FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,535 Commits 1 Branch 26 Tags 73 MiB
1c78996a09
Commit Graph

13535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
229477c35c Added initializers and reverted OSX workaround from 2013. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14959 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-15 10:00:55 +00:00
Robert Osfield
47fd0423ec Moved the cmake_policy(SET CMP0043 NEW) to work for all script paths that Qt5 usage could pass through. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14953 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-14 13:33:12 +00:00
Robert Osfield
d85d98e916 Added cmake_policy(SET CMP0043 NEW) usage when compiling against Qt5 as it was causing a warning we couldn't fix on the OSG side otherwise. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14952 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-14 13:26:40 +00:00
Robert Osfield
4f1504e125 Updated ChangeLog and AUTHORS.txt 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14950 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-14 08:42:36 +00:00
Robert Osfield
423105c299 Added _defineList into the osg::StateSet::compare() implementation to address issues with osgUtil::Optimizer ignoring defines. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14948 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-14 08:25:17 +00:00
Robert Osfield
c4fdc93053 Added Text::GlyphQuads::release/resizeGLObjects() and handling of inconsistent contextID sizes to avoid crashes when viewers and scene graphs aren't initialized correctly to the right number of contexts. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14947 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-13 16:09:45 +00:00
Robert Osfield
e94c3334f9 Standardize the call to setUpThreading() in CompositeViewer/Viewer::realize(). 
Standardize the call to scene->resizeGLObjects().


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14944 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-13 16:03:51 +00:00
Robert Osfield
1859e27501 From Terry Welsh, "fThis fixes problem where new glClipControl feature would not compile for GLES2 profile" 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14943 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-13 08:48:46 +00:00
Robert Osfield
1477e046f6 Updated version number to 3.5.0 after 3.4 branch. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14941 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-03 06:51:09 +00:00
Robert Osfield
a39578826c Updated for 3.4 branch. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14937 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-03 06:28:05 +00:00
Robert Osfield
98ebacdcbb Fixed repeated name in SETUP_PLUGIN. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14936 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-02 11:58:49 +00:00
Robert Osfield
04f4b542bd Updated ChangeLog and AUTHORS file in prep for 3.4 branch. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14935 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-02 10:25:14 +00:00
Robert Osfield
f0ac1a16f9 Build fix 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14934 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-02 08:57:08 +00:00
Robert Osfield
08893c7fcc Moved the defination of GL_MAX_VARYING_COMPONENTS to GL_3_0 block to avoid warnings of redefinition. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14933 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-02 08:52:55 +00:00
Robert Osfield
17dfbe99fc Updated ChangeLog 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14931 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-01 05:32:40 +00:00
Robert Osfield
74ddaeaf50 From Mathias Froehlich, added seriliazers for new osg::ClipControl 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14930 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-01 05:10:20 +00:00
Robert Osfield
2f7193ee4c Updated ChangeLog and AUTHORS files 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14929 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-30 09:51:05 +00:00
Robert Osfield
b4cd40cf7c From Mathias Froehlich, "Attached a new state attribute implementing the glClipControl that appeared with GL4.5." 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14928 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-30 09:11:00 +00:00
Robert Osfield
5cd478e4bb Quitened down debug for ViewConfig argument parsing 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14927 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-30 08:39:33 +00:00
Robert Osfield
d3baf9d311 Build fix for GLDAL>=2 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14925 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-30 08:38:01 +00:00
Robert Osfield
fe09ebfbdb From Christian Kehl, added Vec2::set(const Vec2) method 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14924 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-26 09:40:37 +00:00
Robert Osfield
b5a3a58076 From Jannik Heller, fixed clearReferencesToDependentCameras() calls 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14922 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-19 09:51:30 +00:00
Robert Osfield
3bcfad833c Fixed handling of use GLObjectsVisitor for modifying scene graph state without compiling to OpenGL so that the visitor can be run safely without a graphics context being current. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14921 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-17 16:25:47 +00:00
Robert Osfield
6f00eb2548 Small tidy up to make script more readable. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14920 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-16 17:18:11 +00:00
Robert Osfield
4ec0e76c0b Added QT_QTCORE_INCLUDE_DIR entry to qfont plugin build to fix Qt4 build under Linux 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14919 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-16 17:17:50 +00:00
Robert Osfield
1e0d682979 From Jannik Heller, "I've added the check for Qt version mismatches into osgQt as suggested in http://forum.openscenegraph.org/viewtopic.php?t=14999. 
When an application is built with Qt4, but osgQt was built with Qt5 (or vice versa), upon #includeing osgQt users will receive an #error aborting the build.

This at least provides a proper error message rather than a crash, while we are working on better fixes for the problem."


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14918 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-15 19:59:01 +00:00
Robert Osfield
824cc95518 Experiment with how to define GLsizeiptr. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14917 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-15 13:51:29 +00:00
Robert Osfield
08d2d322d9 Upated version number 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14916 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-15 13:51:09 +00:00
Robert Osfield
75891924bb Removed old and unused windows code path to avoid confusion 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14915 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-12 20:23:15 +00:00
Robert Osfield
82c188c24a Updated ChangeLog 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14913 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-12 11:28:54 +00:00
Robert Osfield
1e78098967 From Farshid Lashkari, "I've modified some setter methods of TextBase to avoid unnecessary calls to computeGlyphRepresentation() if the value has not changed." 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14912 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-12 08:04:42 +00:00
Robert Osfield
fc9848ff19 Reverted the typdef GLfloat GLdouble for Andoid as this was causing conflicts. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14910 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-11 08:44:26 +00:00
Robert Osfield
8aee04c780 Updated ChangeLog and AUTHORS file for 3.3.8 dev release 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14909 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-10 18:22:09 +00:00
Robert Osfield
e69405f99a From Laurens Voerman, "attached is a zip with the files: 
OpenSceneGraph\CMakeModules\FindOpenEXR.cmake

I introduced a bug in the previous submission pointed out by Dmitry Marakasov:
looking for IlmIlf instead of IlmImf (as the previous version did - but using variable OPENEXR_IlmIlf_LIBRARY)

For some reason google decided his message was spam, so I just noticed it, and I reply to confirm his remarks and attach a full file.

"


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14908 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-10 16:48:28 +00:00
Robert Osfield
e76c91ed78 From Colin McDonald, "An earlier fix in OSG 3.2 has been inadvertently lost in 3.3.x. The glGenerateMipMap function is part of the GL_EXT_framebuffer_object extension. Just checking if the function is present before using it for texture mipmaps is not sufficient, as on remote X-windows displays the client side capability may be different from the display server. This can lead to mipmapped textures failing to render. I've restored a fbo extension check. I've also tided up the GL version checking a little." 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14907 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-10 16:47:15 +00:00
Robert Osfield
d2e0081690 From Philippe Renon, "Fixed potential divide by zero in NodeTrackerManipulator : The divide by zero happens when throwing a NodeTrackerManipulator. 
The infinite result trickles down and later causes NaN in culling.

The fix was to use getThrowScale() as done everywhere else."


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14905 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-10 10:00:27 +00:00
Robert Osfield
11a55ea6de Added supoort for osg::CullSettings/Camera::InheritanceMaskActionOnAttributeSetting and InheritanceMask properties. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14904 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-09 16:49:20 +00:00
Robert Osfield
bd9bd3f8b2 Added namespace around typedef to avoid conflict issues 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14903 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-09 12:51:38 +00:00
Robert Osfield
7e05d2fd54 Introduce osg::Object::asNode(), asNodeVisitor(), asStateAttribute() and asUniform() to replace dynamic_cast<> usage in Callback.cpp. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14902 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-09 10:49:34 +00:00
Robert Osfield
37d051af5e Added output of HUD scene graph to hud.osgt and hud.osgb for testing purposes. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14901 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-09 09:44:37 +00:00
Robert Osfield
03565e3bbe Updated AUTHORS and ChangeLog for dev release 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14900 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-08 11:33:49 +00:00
Robert Osfield
4073910ce8 From Mike Connell, "Give ReadFileCallback access to parent location : These small changes to the database pager allow user code in the ReadFileCallback to safely determine where the file being loaded is destined to be inserted into the scenegraph. 
"


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14899 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-08 11:18:24 +00:00
Robert Osfield
ceabbdb8d9 Addressed race condition where SceneView::setLightingMode() was setting a shread Master Camera's StateSet. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14898 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-08 10:20:53 +00:00
Robert Osfield
f7f1487fca Fixed setReferenceTime() bug where a * eather than the correct / was being used. Bug and fix suggested Benjamin Richter. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14896 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-07 11:13:02 +00:00
Robert Osfield
1f0ba7aa4f Updated AUTHORS for dev release 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14895 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-04 09:35:19 +00:00
Robert Osfield
32b60cd2d7 From Jannik Heller, Transform::computeBound() optimization. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14894 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-04 09:13:05 +00:00
Robert Osfield
ff42ff2a11 From Jannik Heller, Removed unused StatsHandler::_keyEventToggleVsync 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14893 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-04 09:05:24 +00:00
Robert Osfield
23cd6d2ba3 From Jannik Heller, "In the attachment you will find a build fix for the latest trunk. osgAnimation failed to compile when using OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION=OFF ." 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14892 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-04 09:00:17 +00:00
Robert Osfield
95f911e98c Removed export that was breaking windows build 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14891 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-03 10:28:34 +00:00
Robert Osfield
fd46645ade From KOS, "New classes for osgAnimation presented: UpdateFloatUniform, UpdateVec3fUniform and UpdateMatrixfUniform (based on UpdateUniform template) 
Classes operate like osgAnimation::UpdateMaterial for Material's diffuse component, but change Uniform."


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14890 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-03 09:14:35 +00:00