FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,926 Commits 1 Branch 26 Tags 73 MiB
959b8e6d1d
Commit Graph

1692 Commits

Author SHA1 Message Date
Robert Osfield
e15006b194 From Cedric Pinson, "here an update of osgmovie example with the following features: 
- play and pause now stop and play all streams given in the command line
(not only the first)
- add key + - to increase decrease the speed of all streams
- add key o to display all stream frame rate
"
 2009-11-20 10:54:39 +00:00
Robert Osfield
6cc2ce5e4a Form Roland Smeenk, "Attached is a small change to the osgWidget::EventInterface so it matches the NotifyWidget and NullWidget interface (added const). Due to this mismatch these widgets never received events. 
I also changed the osgwidgetbox example so the ColorWidget is receiving events again."
 2009-11-19 11:30:22 +00:00
Robert Osfield
1bc204a87f From J.P. Delport, "simple addition to make the scroll wheel work in the example." 2009-11-19 11:21:05 +00:00
Robert Osfield
f38d1cdbb4 Fixed build 2009-11-19 10:47:42 +00:00
Robert Osfield
b7cabac990 From Mathias Froechlich, "Attached the collected fixes I needed to compile with all of them. 
Most notable the __hpux define stuff. The __hpux__ variant seems to be not
defined which resulted in a compile error at this time. Consequently I have
replaced all occurances of __hpux__ with __hpux. And huge surprise: now osg
plugins are found and loaded correctly ...
The next notable one is the MSVC_IDE fix which makes the nmake Makefiles cmake
generator target behave like the ide one. Showed up because I started to do
scripted builds with nmake instead of devenv...
The rest is the usual bunch of stuff that just happens during normal
coding ..."
 2009-11-18 12:15:29 +00:00
Robert Osfield
79f766efab Added OSG_CPP_EXCEPTIONS_AVAILABLE cmake option to enable optional build of plugins and examples that required C++ exceptions 2009-11-17 12:55:52 +00:00
Robert Osfield
22e01d3cba From Cedric Pinson, "After fixing Skeleton, i introduce a compile issue in 
osganimationhardware example
I added a #include <osg/MatrixTransform> to fix it
"
 2009-11-13 13:52:12 +00:00
Robert Osfield
e166b510c7 Improved compatibility with GLES2 2009-11-12 12:07:13 +00:00
Robert Osfield
b00ff07294 Changed default enabling of vertex attribute mapping 2009-11-10 12:03:03 +00:00
Robert Osfield
8bba7c9f98 Added enabling of lighting, and disabling of mipmapping to help out testing of GLES2 target 2009-11-10 12:01:28 +00:00
Robert Osfield
aa2bb575c4 Added simple textured scene graph test accessible using --texture or -t command line options. 2009-11-06 16:51:38 +00:00
Robert Osfield
40f2478b77 Fixed build 2009-11-06 16:09:16 +00:00
Robert Osfield
d7d6d2b215 Moved glColor/glNormal definitions for GLES1.x from include/osg/GL to src/osg/ArrayDispatchers.cpp to avoid import/export issues on functions. 
Fixed typo of GLES1 in disabling the build of OpenGL1.x/2.x specific examples
 2009-11-04 17:26:59 +00:00
Robert Osfield
211ea2f263 Added --simple option and associated set up of a very simple geometry and shader scene graph 2009-11-04 11:03:13 +00:00
Robert Osfield
12ca5156f8 Disabled osgteaport for GLES1, GLES2 and GL3 builds 2009-11-03 16:49:13 +00:00
Robert Osfield
8a4956a257 Replaced glColor4fv call with osg::State::Color(..) 2009-11-03 16:48:48 +00:00
Robert Osfield
8d67c9bb33 Disabled the build of plugins that aren't supported under GLES. 2009-11-03 15:22:14 +00:00
Robert Osfield
a4639398e8 Fixed compile issue with Image.cpp and osgautocapture.cpp under GLES. 
Fixed handling of EGLDisplay in EGL paths of GraphicsWindowX11
 2009-11-01 09:04:41 +00:00
Robert Osfield
0ca4c82e3a Fixed for GLES1 build 2009-10-30 15:16:44 +00:00
Robert Osfield
7e7135be59 From Cedric Pinson, updates to osganimation example to keep in sync with changes with osgAnimation, and introduction of a hardware skinning example 2009-10-28 13:31:24 +00:00
Robert Osfield
126462bb0b Added stats handler to track performance effects of new GLBeginEndAdapter usage 2009-10-21 15:48:11 +00:00
Robert Osfield
9382800576 Added stats handler 2009-10-21 14:14:22 +00:00
Robert Osfield
a0eba771e8 Updated wrappers 2009-10-16 17:22:20 +00:00
Robert Osfield
aefd1513f4 Ported osg::Geometry across to supporting the aliasing of vertex, color and normal etc. calls to Vertex Attributes. 
Added support for automatic aliasing of vertex, normal, color etc. arrays to Vertex Attribute equivelants.

Added new osg::GLBeginEndAdapter class for runtime conversion from glBegin/glEnd codes to vertex arrray equivelants.

Added automatic shader source conversion from gl_ to osg_ builtins.
 2009-10-16 16:26:27 +00:00
Robert Osfield
9e2567cb88 Made the use of the new projection and modelview matrix uniforms optional 2009-10-11 06:05:19 +00:00
Robert Osfield
ae440bfaef From Wojciech Lewandowski, "ref_ptr usage changes made on 9th of June broke VirtualProgram used in osgShaderCompositor example. Taking the opportunity I modified the code a little to use earth sphere as default model. Cow.osg used previously was not looking good in advanced example. I also changed default to advanced example, because its more informative with labels describing virtual programs used to render the objects." 2009-10-10 09:53:10 +00:00
Robert Osfield
e1b3874fd2 From Cedric Pinson, "Here an update of osganimationtimeline example, the callback did not 
follow the callback api, i updated to fix this, then the callback are
called correctly."
 2009-10-10 09:35:16 +00:00
Robert Osfield
f6166d1119 Introduced new uniforms for tracking the modelview and project matrices in shaders using non built-ins. 2009-10-09 13:39:11 +00:00
Robert Osfield
ba8d38b885 Added use of binding of vertex attributes to names 2009-10-09 10:39:55 +00:00
Robert Osfield
1babe771e7 Added remapping of gl_ and ftransform() variables to osg_ equivalents. 2009-10-08 16:23:40 +00:00
Robert Osfield
1cfe017209 Implemented remapping of gl_ builtins vertex attributes to osg_ equivlants. 2009-10-08 15:58:23 +00:00
Robert Osfield
3f55f3f140 New osgvertexattributes example designed to test conversion of fixed function scene graphs to use vertex shaders 
and vertex attributes.
 2009-10-08 14:29:54 +00:00
Robert Osfield
2d26cbe7ab Introduced optional build against the GLU library, using optional compile paths to enable/disable GLU related function. 
To toggle the use of the GLU library adjust the OSG_GLU_AVAILABLE variable via ccmake . or CMakeSetup.
 2009-10-07 19:42:32 +00:00
Robert Osfield
f75013d534 Introduced new BufferObject design + implementation in preperation of implementing a pool system for buffer objects 2009-10-01 20:19:42 +00:00
Robert Osfield
3c03682b4c Introduced new osgQtBrowser example. 2009-09-17 13:40:53 +00:00
Robert Osfield
80be1d9dd6 Fixed empty lines 2009-09-04 09:11:49 +00:00
Robert Osfield
fa84f280f6 Renamed the osgVolume::Layer/ImageDetails parameters RescaleIntercept and RescaleSlope to more general TexelOffset and TexelScale, and changed type to Vec4. 
Refactored the transfer function set up in RayTracedTechnique to prepare for new scale and offset uniforms.

Updated wrappers
 2009-09-03 13:40:50 +00:00
Robert Osfield
43e3089417 Added support for recording the RescaleIntecept and RescaleSlope from the dicome files and passing these values onto osgVolume::ImageLayer 2009-09-01 10:48:32 +00:00
Robert Osfield
b76983c7f9 Fixed typo 2009-08-19 15:36:46 +00:00
Robert Osfield
589629cab8 Introduced TabBoxTrackballDragger 2009-08-05 16:02:44 +00:00
Robert Osfield
431290c04e From Cedric Pinson, fix crash without error messages if the example does find the nathan.osg file. 2009-07-16 11:49:37 +00:00
Robert Osfield
6e6a7c960e Added Dragger::s/getActivationModKeyMask(..) and Dragger::s/getActivationKeyEvent(...) methods to make it possible to have draggers that only respond when you press a specified modified key or standard key. 
Changed the optional dragger in osgvolume to require the shift key to be pressed for the dragger to become active.
 2009-07-03 19:16:53 +00:00
Robert Osfield
baef387b3d Added TrackballDragger code path 2009-07-03 05:54:27 +00:00
Robert Osfield
23dec86e22 Added support for a "-m" option that adds a tab box manipulator to allow positioning and resizing of the rendered volume 2009-07-02 18:50:45 +00:00
Robert Osfield
af39672d3d Removed old references to CommandManager 2009-07-01 14:50:08 +00:00
Robert Osfield
2525bb5d06 Completed refactor of osgManipulator, key changes are: 
Selection is now just a typedef of osg::MatrixTransform, and is deprecated

   CommandManager is shell class that just sets values directly on Dragger, and is deprecated

   Dragger now has list of DraggerCallback that takes over the roll of tracking changes to the Dragger, and
   allows users to track the dragger in any way they wish.

   Dragger now has a convinience method making MatrixTransforms track a dragger.

   Selection and CommandManager are no longer required for use of osgManipulator and are kept around for backwards compatibility.
 2009-07-01 14:01:09 +00:00
Robert Osfield
a2ae370c8e Refactored osgManipulator so that CommandManager is no longer required, instead Dragger directly manages Constaints and associate Selections. 2009-06-30 11:39:39 +00:00
Robert Osfield
e30e4df30c Introduced event handling directly into osgManipulator::Dragger to allow it be used with a global event handler passing in events. 2009-06-29 21:32:10 +00:00
Robert Osfield
9d792c279b From Don Liech, Qt/OSG integration example 2009-06-19 11:31:15 +00:00
Robert Osfield
ad8f2d8974 Changed build OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION to ON and then fixed all the resulting build errors. 2009-06-17 10:39:39 +00:00
Robert Osfield
1479902b07 Added basic Matrix::decompose() test, based on a test progrem wrttien by Paul Obermeier 2009-06-08 12:50:26 +00:00
Robert Osfield
40155d59b4 Implemented updating of revision files as new data is writing to the FileCache 2009-06-04 14:07:12 +00:00
Robert Osfield
cf976e956d Added osgdatabaserevisions example to server as a testbed for new osgDB::DatabaseRevisions functionality 2009-06-02 16:58:32 +00:00
Robert Osfield
aaee56cbde Ran dos2unx of files 2009-05-29 08:24:52 +00:00
Robert Osfield
f0b55bbdb3 From Wojciech Lewandowski, "I suppose this error is caused by using 4 component tex coord in texture2D call. I always forget about adding .xy swizzle at the end of tex coord. I have attached code (hopefully fixed). My NVidia seems to ignore such errors. Cannot test it myself. Simple example works because I actually use textture2Dproj there." 2009-05-28 13:40:54 +00:00
Robert Osfield
d06265b782 Fixed warnings 2009-05-28 13:26:06 +00:00
Robert Osfield
825d701757 Renamed application osgvirtualprogram to osgshadercompostior to better reflect it function 2009-05-27 13:02:01 +00:00
Robert Osfield
dc67dab42e Renamed osgvirtualprogram to osgshadercompositor to better reflect it's function 2009-05-27 13:00:58 +00:00
Robert Osfield
f845b6790a Fixed warning 2009-05-27 09:45:46 +00:00
Robert Osfield
baf1899f33 Fixed warnings 2009-05-26 10:10:11 +00:00
Robert Osfield
2d542d683a From Wojciech Lewandowski, VirtualProgram example that illustrates how one can create a custom system for composing shaders within the scene graph. 2009-05-25 13:02:14 +00:00
Robert Osfield
a2bc7f6759 Fixed typo 2009-05-19 15:11:49 +00:00
Robert Osfield
41b6c4dde8 Rearranged static SDL callback so that it's after the SDL.h header. 2009-05-13 08:40:10 +00:00
Robert Osfield
0de08dad28 Removed SDL header 2009-05-12 16:26:07 +00:00
Robert Osfield
9c5498376c Re-ordered SDL class to try and avoid OSX issues with _main. 2009-05-12 13:24:08 +00:00
Robert Osfield
e179ecc69d Attempt to fix OSX missing _main symbol error 2009-05-12 12:27:54 +00:00
Robert Osfield
02b84e931e From Chris Hanson, spelling and grammer fixes 2009-04-22 12:52:22 +00:00
Robert Osfield
9478fa7f02 From Eduardo Alberto Hernández Muñoz, change to using TexGenNode for setting up tex coordinates 2009-04-22 11:00:20 +00:00
Robert Osfield
9996e565ba From Paul Martz, "Looks like the people who created these two examples were a bit careless with cut and paste." 2009-04-22 10:54:11 +00:00
Robert Osfield
435f410bf8 Fixed build error by replacing M_PI with osg::PI. 2009-04-10 11:19:34 +00:00
Robert Osfield
fddaaf0d00 From Ravi Mathur, "OK I have been away for a looong time, but still occasionally watching from a distance, and saw the bug people have reported about the DepthPartitionNode not handling scaled models properly. 
I believe this is now fixed ... I have attached the new DistanceAccumulator.cpp, along with a modified example file that uses a PositionAttitudeTransform to draw the Earth's orbit around the Sun."
 2009-04-09 14:25:14 +00:00
Robert Osfield
b93581e687 From Cory Riddell, fix for aspect ratio 2009-04-08 14:08:16 +00:00
Robert Osfield
fd5f5a71c2 From Martin Beckett, added mouse wheel support 2009-04-08 10:32:19 +00:00
Robert Osfield
7a56842ef5 Tweaks to shader to fix warnings on with ATI drivers 2009-04-03 09:54:15 +00:00
Robert Osfield
80190a6ffb Added shader to convert images into greyscale when rendering in anaglyphic 2009-03-30 09:55:40 +00:00
Robert Osfield
90f77c43d5 Added osgtexturecompression example to demonstate the quality difference between 
different compression techniques.
 2009-03-26 17:24:28 +00:00
Robert Osfield
31e7f32d3f Added support for image streams 2009-03-24 23:17:05 +00:00
Robert Osfield
63cdbd8714 From Roland Smeenk, "Here's a small simplification of the osganimationmorph example. Only one morphtarget needs to be added to the MorphGeometry since it already has a base geometry. The animation will morph between the base geometry and the first target. 
"
 2009-03-23 16:07:43 +00:00
Robert Osfield
1fd5eefbcf From Maciej Krol, "As promised to Roland I assembled simple shader generator. ShaderGenVisitor converts accumulated fixed function pipeline state sets to ones with shader programs. Generated state sets are attached to geometries and stored in ShaderGenCache for reuse. 
Very simple cases of state configuration are supported (all the ones I really need):
- single per pixel not attenuated non spot light source ON/OFF
- exp2 fog ON/OFF
- diffuse texture in rgb + optional specular gloss in alpha (Texture unit 0) ON/OFF
- normal map texture (Texture unit 1 and Tangent in VertexAttribArray 6) ON/OFF
- blending and alpha testing (not in shader pipeline)

To view fixed function pipeline files and paged databases simply run >osgshadergen myfile.osg"
 2009-03-23 11:53:06 +00:00
Robert Osfield
f1053c52dc Warning fixes 2009-03-13 11:06:12 +00:00
Robert Osfield
7b5f3ec92a Moved IncrementalCompileOperation out of include-src/osgUtil/GLObjectVisitor into their own files. 
Added support to IncrementCompileOperation for controlling how much time is alloted to compilation and flush
 2009-03-12 15:21:04 +00:00
Robert Osfield
1211fd1120 Changed audio playing so that it only happens for a single movie to avoid 
problems with audio stalling.
 2009-03-11 18:13:58 +00:00
Robert Osfield
73cffacf09 Added docs on getPixelAspectRatio and corrected usage of getPixelAspection in osgmovie.cpp 2009-03-11 17:57:33 +00:00
Robert Osfield
5233a716c8 Added handling of Image::isImageTranslucent(), when it is enabling blending. 
Added handling of Image::getPixelAspectRatio() in geometry sizing.
Added scaling of the projection matrix to ensure that aspect ratio is honoured with running in fullscreen mode
 2009-03-11 15:43:13 +00:00
Robert Osfield
ae50d8d956 From Roland Smeenk & Cedric Pinson, 
"Summary of changes:
From Roland
-Added MorphGeometry
-Bone Bindmatrix is only calculated if needed
-osgAnimation plugin now supports all available channel types (before only linear vec3 or quat channels)
-osgAnimation plugin now supports MorphGeometry
-osgAnimation plugin now supports animation and channel weights, animation playmode, duration and starttime
-removed osgAnimationManager.cpp from CMakeList

From Cedric
-fixed the last_update field (it was only updated at the first update) in BasicAnimationManager.cpp
- Refactore some part of MorphGeometry minor changes
- Add osganimationmorph as example
"
 2009-03-09 17:38:39 +00:00
Robert Osfield
7473b06275 Preliminary work on general purpose incremental compile support in osgViewer. 2009-03-08 12:00:36 +00:00
Robert Osfield
97e987a9d9 Added SDL audio path 2009-03-03 20:59:16 +00:00
Robert Osfield
b678c8ca85 Added SDL audio support for reading from ffmpeg movies 2009-03-03 17:37:48 +00:00
Robert Osfield
e035decd95 Introduce FFmpegAudioStream implementation 2009-03-03 16:51:01 +00:00
Robert Osfield
7dc849b97a From Petr Salinger, fix for build under GNU/kFreeBSD. 2009-03-02 09:56:39 +00:00
Robert Osfield
ca895c4ac6 From Bryan Thrall, "Attached files fix typos, from svn 9791: 
DisplaySettings.cpp: OSG_COMPIlE_CONTEXTS -> OSG_COMPILE_CONTEXTS
AnimtkViewer.cpp: is a 3d poker game client -> is an example for viewing
osgAnimation animations"
 2009-02-20 11:53:49 +00:00
Robert Osfield
4d0a3444be From Christian Buchner, "I am hereby amending the osgforest sample with some code (functionally 
equivalent to the GLSL shaders sample) that displays the forest with
shaders on Intel 945 GM hardware. This card supports OpenGL 1.4 and
ARB_fragment/vertex_program only.

I would be pleased if this change made it into the official set of
examples, as it illustrates the use of ARB shaders quite nicely. I did
not find any other example covering this topic."
 2009-02-19 16:58:05 +00:00
Robert Osfield
979d1e6be7 Merged in various changes from the OSG-2.8 to being svn/trunk up to date. 2009-02-19 14:24:10 +00:00
Robert Osfield
51f6fa249f Merged fixes to osgVolume's handling of ImageSequence animated volumes, merge command: 
svn merge -r 9746:9747 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.8
 2009-02-10 18:51:43 +00:00
Robert Osfield
e15383fd7a From Fabien Lavignotte, "Here is some various small fixes i have done while playing with 
osgAnimation.
 - Animation : removed the _name attribute that is never used.
 - BasicAnimationManager : fix a crash on Windows with the example
osganimationviewer. The _lastUpdate attribute was not initialized when
using copy constructor.
 - CMakeLists.txt : add RigGeometry to the headers list"
 2009-02-09 22:56:21 +00:00
Robert Osfield
1e886ce539 From Paul Melis, "While trying out the osgbrowser example (where I had forgotten to update 
LD_LIBRARY_PATH so the XUL libs would be found) I noticed that although
the gecko plugin was found it could not be loaded. But this did not
trigger any visible warning/error message (at least not without INFO
notify level). Would you mind if we change the notify level for a
dlerror() to WARNING? This will also make it more explicit for the case
when a plugin isn't actually found, which seems to come up a lot for
novice users (e.g. no freetype on win32, so no freetype plugin, etc).
Also, the current error message is misleading ("Warning: Could not FIND
plugin to ...") because the it's not always a case of not finding the
plugin. I slightly enhanced the situation of not finding a plugin versus
finding it but not being able to load it.

Here's also a few fixes to some of the examples:
- osgfont: make usage help line more in line with the actual behaviour
- osgcompositeviewer: complain when no model file was provided
- osgmovie: don't include quicktime-dependent feature on Linux
- osgocclussionquery: comment addition (as I was surprised that lines
were being drawn in a function called createRandomTriangles())"
 2009-02-08 15:56:35 +00:00
Robert Osfield
22e4e63060 From Gary Quinn, spelling fixes 2009-02-06 15:17:49 +00:00
Robert Osfield
42cc008c06 From Morne Pistorius, "Attached is a modified version of the QOSGWidget example that shows 
the workaround we discussed for adding/removing views in a composite
viewer at runtime.  A dummy view is added to the viewer to always keep
it live.

Also, I added a #define to the Qt event relay methods to not override
them on a Windows system.  This fixes the bug where duplicate events
are being sent and making it impossible to throw the trackball."
 2009-02-05 12:21:50 +00:00
Robert Osfield
a2c88dd39e Warning fixes 2009-02-05 12:03:19 +00:00
Robert Osfield
baac534bcc From Jean-Sebastien Guay, warning fixes 2009-02-05 10:14:49 +00:00
Robert Osfield
2540c7dd57 Disabled warning 2009-02-03 20:17:24 +00:00
Robert Osfield
734463fcc7 Warning fixes 2009-02-03 15:28:53 +00:00
Robert Osfield
abb63e3199 Added setDataVariance(DYNAMIC) to text label as it's being updated dynamically 2009-02-03 12:47:41 +00:00
Robert Osfield
2d55740b3e Refactored osg::TransferFunction1D to use an std::map internally which is kept in sync with the actual osg::Image that is passed to the GPU. 
Added .osg support for osg::TransferFunction1D.

Updated wrappers
 2009-02-02 14:43:27 +00:00
Robert Osfield
281800539e Fixed handling of TransferFunctionProperty. 2009-01-31 21:45:47 +00:00
Robert Osfield
04631ff9ae From Jean-Sebastien Guay, added missing windows socket library 2009-01-29 16:38:46 +00:00
Robert Osfield
4291a8e193 Added CMakeLists.txt for osgcluster 2009-01-29 14:35:15 +00:00
Robert Osfield
9b64144a2f Added osgcluster example into build system 2009-01-29 13:17:48 +00:00
Robert Osfield
e5680b2b4f Removed now redundent shader files. 
Fixed the adding of  transfer function property.
 2009-01-29 09:24:45 +00:00
Robert Osfield
8c134750e6 Removed old shader files 2009-01-28 16:48:10 +00:00
Robert Osfield
2b45fd1510 From Paul Melis, "Here is an updated osgViewer::StatsHandler. It has the following changes: 
- The text and dark background rectangles are now correctly placed, and
slightly resized here and there.
- All counters (vertices, etc) now use a fixed formatting with 0 digits
precision, to prevent the text from being shown in scientific notation
when the number get large (e.g. 6.34344e+6). I tested with a scene
containing roughly 4 million vertices, to make sure its stats would
display correctly.

I also made slight changes to osgcompositeviewer (attached) to aid in
testing the stats display, specifically displaying of camera and view
names."
 2009-01-28 09:31:43 +00:00
Robert Osfield
baa25411fd From Paul Melis, remove redundent spaces 2009-01-28 09:26:44 +00:00
Robert Osfield
55e89e4466 From Cedric Pinson, "updated osgAnimation with the trunk here the update: 
examples/osganimationviewer/AnimtkViewer.cpp:
- add option to display bone (--drawbone)
- dont crash if the file does not contains a AnimationManagerBase, display the content only

examples/osganimationviewer/AnimtkViewerGUI.cpp:
- adjust the path of image for the gui

include/osgAnimation/Interpolator:
- add warn message instead of old assert

include/osgAnimation/Bone:
src/osgAnimation/Skeleton.cpp:
- change a method name to fit better with what it does. setMatrixInSkeletonSpace instead of setBoneInSkeletonSpace

include/osgAnimation/Skinning:
src/osgAnimation/RigGeometry.cpp:
- add patch from Fabien Lavignotte to compute normal correctly

include/osgAnimation/Sampler:
- adjust behviour without assert, return 0 instead of crashing
"
 2009-01-21 19:02:54 +00:00
Robert Osfield
d542961ca3 Fixed compile errors for when ref_ptr<> auto conversion is disabled 2009-01-21 19:01:26 +00:00
Robert Osfield
a6284b0e03 Renamed ShaderTechnique to RayTracedTechnique 2009-01-21 14:27:58 +00:00
Robert Osfield
0897368fa6 Cleaned up osgvolume 2009-01-21 12:06:13 +00:00
Robert Osfield
1c88753551 Introduced the ability to switch between different visual properties in osgVolume 2009-01-21 11:46:03 +00:00
Robert Osfield
a40aa3a734 Moved PropertyAdjustmentCallback from osgvolume.cpp into osgVolume. 
Updated lighting shaders.
 2009-01-20 17:41:45 +00:00
Robert Osfield
fe667cdd2b Added event key variables 2009-01-20 15:06:44 +00:00
Robert Osfield
d46e0fcc79 Added support for SampleDensityProperty and TransparencyProperty 2009-01-20 13:50:57 +00:00
Robert Osfield
87cd4530f5 Added AlphaFunc support into osgVolume::AlphaFuncProperty. 2009-01-20 12:39:26 +00:00
Robert Osfield
894b161878 Updated event callback to be able to update iso surface value. 2009-01-17 17:23:47 +00:00
Robert Osfield
b176c3a223 Removed old volume rendering scene graph code from osgvolume example. 
Moved createNormalMapTexture and applyTransferFunction functions from osgvolume example into include/osgVolume/Layer.
 2009-01-16 17:59:38 +00:00
Robert Osfield
29ac92df0e Moved basics of fixed function pipeline implementation from osgvolume example into osgVolume 2009-01-16 11:27:20 +00:00
Robert Osfield
78c2f98b7a Introduced ImageLayer computeMinMax + rescaling methods, and use of rescaleToZeroToOneRange by default. 2009-01-16 10:23:17 +00:00
Robert Osfield
ba94ea8c7d Introduce osgVolume::PropertVisitor, and IsoSurface, MaximumImageProjection, Ligting and AlphaFunc Properties 2009-01-15 15:57:04 +00:00
Robert Osfield
d87ec7cb18 Introduced osgVolume::Property, CompositePropery and TransferFunctionPropety classes 2009-01-14 15:16:29 +00:00
Robert Osfield
f260737cd8 Introduced class interfaces for FixedFunctionTechnique and ShaderTechnique volume rendering techniques. 2009-01-13 17:20:32 +00:00
Robert Osfield
c2e7eacc06 Changed to use ref_ptr<> for scene model to avoid crash 2009-01-12 13:12:04 +00:00
Robert Osfield
e37d22ad27 Fixed warning 2009-01-09 15:57:14 +00:00
Robert Osfield
458993fa88 Moved osgVolume::ImageUtils to osg::ImageUtils, updated wrappers, and started moving osgvolume example across to create osgVolume subgraphs 2009-01-09 15:19:25 +00:00
Robert Osfield
c380ac5a1f From Cedric Pinson, "Here the updated osganimationskinning.cpp that works as before" 2009-01-08 14:52:11 +00:00
Robert Osfield
803d0dc60c Added missing *. 2009-01-08 12:47:20 +00:00
Robert Osfield
418dc34776 Fixed warnings 2009-01-07 11:24:47 +00:00
Robert Osfield
8745ec7d69 Removed the usage of assert to prevent associated compile warnings and to clean up code 2009-01-06 19:09:50 +00:00
Robert Osfield
5bf69c9cbb Updated path to reflect where the new button images are located. 2009-01-06 19:08:34 +00:00
Robert Osfield
1d599c0572 From Don Leich, "Here are a couple of fixes for the file examples/osgviewerQT/QOSGWidget.cpp to 
address some OS X issues.  Most of these fixes were previously submitted by Julian Scheid.  However, this patch however should not break the example for non-OS X builds and has been tested on 64-bit Linux as well as Mac OS X 10.5.

o  The value returned by QWidget::winId() is not usable as input for
WindowData under OS X the way it is for both Windows and Unix.  Julian's fix
for this uses the Carbon API.  Since the fix for X11 in unknown, it is now
assumed that OSG has been built with OSG_WINDOWING_SYSTEM='Carbon' for this
example to work at all when running under OS X.

o  The CompositeViewer version would hang on exit with the original timer start
argument.  Changing the argument value to match the non-composite version
seemed to cure the hanging.

o  Julian's patch altered the setGeometry position to 30/30 in order to see any
window decorations.  I did not have this problem, but left his changes intact.

o  The non-composite viewer needed it's camera initialization defered until
after the ViewerQOSG's Qt base class had been initialized.  Otherwise, the view
did not cover the entire window.
"
 2009-01-06 16:45:35 +00:00
Robert Osfield
af7bb82175 From Paul Martz, example demonstating new draw instanced primitive funcitonality. 2009-01-06 15:11:54 +00:00
Robert Osfield
3ddafa1078 From Don Leich, build fix for OSX. 2009-01-05 17:52:41 +00:00
Robert Osfield
910927145e From Paul Martz, added --points option for forcing points rendering of polygonal models 2009-01-05 17:06:09 +00:00
Robert Osfield
02beb8c74a Added support for user defined clipping of the precipitation effect, to test use: 
osgpreciptation lz.osg --clip 20
 2008-12-19 16:13:19 +00:00
Robert Osfield
74d090845f Added StandardShadowMap to list to test cases 2008-12-19 12:28:53 +00:00
Robert Osfield
9b1445d5b9 Fixed warnings 2008-12-18 13:56:30 +00:00
Robert Osfield
f8151127e3 From J.P Delport, "I changed the default HDR mode to the ARB format and put in comments for some other possible modes. 
Some other comment cleanups too."
 2008-12-17 17:23:17 +00:00
Robert Osfield
ffe77a785a Build fixes for when the implict ref_ptr<> cast is not enabled 2008-12-16 20:49:12 +00:00
Robert Osfield
60fc821764 From Cedric Pinson and Jeremey Moles, Changes to OpenSceneGraph-osgWidget-dev branch. 
Notes from Robert Osfield, Merged changes to OpenSceneGraph-osgWidget-dev r9367 (prior to my botched attempt at merged svn/trunk into the branch).
 2008-12-16 20:29:00 +00:00
Robert Osfield
315aeeb557 Where possible moved redundent C header includes from headers to source files 2008-12-12 18:47:30 +00:00
Robert Osfield
4896fe6e05 From Mattias Helsing, "When building osg static on Windows the _declspec's wasn't escaped for 
applications, examples or wrappers. Attached are the CMakeLists I had
to change to make these compile.
"
 2008-12-11 17:00:40 +00:00
Robert Osfield
c3611c5875 Added mechanism for registering proxy objects in the .osg plugin in a way that is compatible with static linking. 2008-12-10 16:26:02 +00:00
Robert Osfield
bceaef6f06 Fixed link line 2008-12-10 12:50:40 +00:00
Robert Osfield
c8190d9c54 Cleaned up osgWidget::VncClient and osgWidget::Browser so that their implementations are all more consitent with the osgWidget::PdfReader. 2008-12-09 11:05:04 +00:00
Robert Osfield
d8c17e4c4c Added support for setting background colour of Pdf document. 2008-12-09 09:26:51 +00:00
Robert Osfield
6f356aeb97 Intoduce new osgWidget::PdfReader and osgWidget::VncClient front ends to osgWidget, 
with new pdf plugin and updated vnc plugin that now support these front ends.

Updated osgpdf and osgvnc examples to new these new interfaces.
 2008-12-07 17:02:30 +00:00
Robert Osfield
3c611dcf30 Build fix for when implicit conversion in ref_ptr<> is switched off. 2008-11-29 11:35:03 +00:00
Robert Osfield
cd4b4b8bfe Added new examples 2008-11-28 14:37:58 +00:00
Robert Osfield
070b9c2cd9 From Cedric Pinson, updates to osganimation examples. 
Merged by Robert Osfield, from OpenSceneGraph-osgWidget-dev
 2008-11-28 14:37:16 +00:00
Robert Osfield
9b1841d009 From Jeremy Moles, updates to osgwidget examples. 
Merged by Robert Osfield from OpenSceneGraph-osgWidget-dev
 2008-11-28 14:36:39 +00:00
Robert Osfield
12bfb6d79a From Jean-Sebastien Guay, "osgautocapture uses M_PI to convert degrees to radians, which didn't compile on Win32. Switched to using osg::DegreesToRadians. Also removed the "convert to radians" comment on each line, as the code clearly conveys this without needing a comment now." 2008-11-27 09:45:41 +00:00
Robert Osfield
270fd48536 From John Vidar Larring, osgautocapture example that captures an image from a paged database by frame loop to the paging is complete, then takes a snapshot. 2008-11-26 11:23:06 +00:00
Robert Osfield
a7a7115581 Fix for build with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION off 2008-11-25 15:57:27 +00:00
Robert Osfield
d08d778608 From Jaromir Vitek, "In attachment are another fixes for using packed depth+stencil (PDS). 
* When used PDS RenderStage::runCameraSetUp sets flag that FBO has already stencil,depth buffer attached. Prevents adding next depth buffer.
* Sets correct traits for p-buffer if used PDS and something goes wrong with FBO setup or p-buffer is used directly.
* Adds warning to camera if user add depth/stencil already attached through PDS.
* Sets blitMask when use blit to resolve buffer.

There is also new example with using multisampled FBO."
 2008-11-25 10:57:14 +00:00
Robert Osfield
2517c1e77e Improved the set of the master + slave cameras 2008-11-24 16:02:20 +00:00
Robert Osfield
6ae07ce0e2 From Roland Smeenk, "This application can be used for testing plugins that can both read and write a certain file format. It will display the original file next to the written and reread file. 
Example:
osgsidebyside -o cow.dae cow.osg
 
This example will read cow.osg, write cow.dae, read cow.dae and display cow.osg on the left side and cow.dae on the right side of the view.
 
Possible interactions:
KEY_UP   Speedup DOF animation
KEY_DOWN SlowDown DOF animation
KEY_RIGHT Toggle all MultiSwitches"
 2008-11-24 14:37:15 +00:00
Robert Osfield
d7ba995370 Updated wrappers 2008-11-24 10:13:27 +00:00
Robert Osfield
5b15436935 Added mechanism for tracking when interactive images are being rendered to 
enable their backends to only rendered them when they are actively being rendered
in the OpenGL window.
 2008-11-23 15:51:43 +00:00
Robert Osfield
9f55408ca3 Removed the optional build for osgWidget and plugins as these are options that are appropriate for building all the time 2008-11-22 14:30:21 +00:00
Robert Osfield
56a2cc65d0 From Cedric Pinson, Pulled in osgAnimation from OpenSceneGraph-osgWidget-dev into svn/trunk. 2008-11-22 12:14:19 +00:00
Robert Osfield
d903423ded From Jaromir Vitek, osgpackeddepthstencil example as a test case. 2008-11-21 12:38:22 +00:00
Robert Osfield
beae8ab67f Clean up osgbrowser after moving browser implementation into gecko plugin 2008-11-20 11:28:20 +00:00
Robert Osfield
5288263528 Moved Browser.h and Browser.cpp from osgbrowser into osgWidget. 2008-11-19 17:16:29 +00:00
Robert Osfield
35330867c5 Fixed component directory path handling. 2008-11-19 17:02:45 +00:00
Robert Osfield
094733def5 Refactored browser classes so that there is now a base class and reader writer. 2008-11-19 16:58:32 +00:00
Robert Osfield
297dd32011 Changed osgbrowser example to use a local CMakeModules/FindXUL.cmake script, 
and specialization of GTK dependencies to only non Windows/OSX platforms.
 2008-11-18 23:38:18 +00:00
Robert Osfield
a36ff70df4 Removed debug output 2008-11-18 17:20:45 +00:00
Robert Osfield
96188d0240 Moved update functionality into from UBrowserImage into update. 2008-11-18 14:46:02 +00:00
Robert Osfield
3b3d932d30 Added support for running all ubrowser operataions in a background thread. 2008-11-18 13:36:47 +00:00
Robert Osfield
8abd7c3a76 Fixed key mapping 2008-11-17 19:15:12 +00:00
Robert Osfield
37bd44042a Refactored the UBrowser functionality so a UBrowserThread singlton class takes 
over more responsibility of integratation with llmozlib.
 2008-11-17 17:58:59 +00:00
Robert Osfield
ca5c93a983 Removed dependency on GLUT. 2008-11-17 15:53:04 +00:00
Robert Osfield
5eaf95ed0f Ported example to using OSG objects for rendering rather than GLUT 2008-11-17 15:49:24 +00:00
Robert Osfield
39646d2dff Introduced xulrunner extensions from llmozlib2, and got things working under linux 2008-11-17 10:36:55 +00:00
Robert Osfield
2a1f7f0f7a Added GTK and GLUT guards to osgbrowser include 2008-11-14 16:54:07 +00:00
Robert Osfield
b62cb79c7e Further work on experiment llmozlib/geko based embedded web browser 2008-11-14 16:48:07 +00:00
Robert Osfield
d75cc7f84d An "attempt" at using LLMozLib sources as a base for a gecko based embedded browser. 2008-11-13 15:35:08 +00:00
Robert Osfield
ab9c0898c3 Moved Poppler-glib check into root CMakeList.txt 2008-11-12 22:54:12 +00:00
Robert Osfield
69effce44e Improved filepath handling, and increased the image resolution for better rendering quality 2008-11-12 14:57:30 +00:00
Robert Osfield
771dc7d645 Introduced new osgpdf example that use Cario + Poppler libraries to provide a means of rendering a pdf document to an osg::Image. 2008-11-12 14:21:05 +00:00
Robert Osfield
89829f8153 Added osgViewerGetVersion() into context creation code as a means of forcing windows to link in osgViewer properly. 2008-11-12 10:30:17 +00:00
Robert Osfield
c1568bb735 Improved naming 2008-11-11 17:59:35 +00:00
Robert Osfield
f1bb6592bb Tweaked comment 2008-11-11 17:30:11 +00:00
Robert Osfield
014246bef6 Added default fallback of a window context is none is otherwise specified. 2008-11-11 17:29:48 +00:00
Robert Osfield
7468904dd6 Added command line argument docs and support for -h/--help command line options 2008-11-11 16:59:58 +00:00
Robert Osfield
ee172b840c Added timing stats 2008-11-11 16:21:04 +00:00
Robert Osfield
3754dc4230 Added --geometry, --geometry-vbo and --geometry-va command line options and associated geometry test codes 2008-11-11 16:13:37 +00:00
Robert Osfield
4dd8ad2f16 Added --delay <microseconds> option that is run between each OpenGL object apply, defaults to 0 2008-11-11 15:00:29 +00:00
Robert Osfield
0de253ad2c Added support for fbo testing. 2008-11-11 12:50:51 +00:00
Robert Osfield
915a645761 First cut of osgmemorytest example that is written to allocate many windows/pbuffer/GL objects as test of how many objects can be allocated on a machine. 2008-11-10 20:06:27 +00:00
Robert Osfield
5bb6fe2ee7 Added support for Camera::PACKED_DEPTH_STENCIL_BUFFER to .osg and .ive formats 2008-11-09 11:56:02 +00:00
Robert Osfield
d75cd032b9 From Jean-Sebastien Guay, replaced M_PI with osg::PI. 2008-11-08 17:53:51 +00:00
Robert Osfield
720551d549 From Michael Platings, Converted std::fstream/ifstream/ofstream to osgDB::fstream/ifstream/ofstream and 
fopen to osgDB::fopen to facilitate support for wide character filenames using UT8 encoding.
 2008-11-07 15:08:08 +00:00