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

Commit Graph

  • 045caf1086 From Javier Taibo, "I have found a "bug" in the new audio decoding code (actually I think the bug is in ffmpeg, but anyway it should be wise to protect the OSG plug-in about it). I am attaching a security check in FFmpegDecoderAudio.cpp. Robert Osfield 2015-01-23 17:15:20 +00:00
  • 4bcf4cf7bb Changed osgFX::MultiTextureControl so that it uses an osg::FloatArray internally to enable sharing with osg::Uniform. Robert Osfield 2015-01-23 13:51:09 +00:00
  • 22cf4c18c3 Added MultiTextureControl event handling of shift 012 i.e. ')', '!', '"' and 'A' to toggle full on for each of the respective or all texture units. Robert Osfield 2015-01-23 13:50:12 +00:00
  • f5faf615ef Added #define GL_SEPARATE_ATTRIBS and correcte GL_INTERLEAVED_ATTRIBS Robert Osfield 2015-01-22 16:49:00 +00:00
  • 51b19d2d8b From Alexey Pavlov, "Export fix for Windows platform" Robert Osfield 2015-01-22 16:41:34 +00:00
  • e330e9309c Added GL_INTERLEAVED_ATTRIBS for windows build Robert Osfield 2015-01-22 15:08:26 +00:00
  • 4a668d53c5 Fixed warning Robert Osfield 2015-01-22 15:07:50 +00:00
  • d5f2c34f24 From Andreas Henne, OpenGL core profile fixes required for OSX. Robert Osfield 2015-01-21 15:35:19 +00:00
  • 7fbeeefea8 Added TextureWeights uniform support and controls to osgFX::MultiTextureControl to support usage with shaders. Robert Osfield 2015-01-21 11:09:29 +00:00
  • 3ab06c54bf Re-enabled texturing and fixed runtime warning Robert Osfield 2015-01-20 18:01:10 +00:00
  • 51afa2c1df Added hardwired geometry shaders Robert Osfield 2015-01-20 17:58:56 +00:00
  • a0f1442aae Updated shaders Robert Osfield 2015-01-20 17:40:46 +00:00
  • 98f5fca9c2 Added key osgTerrain::GeometryPool methods virtual to make it easier to override the shaders Robert Osfield 2015-01-20 15:23:06 +00:00
  • 0a4efa35c3 Changed the reset of the GLExtensions::Set() in the State destructor so that it checks to see if the local _glExtensions pointer has been set up and taken ownership of the GLExtensions::Set() value Robert Osfield 2015-01-20 11:24:31 +00:00
  • 3eca5765c9 Added GeometryPool::s/getUseGeometryShader() hint, and OSG_TERRAIN_USE_GEOMETRY_SHADER env var for setting the default value. Robert Osfield 2015-01-19 11:29:55 +00:00
  • 249c0ff208 Added support for using geometry shaders to align the quad diagonals with the local terrain Robert Osfield 2015-01-16 11:03:11 +00:00
  • 3e3d7e4dc1 Added a local Vec3Array cache to the HeightFieldDrawable to facilitate efficient intersection testing Robert Osfield 2015-01-12 10:31:58 +00:00
  • ed57c8718c Added ability to populate a local vertex cache for when one computes final vertex position in a vertex shader but still want to the Primitive functors to work with the transformed positions. Robert Osfield 2015-01-12 10:30:50 +00:00
  • d409ffcb91 From Javier Taibo, "I have found that since version 1.1, FFMPEG changed the way audio streams are retrieved, from packed to planar format. SDL interprets packed audio, as is used in the osgmovie example. To make the audio work when the OSGffmpeg plug-in is compiled against recent FFMPEG versions, FFmpegDecoderAudio must check for planar formats and in these cases request the samples as packed. This way all works as before. It can be checked with osgmovie example application. Robert Osfield 2015-01-07 14:14:55 +00:00
  • bf794165d5 From Farshid Lashkari, "small change to osg::Image::readImageFromCurrentTexture to allow reading data from compressed cubemap textures." Robert Osfield 2015-01-07 10:36:34 +00:00
  • 134b2e506f Cleaned up GL_TEXTURE_BUFFER_*ARB usage as include/osg/GLDefines now provides the non ARB variants Robert Osfield 2015-01-06 17:23:26 +00:00
  • 8b384baca9 From Julien Valentin, "To sum up changes, I had: -some extensions in GLExtensions - GL_TEXTURE_BUFFER as target in osg::StateSet - a VBO based transform feed back example " Robert Osfield 2015-01-06 17:12:51 +00:00
  • f9f480b935 Updates SO_VERSION in prep for API modifications since the 3.3.3 dev release Robert Osfield 2015-01-06 17:09:44 +00:00
  • dab3efadce Updated ChangeLog Robert Osfield 2015-01-06 15:10:48 +00:00
  • 6f004ef7db From Julien Valentin, added missing initializer Robert Osfield 2015-01-06 14:55:10 +00:00
  • 4538a0fa41 From Julien Valentin, added missing initializer Robert Osfield 2015-01-06 14:55:00 +00:00
  • f7b95ea4e5 From Julien Valentin, typo fix Robert Osfield 2015-01-06 14:41:30 +00:00
  • 6895e29417 From Julien Valentin, typo fix Robert Osfield 2015-01-06 14:41:18 +00:00
  • b1852757b5 From Jason Beverage, "Here is a fix to the STL plugin that fixes build errors introduced in the last commit. It's just a simple addition of the stdint.h header." Robert Osfield 2015-01-05 17:39:44 +00:00
  • ace32ebe6c Updated ChangeLog and AUTHORS Robert Osfield 2014-12-24 11:56:48 +00:00
  • 1b1c987356 Removed debug message Robert Osfield 2014-12-24 11:43:41 +00:00
  • 78729e28fd From Marc Helbling, Clément Léger, Aurélien Chatelain, Paul Cheyrou-Lagrèze : "a last submission for the obj plugin * supports vertex color definition after vertex position by Clément Léger * supports zbrush vertex color definition (as #MRGB comment) by Aurélien Chatelain * adds a noReverseFace option to not mess with face definition by Aurélien Chatelain * makes material parsing case insensitive (by Paul Cheyrou-Lagrèze and me) * makes the plugin resilient to faulty vertex uv/normal definition (i.e. when a too big index is referenced) by Aurélien hatelain " Robert Osfield 2014-12-24 11:25:46 +00:00
  • 50203023c7 From Aurélien Chatelain, "adds support for * quad primitives * face definition with the "vertex_index" label (previously only "vertex_indices" was supported) * replaces normal computation by the SmoothingVisitor to avoid code duplication " Robert Osfield 2014-12-24 11:02:18 +00:00
  • a331680cec From Aurélien Chatelain, "the smoothing visitor did not handle shared arrays. It may leads to bad geometry arrays when a shared array is involved in the scene. This submission adds shared array duplication (and moves the SharedArrayOptimizer declaration in MeshOptimizer to make it callable from the SmoothingVisitor)." Robert Osfield 2014-12-24 10:55:49 +00:00
  • 2870c12b03 From Aurélien Chatelain, "updates the STL plugin: * fixes vertex color support * adds 'magics' color definition * cleans options to make the plugin more consistent with other plugins * adds options to not tristrip geometries" Robert Osfield 2014-12-24 10:47:25 +00:00
  • 18323ac899 Aded shaders for various combinations of layers. Robert Osfield 2014-12-24 10:14:03 +00:00
  • c57e62e799 Added osgDB::readShaderFileWithFallback(..) convinience functions to make it easier to set up reading external shader files with a built in fallback. Robert Osfield 2014-12-24 10:13:42 +00:00
  • f984f6032f Added support for reading Vec3 colour arrays Robert Osfield 2014-12-23 14:20:53 +00:00
  • 5a4f962013 Changes to allow the COLLADA plugin to compile against the latest COLLADA DOM version 2.4 as well as retaining compatibility with the old 2.2 DOM. Robert Osfield 2014-12-23 12:10:03 +00:00
  • dd650921b1 Added comment about using -DCMAKE_DISABLE_FINDPACKAGE_* command line. Robert Osfield 2014-12-22 10:35:33 +00:00
  • 6cf1db199c Added comment about using -DCMAKE_DISABLE_FINDPACKAGE_* command line. Robert Osfield 2014-12-22 10:35:30 +00:00
  • 73221e8682 Added doxygen comment for ref_ptr<>::release(). Robert Osfield 2014-12-22 09:50:10 +00:00
  • d4e5c72ebc Added doxygen comment for ref_ptr<>::release(). Robert Osfield 2014-12-22 09:50:08 +00:00
  • 8e901ebbac Updated version number after dev release Robert Osfield 2014-12-22 09:49:17 +00:00
  • 4945e03bcb Windows build error and warning fixes Robert Osfield 2014-12-19 11:00:31 +00:00
  • c6013c721e Updated ChangeLog and AUTHORS file for dev release Robert Osfield 2014-12-19 10:25:49 +00:00
  • dfc02b78bf Added if () block to avoid script variables set to NOT-Found being used in searching Robert Osfield 2014-12-19 08:27:30 +00:00
  • a03ec99005 Fixed script warnings Robert Osfield 2014-12-19 08:25:35 +00:00
  • 8be71caeaf From Aitor Moreno, LAS plugin - depends upon boost and liblas and liblas-c Robert Osfield 2014-12-18 17:47:08 +00:00
  • b163ff8562 From Adrian Clark, build fix for recent Android NDK using the old Android build approach. Robert Osfield 2014-12-18 16:52:57 +00:00
  • 4ce6b07886 From Mattias Helsing, "CMake have release 3.0 and 3.1 and we have some bad checks for cmake major version when settings cmake policies in CMakeLists.txt. This fixes it" Robert Osfield 2014-12-18 15:59:16 +00:00
  • 3dd2816414 From Mattias Helsing, "CMake have release 3.0 and 3.1 and we have some bad checks for cmake major version when settings cmake policies in CMakeLists.txt. This fixes it" Robert Osfield 2014-12-18 15:59:06 +00:00
  • eeadbae72d Updated AUTHORS Robert Osfield 2014-12-18 11:37:54 +00:00
  • 2a46857353 Updated AUTHORS Robert Osfield 2014-12-18 11:36:16 +00:00
  • e281c264a7 Updated ChangeLog in prep for dev release Robert Osfield 2014-12-18 11:19:11 +00:00
  • 34177d3f63 Fixed warning Robert Osfield 2014-12-18 11:09:43 +00:00
  • 6f9ac83693 Added DisplaySettings::s/getNvOptimusEnablement() and OSG_NvOptimusEnablement env var control to control the setting of the NvOptimusEnablement variable Robert Osfield 2014-12-18 10:59:07 +00:00
  • 075e874c85 From Sukender, "Added options to the FBX writer: an ascii/binary switch, and the ability to select FBX version as the SDK handles it (Ex: "FBX201300"). Robert Osfield 2014-12-18 09:24:46 +00:00
  • b203faaa22 From Adrian Clark, "Recently I tried compiling version 3.x of OpenSceneGraph for Android, using a recent Android NDK, only to run into problems with missing dependencies when trying to link my android project against the generated libraries. Robert Osfield 2014-12-18 09:20:40 +00:00
  • af16041f57 From Mattias Helsing, "The addition of the GStreamer cmake find script broke my build because cmake vars weren't passed correctly to find_package_handler_args, so while the find script didn't find a single required GStreamer lib or include path it still reported GSTREAMER_FOUND=TRUE (and then tried to compile the new plugin). This fixes it and correctly reports missing components." Robert Osfield 2014-12-18 09:03:15 +00:00
  • adf9596316 Added support for using SDL2 to the osgmovie to enable it to handle floating point audio formats Robert Osfield 2014-12-17 19:21:32 +00:00
  • 69abe094ab From Javier Taibo, " I have found that since version 1.1, FFMPEG changed the way audio streams are retrieved, from packed to planar format. SDL interprets packed audio, as is used in the osgmovie example. To make the audio work when the OSGffmpeg plug-in is compiled against recent FFMPEG versions, FFmpegDecoderAudio must check for planar formats and in these cases request the samples as packed. This way all works as before. It can be checked with osgmovie example application. Robert Osfield 2014-12-17 19:20:48 +00:00
  • 4513709a1b From Sukender, "FBX writer was writing an empty file when the scene had a root node being a Geode. This was caused be the change in Drawable (now derived from Node) and Geode (now derived from Group). This fix simply sticks with previous behaviour. Another change could be to adapt WriterNodeVisitor. " Robert Osfield 2014-12-17 10:19:02 +00:00
  • e7ea085912 Fixed warnings and memmory leaks Robert Osfield 2014-12-16 17:37:03 +00:00
  • e4e22bb1af Fixed warnings Robert Osfield 2014-12-16 17:15:21 +00:00
  • 4dfe6ab048 Improved handling of invalid/unhandled files Added support for ImageStream::LoopigMode variable Fixed memory leak associtied with restarting videos Changed Image::setData() to Image::dirty() to avoid resetting data Robert Osfield 2014-12-16 17:08:01 +00:00
  • 6cd9932780 From Julen Garcia, "Here there is a small plugin I use to play video files. It is based on GStreamer http://gstreamer.freedesktop.org and I have used the FFmpeg plugin as inspiration." Robert Osfield 2014-12-16 11:20:42 +00:00
  • 58c47e9842 From Marc Helbling, "please find enclosed a submission that should improve the VertexAccessOrderVisitor (pre-transform) optimizer: * it sorts primitives to keep "more complex" primitives first; maybe you'll prefer to have this as an option (but usually it should make more sense to pre-transform triangles before e.g. lines) * currently, the visitor rely on TriangleIndexFunctor and does not take care of points and lines (see https://github.com/openscenegraph/osg/blob/master/include/osg/TriangleIndexFunctor#L124-130). This can lead to issues e.g. if you store the wireframe lines along with some triangles: the triangles will be reindexed but not the line. I've therefore added osg/include/TriangleLinePointIndexFunctor to index triangles, lines and points and derived VertexReorder from this class. * to avoid issues, shared arrays are duplicated. However, in some cases (e.g. an UV channel shared in the geometry only) this is not required. I'm adding a SharedArrayOptimizer to optimize this: it looks for duplicated UVs before the array duplication and deduplicate arrays after. " Robert Osfield 2014-12-16 09:34:15 +00:00
  • 117869d154 From Marc Helbling, "please find the mergeTriangleStrip code merged in osgUtil::TriStripVisitor. I've removed the references to DrawArrays as we should no longer produce any. Robert Osfield 2014-12-15 17:15:21 +00:00
  • 811dde86c8 Build fix Robert Osfield 2014-12-10 18:23:32 +00:00
  • 49c48a5509 Added OpenGL Transform Feedback extensions. Robert Osfield 2014-12-10 13:05:47 +00:00
  • 1b6e50a2dd From Marcus Hein, Added support for OpenGL SSBO and SSBB via osg::ShaderStorageBufferObject and osg::ShaderStorageBufferBinding to core OSG library, and added new osgSSBO example Robert Osfield 2014-12-10 12:23:04 +00:00
  • 92e2d849ed Added GLDefines header Robert Osfield 2014-12-10 11:44:16 +00:00
  • 324dc573a0 From Farshid Lashkari, "The Collada loader would crash while processing textures on certain files. I've attached the fix." Robert Osfield 2014-12-10 11:30:02 +00:00
  • 487c2b5f67 From Farshid Lashkari, "The Collada loader would crash while processing textures on certain files. I've attached the fix." Robert Osfield 2014-12-10 11:29:54 +00:00
  • 3c07921dee Removed old GL2Extensions class, replacing it with a typedef to GL2Extensions Removed old includes to include/osg/GL2Extensions Robert Osfield 2014-12-10 10:44:58 +00:00
  • 485709f708 Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object. Moved the #defines into new include/osg/GLDefines Converted all GL2Extensions usage to GLExtensions usage Robert Osfield 2014-12-10 10:38:12 +00:00
  • 09205544b7 Streamlined the extension functions Robert Osfield 2014-12-10 09:11:17 +00:00
  • 7629a5126a Added #ifdef's around GLsync typedef Robert Osfield 2014-12-09 21:33:12 +00:00
  • 22e51c9902 Windows build fixes Robert Osfield 2014-12-09 20:09:29 +00:00
  • a6aa47afcd Added new examples to runexamples.bat script Robert Osfield 2014-12-09 19:31:53 +00:00
  • d166b6d1df Quietened down debug messages Robert Osfield 2014-12-09 19:22:45 +00:00
  • d32cd203a2 From Wand Rui, "I've rewritten the osgblenddrawbuffers example to use the new BlendFunci and Capability classes. Hope it will tell others how to make use of the new functionality and why they are important in modern MRT-based applications." Robert Osfield 2014-12-09 19:20:05 +00:00
  • 43049ebcf1 Moved FBO Extensions into GL2Extensions. Robert Osfield 2014-12-09 18:30:28 +00:00
  • d5fcdabfa1 Removed no longer used Extension definition Robert Osfield 2014-12-09 14:58:34 +00:00
  • e31f682451 Moved local Extensions structs into GL2Extensions Robert Osfield 2014-12-09 14:57:25 +00:00
  • 3f1e77d479 Moveved Stencil/StencilTwoSided::Extensions into GL2Extensions Robert Osfield 2014-12-09 11:14:33 +00:00
  • ec4f898bce Moved local Extensions objects to GL2Extensions Robert Osfield 2014-12-09 10:37:09 +00:00
  • cceee38727 Moved Texture*::Extensions functionality into GL2Extensions Robert Osfield 2014-12-09 10:05:59 +00:00
  • a8804e2366 MOved VertexProgram and FragmentProgram::Extensions into GL2Extensions. Robert Osfield 2014-12-08 16:08:44 +00:00
  • 750cd78178 Fixed memory leak in RenderStageCache. Robert Osfield 2014-12-08 11:08:48 +00:00
  • 35cfbfdb8c Fixed memory leak in RenderStageCache. Robert Osfield 2014-12-08 11:08:29 +00:00
  • bc424bc54f MOved SampleMaski::Extensions into osg::GL2Extensions Robert Osfield 2014-12-07 17:31:49 +00:00
  • 9b03b3f8ce Moved TextureCubeMap::Extension functionality into GL2Extensions Robert Osfield 2014-12-05 20:05:18 +00:00
  • f634152de0 Moved osg::Drawable::Extensions into osg::GL2Extensions Robert Osfield 2014-12-05 17:26:42 +00:00
  • 1ce8029f39 Fixed windows build warnings Robert Osfield 2014-12-05 10:37:20 +00:00
  • 1bcb944ddc Windows build fix Robert Osfield 2014-12-05 09:52:42 +00:00
  • aa090f0f99 From the GLintptr + GLsizeiptr defintions to GL2Extensions header Robert Osfield 2014-12-05 08:58:23 +00:00
  • d83e641fad Moved osg::BlenFunc::Extensions into osg::GL2Extensions Robert Osfield 2014-12-04 19:03:16 +00:00
  • d02c0bdc49 Moved GLBufferObject::Extensions structure into osg::GL2Extensions Robert Osfield 2014-12-04 18:13:11 +00:00