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

Commit Graph

  • 69407f4054 Removed redundent spaces Robert Osfield 2014-12-04 18:12:07 +00:00
  • 1791ac08a8 Added glMemoryBarrier, glMapBufferRange and glBindBufferBase to GL2Extensions Robert Osfield 2014-12-04 17:12:55 +00:00
  • 6569f69de1 Moved old GL2Extensions::Get(..) usage across to new osg::State::get<GL2Extensions>() usage Robert Osfield 2014-12-04 16:28:32 +00:00
  • 66da1328f8 Ported GL2Extentions across to using the new GL extensions approach - cutting code count by 3000 lines! Robert Osfield 2014-12-04 16:22:31 +00:00
  • f8d53b7c8d Build fix for when ref_ptr<> auto conversion is disabled Robert Osfield 2014-12-04 15:10:43 +00:00
  • 5efe60dcf5 Added osg::Capability and Cabibilityi base classes to wrap up glEnable/glDisable + glEnablei/glDisablei functionality, with osg::Enablei and osg::Disablei concrete implementations. Robert Osfield 2014-12-03 17:31:16 +00:00
  • 457d41d385 Added osg::BlendFunci, osg::BlendEquationi and osg::ColorMaski StateAttrirbutes that wrap the glBlendFunci, glBlendEquationi and glColorMaski functions Robert Osfield 2014-12-02 17:12:56 +00:00
  • a9cab19ddb Moved BlendEquation across to using the new GL extension setup approach. Robert Osfield 2014-12-02 15:37:07 +00:00
  • 0ce96fbe8b Fixed typo Robert Osfield 2014-12-02 15:21:24 +00:00
  • ff73445bf3 Added a template get and get_exisiting method into osg::State that implements a new mechanism for managing OpenGL extensions. Robert Osfield 2014-12-02 11:10:23 +00:00
  • b7067ad988 From Rafa Gaitan, "I'm attaching also a new version of the toolchain with support for the r10c ndk. This fixes some CMake Warnings and allows to use the toolchain in macosx." Robert Osfield 2014-11-28 16:20:28 +00:00
  • e5f5c30e4d Removed include/osg/Version and include/OpenThreads/Version headers as these are autogenerated. Robert Osfield 2014-11-28 16:10:14 +00:00
  • d7c6bb1c4b Standardized on defined(__ANDROID__) Robert Osfield 2014-11-28 10:54:40 +00:00
  • 6d98c5460f Added getlocaledecpoint() workaround for Android build of lua plugin Robert Osfield 2014-11-28 10:52:06 +00:00
  • 1c9993dd5d Added in source shaders Robert Osfield 2014-11-27 15:54:24 +00:00
  • 114ddbb0c6 Changed the name of shader files Robert Osfield 2014-11-27 15:39:38 +00:00
  • 95b3622d1d From Jason Beverage, "It looks like the Callback header got accidentally removed from the CMakeLists.txt in the submission yesterday for the geometry instancing example." Robert Osfield 2014-11-26 20:40:57 +00:00
  • 4184696809 Windows build fix Robert Osfield 2014-11-26 19:05:09 +00:00
  • d76947845a Fixed warnings Robert Osfield 2014-11-26 17:08:16 +00:00
  • b5179e247f Fixed warnigns Robert Osfield 2014-11-26 17:07:51 +00:00
  • 84ec88cc25 Removed redundent line endings Robert Osfield 2014-11-26 17:07:07 +00:00
  • 2f0cc6fbc9 Fixed warnings Robert Osfield 2014-11-26 17:04:12 +00:00
  • f802f6d0ed Fixed deprecated warnings Robert Osfield 2014-11-26 16:29:53 +00:00
  • 7a9e97877c Fixed deprecated warnings Robert Osfield 2014-11-26 16:29:43 +00:00
  • 0bedd4c43a Fixed warning Robert Osfield 2014-11-26 16:15:50 +00:00
  • a165930b48 Fixed warning Robert Osfield 2014-11-26 16:15:37 +00:00
  • d1b9bdbbbe Fixed warnings Robert Osfield 2014-11-26 16:07:46 +00:00
  • c923584158 Removed redudent spaces Robert Osfield 2014-11-26 16:06:55 +00:00
  • 0be132c07c Fixed warnings. Robert Osfield 2014-11-26 16:04:33 +00:00
  • c789f7bced Fixed warning Robert Osfield 2014-11-26 16:02:06 +00:00
  • d6ed4c4d6d Fixed warning Robert Osfield 2014-11-26 16:00:18 +00:00
  • 8fe82b463f Fixed warning Robert Osfield 2014-11-26 15:59:23 +00:00
  • dd186fe6a1 Added osgTerrain::DisplacementMappingTechnique serializer Robert Osfield 2014-11-26 14:06:27 +00:00
  • dfb0b2ab8e Renamed ShaderTerrain to DisplacementMappingTechnique and moved it from the osgterrain example testbed into the osgTerrain NodeKit Robert Osfield 2014-11-26 14:04:20 +00:00
  • d9f93f9d1a Moved osgTerrain::GeometryPool from osgterrain example into osgTerrain NodeKit Robert Osfield 2014-11-26 13:36:28 +00:00
  • eaa170809f Removed GL header as it's already included via the ${OPENSCENEGRAPH_OPENGL_HEADER} entry. Robert Osfield 2014-11-25 14:37:05 +00:00
  • 4c5a1885d2 From PawelKsiezopolski, "This submission contains a new example for OSG : a geometry instancing rendering algorithm consisting of two consequent phases : Robert Osfield 2014-11-25 10:58:23 +00:00
  • f06ea2bc6e Removed DrawArrays optimization to simplify the code and open the door to adding primitive combining. Robert Osfield 2014-11-25 10:33:20 +00:00
  • 79a4fff2dc Commented out State::setUpVertexAttribAlias(..) debug message. Robert Osfield 2014-11-25 10:11:06 +00:00
  • 18810de975 From Jan Klimke, "i noticed, that there are a couple of additional flaws when building osg for Mac OS X 10.10 Yosemite. Robert Osfield 2014-11-24 15:24:31 +00:00
  • 53e337611a From Jan Klimke, "i noticed, that there are a couple of additional flaws when building osg for Mac OS X 10.10 Yosemite. Robert Osfield 2014-11-24 15:19:20 +00:00
  • 86ddca4edb Added VertexAttribDivisor class to wrap up glVertexAttribDivisor function Robert Osfield 2014-11-24 14:54:39 +00:00
  • e3ba4c82e4 Fixed handling of viewer's Camera Robert Osfield 2014-11-24 14:10:40 +00:00
  • 2a8d894168 Fixed osgsimplegl3 example's set up of the main camera. Robert Osfield 2014-11-24 14:09:14 +00:00
  • fce7137525 Added numTextureUnits parameter to the osg::State::resetVertexAttributeAlias(bool, unit) method, and set the default to 8. Robert Osfield 2014-11-24 14:01:05 +00:00
  • 671d8dc342 From Alberto Luaces,"the current code uses the preprocessor for generating the plugin path in a way that when CMAKE_INSTALL_PREFIX contains something along the lines of Robert Osfield 2014-11-21 20:16:16 +00:00
  • ce82cfd25f From Alberto Luaces,"the current code uses the preprocessor for generating the plugin path in a way that when CMAKE_INSTALL_PREFIX contains something along the lines of Robert Osfield 2014-11-21 20:16:13 +00:00
  • a97f104ab6 Added comment clarifying how Image::getColor(..) out of 0..1 range texcoords are handled - now clamped to edge. Robert Osfield 2014-11-21 20:15:30 +00:00
  • e51fd3d4fa Implemented a clamp to edge policy for the Image::g/setColor(color, texcoord). Robert Osfield 2014-11-21 17:22:30 +00:00
  • b37d6b1921 Added testing for Drawables in the CopyOp::operator(Node*) to replicate the old functionality. Robert Osfield 2014-11-21 17:17:11 +00:00
  • e67466a74f From Sebastian Messerschmidt, "Added setColor function to modify an image based on texture coordinates, parallel to the getColor functionality." Robert Osfield 2014-11-21 16:27:29 +00:00
  • f49d7ae110 Added --db-affinit cpuNum option to osgterrain example to illustrate how to set the thead affinity of the DatabasePager threads. Robert Osfield 2014-11-21 14:46:08 +00:00
  • c71016bd3c From Sebastian Messerschmidt, "Attached you find a change adding a getNumSamples() function to retrieve the value set via setNumSamples." Robert Osfield 2014-11-21 10:44:01 +00:00
  • b9a529148a From Rafa Gaitan, "I finally had some time to change the build system for Android using a Toolchain, which, I think, will be easier to maintain and uses cmake standard system to build it. Robert Osfield 2014-11-21 10:37:33 +00:00
  • 2986df22d6 From Björn Blissing, fix for ambiguous defines in Atomic.cpp when compiling with MinGW and GCC Robert Osfield 2014-11-21 10:21:46 +00:00
  • 9c42d8f0da From Björn Blissing, fix for ambiguous defines in Atomic.cpp when compiling with MinGW and GCC Robert Osfield 2014-11-21 10:21:44 +00:00
  • 2b4221c211 Copied Contributors file from svn/trunk. Robert Osfield 2014-11-21 09:28:20 +00:00
  • 5da4e80e95 From Claus Steuer, "XCode 6, IOs 8.1 SDK Compile fix : There are some undefined texture formats when compiling osg for IOs 8.1 with XCode 6 and OpenGLES2 enabled." Robert Osfield 2014-11-20 17:37:52 +00:00
  • 7d04c3457a From Claus Steuer, "XCode 6, IOs 8.1 SDK Compile fix : There are some undefined texture formats when compiling osg for IOs 8.1 with XCode 6 and OpenGLES2 enabled." Robert Osfield 2014-11-20 17:37:50 +00:00
  • f8c4ad4b90 From Pjotr Svetachov, "I was experimenting with VBO's to try to get them on par with display lists when drawing lots of batches and noticed that my program generated a lot of unneeded glClientActiveTexture calls. Digging deeper I found out it came from State::disableTexCoordPointer where the function would call glClientActiveTexture but not glDisableClientState because the geometry didn't have texture coordinates for that channel. This is because in our scene there are some geometries that have move than one uv channels making State::_texCoordArrayList grow. Then the method State::applyDisablingOfVertexAttributes() will call disableTexCoordPointer multiple times. Robert Osfield 2014-11-20 17:00:14 +00:00
  • 834c940db1 From Farshid Lashkari, "The obj loader was overriding the existing database path list with the file path of the model, instead of prepending the file path to the path list. The latter seems to be more common behavior for most of the existing loader plugins. Also, the local options weren't actually being used when processing the scene graph for textures. I've attached the fix for both issues." Robert Osfield 2014-11-20 16:38:23 +00:00
  • 166a8b6ccf From Farshid Lashkari, "The obj loader was overriding the existing database path list with the file path of the model, instead of prepending the file path to the path list. The latter seems to be more common behavior for most of the existing loader plugins. Also, the local options weren't actually being used when processing the scene graph for textures. I've attached the fix for both issues." Robert Osfield 2014-11-20 16:38:17 +00:00
  • 600e98773e From Marc Helbling, "here is a trivial fix in the Inventor plugin. In one code path, the pointer validity is checked after dereferencing a pointer that can be null (image->valid()) instead of calling ref_ptr::valid (image.valid())." Robert Osfield 2014-11-20 10:52:24 +00:00
  • 5cc425cf99 From Marc Helbling, "here is a trivial fix in the Inventor plugin. In one code path, the pointer validity is checked after dereferencing a pointer that can be null (image->valid()) instead of calling ref_ptr::valid (image.valid())." Robert Osfield 2014-11-20 10:52:20 +00:00
  • 2da766ff1b From Marc Helbling, "I've come across scenes that contains geometries with initialized but empty vertex arrays and primitives and that would make some optimizers crash. Robert Osfield 2014-11-20 10:45:05 +00:00
  • f19a63e50d From Marc Helbling, "I've come across scenes that contains geometries with initialized but empty vertex arrays and primitives and that would make some optimizers crash. Robert Osfield 2014-11-20 10:45:03 +00:00
  • 1e75ca63f4 From Christian Ruzicka, "while testing this commit on our OSG 3.2 version, I observed that the changes for ETC2 brake ETC1 support. Attached you'll find the changes to get ETC1 running again" Robert Osfield 2014-11-20 10:05:52 +00:00
  • cf7258e03a From Sukender, "Fix for 3DS reader, which may read wrong triangles. Actually, indices may suffer a 'short int' overflow, in two places." Robert Osfield 2014-11-20 09:55:50 +00:00
  • 506f26d292 From Sukender, "Fix for 3DS reader, which may read wrong triangles. Actually, indices may suffer a 'short int' overflow, in two places." Robert Osfield 2014-11-20 09:55:48 +00:00
  • b4354df6fb Fixed segfalt in Texture2DArray copy constructor where it would apply images to an uninitialzed vector. Robert Osfield 2014-11-20 09:41:27 +00:00
  • c8d3571efd Fixed segfalt in Texture2DArray copy constructor where it would apply images to an uninitialzed vector. Robert Osfield 2014-11-20 09:41:22 +00:00
  • 1fa34dbbcc From Marc Helbling, "patch adding support for ambient material in the FBX plugin. It's a straightfoward adaptation of the emissive support and has been tested on a proprietary model." Robert Osfield 2014-11-20 09:32:40 +00:00
  • 7ae45b7ac2 From Marc Helbling, "patch adding support for ambient material in the FBX plugin. It's a straightfoward adaptation of the emissive support and has been tested on a proprietary model." Robert Osfield 2014-11-20 09:32:38 +00:00
  • 3cabbb5a5a Added default setting of build type to Release Robert Osfield 2014-11-20 09:31:47 +00:00
  • f3859f6d11 From Pjotr Svetachov, fix for build breakage with giflib 5.0. Robert Osfield 2014-11-20 09:21:52 +00:00
  • 0c052ce2ed From Pjotr Svetachov, fix for build breakage with giflib 5.0. Robert Osfield 2014-11-20 09:21:48 +00:00
  • f0882eda6b From Per Nordqvist, "The README.txt is still somewhat confusing so I have updated it" Robert Osfield 2014-11-20 08:26:34 +00:00
  • aa17d70853 Removed configure script as it's no longer required as cmake . will now default to Release Robert Osfield 2014-11-19 17:45:45 +00:00
  • f3eb245e98 Added CMake script to set the default CMAKE_BUILD_TYPE to Release. Approach taken from simgear. Robert Osfield 2014-11-19 17:42:11 +00:00
  • 60bafc2050 Fixed contributors names Robert Osfield 2014-11-19 17:31:45 +00:00
  • 0dd978df7a From Clement Boesch, "Fix remaining bit of Giflib5 usage" Robert Osfield 2014-11-19 17:31:00 +00:00
  • a08b3104a8 Fixed Contributors names Robert Osfield 2014-11-19 17:29:15 +00:00
  • 43bdd32242 From Clement Boesch, "Fix remaining bit of Giflib5 usage" Robert Osfield 2014-11-19 17:10:21 +00:00
  • 3dd9f8d430 From Laurens Voerman, "I found a new way to crach the osgviewer: osgviewer "ProxyNode { FileNameList { cow.osgt } num_children 1 }".osgs Robert Osfield 2014-11-19 11:37:37 +00:00
  • 0ec0b79d6c From Laurens Voerman, "I found a new way to crach the osgviewer: osgviewer "ProxyNode { FileNameList { cow.osgt } num_children 1 }".osgs Robert Osfield 2014-11-19 11:37:33 +00:00
  • 34863fe2d2 From Wang Rui, "The submission includes some fixes for osgQt library and osgQtWidgets example: (1) QTextEdit now works with mouse/drag events, (2) scrollbars will change when OSG window is resizing, (3) improve rendering efficiency of QGraphicsViewAdapter so that it works with complex Qt UI, (4) add new setBackgroundWidget() method to indicate a 'background widget', which will ignore mouse/key events on it and pass them to the 3D scene." Robert Osfield 2014-11-19 11:30:53 +00:00
  • 5f45a39f28 Changed the way that the cell size is passed to the shader Robert Osfield 2014-11-19 10:43:07 +00:00
  • 5ab861cd04 From James Turner, "Converting the loops to forward versions fixed the issue. The problem is size_t is unsigned; at the limit condition it doesn’t go negative but wraps around to 0xffffffffffffffff …. and boom." Robert Osfield 2014-11-19 09:33:53 +00:00
  • f40df07ec7 Fixed typo Robert Osfield 2014-11-17 15:43:26 +00:00
  • ab47842d6d Fixed typo in comment Robert Osfield 2014-11-17 09:19:38 +00:00
  • 6661deeb24 Added use of GL_TRIANGLE_STRIP to cut down the size of the primitive indices required. Robert Osfield 2014-11-14 17:44:20 +00:00
  • bff5b0261b Implemented skirt functionality Robert Osfield 2014-11-14 16:47:32 +00:00
  • 25cfb81a09 Refactored the handling of use of the osgDB::ObjectCache in the DatabasePager to use a local thread specific ObjectCache to handle new additions and then have these additions merged with the main Registry ObjectCache during the main loop. Robert Osfield 2014-11-13 09:40:11 +00:00
  • ed28ec97c7 Moved implementation of ObjectCache functionality out of Registry into a dedicated osgDB::ObjectCache class. Robert Osfield 2014-11-11 18:28:07 +00:00
  • 0e9c93f335 To handle thread safe paging and use of the osgDB::Registry ObjectCache, moved the handling of cache into osgDB::DatabasePager. Robert Osfield 2014-11-10 16:04:43 +00:00
  • 14620aa1dd From Pjotr Svetachov, "I tried your fix and it exposed a bug in my fix :) The problem is that the readObjectFields method will add the object to the _identifierMap. So all the other instances of that image in the same file will be replaced by the created dummy object. In my fix this was an dummy image and I didn't notice it in our scene's, probably because it covered a small part of an object. In your fix the dummy object was not an image and that leads to a crash when something tries to use it as an image. I have attached a small fix for this bug. Robert Osfield 2014-11-06 10:44:27 +00:00
  • a84df15c0a Introduced use of MarkerObject to IncrmentalCompileOperation/DatabasePager as a way of marking objects that have already been processed and compiled, thus avoid potential threading conflicts when paged subgraphs are reused. Robert Osfield 2014-11-06 10:40:54 +00:00
  • 7f592b7ad5 Added handling of the reading of field properties to a dummy object for cached images to avoid threading issues associated with reusing and modifying an active object. Robert Osfield 2014-11-05 16:08:42 +00:00
  • 9cda04e51f Reinstated the original mechanism for OperationThread::cancel() that co-operatively releases blocks/barriers to make sure the thread is able to exit correctly. Robert Osfield 2014-11-05 13:38:50 +00:00
  • 7a33cc00cd Improvements to the ShaderTerrain experiemental terrain rendering technique. Robert Osfield 2014-11-04 20:07:40 +00:00