Robert Osfield
a1bda7d39e
Removed #if 0 #endif block
2013-07-19 10:11:42 +00:00
Robert Osfield
e7b86099d1
Fixed problem with the osgviewerQt code override the default View::Camera without setting it's default state on it's StateSet like View does by default.
2013-07-19 09:43:54 +00:00
Robert Osfield
592c580721
Replaced deprecated osg::Geometry::set*Binding() usage.
2013-06-27 09:59:33 +00:00
Robert Osfield
4b9aa1fd24
Replaced deprecated osg::Geometry::set*Binding() usage.
2013-06-27 09:54:12 +00:00
Robert Osfield
1793466442
With assistance from Sukender, moved the depreacted osg::Geometry vertex indices and AttributeBinding definitions out into a separated namespace/class so to use
...
deprecated features you should now use deprecated_osg::Geometry in place of osg::Geometry.
2013-06-25 16:10:24 +00:00
Robert Osfield
ceb97fe230
From Christian Buchner, "Here is a strongly overhauled version of the original osgoit ("order independent transparency") by Mathias Fröhlich. I called this version myosgoit. It looks very nice, just build and run it!
...
This version adds:
- an encapsulation of the entire Depth Peeling procedure into a class (not currently a scene graph node) for easier integration in other projects.
- compositing with opaque (solid) geometry is possible and the opaque model is only rendered once. This needs to performs some depth buffer blitting between FBOs.
- mix and match with GLSL shaders in the transparent objects is possible, as demonstrated with a 3D heat map intersecting an opaque truck model.
Some Drawbacks:
- the display framebuffer does not receive any depth information from the compositing camera. This could be fixed by compositing with a GLSL shader and writing to FragDepth."
From Robert Osfield, ported the code to work under Linux and without the automatic ref_ptr to C* conversion.
2013-06-25 11:13:50 +00:00
Robert Osfield
15fea448d8
Added new osg::Array::Binding parameter to osg::Geometry::set*Array(osg::Array* array, osg::Array::Binding binding=osg::Array::BIND_UNDEFINED) methods to make it easier for the user
...
to set the binding without the need to call the deprecated osg::Geometry::set*Binding(osg::Geometry::AttributeBinding)
2013-06-21 09:43:15 +00:00
Robert Osfield
d82c62a03b
Removed spaces at ends of lines
2013-06-21 09:40:43 +00:00
Robert Osfield
2ab3a1e316
Removed svn:executable property.
2013-06-19 17:28:28 +00:00
Robert Osfield
df075ef9bb
Cleaned up usage of BIND_PER_PRIMITIVE where possible.
2013-06-19 16:24:59 +00:00
Robert Osfield
744960bbf2
Build fixes for new deprecated osg::Geometry functions
2013-06-19 10:56:31 +00:00
Robert Osfield
297a8a221b
Added #define OSG_USE_DEPRECATED_GEOMETRY_METHODS usage into code to allow code to compile enen when CMake configuration has set the #define to off in include/osg/Config.
2013-06-18 19:09:33 +00:00
Robert Osfield
7d40c7258f
Clean up up osg::Geometry, removing long deprecated support for array indices and BIND_PER_PRIMITIVE binding that forced OpenGL slow paths. osg::Geometry is now smaller and only supports OpenGL fasts paths.
...
New methods osg::Geometry::containsDeprecatedData() and osg::Geometry::fixDeprecatedData() provide a means for converting geometries that still use the array indices and BIND_PER_PRIMITIVE across to complient
versions.
Cleaned up the rest of the OSG where use of array indices and BIND_PER_PRIMITIVE were accessed or used.
2013-06-18 11:18:28 +00:00
Robert Osfield
1a7f2fcb3e
Introduced new osg::PatchParameter StateAttribute class to wrap up glPatchParameter associated state.
...
Note, osg::Program::setParameter(GL_PATCH_VERTICES,num); is nolonger support and should be replaced by using the new PatchParameter class.
2013-06-11 10:52:37 +00:00
Robert Osfield
4623c251bb
Fixed indentation
2013-06-11 10:49:57 +00:00
Robert Osfield
bdfd18dc03
From Kristofer Tingdahl, with additions from Riccardo Corsi and Robert Milharcic, support for Qt5 build
2013-06-10 14:34:25 +00:00
Robert Osfield
a6e57026b2
From Mathias Froehlich, "attached is a change to osgsharedarray to move completely to the fast geometry
...
path. Also the arrays are moved back to static storage since this is the data
that is actually referenced in draw. So the change moving this onto the stack
that happend somewhere before broke this."
2013-06-07 10:52:29 +00:00
Robert Osfield
a70318fbd5
Removed now redundent osggeodemo
2013-06-04 14:43:19 +00:00
Robert Osfield
bab251fc59
Cleaned up BIND_PER_PRIMITIVE and array indice usage
2013-06-04 10:06:19 +00:00
Robert Osfield
caa3a06c70
Introduced GeometryNew which is a cleaned up version of Geometry that removes support for array indices.
...
GeometryNew is only temporary and will be renamed to Geometry on the completion of refactoring work and feedback from community.
Ported osggeometry across to use GeometryNew.
2013-06-04 09:32:59 +00:00
Robert Osfield
4cca5c1d1c
Removed deprecated usage of osg::Geometry indices and BIND_PER_PRIMITIVE
2013-06-04 09:29:37 +00:00
Robert Osfield
47f574429a
From Marcin Prus and Robert Osfield, moved the key parts of the .dds plugins computeRowWidthInBytes implementation into the osg::Image::computeImageSizeInBytes(..) to
...
address bugs in the computation of image size.
2013-05-28 14:14:45 +00:00
Robert Osfield
02e4aef5cb
From Martin Naylor, "I am receiving 1 build error whilst building the SVN, its in osgforest as follows:
...
error C2065: 'GL_RGBA32F' : undeclared identifier
Shoudlnt that be GL_RGBA32F_ARB as defined in texture header?
Attached is the easy fix :)."
2013-05-27 08:13:23 +00:00
Robert Osfield
2923c8014a
From Jordi Torres, "We must use JNI_FALSE instead of false in JNI code. Otherwise the examples will not compile. This patch should be applied to osgAndroidExampleGLES1/jni and osgAndroidExampleGLES2/jni. the osgNativeLib.cpp is the same. "
2013-05-24 17:06:08 +00:00
Robert Osfield
5de095cb1d
From Pawel Ksiezopolski, Added example of using osg::TextureBuffer + GLSL to render forest.
2013-05-23 15:55:22 +00:00
Robert Osfield
455ebbc5f1
Refactored the support for stereo and keystone RTT setup so that it can be applied to an existing Camera.
2013-05-20 19:24:34 +00:00
Robert Osfield
6cb26321a9
Reverted back to changes before experiements with ViewConfig
2013-05-16 14:07:35 +00:00
Robert Osfield
3b6c2b636a
Renamed osgViewer::Config osgViewer::ViewConfig and moved it's declaration into include/osgViewer.
2013-05-16 10:11:06 +00:00
Robert Osfield
e3ed763c15
Added WoWVxDisplay view config
2013-05-16 09:08:27 +00:00
Robert Osfield
625821a91a
Created a dedicated include/osgViewer/config and src/osgViewer/config directories to place all the Config classes.
2013-05-15 16:15:38 +00:00
Robert Osfield
4e34cadee2
Added to Viewer::realize() automatic setup using Keystone when available and enabled, and when no other window setup has been selected.
2013-05-13 09:18:37 +00:00
Robert Osfield
9402efe38e
Added DisplaySettings::KeystoneHint flag that can be set via --keystone-on and --keystone-off command line parameters, and the OSG_KEYSTONE env var
2013-05-10 17:59:07 +00:00
Robert Osfield
5dd07e4d1c
Added keystone file handling
2013-05-10 16:06:10 +00:00
Robert Osfield
9eb5465ff5
Added --keystone <filename> command line support into DisplaySettings, and added OSG_KEYSTONE_FILES env var support into osg::DisplaySettings.
2013-05-10 11:56:09 +00:00
Robert Osfield
9c1c34d765
Moved Keystone support from osgkeystone example into osgViewer::View
2013-05-10 10:00:38 +00:00
Robert Osfield
e545627571
Moved Keystone class into osgViewer library.
2013-05-09 15:18:14 +00:00
Robert Osfield
046c3fca7a
Cleaned up event handler and namespaces in prep for integrating keystone functionality into osgViewer
2013-05-07 14:43:36 +00:00
Robert Osfield
8810d27f7c
Added keystone support for left eye, right eye and quad buffer stereo
2013-05-07 13:34:47 +00:00
Robert Osfield
9bb4ed08e1
Added keystone setup to vertical split stereo suport and cleaned up the horizontal split stereo code
2013-05-07 11:13:50 +00:00
Robert Osfield
668d351765
Introduced new scheme for handling mouse events with osgViewer. The new scheme enables robust event handling even when using distortion correction render to texture Cameras.
2013-05-03 19:26:27 +00:00
Robert Osfield
a2615388db
Refactored Keystone setup as a step toward integrating Keystone correction with stereo
2013-04-18 17:02:57 +00:00
Robert Osfield
adea6c9329
Implemented stereo support into osgkeystone as a testbed for moving stereo support from SceneView into osgViewer
2013-04-18 09:47:28 +00:00
Robert Osfield
65f23ba9af
Implemented initial cut of anaglyphic stereo
2013-04-17 11:04:12 +00:00
Robert Osfield
bc288d23dc
Added support for enable/disabling the keystone editing using the Ctrl-g key to toggle the UI and grid on/off.
2013-04-12 13:01:51 +00:00
Robert Osfield
efbf05cd59
Moved keystone event handler onto the keystone distortion Camera.
2013-04-12 09:05:11 +00:00
Robert Osfield
835a80ae90
Refactoed the grid rendering so that it's now implemented as part of the distortion mesh pass, leaving the main scene graph alone.
2013-04-12 08:52:21 +00:00
Robert Osfield
f79d89e0ce
Add support for a finer grained mesh on the distortion mesh for higher quality results.
2013-04-11 17:12:32 +00:00
Robert Osfield
7ff4be954b
Moved the keystone geometry computation into a Keystone::compute3DPositions(..) method
2013-04-11 16:07:49 +00:00
Robert Osfield
830d21471b
Removed old experimental keystone code to clean up the example
2013-04-10 16:36:49 +00:00
Robert Osfield
18d14065a5
Changed the way that the keystone geometry is calculated.
2013-03-28 10:46:24 +00:00