Commit Graph

  • 3f637584f5 Fixed line endings Robert Osfield 2014-07-03 13:05:09 +00:00
  • 7a18876c5b Changed enum usage to use the new osgVolume::VolumeSettings versions and added support for reading a VolumeSettings file. Robert Osfield 2014-07-03 13:01:05 +00:00
  • 3c6a1ec117 Refactor VolumeSettings so that it's subclassed from osgVolume::Property Robert Osfield 2014-07-03 10:01:46 +00:00
  • c4f199d1b5 Added osgVolume::VolumeSettings object Robert Osfield 2014-07-02 16:26:18 +00:00
  • b8dbebeca7 Changed the default image output format to .osgb as .dds isn't able to represent signed byte, short and int data correctly. Robert Osfield 2014-07-02 15:34:37 +00:00
  • 46c52f2a97 Merged fix from svn/trunk to handlng of file type of nested files within a .osgx, .osgt and .osgb file. Robert Osfield 2014-07-02 14:14:57 +00:00
  • 7bacd73e85 fixed handlng of file type of nested files within a .osgx, .osgt and .osgb file. Robert Osfield 2014-07-02 14:14:53 +00:00
  • d4c4bee020 From Laurens Voerman, "just like ClusterCullingCallback (fixed in r14322) visual studio likes an explicit implementation of run() for InteractiveImageHandler. Robert Osfield 2014-07-02 10:25:29 +00:00
  • dfd59cbfe1 Added #include <stdint.h> to address compile issue on some Linux distro's. Robert Osfield 2014-07-01 07:31:48 +00:00
  • 48c9816c38 Added #include <stdint.h> to address compile issue on some Linux distro's. Robert Osfield 2014-07-01 07:31:46 +00:00
  • 81b32a3d89 Add dds no flip on write option to prevent output of .dds volume from being flipped by the dds plugin. Robert Osfield 2014-06-30 15:31:39 +00:00
  • 43a068b156 Add dds no flip on write option to prevent output of .dds volume from being flipped by the dds plugin. Robert Osfield 2014-06-30 15:31:36 +00:00
  • 45bea0db4b REmoved debug cout Robert Osfield 2014-06-30 13:24:41 +00:00
  • 98889b7331 Updated ChangeLog and AUTHORS file Robert Osfield 2014-06-30 10:22:37 +00:00
  • 4fefd87b80 From Mikhail Izmestev, "Attached fix to avoid vector reallocs on push_back in StateGraph::moveStateGraph." Robert Osfield 2014-06-30 10:13:22 +00:00
  • bb8b1538c7 From Mikhail Izmestev, "Attached fix to avoid vector reallocs on push_back in StateGraph::moveStateGraph." Robert Osfield 2014-06-30 10:13:19 +00:00
  • 586c177db9 Updated ChangeLog and AUTHORS file Robert Osfield 2014-06-30 09:13:04 +00:00
  • 147c5e183f Updated ChangeLog and AUTHORS file Robert Osfield 2014-06-30 09:12:14 +00:00
  • 9d5a510441 Updated version number Robert Osfield 2014-06-30 08:56:08 +00:00
  • b138fa8ab7 Updated RC number Robert Osfield 2014-06-30 08:55:36 +00:00
  • 5fb078b4f1 From Pjotr Svetachov, "Here is a small fix for a overflow when editing large 3d volume data." Robert Osfield 2014-06-30 08:46:54 +00:00
  • 5aa7acd92b From Pjotr Svetachov, "Here is a small fix for a overflow when editing large 3d volume data." Robert Osfield 2014-06-30 08:46:53 +00:00
  • a4a684cb07 Removed space from #include. Robert Osfield 2014-06-30 08:20:31 +00:00
  • 1581699022 Removed space from #include. Robert Osfield 2014-06-30 08:20:30 +00:00
  • d009dec52f Merged librsvg-2.0>=2.35 version check from svn/trunk. Robert Osfield 2014-06-30 07:39:16 +00:00
  • 9d14c9908e From Alexander Sinditskiy, build fix to allow building against versions older than librsvg-2.36.2 Robert Osfield 2014-06-30 07:37:09 +00:00
  • 4c18eb62ca From Alexander Sinditskiy, build fix to allow building against versions older than librsvg-2.36.2 Robert Osfield 2014-06-30 07:37:06 +00:00
  • 7a14b224ed Replaced using NodeCallback::run with explict run() implementation. Robert Osfield 2014-06-28 06:22:47 +00:00
  • 555c935ffd From Pjotr Svetachov, "I made a small change to DataOutputStream.cpp which makes saving Geodes possible again. This is only half a fix as it only will save a Drawable that is part of a Geode. But this change does not require a version bump of the .ive format. I tried it with a few datasets we have here with the 3.2 stable branch and the trunk with this patch and there was no difference in the .ive files that were produced." Robert Osfield 2014-06-27 15:57:34 +00:00
  • 1d4fbbce1f Removed unused method. Robert Osfield 2014-06-27 15:55:05 +00:00
  • cd5e4a999b Removed unused method. Robert Osfield 2014-06-27 15:55:02 +00:00
  • 46e53047bc From Laurens Voerman, "attached is a modified version of src/osgUtil/Tessellator.cpp current code checks for a Nullpointer and on notify level info or above will inform you with a crash, by dereferencing it." Robert Osfield 2014-06-27 15:48:41 +00:00
  • e9728042b9 From Laurens Voerman, "attached is a modified version of src/osgUtil/Tessellator.cpp current code checks for a Nullpointer and on notify level info or above will inform you with a crash, by dereferencing it." Robert Osfield 2014-06-27 15:48:38 +00:00
  • 1d120f7814 Updated AUTHORS file Robert Osfield 2014-06-27 15:39:56 +00:00
  • 23ae2acf73 Updated AUTHORS file Robert Osfield 2014-06-27 15:39:05 +00:00
  • f42ac7e15b Added an OSG_INIT_SINGLETON_PROXY to make sure that the ApplicationUsage singleton gets intialized before usage. Robert Osfield 2014-06-27 15:38:52 +00:00
  • 2c25825800 Added a render order sort to the list of Cameras being tested by the *Viewer::generatePointerData(..) method to ensure that the highest Camera gets focus. Robert Osfield 2014-06-27 15:38:48 +00:00
  • 32e0e21013 Updated AUTHORS file Robert Osfield 2014-06-27 15:36:47 +00:00
  • 8d6bee6da9 Added a render order sort to the list of Cameras being tested by the *Viewer::generatePointerData(..) method to ensure that the highest Camera gets focus. Robert Osfield 2014-06-27 15:30:56 +00:00
  • 2f83db9442 Added a render order sort to the list of Cameras being tested by the *Viewer::generatePointerData(..) method to ensure that the highest Camera gets focus. Robert Osfield 2014-06-27 15:30:50 +00:00
  • 78a59c33bd Updated AUTHORS file Robert Osfield 2014-06-27 15:26:03 +00:00
  • d994e84288 Update ChangeLog for dev release Robert Osfield 2014-06-26 15:54:47 +00:00
  • ec8a784d90 Updated ChangeLog for 3.2.1-rc4 Robert Osfield 2014-06-26 15:54:37 +00:00
  • 949d6f20e5 Updated RC number to 4. Robert Osfield 2014-06-26 15:18:56 +00:00
  • 92d684de6b Revised KdTreeBuilder so that is used the new apply(osg::Geometry&) method rather than expanding an osg::Geode. Robert Osfield 2014-06-26 14:16:11 +00:00
  • a21ce3469b From Sebastian Messerschmidt, "I've applied a simple fix for the backward animation support in osg::Sequence. It will simply use the sign of the speed set in the getNextValue. Attached file is against trunk." Robert Osfield 2014-06-26 11:49:59 +00:00
  • ce51923f87 From Sebastian Messerschmidt, "I've applied a simple fix for the backward animation support in osg::Sequence. It will simply use the sign of the speed set in the getNextValue. Attached file is against trunk." Robert Osfield 2014-06-26 11:49:58 +00:00
  • 67f98edc05 From Lauren Voerman, "In order to speed up loading large scenes (especially from network disk) I added code to our viewer to setup multiple database-pagers and request the files trough a database-request: databasePager->setUpThreads(16, 1); Robert Osfield 2014-06-26 11:11:59 +00:00
  • 1571ac72b7 From Laurens Voerman, "In order to speed up loading large scenes (especially from network disk) I added code to our viewer to setup multiple database-pagers and request the files trough a database-request: databasePager->setUpThreads(16, 1); Robert Osfield 2014-06-26 11:11:38 +00:00
  • 93cf84da3e Removed erroneous character Robert Osfield 2014-06-26 11:09:46 +00:00
  • 64bef29848 Removed erroneous character Robert Osfield 2014-06-26 11:09:21 +00:00
  • febcb25cb6 From Farshid Lashkari, "I noticed that Text3D objects would change there z alignment depending on the alignment mode. I'm not sure if this was intentional or just a simple mistake. My expectation was that the front of the object would always stay aligned to the 0 z-plane, regardless of the alignment mode. I've attached an updated version that retains a consistent z-alignment." "I just now noticed another issue with Text3D objects. It was not properly computing the bounding box when non-axis aligned rotations were being applied. In this case all corners of the bounding box need to be transformed in order to get the correct containing box. I've attached the updated file." "The incorrect bounding box problem also applies to regular Text objects. I've attached the fix for that as well as the original Text3D fix." Robert Osfield 2014-06-26 10:53:18 +00:00
  • fc0c2a76c1 From Farshid Lashkari, "I noticed that Text3D objects would change there z alignment depending on the alignment mode. I'm not sure if this was intentional or just a simple mistake. My expectation was that the front of the object would always stay aligned to the 0 z-plane, regardless of the alignment mode. I've attached an updated version that retains a consistent z-alignment." "I just now noticed another issue with Text3D objects. It was not properly computing the bounding box when non-axis aligned rotations were being applied. In this case all corners of the bounding box need to be transformed in order to get the correct containing box. I've attached the updated file." "The incorrect bounding box problem also applies to regular Text objects. I've attached the fix for that as well as the original Text3D fix." Robert Osfield 2014-06-26 10:53:16 +00:00
  • 138ea0e0c7 From Pjotr Svetachov, "For a scene with a lot of animated agents I did some small optimizations to reduce cpu overhead: 1) Avoid a load-hit-store in UpdateBone. b->getMatrixInBoneSpace() returns the same matrix that was just stored with b->setMatrix() 2) Avoid calling element->isIdentity() for the whole transform stack (can be expensive is element is a matrix) 3) Make the key frame interpolator use binary search instead of a linear one. This is very noticeable in scenes where some geometry has long repeating animations that start at the same time, you will see the update time grow then reset and grow again." Robert Osfield 2014-06-26 10:45:07 +00:00
  • ed314c6d7d From Laurens Voerman, "while debugging ImageSequence I had a crash, due to the very large frametimes caused by halting the program. The problem is that when the frame time exceeds the length of the entire image sequence, a looping sequence will try to read it's _imageDataList beyond its size. fix attached for src/osg/ImageSequence.cpp" Robert Osfield 2014-06-26 10:24:41 +00:00
  • fb09bd6c12 From Laurens Voerman, "while debugging ImageSequence I had a crash, due to the very large frametimes caused by halting the program. The problem is that when the frame time exceeds the length of the entire image sequence, a looping sequence will try to read it's _imageDataList beyond its size. fix attached for src/osg/ImageSequence.cpp" Robert Osfield 2014-06-26 10:24:39 +00:00
  • 94e7f4e860 From Laurens Voerman, "while testing databasepager stuff I noticed that the various loaders (osg/ive/osgx) do not pass the current options to the imagePager, therefore the images cannot be found if not in the global OSG_FILE_PATH. Attached is a fix, containing modified versions of Robert Osfield 2014-06-26 10:05:55 +00:00
  • d82131544b From Laurens Voerman, "while testing databasepager stuff I noticed that the various loaders (osg/ive/osgx) do not pass the current options to the imagePager, therefore the images cannot be found if not in the global OSG_FILE_PATH. Attached is a fix, containing modified versions of Robert Osfield 2014-06-26 10:05:53 +00:00
  • 1ca2ed9729 From Farshid Lashkari, "I've attached a small fix for the ply loader to support Windows style line endings when reading the header." Robert Osfield 2014-06-26 09:39:16 +00:00
  • d939adeb56 From Farshid Lashkari, "I've attached a small fix for the ply loader to support Windows style line endings when reading the header." Robert Osfield 2014-06-26 09:38:56 +00:00
  • 2428e07f35 From Aurelien Albert, "This submission fix all my problems with reading / writing "osgb" files inside "osga" archive with final archive size > 2 Go, with Windows OS (didn't tested with Linux)" Robert Osfield 2014-06-26 09:33:56 +00:00
  • f86acab9b2 From Aurelien Albert, "This submission fix all my problems with reading / writing "osgb" files inside "osga" archive with final archive size > 2 Go, with Windows OS (didn't tested with Linux)" Robert Osfield 2014-06-26 09:33:54 +00:00
  • 86ddbc7ad9 From Riccardo Corsi, "there's an inconsistency between the behavior of the method and the debug message it prints out on the console. Robert Osfield 2014-06-25 16:05:56 +00:00
  • 5461ca4b6f From Riccardo Corsi, "there's an inconsistency between the behavior of the method and the debug message it prints out on the console. Robert Osfield 2014-06-25 16:05:53 +00:00
  • aac0a5fbe2 From Auelien Albert, "I'm working on an application which use 3ds file format as input and use the name of the material to "map" specific data with 3d geometry. Robert Osfield 2014-06-25 15:55:21 +00:00
  • a2db511c99 Refactored the way that hole are pruned from the occluder hole list. Robert Osfield 2014-06-25 15:47:59 +00:00
  • 0f797078f0 Refactored the way that hole are pruned from the occluder hole list. Robert Osfield 2014-06-25 15:47:54 +00:00
  • 1674692840 From Laurens Voerman, "a minor patch for osgconv to make sure the helptext is printed if you run "osgconv -h" with OSG_NOTIFY_LEVEL set too low. applys to both trunk and stable branch." Robert Osfield 2014-06-25 11:07:59 +00:00
  • 14332e5ca1 From Laurens Voerman, "a minor patch for osgconv to make sure the helptext is printed if you run "osgconv -h" with OSG_NOTIFY_LEVEL set too low. applys to both trunk and stable branch." Robert Osfield 2014-06-25 11:07:57 +00:00
  • 2f8a4c654a From Mikhail Izmestev, "Attached fix to avoid vector usage in StateGraph::prune and reduce heap allocations." Robert Osfield 2014-06-25 10:45:35 +00:00
  • 5c488d4c46 From Mikhail Izmestev, "Attached fix to avoid vector usage in StateGraph::prune and reduce heap allocations." Robert Osfield 2014-06-25 10:45:18 +00:00
  • 4e530a1938 changed debug message to use OSG_DEBUG Robert Osfield 2014-06-25 09:58:49 +00:00
  • d22f62396c From Alexander Sinditskiy, "My changes added support for gltexstorrage2d for texture2d. Robert Osfield 2014-06-25 09:57:36 +00:00
  • 832fb9798e From Björn Blissing, "I found a minor error in documentation in include/osg/Math. Function: absolute() had the same description as the function minimum() Robert Osfield 2014-06-25 08:21:40 +00:00
  • 71f7a74091 From Björn Blissing, "I found a minor error in documentation in include/osg/Math. Function: absolute() had the same description as the function minimum() Robert Osfield 2014-06-25 08:21:13 +00:00
  • 81c23564b5 From Björn Blissing, "Fix to support correct shininess and transparency in FBX plugin" Robert Osfield 2014-06-25 08:18:05 +00:00
  • 79b0f8c839 From Björn Blissing, "Fix to support correct shininess and transparency in FBX plugin Robert Osfield 2014-06-25 08:17:59 +00:00
  • 8d41495014 From Pjotr Svetachov, "There were some modes missing when exporting to .ogst so I added them." Robert Osfield 2014-06-24 19:57:45 +00:00
  • 82a34a2546 From Pjotr Svetachov, "There were some modes missing when exporting to .ogst so I added them." Robert Osfield 2014-06-24 19:57:19 +00:00
  • fb28e0ffa1 "I've attached a small for the osg ReaderWriter. It was performing a case sensitive comparison to the file extension to determine whether to write the file in ascii or binary. This meant that if the filename was "model.OSGT" it would be treated as binary, instead of ascii. I've updated the plugin to ignore case." Robert Osfield 2014-06-24 14:59:04 +00:00
  • bd82d2a52d From Farshid Lashkari, "I've attached a small for the osg ReaderWriter. It was performing a case sensitive comparison to the file extension to determine whether to write the file in ascii or binary. This meant that if the filename was "model.OSGT" it would be treated as binary, instead of ascii. I've updated the plugin to ignore case." Robert Osfield 2014-06-24 14:58:13 +00:00
  • cb3ce747ca Fix to merge Geometries. Robert Osfield 2014-06-24 11:24:48 +00:00
  • 7295258d71 Merged fix to merge geometries. Robert Osfield 2014-06-24 11:24:13 +00:00
  • 4ec4e88f85 Fixed nested callback calling. Robert Osfield 2014-06-23 12:02:41 +00:00
  • a6939bc46f Fixed check against number of vertices Robert Osfield 2014-06-16 16:18:02 +00:00
  • c6ab14018a Fixed check against totaly number of vertices Robert Osfield 2014-06-16 16:16:10 +00:00
  • 8d06b9b019 From Aurelien Albert, "I've got some issues using osgb files within an big osga archive (file size > 2Go). Robert Osfield 2014-06-16 08:54:54 +00:00
  • 773d0a2ddf From Aurelien Albert, "I've got some issues using osgb files within an big osga archive (file size > 2Go). Robert Osfield 2014-06-16 08:54:51 +00:00
  • 9195a0000b Added osgUI::ColorPalette class Robert Osfield 2014-06-13 17:17:09 +00:00
  • 3a18699074 Fixed typo in parameter name Robert Osfield 2014-06-13 17:16:51 +00:00
  • d9a6491a43 Removed generation of scroll event on the X11 button release event as X11 was generating both a pair of press/release events for a single scroll when movement. Robert Osfield 2014-06-12 16:00:21 +00:00
  • 1b3dba7860 Removed generation of scroll event on the X11 button release event as X11 was generating both a pair of press/release events for a single scroll when movement. Robert Osfield 2014-06-12 16:00:20 +00:00
  • be13c2202d Added if () blocks to State::convertVertexShaderSourceToOsgBuiltIns() to ensure that only parts of the shader than need replacing are replaced. Robert Osfield 2014-06-12 15:24:34 +00:00
  • f127220582 Added if () blocks to State::convertVertexShaderSourceToOsgBuiltIns() to ensure that only parts of the shader than need replacing are replaced. Robert Osfield 2014-06-12 15:24:31 +00:00
  • 410f7d27ed Improved positioning of combo box popup items Robert Osfield 2014-06-12 14:12:30 +00:00
  • 63d101b653 Added frame support to ComboBox. Robert Osfield 2014-06-12 14:05:28 +00:00
  • 584035b663 Added handling of AligmentSettings of Text layout Robert Osfield 2014-06-11 16:31:17 +00:00
  • 86a9a45525 Implemented more robust intersection handling for mouse interactions. Wired up even handling of ComboBox popup. Robert Osfield 2014-06-11 10:55:33 +00:00
  • 89ca694684 Added using Callback::run() method to Drawable::CullCallback Robert Osfield 2014-06-10 08:50:42 +00:00
  • d234262585 Fixed handling of Drawable callbacks and NumChildrenRequiringEventTraversal Robert Osfield 2014-06-09 13:46:44 +00:00