FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • e900ecc4c7 Added -Wshadow tp OSG_AGGRESSIVE_WARNING_FLAGS for GNU compiler Robert Osfield 2016-05-20 10:51:40 +01:00
  • bf343240e4 Merge branch 'AdriCS-master' Robert Osfield 2016-05-19 18:54:11 +01:00
  • 89a2ed7da4 Extra header include. Adri 2014-10-02 12:27:20 +02:00
  • a81edcfba7 Added include/osgQt/Version and src/osgQt/__ to .gitignore Robert Osfield 2016-05-19 18:51:58 +01:00
  • 3db6aa255f Removed redundent #if OSG_USE_BOUND block Robert Osfield 2016-05-19 17:38:50 +01:00
  • a5b05f77ea This submission removes the define / code path OSG_USE_BOUND that was never used. The class osg::Bound used by this code doesn't exist either. Jannik Heller 2016-05-19 17:32:24 +01:00
  • 2ef6909d9b I am hereby submitting a deferred rendering code sample, originally written by Michael Kapelko in 2013. I am submitting this code with his approval. Christian Buchner 2016-05-19 17:20:29 +01:00
  • 037de9bd20 Fixed build error associated with change of type of getInterface() Robert Osfield 2016-05-19 14:26:48 +01:00
  • 10a89ae0c5 Win32 Build fixes Robert Osfield 2016-05-16 16:23:21 +01:00
  • a0684bd058 Changed osg::NodeVisitor::traverse(node) to traverse(node) to take advantage of the local travese() implementation pushing/popping any StateSet that is on the node. Robert Osfield 2016-05-18 18:30:51 +01:00
  • 8863e03685 Replaced static ref_ptr<> with observer_ptr<> to avoid local static references hanging around. Robert Osfield 2016-05-16 18:52:39 +01:00
  • fe6238d126 Added osg::GraphicsContext::WindowingSystemInterfaces singleton for managing multiple WIndowinSystemInterface implementations being registered at the same time. Robert Osfield 2016-05-16 13:45:31 +01:00
  • dd10619192 Added GLES3 path for setting up with EGL Robert Osfield 2016-05-06 19:55:04 +01:00
  • 933b8cdbaf Added GLES3 path for setting up with EGL Robert Osfield 2016-05-06 19:55:04 +01:00
  • 7200e38fce Added 3.4 press release to NEWS.txt Robert Osfield 2016-05-06 17:49:01 +01:00
  • 58ca08a7ca Added 3.4 press release to NEWS.txt Robert Osfield 2016-05-06 17:49:01 +01:00
  • 7b34ca0a39 Added using to quieten warning Robert Osfield 2016-04-29 10:39:57 +01:00
  • 6cfbaa61c0 Moved the IdentifierMap from global to into osg namespace and changed to static Robert Osfield 2016-04-27 14:21:11 +01:00
  • 4a1f033dbe Added non const releaseGLObjects(osg::State* state) for backwards compatibility Robert Osfield 2016-04-27 08:40:35 +01:00
  • ec19ee9655 Fixed copy _readBuffer bug. Robert Osfield 2016-04-21 14:07:22 +01:00
  • cba48de3d3 Fixed copy _readBuffer bug. Robert Osfield 2016-04-21 14:07:22 +01:00
  • 653af27d02 Fixed ShaderComposer::releaseGLObjects(State*) const method as it's const was missing. Rewrote the ShaderComposer::releaseGLObjects() const method to pass on the releaseGLObjects() calls to any associated Program or Shader objects. Robert Osfield 2016-04-18 20:46:45 +01:00
  • eb50a15b52 Fixed ShaderComposer::releaseGLObjects(State*) const method as it's const was missing. Rewrote the ShaderComposer::releaseGLObjects() const method to pass on the releaseGLObjects() calls to any associated Program or Shader objects. Robert Osfield 2016-04-18 20:46:45 +01:00
  • 29ce4f616d From Vladimir Chebaev, fixed handling of outline orientiation Robert Osfield 2016-04-14 17:46:27 +01:00
  • f39cc7b6f1 From Vladimir Chebaev, fixed handling of outline orientiation Robert Osfield 2016-04-14 17:46:27 +01:00
  • 84618896c2 From Vladimir Chebaev, fixed handling of outline orientiation Robert Osfield 2016-04-14 17:46:27 +01:00
  • 8c10323154 From Vladimir Chebaev, fixed handling of outline orientiation Robert Osfield 2016-04-14 17:46:27 +01:00
  • 879a8bd020 Changed the default value paramter to be consistent with the non templated version of StateSet::setTextureAttributeAndModes(..) Robert Osfield 2016-03-29 20:24:05 +01:00
  • ccb06f003a Merge branch 'OpenSceneGraph-3.4' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.4 Robert Osfield 2016-03-31 19:26:51 +01:00
  • 79fa48c984 added assignment of mipmap levels from source image. Robert Osfield 2016-03-31 17:52:29 +01:00
  • 91ca25d2b8 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph Robert Osfield 2016-03-31 19:22:03 +01:00
  • d41d92e65d added assignment of mipmap levels from source image. Robert Osfield 2016-03-31 17:52:29 +01:00
  • 47022a1bf0 From Sherman Wilcox, added assignment of mipmap levels from source image. Robert Osfield 2016-03-31 17:52:29 +01:00
  • 893628971a From Sherman Wilcox, added assignment of mipmap levels from source image. Robert Osfield 2016-03-31 17:52:29 +01:00
  • e6a99b5ae5 Reversed the order of some sizedInternalFormats enum entries to sync with the change in serach direction that was checked in as an earlier revision. Robert Osfield 2016-03-31 17:12:28 +01:00
  • 459ae5ce64 Changed the default value paramter to be consistent with the non templated version of StateSet::setTextureAttributeAndModes(..) Robert Osfield 2016-03-29 20:24:05 +01:00
  • cd3831b045 Added &nl; xml control character to allow one to put newlines into a single text string in Present3D presentations Robert Osfield 2016-03-13 09:03:44 -02:30
  • 9d68e13567 Added support for invoked an editor defined by P3D_EDITOR or EDITOR env vars when user press 'U' in Present3D. This feature makes it easier to editor an presentation that is already running in Present3D, once the edits are done pressing 'u' in Present3D then loads the file again. Robert Osfield 2016-03-11 19:41:22 +00:00
  • 926cffb2ee From Jannik Heller, Wrong function call in setTextureAttributeAndModes "From I think that this piece of code in StateSet::setTextureAttributeAndModes is a copy&paste mistake: Robert Osfield 2016-03-11 15:35:07 +00:00
  • cb2af961db From Jannik Heller, Wrong function call in setTextureAttributeAndModes "From I think that this piece of code in StateSet::setTextureAttributeAndModes is a copy&paste mistake: Robert Osfield 2016-03-11 15:35:07 +00:00
  • faea95b5fb Added handling of auto stepping to ON_DEMAND handling. Robert Osfield 2016-03-10 19:58:35 +00:00
  • 68430ee8e5 Added a local implementation of SlideEventHandler::checkNeedToDoFrame() so that Present3D can toggle on/off the need for continuous rendering to only slides that require it, enabling slides with no animation to sit iddle rather keeping rendering, reducing CPU/GPU overhead and saving power. Robert Osfield 2016-03-10 16:35:08 +00:00
  • 1f5b7855eb Added basic support for OSG_RUN_FRAME_SCHEME ON_DEMAND env var and --run-on-demand, --run-continuous to Present3D Robert Osfield 2016-03-10 11:24:21 +00:00
  • f044bc6b45 From Joe Thompson, "OpenSceneGraph cannot be built with Visual Studio 2008. The file osg-OpenSceneGraph-3.4.0\include\osg\Types typedefs int8_t, int16_t, int32_t and int64_t These are typedefed as signed __intX in several other places. With VS2008, this causes an error "int8_t redifined, different basic types" Explicitly declaring them signed fixes the error." Robert Osfield 2016-03-02 09:18:26 +00:00
  • f5b5202296 From Joe Thompson, "OpenSceneGraph cannot be built with Visual Studio 2008. The file osg-OpenSceneGraph-3.4.0\include\osg\Types typedefs int8_t, int16_t, int32_t and int64_t These are typedefed as signed __intX in several other places. With VS2008, this causes an error "int8_t redifined, different basic types" Explicitly declaring them signed fixes the error." Robert Osfield 2016-03-02 09:18:26 +00:00
  • ac8bbb9d1e Updated ChangeLog Robert Osfield 2016-03-01 20:37:07 +00:00
  • 92ee6de05e Changed svn reference to git Robert Osfield 2016-03-01 20:35:58 +00:00
  • db24f7f09d Removed redundent CMake vars Robert Osfield 2016-03-01 20:34:18 +00:00
  • 520b6c24f6 Fixed the make tag-run and branch-run Robert Osfield 2016-03-01 20:24:19 +00:00
  • 02625801da Updated ChangeLog Robert Osfield 2016-03-01 20:25:33 +00:00
  • cd00f7b558 Fixed the make tag-run and branch-run Robert Osfield 2016-03-01 20:24:19 +00:00
  • 7c61acef40 Updated ChangeLog and AURHORS file Robert Osfield 2016-03-01 19:55:01 +00:00
  • 244cec821e Updated AUTHORS and ChangeLog Robert Osfield 2016-03-01 19:54:36 +00:00
  • ba309bf38b Refactored the make tag-test, tag-run, branch-test, branch-run and ChangeLog features of the CMakeLists build system so it now supports working off git instead of subversion Robert Osfield 2016-03-01 19:44:32 +00:00
  • a1aecc024e Refactored the make tag-test, tag-run, branch-test, branch-run and ChangeLog features of the CMakeLists build system so it now supports working off git instead of subversion Robert Osfield 2016-03-01 19:44:32 +00:00
  • 0d1c8286a2 Updated version number for 3.5.2 dev release Robert Osfield 2016-03-01 15:33:16 +00:00
  • bb79e523d4 From Konstantin Matveyev, "Two classes (with wrappers) added to osgAnimation: UpdateVec2fUniform and UpdateVec4fUniform" Robert Osfield 2016-03-01 15:09:12 +00:00
  • 33b838e437 From Jannik Heller, "This submission makes the osgFX::Technique traverse as a normal Group if the visitor is not a cull visitor. Robert Osfield 2016-03-01 11:57:02 +00:00
  • 60a7b8ce02 Within the #pragmatic shader composition code added platform specific line endings for WIN32 vs all other platforms to "\r\n" and "\n" respectively. Robert Osfield 2016-03-01 11:45:20 +00:00
  • 707c1a32aa Within the #pragmatic shader composition code added platform specific line endings for WIN32 vs all other platforms to "\r\n" and "\n" respectively. Robert Osfield 2016-03-01 11:45:20 +00:00
  • d055216740 From Wee See and Robert Osfield, Introduced StatsHandler::collectWhichCamerasToRenderStatsFor(osgViewer::ViewerBase* viewer, osgViewer::ViewerBase::Cameras& cameras) method to make it possible to customize which Cameras the handler renders stats for. Robert Osfield 2016-03-01 11:06:39 +00:00
  • 5d03bb9a2b From Jannik Heller, "This submission fixes a stuttering issue that may occur when occlusion query nodes are in view. The problem is that OSG retrieves the occlusion query result without first checking if it's available (GL_QUERY_RESULT_AVAILABLE). Thus, the driver has to sync with the GPU i.e. wait for all queued draw calls to complete. This is particularly bad in V-Synced situations where the driver may be using multi frame queueing techniques - coupled with the fact that OSG only runs an occlusion query every 5th frame, results in very unpleasant stuttering in some situations. Robert Osfield 2016-03-01 10:37:41 +00:00
  • be98c884bd From Ognjen Kostic, "Some android phones have no support for OES_element_index_uint extension that is required if glDrawElements is to be called with GL_UNSIGNED_INT for element type. In OSG 3.4, osgText::Text( ::_quadIndices) uses DrawElementsUInt that will fail on these devices and no text will appear - tested on Samsung Galaxy Trend 2 SM-G313HN. Robert Osfield 2016-03-01 10:21:14 +00:00
  • 3a15c66290 Merged improved parsing of #pragma from master. Robert Osfield 2016-02-29 15:57:01 +00:00
  • f73d1fb7ea Refactored the parsing of #pragma to address problems handling #pragma without () usage. Robert Osfield 2016-02-29 15:06:36 +00:00
  • 370cb7bc6e Fixed debug build Robert Osfield 2016-02-24 16:00:12 +00:00
  • 577d161303 Fixed debug build Robert Osfield 2016-02-24 16:00:12 +00:00
  • 6011bc4307 From Jannik Heller, osgParticle freeze on cull fix, ammended by Robert Osfield to make if statements a little more readable. Robert Osfield 2016-02-23 10:12:31 +00:00
  • 31fad1476f From Jannik Heller, osgParticle freeze on cull fix, ammended by Robert Osfield to make if statements a little more readable. Robert Osfield 2016-02-23 10:12:31 +00:00
  • 40caedc7cd From Anish Thomas, "Underflow bug in BufferObject pool usage" Robert Osfield 2016-02-22 09:19:51 +00:00
  • e8ac5af41b From Anish Thomas, "Underflow bug in BufferObject pool usage" Robert Osfield 2016-02-22 09:19:51 +00:00
  • 4371512dd2 From Bjorn Blissing, "I stumbled upon a strange ifdef-case inside Geometry.cpp Robert Osfield 2016-02-19 15:01:27 +00:00
  • 78aaf7955e From Bjorn Blissing, "I stumbled upon a strange ifdef-case inside Geometry.cpp Robert Osfield 2016-02-19 15:01:27 +00:00
  • 9132d98785 To the COLLADA_INCLUDE_DIR search paths added the directories: Robert Osfield 2016-02-19 12:19:12 +00:00
  • 09bde307de To the COLLADA_INCLUDE_DIR search paths added the directories: Robert Osfield 2016-02-19 12:19:12 +00:00
  • 47c531cc37 Updated the AuthenticationDetails::HttpAuthentication enum to reflect current libcurl values Robert Osfield 2016-02-18 19:53:36 +00:00
  • 58f940c0f1 Updated the AuthenticationDetails::HttpAuthentication enum to reflect current libcurl values Robert Osfield 2016-02-18 19:53:36 +00:00
  • 4704621c39 Replaced (long int) with more portable (GLint64) Robert Osfield 2016-02-18 10:57:19 +00:00
  • 9bdb3f55dd Replaced (long int) with more portable (GLint64) Robert Osfield 2016-02-18 10:57:19 +00:00
  • 0244b234ca From Tony Vasile, "This is a fix for the handling of OpenFlight files with switches whose children have a transformation matrix on them. It may break other things and I have only tested this with one of my models." Robert Osfield 2016-02-18 10:04:04 +00:00
  • 08a1c45605 From Tony Vasile, "This is a fix for the handling of OpenFlight files with switches whose children have a transformation matrix on them. It may break other things and I have only tested this with one of my models." Robert Osfield 2016-02-18 10:04:04 +00:00
  • 09fd75dcf4 From Mourad Boufarguine, "This submission fixes typos in Uniform::getTypename() method in Uniform.cpp (missing "r" in usampler names)." Robert Osfield 2016-02-18 09:25:48 +00:00
  • 93b10f35c1 From Mourad Boufarguine, "This submission fixes typos in Uniform::getTypename() method in Uniform.cpp (missing "r" in usampler names)." Robert Osfield 2016-02-18 09:25:48 +00:00
  • c3d45732a1 Renamed zero and one to transparentCount and opaqueCount to avoid confusion in their meaning and usage. Robert Osfield 2016-02-18 08:50:06 +00:00
  • 51136204d2 Renamed zero and one to transparentCount and opaqueCount to avoid confusion in their meaning and usage. Robert Osfield 2016-02-18 08:50:06 +00:00
  • c297fd18b2 Fixed warning Robert Osfield 2016-02-17 17:36:10 +00:00
  • 4f36b553b3 Commented out unused functions and variable. Robert Osfield 2016-02-17 17:08:07 +00:00
  • 89f74b1a56 Fixed warning Robert Osfield 2016-02-17 17:36:10 +00:00
  • 6089257d3c Commented out unused functions and variable. Robert Osfield 2016-02-17 17:08:07 +00:00
  • 97336b89ac Introduced a separate GLuint64 one variable to get around a 32bit build timer issue under Windows. Robert Osfield 2016-02-17 15:59:13 +00:00
  • f6372f2fab Introduced a separate GLuint64 one variable to get around a 32bit build timer issue under Windows. Robert Osfield 2016-02-17 15:59:13 +00:00
  • 98ca24ff4e From Laurens Voerman, "a few additions in the repository (asDrawableEventCallback / asDrawableCullCallback) made this version a bit outdated, so I get so new warnings. This update can fix those warnings." Robert Osfield 2016-02-17 15:09:14 +00:00
  • 67202b2662 From Romain Ouabdelkader, "This is a fix for osgText to calculate kerning and to load glyph3D with the text's font resolution. Robert Osfield 2016-02-15 13:30:39 +00:00
  • 937ef73521 From Laurens Loerman, Fix for "Visual Studio 2013 gives me a large amount (2778) of warnings about inheritance via dominace (C4250)." Robert Osfield 2016-02-15 12:37:05 +00:00
  • 9bde2ef631 Added support for NodeMask to osg::Drawable serializers Robert Osfield 2016-02-11 16:25:47 +00:00
  • 3e0435febd From Jannik Heller , GL object deletion fix. "This submission changes deleteGLObject calls to scheduleGLObjectForDeletion, to ensure that the actual deletion happens from the correct thread (the graphics thread). This fixes the leak I reported in http://forum.openscenegraph.org/viewtopic.php?t=15567 , and possibly also http://forum.openscenegraph.org/viewtopic.php?t=15564." Robert Osfield 2016-02-05 20:29:22 +00:00
  • 8cefa05e3a From "Jannik Heller", I just updated to the latest commit and noticed that drawable cull callbacks were no longer working. As it turns out there was a missing implementation of the asDrawableCullCallback() and asDrawableEventCallback(), after implementing these methods everything is working as expected. Robert Osfield 2016-02-04 20:15:14 +00:00
  • aa17f5441a From Laurens Voerman, "E:\osg\osgSvnGit\OpenSceneGraph\include\osg/Callback(286): warning C4099: 'osg::DrawableUpdateCallback' : type name first seen using 'class' now seen using 'struct' (E:\osg\osgSvnGit\OpenSceneGraph\src\osgUtil\RenderBin.cpp) E:\osg\osgSvnGit\OpenSceneGraph\include\osg/Callback(27) : see declaration of 'osg::DrawableUpdateCallback' Robert Osfield 2016-02-04 19:53:13 +00:00
  • e00977f3c2 Added OSG_EXPORT Robert Osfield 2016-02-04 19:40:14 +00:00
  • e1eaeced8c From Laurens Voerman, "While compiling with Visual Studio 12 (aka 2013 update 3) I get a these errors: E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(364): error C2039: 'min' : is not a member of 'std' E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(364): error C3861: 'min': identifier not found E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(372): error C2039: 'min' : is not a member of 'std' E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(372): error C3861: 'min': identifier not found E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(381): error C2039: 'min' : is not a member of 'std' E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(381): error C3861: 'min': identifier not found E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(436): error C2039: 'min' : is not a member of 'std' E:\osg\osgSvnGit\OpenSceneGraph\src\osg\PrimitiveSet.cpp(436): error C3861: 'min': identifier not found Robert Osfield 2016-02-04 19:38:23 +00:00