Robert Osfield
64b26ebeb5
Added debug State::print(std::ostream&) method and extra debug messages in ShaderComposer and ShaderAttribute.
...
Added better shader composition testing in the osgshadercomposition example.
2010-07-10 17:14:59 +00:00
Robert Osfield
d45cb5f7a1
From Pierre Bourdin, "just a small typo in debug messages of Viewer.cpp..."
2010-07-10 10:07:59 +00:00
Robert Osfield
f697988586
From Michael Platings, "Autodesk have re-released 2011.3 of the FBX SDK with Visual Studio 2010 support ( http://images.autodesk.com/adsk/files/fbx20113_fbxsdk_win_static.exe ). I've attached an updated FindFBX.cmake that supports this latest version but also retains support for FBX 2011.2 for those who don't want to update."
2010-07-10 09:56:06 +00:00
Robert Osfield
3cd08d7730
From Wang Rui, "I've found a minor bug in the cmake script of src/osgPresentation when testing the osgIntrospection project. It missed the Export header file and thus will not install this file while 'make install'. Add a line to the LIB_PUBLIC_HEADERS variable will fix the issue."
2010-07-08 10:56:34 +00:00
Robert Osfield
bc3578cf16
From Jean-Sebastien Guay and Martin Scheffler, "First are Martin's changes:
...
* Added support for floating windows and context menus in QMDIAreas.
* Protected the size (_width and _height) by a mutex to prevent threading problems.
Then my own:
* Made sure the embedded widget's size follows the graphicsView's size at all times so that window resizes will resize the widget as expected in fullscreen mode."
2010-07-08 10:51:37 +00:00
Robert Osfield
d50bf88bc0
Added some debugging to investigate issue of global default ShaderAttribute not being automatically assigned.
2010-07-07 11:02:15 +00:00
Robert Osfield
46b221a832
Added compile/release and resize of GL objects to ShaderAttribute.
...
Removed the StateAttribute::compose() method.
Fixed the default type value in ShaderAttribute
2010-07-06 12:19:26 +00:00
Robert Osfield
74ae526bb5
Added support for passing on uniforms from StateAttribute
2010-07-06 10:55:54 +00:00
Robert Osfield
751b0498fe
Added basic code injection fields to osg::Shader,
...
creation of main shader to ShaderComposer and
collection of ShaderComponent to osg::State.
Also added very basic shader set up in osgshadecomposition example.
2010-07-05 16:32:58 +00:00
Robert Osfield
9f8670f50d
Implement basic cache in ShadeComposer
2010-07-02 14:18:59 +00:00
Robert Osfield
a55c4b7d70
Added basic ShaderComponent class and beginnings osgshadercomposition example
2010-07-02 12:04:20 +00:00
Robert Osfield
aef5e36cf1
From Stephan Huber, fixed typo.
2010-06-28 17:27:56 +00:00
Robert Osfield
42a2f2dcf9
Added skipping of newlines in AsciiStreamOperator.h
2010-06-28 09:52:18 +00:00
Robert Osfield
e0d8e0a5c7
From Wang Rui, "A solution for serialziers to call static functions at the end of reading/writing is to use a user serializer. The serialziers/osgManipulator/Draggers.cpp uses a DefaultGeometry serializer to run setupDefaultGeometry() once the reading process is finished, and this can also be applied to load the TerrainTileCallback.
...
I've attached the modified serializer/osgTerrain/TerrainTile.cpp for tracing and solving current problem."
2010-06-28 08:27:30 +00:00
Robert Osfield
9d9a36f6af
From Brad Christiansen, "The small change I have made (against this morning's trunk) enables subclasses to register and unregister windows via protected methods. I need this access as I have a subclass that handles some of the oddities of mixing a native OpenGL window with Java's windowing system. I doubt there will be much general benefit of the modification but it should also not be harmful in any way to others."
2010-06-28 08:24:53 +00:00
Robert Osfield
fec23cb098
From Torben Dannhauer, "I have extended the attached zipped file to recognize some more filenames and versions.
...
I added support to find libxml2 in the 3rdparty package if available.
Now this file can find all libraries from the 32/64bit VS2008sp1 dependency package except collada. I will add that later.
"
2010-06-28 08:20:59 +00:00
Robert Osfield
0119eec3fe
Checked in missing source file.
2010-06-26 09:55:18 +00:00
Robert Osfield
5cac233764
Added beginnings of shader composition with the shells of the ShaderComposer and ShaderAttribute classes. This aren't
...
functional yet, but a useful placeholders for future fucntionality.
2010-06-24 17:15:27 +00:00
Robert Osfield
83ea076d8b
Fixed typo
2010-06-24 15:43:33 +00:00
Robert Osfield
d138f99cf1
Renamed osgshadercompositor to osgvirtualprogram.
2010-06-24 14:03:51 +00:00
Robert Osfield
0816d4f9cd
From Magnus Kessler, "FFmpeg headers need __STDC_CONSTANT_MACROS defined before stdint.h is loaded.
...
The file FFmpegHeaders.hpp sets this definition. However, if stdint.h is
already included through other files, it won't take any effect.
Include FFmpeg headers as early as possible in order to avoid stdint.h being
included on other paths.
"
2010-06-23 14:38:49 +00:00
Robert Osfield
5092c08dab
Removed osgIntrospection and added osgQt to doxygen files
2010-06-23 14:18:42 +00:00
Robert Osfield
422a5e7058
Removed osgIntrospection as it's now available as a seperate osgIntrospection project that can be checked out thus:
...
svn co http://www.openscenegraph.org/svn/osg/osgIntrospection osgIntrospection
2010-06-23 13:28:19 +00:00
Robert Osfield
36366f61d5
From Mathias Fiedler, "i'm using OSG on ES 2.0 and observed that only one texture unit will be supported by OSG.
...
In State::initializeExtensionProcs() the _glMaxTextureUnits is calculated based on osg::getGLVersionNumber().
At least for ES 2.0 this function will return 0.f since the version string will look like "OpenGL ES 2.0 ...".
My proposal doesn't touch getGLVersionNumber(), since desktop OpenGL 2.0 isn't OpenGL ES 2.0.
So i changed the conditions in State::initializeExtensionProcs() for getting the number via glGetIntegerv()."
2010-06-21 16:48:03 +00:00
Robert Osfield
6d572d0530
From Alberto Luaces, "I have updated a bit the pkg-config system:
...
1. Install the .pc file for osgIntrospection only if it is compiled,
instead of unconditionally.
2. New .pc file for osgQt, also created only if that library is actually
compiled.
"
2010-06-21 15:55:13 +00:00
Robert Osfield
d8b2d9e656
Moved Xcode project out into OpenSceneGraph/deprecated
2010-06-21 15:09:07 +00:00
Robert Osfield
c6b293dbcf
Implement support for compound name only entries in CompositeLayer
2010-06-21 14:42:18 +00:00
Robert Osfield
4ae8eb607f
Updated version number for next dev release
2010-06-21 10:33:46 +00:00
Robert Osfield
aadd3c4feb
From Magnus Kessler, "The attached file fixes the build error reported by Maxim Gammer. In out-of-
...
source build moc has difficulties with header files that do not end in ".h".
Force moc to include any files passed to it."
2010-06-21 10:19:57 +00:00
Robert Osfield
875cb3b412
Updated ChangeLog and AUTHORS file for 2.9.8 release
2010-06-18 16:07:55 +00:00
Robert Osfield
6b2ad196c1
From Laurens Voerman, "While reading the code for setUpViewFor3DSphericalDisplay I noticed that the top face of the cube map uses Draw/Read buffer GL_BACK, while all other faces are using the GL_FRONT buffer. This because the buffer variable is hidden by a new buffer at lower scope.
...
Removing the local variable tested (win32 and linux64) and works fine."
2010-06-18 15:48:50 +00:00
Robert Osfield
a7e5d27a53
Updated AUTHORS
2010-06-18 15:46:10 +00:00
Robert Osfield
59cdb8dee1
Updated ChangeLog
2010-06-18 15:16:20 +00:00
Robert Osfield
b8d4533fa3
Added checks against windows being realized before doing warp pointer
2010-06-18 14:53:58 +00:00
Robert Osfield
208b2fc3d0
#if 0'd out debugging timing code for detecting deadlocks
2010-06-18 09:48:55 +00:00
Robert Osfield
98203252dc
Build fixes for when OSG_USE_REF_PTR_IMPLICIT_OUTPUT is set to OFF
2010-06-18 09:07:17 +00:00
Robert Osfield
39ee19e058
Fixed warnings
2010-06-17 15:23:44 +00:00
Robert Osfield
3ecccc4a50
From Nguyen Van Truong, introduced the use of the ScratchPad when distributing the master killed message
2010-06-17 14:36:11 +00:00
Robert Osfield
776c03b9e3
From Nguyen Van Truong, fix for passing of events to slaves
2010-06-17 14:28:16 +00:00
Robert Osfield
8fae9c5779
Added event handling
2010-06-17 14:18:11 +00:00
Robert Osfield
0d641bf483
From Brad Christiansen, "I tried building the latest (as of Sunday) SVN version of OSG using Visual Studio 2010 and it failed due to a missing include. The build completed successfully by adding #include <iterator> to nodeTrackerManipulator.cpp, which is attached."
2010-06-17 11:07:54 +00:00
Robert Osfield
c3b9419e05
From Farshid Lashkari, "I've made a small modification to osgDB::DynamicLibrary so it can load UTF-8 filenames on Windows."
2010-06-17 11:03:23 +00:00
Robert Osfield
5c2abfe062
From Jim Vaughan, "The attached file fixes a bug in the Inventor loader that causes texture images to have r with a value of zero.
...
The bug caused the image data to not get copied, size the size was calculated to be zero. This caused crashes during rendering."
2010-06-17 11:01:40 +00:00
Robert Osfield
bbe59cd3e0
Fixed bug where PropertyAdjustmentCallback was being added multiple times.
2010-06-16 16:49:45 +00:00
Robert Osfield
751d7baf1c
Changed the default behaviour of computeHomePosition so that it uses the bounding sphere of the model rather than computing the bounding box.
2010-06-16 15:56:42 +00:00
Robert Osfield
8ff46e1586
Added better handling of when the bounding box computation fails to return a valid bounding box.
2010-06-16 15:56:07 +00:00
Robert Osfield
459a7e1fac
Updated wrappers
2010-06-16 15:54:24 +00:00
Robert Osfield
f97c2b65b3
Added reporting of possible deadlock of paging thread
2010-06-16 15:53:57 +00:00
Robert Osfield
80389a4a13
Re-organized the access of the mutex in Terrain to avoid deadlocks, and temporarily switched off the update of the neightbouring tile boundaries within the GeometryTechnique::generateGeometry method, again to avoid deadlocks.
2010-06-16 12:46:16 +00:00
Robert Osfield
d3527f3830
Added timing code for helping detect deadlocks in the paging threads
2010-06-16 08:13:00 +00:00
