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

Commit Graph

  • 7165182e35 From Konstantin Matveyev, "Last update in the osgAnimation::Animation ONCE mode bug fix" Robert Osfield 2015-03-16 10:30:18 +00:00
  • a88fa6f7b7 Added --play-mode [ONCE, STAY, LOOP, PPONG] to help with testing. Robert Osfield 2015-03-16 10:07:13 +00:00
  • 5878a70ede Reverted merged from svn/trunk. Robert Osfield 2015-03-13 08:13:59 +00:00
  • 58717d9279 From Konstantin Matveyev, "Small fix for OSG 3.3.6.119 in the attachment. Robert Osfield 2015-03-13 08:12:26 +00:00
  • 57d04290ab From Konstantin Matveyev, "Small fix for OSG 3.3.6.119 in the attachment. Robert Osfield 2015-03-13 08:12:19 +00:00
  • e2f208af54 Refactored how the callbacks for updating geometry are managed in MorphGeometry and RigGeometry to address bugs in serialization. Robert Osfield 2015-03-12 17:11:11 +00:00
  • ceda86b31b From Laurens Voerman, "attached is a zip with a modified version of: OpenSceneGraph\CMakeModules\FindFBX.cmake Robert Osfield 2015-03-12 15:12:57 +00:00
  • dd2de7f132 From Laurens Voerman, "attached is a zip with a modified version of: OpenSceneGraph\CMakeModules\FindFBX.cmake Robert Osfield 2015-03-12 15:12:29 +00:00
  • d3e9c44440 From Mattias Helsing, add copyright notice from other osgjs header to the json_stream header Robert Osfield 2015-03-12 13:41:00 +00:00
  • 3d144a0312 Added using namespace std and removed the std:: prefixes before the std::isfinte and std::isinf function calls to avoid problems with Android builds against older NDK's. Robert Osfield 2015-03-12 13:37:08 +00:00
  • 499e38ff98 Warning fixes Robert Osfield 2015-03-11 17:47:30 +00:00
  • 53859bb3de From Laurens Voerman, warning fixes Robert Osfield 2015-03-11 17:47:08 +00:00
  • 3461d9e8b5 From Laurens Voerman, "The current version will not compile with SDL version 2, error OpenSceneGraph\src\osgPlugins\sdl\JoystickDevice.cpp(42): error C2664: 'const char *SDL_JoystickName(SDL_Joystick *)' : cannot convert argument 1 from 'int' to 'SDL_Joystick *' due to changes in the SDL api. Robert Osfield 2015-03-11 17:37:33 +00:00
  • 11f5039695 From Laurens Voerman, "The current version will not compile with SDL version 2, error OpenSceneGraph\src\osgPlugins\sdl\JoystickDevice.cpp(42): error C2664: 'const char *SDL_JoystickName(SDL_Joystick *)' : cannot convert argument 1 from 'int' to 'SDL_Joystick *' due to changes in the SDL api. Robert Osfield 2015-03-11 17:36:45 +00:00
  • 75b9cd3627 Completed support for assigning 3D osg::Image to osg::Texture2DArray. Robert Osfield 2015-03-11 17:27:08 +00:00
  • b6acb1a8d3 Updated the comments to be more relevant Robert Osfield 2015-03-11 15:44:23 +00:00
  • c30be2355b Work in progress to allow osg::Texture2DArray to be set up with a single osg::Image containing 3D image data. Robert Osfield 2015-03-10 18:15:02 +00:00
  • d97e01c520 Work in progress on new osgtexture2DArray example Robert Osfield 2015-03-10 18:07:17 +00:00
  • 2a84719f4a From Cedric Pinson, gles and osgjs plugins that support conversion of OSG loaded models into a form that can be used with osgjs JavaScript library Robert Osfield 2015-03-09 11:27:26 +00:00
  • 9e2c23c9d3 Update AUTHORS file for 3.3.6 dev release Robert Osfield 2015-03-05 19:53:17 +00:00
  • 6a860e5e82 Updated dev release number Robert Osfield 2015-03-05 19:33:17 +00:00
  • e5b533726e Updated ChangeLog for dev release Robert Osfield 2015-03-05 19:26:08 +00:00
  • 4a535fe426 Updated RC to 2. Robert Osfield 2015-03-05 18:00:54 +00:00
  • fc7302ccba Updated AUTHORS file for next release candidate Robert Osfield 2015-03-05 18:00:16 +00:00
  • ed9502e017 Added check for newline at end of version line, and of it's not add a '\n' Robert Osfield 2015-03-05 10:53:28 +00:00
  • efb90a6a80 Updated SO_VERSION after changes to osgPresentation Robert Osfield 2015-03-04 18:39:04 +00:00
  • 8c8b8f3305 Restructed the osgPresentation and present3D directories back to the structure that was present in OSG-3.2 Robert Osfield 2015-03-04 18:36:44 +00:00
  • 26d1679248 Removed the experiemental osgPresentation classes. These are only partially functional and not appropriate for the stable OSG-3.4 release Robert Osfield 2015-03-04 17:42:30 +00:00
  • 412a9154c3 Updated AUTHORS for 3.3.5 dev release Robert Osfield 2015-03-03 15:26:15 +00:00
  • 66aef5dfc9 Fixed ClusterCullingCallback parser problem due to osg::Callback not being included in inheritance list Robert Osfield 2015-03-03 14:59:37 +00:00
  • 7f4d116391 Restructed the checks in the CollectLowestTransformsVisitor::removeTransforms() to avoid benign case being flagged as warning. Robert Osfield 2015-03-03 12:56:10 +00:00
  • 5346e7772a Restructed the checks in the CollectLowestTransformsVisitor::removeTransforms() to avoid benign case being flagged as warning. Robert Osfield 2015-03-03 12:56:09 +00:00
  • ec6edf535d From Miha Ravselj, "Regarding previous submission it was only partial solution. After further testing I found similar bug also in ClearNode serializer. Robert Osfield 2015-03-03 12:03:23 +00:00
  • 4c4738eced Re-organized the #ifdef's to avoid usage of glPolyginMode under GLES Robert Osfield 2015-03-03 12:00:52 +00:00
  • edf27e36ed Re-organized the #ifdef's to avoid usage of glPolyginMode under GLES Robert Osfield 2015-03-03 12:00:22 +00:00
  • 925c37b783 Updated SO_VERSION to take account of API changes in osgDB Robert Osfield 2015-03-02 14:38:17 +00:00
  • 58edd10d04 From Johannes Scholz, "Attached you find a patch for osgDB::OutputStream and osgDB::InputStream to include osg::Image::data() using Base64 encoding inside the ASCII OSGT, if WriteImageHint=IncludeData is set, only." Robert Osfield 2015-03-02 12:11:43 +00:00
  • 1d9e7f144b From Michael McDonnel, "The tessellation shader example has a small bug.The middle of the geometry is clipped as soon as it is tessellated. The clipping is probably caused by rounding errors because it is only in one spot. The clipping disappears when the camera is moved, and reappears when it is moved back. Expanding the the bounding box fixed the clipping bug." Robert Osfield 2015-03-02 12:09:25 +00:00
  • c8d8a051ad From Michael McDonnell, Merged enchancements to osgtesselationshader example from OSG-svn/trunk to OSG-3.2 branch. Robert Osfield 2015-03-02 11:08:59 +00:00
  • 0a83632f0a Fixed StateSet::Define names to match OpenSceneGraph-Data/shaders. Robert Osfield 2015-03-01 15:20:37 +00:00
  • 321750d72d From Jannik Heller, "I noticed the rotation in the OrbitManipulator depends on the framerate. To reproduce this issue, start the osganimate example, rotate the model with the left mouse button, then let go of the mouse button while still moving. You will notice that with V-Sync enabled, the model rotates slower. Robert Osfield 2015-03-01 11:08:58 +00:00
  • 4c9e17fcc7 From Jannik Heller, "I noticed the rotation in the OrbitManipulator depends on the framerate. To reproduce this issue, start the osganimate example, rotate the model with the left mouse button, then let go of the mouse button while still moving. You will notice that with V-Sync enabled, the model rotates slower. Robert Osfield 2015-03-01 11:08:51 +00:00
  • 95853370e1 Updated AUTHROS, Controbitors and rc number in prep for the 3.2.2-rc1 Robert Osfield 2015-02-27 10:15:45 +00:00
  • e3e1a55702 Updated version number after dev release. Robert Osfield 2015-02-27 10:01:56 +00:00
  • e9f497aa1f Updated ChangeLog and Contributors to fix trailing spaces Robert Osfield 2015-02-27 09:47:58 +00:00
  • b59b0e0253 Fixed Windows warnings Robert Osfield 2015-02-27 09:05:04 +00:00
  • d03b38dea8 Fixes for warnings Robert Osfield 2015-02-27 04:29:30 +00:00
  • 23b76599bd Fixed build with auto ptr conversion switched off Robert Osfield 2015-02-26 20:15:36 +00:00
  • c90cc658a0 Updated AUTHORS Robert Osfield 2015-02-26 20:06:11 +00:00
  • f93a4f330a Updated AUTHORS Robert Osfield 2015-02-26 19:51:56 +00:00
  • 6a30705870 From Bradley Baker Searles, "We had someone replace a DDS texture with a GL_RGB/GL_UNSIGNED_SHORT_5_6_6 image, which would trigger a crash in Image.cpp while flipping the mipmap chain. The code was trying to flip the mipmaps using the rowStep for the full-size image (we have "dds_flip" set in the osgDB::ReaderWriter::Options in the osgDB::Registry)." Robert Osfield 2015-02-26 19:14:28 +00:00
  • 7c8ab128a6 From Bradley Baker Searles, "We had someone replace a DDS texture with a GL_RGB/GL_UNSIGNED_SHORT_5_6_6 image, which would trigger a crash in Image.cpp while flipping the mipmap chain. The code was trying to flip the mipmaps using the rowStep for the full-size image (we have "dds_flip" set in the osgDB::ReaderWriter::Options in the osgDB::Registry)." Robert Osfield 2015-02-26 19:13:46 +00:00
  • 1185fbda34 From Bradley Baker Searles, "Small patch attached to handle DDS flip when s=4. Currently it will omit flipping and generate a warning: "Vertical flip was skipped. Image dimensions have to be multiple of 4."." Robert Osfield 2015-02-26 18:07:25 +00:00
  • 9dffd49241 From Bradley Baker Searles, "Small patch attached to handle DDS flip when s=4. Currently it will omit flipping and generate a warning: "Vertical flip was skipped. Image dimensions have to be multiple of 4." Robert Osfield 2015-02-26 18:06:06 +00:00
  • 77f662f9f7 From Julien Valentin and Alberto Luaces, added support for transform feedback extensions Robert Osfield 2015-02-26 17:49:36 +00:00
  • 63acee9ee3 Update AUTHORS file Robert Osfield 2015-02-26 17:18:31 +00:00
  • 005e52144d Fixed typo Robert Osfield 2015-02-26 14:16:36 +00:00
  • d1c93f6bad Fixed typo Robert Osfield 2015-02-26 14:16:22 +00:00
  • 11ff450231 Regenerated AUTHORS.txt to fix missing special characters Robert Osfield 2015-02-26 13:52:12 +00:00
  • 9362339242 Updated AUTHORS file Robert Osfield 2015-02-25 19:59:01 +00:00
  • 32831b1ef8 Updated ChangeLog Robert Osfield 2015-02-25 19:52:00 +00:00
  • 5f1b41a84f From Aitor Moreno, "Attached you will find the modified file without the lines which raises the exception. " Robert Osfield 2015-02-25 19:38:43 +00:00
  • 1db6def2c4 From Jamie Robertson, "I've been using osgSim::ScalarBar to display fixed range color values (e.g. red from 1-2, green from 3-4 etc), by setting the _numColors the same as the number of actual colors in the ColorRange. Robert Osfield 2015-02-25 19:31:20 +00:00
  • 47202acc24 From Dmitry Marakasov, "While packaging osg-3.3.3 I've discovered that gstreamer detection is broken: Robert Osfield 2015-02-25 19:25:34 +00:00
  • 30a62bc4ad From Jonathan Greig, "I was testing out the example and it works fine as a standalone example, but I found that it didn't work as expected when adding the class to some existing code I have to test it out. The osg widget was appearing but it didn't appear to be updating. After tweaking it to pass on the parent QWidget pointer from my code, it worked as expected. I added the WindowFlags to the attached file for good measure. If you look at the Qt Documentation for QWidget ( http://doc.qt.io/qt-5/qwidget.html#QWidget ), you'll see that is exactly where I got this from. When subclassing a widget as such, you should allow the user to pass in the parent at least, considering that has a major effect on how or if Qt may clean up the memory." Robert Osfield 2015-02-25 19:19:37 +00:00
  • 47db2da8b4 From Andreas Henne, Support for GL3 core profile in osgText Robert Osfield 2015-02-25 18:56:29 +00:00
  • 7d50c8e634 From Michael McDonnell, "I have changed the code so that the plus key increases both the inner and outer tessellation. The minus key decrease both the inner and outer tessellation. You can still use the arrow keys to control inner and outer tessellation separately." Robert Osfield 2015-02-25 16:59:43 +00:00
  • e7d41377be Fixed handling of NULL entries in osg::Geometry TexCoordArrayList and VertexAttribArrayList. Robert Osfield 2015-02-25 14:55:59 +00:00
  • 213efd20ad Fixed matrix setup. Robert Osfield 2015-02-24 11:06:05 +00:00
  • b6f05114dc Fixed image allocation operations. Robert Osfield 2015-02-23 20:28:37 +00:00
  • bd3f390b2f Fixed image allocation operations. Robert Osfield 2015-02-23 20:28:28 +00:00
  • 594b3064c0 From Miha Ravšelj and Robert Osfield, fix for serializer bug in osgText::TextBase and osg::Camera Robert Osfield 2015-02-23 11:43:21 +00:00
  • 8bb91a5265 From Arjun Ramamurthy, fix for StatsHandler when being used in multiple view/windows Robert Osfield 2015-02-23 11:07:35 +00:00
  • 685a270c18 From Arjun Ramamurthy, fix for use of StatsHandler in multipleviews/windows Robert Osfield 2015-02-23 11:07:03 +00:00
  • 1320c923ca Changed the toggle of defines so that it works with assumed defaults now set up by the GeometryPool so that when toggling it doesn't have a delay in what the user would expect Robert Osfield 2015-02-20 15:12:57 +00:00
  • 72c4f3a8ba Removed redudent shaders, and updated remaining shaders to match OpenSceneGraph-Data/shaders Robert Osfield 2015-02-20 15:04:56 +00:00
  • afbf20eba9 First step of refactoring the osg::Program management in osgTerrain::GeometryPool for better performance by placing default osg::Program and shader defines on a single StateSet below the osgTerrain::Terrain Robert Osfield 2015-02-20 15:02:43 +00:00
  • 5c023d1f76 Moved osgTerrain::GeometryPool from osgTerrain::DisplacementMappingTechnique to the osgTerrain::Terrain Robert Osfield 2015-02-18 10:52:52 +00:00
  • 13f2cb3f47 From Sebastian Messerschmidt,"Attached you find a version of the ReaderWriterDDS with info outputs set to OSG_INFO instead of OSG_NOTICE. The old version spams the console for each loaded DDS file." Robert Osfield 2015-02-18 10:23:43 +00:00
  • e5d51da1b3 From Sebastian Messerschmidt, "Attached you find a version of the ReaderWriterDDS with info outputs set to OSG_INFO instead of OSG_NOTICE. The old version spams the console for each loaded DDS file." Robert Osfield 2015-02-18 10:23:14 +00:00
  • 4cb5bce66a Added support for DefineList to StateSet::merge(..) Robert Osfield 2015-02-17 20:42:12 +00:00
  • 3e2305d815 From Stephan Wenglorz, "the attached fix corrects a small bug in OperationThread::setDone(bool), calling it had the opposite effect of what was intended, i.e. setting done to false actually finished the thread. The effect was that VPB threads would exit before starting osgdem when a task had been enqueued, because they initially set done to false." Robert Osfield 2015-02-17 19:40:58 +00:00
  • 8546e911fc Removed GL_ usage in defines Robert Osfield 2015-02-17 19:22:37 +00:00
  • 441dbe6b02 Removed commented out lines Robert Osfield 2015-02-17 19:21:29 +00:00
  • 53198f2e9b Cleaned up warning generated when compiling osgocculusviewer Robert Osfield 2015-02-17 10:36:41 +00:00
  • 6bddbdf074 Improvements to the #pragma(tic) shader composition support Robert Osfield 2015-02-13 12:50:43 +00:00
  • 77b8962bcc Deprecated the old ShaderComposition example code so that it's now only invoked if you add a --old to the osgshadercomposition command line. Robert Osfield 2015-02-13 10:56:59 +00:00
  • a40260a5a5 From Farshid Lashkari, "I've attached a fix for some internal glu functions so that they use size_t for computing allocation sizes instead of GLint. I encountered some large images that were triggering integer overflows with the current code." Robert Osfield 2015-02-13 07:45:49 +00:00
  • 66210a6aca Fixed warning Robert Osfield 2015-02-11 19:21:27 +00:00
  • 9fa3defb0e Added reassignment of the #version line to the first entry in the source list. Robert Osfield 2015-02-11 16:41:31 +00:00
  • 4a9f4aae9d Added GL #define for Windows build Robert Osfield 2015-02-11 09:41:15 +00:00
  • a676d5d37b Windows build fix Robert Osfield 2015-02-10 21:13:16 +00:00
  • 06f186dc07 Added GL_LINES_ADJACENCY_EXT variants back into ObjectWraper to enable backwards compatibility. Robert Osfield 2015-02-10 18:01:02 +00:00
  • ea7dbabda1 Change for new Program API Robert Osfield 2015-02-10 17:53:29 +00:00
  • b38c6258bf Added support for new #pragam(atic) shader composition to new displacement mapping technique Robert Osfield 2015-02-10 17:20:26 +00:00
  • b90503fdf5 Introduced new shader composition approach that utilizes #pragma requires(), #pragma import_defines() and #ifdef in GLSL to enable multiple different versions of shaders based on defines passed in from osg::StateSet::setDefine(..). Robert Osfield 2015-02-10 17:04:02 +00:00
  • bb637e73f3 Fixed typo. Robert Osfield 2015-02-04 15:11:00 +00:00
  • 1debc21bb2 Removed unncessary _EXT Robert Osfield 2015-02-03 16:36:19 +00:00
  • bbb54cedc7 Commented out the experimental V8 and Python plugins as these plugins only existed as a proof of concept test linkage with these dependenices, and have no functionality beyond this. Robert Osfield 2015-02-02 09:53:55 +00:00
  • a9804d7e19 Replaced _EXT defines with GL-3.2 versions Robert Osfield 2015-01-27 15:07:53 +00:00