Commit Graph

  • 701c976495 Update AUTHORS file for 3.0.0. Robert Osfield 2011-06-27 12:59:45 +00:00
  • 3f7406e903 Updated ChangeLOG, NEWS and READE for 3.0.0 release Robert Osfield 2011-06-27 12:08:05 +00:00
  • 0079c132a7 Updated Version number to final 3.0.0 configuration. Robert Osfield 2011-06-27 10:45:36 +00:00
  • 3254630625 Merged doxygen comment improvement from svn/trunk. Robert Osfield 2011-06-27 10:22:03 +00:00
  • d3d536f0a5 Fixed typo Robert Osfield 2011-06-27 10:20:37 +00:00
  • 7b97a70c22 Improved the setContextID doxygen comment. Robert Osfield 2011-06-27 10:19:44 +00:00
  • 125fa6d05d Merged from svn/trunk changeset 12656. From Andreas Eskland, "I found that a binary PNM file couldn't be read by the PNM plugin in the 3.0 branch. Attached is a small fix in ReaderWriterPNM.cpp, simply opening the file in binary mode." Robert Osfield 2011-06-25 20:55:01 +00:00
  • 3979eb7755 From Andreas Eskland, "I found that a binary PNM file couldn't be read by the PNM plugin in the 3.0 branch. Attached is a small fix in ReaderWriterPNM.cpp, simply opening the file in binary mode." Robert Osfield 2011-06-25 20:51:58 +00:00
  • a92241d40d Merged from svn/trunk changset 12654. Fixed memory growth issue when using Texture2D::SubloadCallbacks that don't set the TextureObjects sizes. Robert Osfield 2011-06-25 11:02:09 +00:00
  • eed9e9f7e1 Fixed memory growth issue when using Texture2D::SubloadCallbacks that don't set the TextureObjects sizes. Robert Osfield 2011-06-25 11:00:33 +00:00
  • 8ea9d68c9c Merged from svn/trunk changeset 12652, Tighten up float usage Robert Osfield 2011-06-25 07:07:58 +00:00
  • 913e159114 Tightened up float usage. Robert Osfield 2011-06-25 07:07:16 +00:00
  • 1e94ed9fa8 Updated ChangeLog and AUTHORS file for 3.0.0-rc5 Robert Osfield 2011-06-24 19:45:21 +00:00
  • cd7dc0f161 Merged from svn/trunk changeset 12648, tightened up float/double usage Robert Osfield 2011-06-24 19:18:53 +00:00
  • 8620c4af7e Tightened up the float/double usage Robert Osfield 2011-06-24 19:17:25 +00:00
  • 6779944c0e Updated ChangeLog, NEWS and READE for 3.0.0-rc5 Robert Osfield 2011-06-24 16:27:42 +00:00
  • d5f476a822 Merged from svn/trunk changeset 12645. Removed redundent assert and associated variables to fix warnings. Robert Osfield 2011-06-24 16:16:04 +00:00
  • a9658dbd4d Removed redundent assert and associated variables to fix warnings. Robert Osfield 2011-06-24 16:15:47 +00:00
  • b361047aa0 Updated release candidate number to 5 for 3.0.0-rc5 Robert Osfield 2011-06-24 16:05:23 +00:00
  • bd2ad48c00 Merged from svn/trunk changeset 12642, "Implemented missing writeShader" Robert Osfield 2011-06-24 15:05:28 +00:00
  • d6a3ac647b Implemented missing writeShader Robert Osfield 2011-06-24 15:04:16 +00:00
  • e306f27e23 Merged from svn/trunk changeset 12640, From Martin Innus, fixed erroneous change of INTEGER to UNKNOWN, reverting back to INTEGER. Robert Osfield 2011-06-24 13:36:45 +00:00
  • f68c2246fc From Martin Innus, fixed erroneous change of INTEGER to UNKNOWN, reverting back to INTEGER. Robert Osfield 2011-06-24 13:35:20 +00:00
  • 26ee7e07d3 Merged from svn/trunk changeset 12638: Robert Osfield 2011-06-24 12:52:11 +00:00
  • 5fd1ece440 Implemented missing Archive::readShader/writeShader, and added searching of the archive list in Registr::read() so that files that are stored in the archives can be found. Robert Osfield 2011-06-24 12:40:18 +00:00
  • 3660e3a3c3 Merged from svn/trunk changeset 12636, "While we're on osgSim/ShapeAttribute, here's a fix that fixes the 'UNKNOW' typo and some doxygen" Robert Osfield 2011-06-24 08:33:58 +00:00
  • 0a48e99a25 From Ulrich Hertlein, "While we're on osgSim/ShapeAttribute, here's a fix that fixes the 'UNKNOW' typo and some doxygen" Robert Osfield 2011-06-24 08:32:25 +00:00
  • cb627520a7 From Wang Rui, Merged from svn/trunk changeset 12633. Robert Osfield 2011-06-24 08:16:59 +00:00
  • c5867e4957 Merged from svn/trunk changeset 12632. Added operator ==, != and < to fix VS build Robert Osfield 2011-06-24 08:15:51 +00:00
  • 41a6d949c2 From Wang Rui, "I've modified the code to handle -1.#IND and other kinds of infinite values. Please see the attachments for details" Robert Osfield 2011-06-24 08:13:58 +00:00
  • e79d51713f Added operator ==, != and < to fix VS build Robert Osfield 2011-06-24 08:05:54 +00:00
  • 8f20178748 Merged from svn/trunk changeset r12628. Robert Osfield 2011-06-23 20:09:26 +00:00
  • c93ef23d2f Updated release candidate number to 4. Robert Osfield 2011-06-23 20:03:16 +00:00
  • 8e2857905f Fixed warnings generated by clang, Robert Osfield 2011-06-23 19:58:52 +00:00
  • 69659ade08 Merged from svn/trunk changeset r12573, Added catch for window manager doesn't set the window size to full screen. Robert Osfield 2011-06-23 18:29:35 +00:00
  • d4e68e5d73 Merged from svn/trunk changeset 12625. Warning fixes for: Robert Osfield 2011-06-23 18:26:11 +00:00
  • fa40366ae4 Warning fixes for: Robert Osfield 2011-06-23 18:24:07 +00:00
  • b29bf3fe06 Merged from svn/trunk changeset 12623.Fixed virtual method mismtaches between subclasses and parent classes. Robert Osfield 2011-06-23 16:39:25 +00:00
  • c617ea0163 Fixed virtual method mismtaches between subclasses and parent classes. Robert Osfield 2011-06-23 16:36:36 +00:00
  • ee7668fe6c From Ulrich Hertlein, build fix for OSX. Robert Osfield 2011-06-23 15:42:45 +00:00
  • 8f23b42ed2 From Ulrich Hertlein, build fix for OSX. Robert Osfield 2011-06-23 15:42:44 +00:00
  • 17d876f787 Merged from svn/trunk, changeset 12619, "Added better handling of archives in ReaderWriterZip::readNode() so that if there is no master file definition it loads all the available nodes in the zip archive and returns an osg::Group containing all the nodes if there is more than one, or just returns the node if there is just one. Also implemented this functionality for ReaderWriterZip::readImage()." Robert Osfield 2011-06-23 15:39:11 +00:00
  • 00cf10be35 Added better handling of archives in ReaderWriterZip::readNode() so that if there is no master file definition it loads all the available nodes in the zip archive and returns an osg::Group containing all the nodes if there is more than one, or just returns the node if there is just one. Also implemented this functionality for ReaderWriterZip::readImage(). Robert Osfield 2011-06-23 15:37:35 +00:00
  • 5cb72e06c2 Fixed typo in name Robert Osfield 2011-06-23 12:25:52 +00:00
  • 97e4451b16 Fixed typo in name Robert Osfield 2011-06-23 12:24:47 +00:00
  • 68ac058045 Updated ChangeLog and AUTHORS files Robert Osfield 2011-06-23 11:32:24 +00:00
  • 75fa5c0555 Fixed name typos Robert Osfield 2011-06-23 11:32:09 +00:00
  • fe0232ffba Updated ChangeLog and AUTHORS file Robert Osfield 2011-06-23 11:27:23 +00:00
  • 58291f986c Fixed name typo Robert Osfield 2011-06-23 11:26:51 +00:00
  • 3159b36acd Merged from svn/trunk changeset r12611. Robert Osfield 2011-06-23 11:10:54 +00:00
  • 7455f6265c Fixed warnings. Robert Osfield 2011-06-23 11:09:49 +00:00
  • 893a6365a4 From Ryan Pavlik, merge from svn/trunk changeset 12608, "I have successfully compiled OpenSceneGraph trunk using the Clang compiler (using a recent trunk build of llvm and clang, haven't tested an older release). The attached files contain the change shown in the diff below, which was required to finish the build with Clang. It fixes an issue with two-phase name lookup - there's more information here http://blog.llvm.org/2009/12/dreaded-two-phase-name-lookup.html" Robert Osfield 2011-06-23 09:39:45 +00:00
  • e330051cf3 Converted tabs to four spaces Robert Osfield 2011-06-23 09:27:25 +00:00
  • 8570c37ed5 From Ryan Pavlik, "I have successfully compiled OpenSceneGraph trunk using the Clang compiler (using a recent trunk build of llvm and clang, haven't tested an older release). The attached files contain the change shown in the diff below, which was required to finish the build with Clang. It fixes an issue with two-phase name lookup - there's more information here http://blog.llvm.org/2009/12/dreaded-two-phase-name-lookup.html " Robert Osfield 2011-06-23 09:26:27 +00:00
  • 672777189a From Dimi Christopoulos, merged from svn/trunk changeset 12606."I attach a fixed version of mipmap.cpp which produced a lot of warning on my gcc compiler." Robert Osfield 2011-06-23 09:24:38 +00:00
  • 5ee864ff25 From Dimi Christopoulos, "I attach a fixed version of mipmap.cpp which produced a lot of warning on my gcc compiler." Robert Osfield 2011-06-23 09:22:23 +00:00
  • fa26facba9 Converted tabs to four spaces Robert Osfield 2011-06-23 07:13:13 +00:00
  • 1ef313787d Update ChangeLog and AUTHORs file for 3.0.0-rc3 Robert Osfield 2011-06-22 16:34:46 +00:00
  • 35c26bb5aa From Magnus Kessler, "I have recently installed the latest version of collada-dom on Linux, and found that the include path has changed. By default, collada-dom now installs its header files under /usr/local/include/collada-dom or/usr/include/collada- dom. The attached FindCollada.cmake has been updated to look for these locations in addition to the previous candidate locations." Robert Osfield 2011-06-22 16:18:52 +00:00
  • c34fe4255b From Magnus Kessler, "I have recently installed the latest version of collada-dom on Linux, and found that the include path has changed. By default, collada-dom now installs its header files under /usr/local/include/collada-dom or/usr/include/collada- dom. The attached FindCollada.cmake has been updated to look for these locations in addition to the previous candidate locations." Robert Osfield 2011-06-22 16:18:34 +00:00
  • 8aee244e64 Updated ChangeLog and AUTHORS file for release Robert Osfield 2011-06-22 15:41:57 +00:00
  • 12ca59d3e5 Updated RC number for the 3.0.0-rc3 Robert Osfield 2011-06-22 12:45:35 +00:00
  • 93156fd2ce Merged from svn/trunk changeset 12597: Robert Osfield 2011-06-22 12:38:53 +00:00
  • 30becd5ed3 Resolved warnings reported by g++ 4.6's -Wunused-but-set-variable. Robert Osfield 2011-06-22 12:30:01 +00:00
  • 6783dcff17 Fixed regression in --run-on-demand feature Robert Osfield 2011-06-22 09:12:12 +00:00
  • e9d597b392 Fixed regression in --run-on-demand feature Robert Osfield 2011-06-22 09:06:51 +00:00
  • 781e4e259d Merged from svn/trunk changeset r12593, Removed assert() that always evaluated to true. Robert Osfield 2011-06-21 17:30:07 +00:00
  • 99b9eff9f4 Removed assert() that always evaluated to true. Robert Osfield 2011-06-21 17:26:40 +00:00
  • 46fa819fa1 Merged from svn/trunk, changeset 12591, From Torben Dannhauer, "originally I posted the addendum of 'freetype244MT', but that was wrong. I updated it to the correct addendum of 'freetype244' yesterday, but supposedly that was not forwarded to you by the forum-to-mail-gateway. Robert Osfield 2011-06-21 13:03:24 +00:00
  • aab458da93 From Torben Dannhauer, "originally I posted the addendum of 'freetype244MT', but that was wrong. I updated it to the correct addendum of 'freetype244' yesterday, but supposedly that was not forwarded to you by the forum-to-mail-gateway. Robert Osfield 2011-06-21 13:01:23 +00:00
  • 80e1adfb6c Updated ChangeLog and AUTHORS file for 3.0.0-rc2 Robert Osfield 2011-06-21 10:26:30 +00:00
  • 1b7b0b8cd2 Updated ChangeLog Robert Osfield 2011-06-21 10:15:03 +00:00
  • ff216c2100 Merged changeset 12581 from svn/trunk to address VisualStudio warning Robert Osfield 2011-06-21 10:07:59 +00:00
  • 7f6938ebad Merged from svn/trunk warnings fixes provided by Changeset 12582 from Michael Platings, along with addition of returns at ends of files and changes to tabs to four spaces. Robert Osfield 2011-06-21 09:58:31 +00:00
  • 111a4a9274 Added returns to end of files Robert Osfield 2011-06-21 09:54:57 +00:00
  • e3c89d7f60 Added return to end of file Robert Osfield 2011-06-21 09:54:23 +00:00
  • f38a855a73 Conveted tabs to four spaces and added a return to end of file Robert Osfield 2011-06-21 09:53:34 +00:00
  • dc123461c7 Fixed redundant "enumeration not handled in switch" warnings. Fixed a warning about a comparison between different enums - EUnifiedMappingType was being compared with EMappingType. In general the FBX SDK is moving away from Get & Set functions to giving direct access to properties, so I have changed GetMappingType() to CurrentMappingType.Get() Michael PLATINGS 2011-06-21 09:29:32 +00:00
  • 90a88488d3 Disabled VisualStudio warning warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable Robert Osfield 2011-06-21 09:00:01 +00:00
  • 1dc91aa355 Updated release candidate number Robert Osfield 2011-06-20 19:41:39 +00:00
  • caa9e38d2b Merged from svn/trunk, r12574. Robert Osfield 2011-06-20 19:37:40 +00:00
  • 6402710910 Merged changes to svn/trunk that address cppcheck reported issues: Robert Osfield 2011-06-20 19:33:47 +00:00
  • 7f9e1c5a6f Fixed a range of issues reported by cppcheck: Robert Osfield 2011-06-20 19:15:53 +00:00
  • b087e0f952 Merged following revisions from svn/trunk which address problems with toggling fullscreen on/off under modern X11 window managers Robert Osfield 2011-06-20 17:54:27 +00:00
  • 20f334b6f8 Removed unneccesary namespace qualifiers, and issue picked out by cppcheck. Robert Osfield 2011-06-20 14:09:49 +00:00
  • 9781fe55ea From Farshid Lashkari, BGR write support for BMP, PNG and TGA Robert Osfield 2011-06-20 12:36:53 +00:00
  • 0392efafea Added catch for window manager doesn't set the window size to full screen. Robert Osfield 2011-06-20 11:25:52 +00:00
  • 0ff97d1350 Added check against Traits::overrideRedirct to prevent the fullscreen workaround being run when overrideRedirect is on as overrideRedirect switches off the window managers ability to manage the fullscreen so the problem doesn't need working around. Robert Osfield 2011-06-20 09:28:39 +00:00
  • 47146017ae Introduced a workaround for fullscreen toggle issues under modern X11 window managers. Robert Osfield 2011-06-20 09:22:57 +00:00
  • 98a2ec67a6 Merged from svn/trunk. Added sleep before window resizing to make it less likely that the previous frames rendering traversal is still running when the window(s) is resized, something that creates what looks like a glitch in rendering. Robert Osfield 2011-06-20 09:22:05 +00:00
  • 8c37336fdc Added sleep before window resizing to make it less likely that the previous frames rendering traversal is still running when the window(s) is resized, something that creates what looks like a glitch in rendering. Robert Osfield 2011-06-20 09:20:39 +00:00
  • d5d9f4c082 From Torben Dannhauer, "Just in time for OSG 3.0 I will present an updated 3rdParty package for VS2008 , which includes some updated libraries (libcurl, freetype, jpeg). It also provides now all debug databases (*.pdb), so all the annoying compile warnings about missing .pdb files are gone. Robert Osfield 2011-06-19 19:21:21 +00:00
  • 058eef0555 From Torben Dannhauer, "Just in time for OSG 3.0 I will present an updated 3rdParty package for VS2008 , which includes some updated libraries (libcurl, freetype, jpeg). It also provides now all debug databases (*.pdb), so all the annoying compile warnings about missing .pdb files are gone. Robert Osfield 2011-06-19 19:16:49 +00:00
  • 389c2e6407 Updated version to 3.1.0 in prep for the first developer release for 3.x series Robert Osfield 2011-06-17 16:55:49 +00:00
  • a656e402b7 Reset OPENSCENEGRAPH_SVN setting to branches to enable the tags to be created on the branches rather svn/trunk. Robert Osfield 2011-06-17 16:37:58 +00:00
  • f173ea4224 First cut of OpenSceneGraph-3.0 branch from svn/trunk. Robert Osfield 2011-06-17 13:14:49 +00:00
  • c6f4c26e31 Added extern "C" to fix build issues under OSX Robert Osfield 2011-06-17 12:57:31 +00:00
  • dd2a3a509e Updated ChangeLog, NEWS and READE for 3.0.0-rc1 Robert Osfield 2011-06-17 12:31:07 +00:00
  • e3710db9d2 Updated version number Robert Osfield 2011-06-17 11:47:47 +00:00
  • 33cb4566ff Fixed Jorge Izquierdo name. Robert Osfield 2011-06-17 11:47:33 +00:00