FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,482 Commits 1 Branch 26 Tags
OpenSceneGraph-2.8.5
Commit Graph

10482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul MARTZ
cb442ffacc Tagging 2.8.5 final release. OpenSceneGraph-2.8.5 2011-06-07 00:49:48 +00:00
Paul MARTZ
d75bdbc7e5 2.8 branch: Wrappers fix for Object::getName() virtual declaration and related change to Uniform class, from Ryan Pavlik. 2011-06-04 16:03:13 +00:00
Paul MARTZ
9e8c1b033e 2.8 branch: Merge 11959 from trunk. Makes Object::setName() virtual, which fixes an issue with the uniform name ID mechanism. 2011-06-04 00:07:59 +00:00
Paul MARTZ
0aab63cfba 2.8 branch: Fix for 3ds backport missing #include, from Robert Osfield. 2011-06-01 14:51:40 +00:00
Paul MARTZ
66b31b677a 2.8 branch: Backport of 3ds plugin from trunk. 2011-06-01 00:58:43 +00:00
Paul MARTZ
86f312cae9 2.8 branch: From Ryan Pavlik, updates to osgWrappers for changes to osgText and libosg's Texture2DMultisample support. 2011-05-27 14:32:36 +00:00
Paul MARTZ
6ceb0a8f87 2.8 branch: osgconv support for --use-world-frame, from Ryan Pavlik, with tweak by Robert Osfield. 2011-05-27 14:17:23 +00:00
Paul MARTZ
fe40f0b9a4 2.8 branch: Backport of r12285 to constrain osgconv's 
output to 80 columns.
 2011-05-26 01:55:29 +00:00
Paul MARTZ
25612d10af 2.8 branch: Backport of r11768 to improve rendering of osgText::Text objects, from Eric Sokolowsky. 2011-05-24 18:41:06 +00:00
Paul MARTZ
3477e813d0 2.8 branch: PNM plugin improvements from Eric Sokolowsky: backport of r12220 from trunk; and "fixes numerous bugs in reading 8-bit and 16-bit images, including loading the images upside-down". The latter is pending commit to trunk. 2011-05-24 14:48:13 +00:00
Paul MARTZ
ef322aba61 2.8 branch: Doubly odd. Not sure why the merge didn't mark the Texture2DMultisample files for addition... 2011-05-23 15:29:40 +00:00
Paul MARTZ
a6db4f56ef 2.8 branch. Not quite sure why this wasn't marked as ADD by svn during the merge... 2011-05-23 15:17:24 +00:00
Paul MARTZ
6c6c1183c0 2.8 branch: Texture2DMultisample support. This is a backport of r11218, r11229, and r11365 from trunk. 2011-05-22 20:52:41 +00:00
Paul MARTZ
8d20926032 2.8 branch: This is a backport of r11055 from trunk so that libosg and libosgDB link against libdl on Linux systems. Backported by Ryan Pavlik. Trunk commit messages: "From Jim Brooks, fix for FreeBSD build where FIND_LIBRARY(DL_LIBRARY..) return NOT_FOUND. And From Alberto Luaces, "he new GNU linker, "gold", is going to replace soon the current ld in almost all Linux distributions. Although it is 100% compatible with ld, by default it gives an error if a library has unresolved symbols at link time, that is, it has set -Wl,--no-undefined by default. Debian folks have found that libosg.so and libosgDB.so use some functions belonging to libdl.so {dlsym,dlopen,dlclose,dlerror} without linking to it. My changes link those two libraries to libdl.so explicitly in the same way it is already done for libm.so and librt.so." 2011-05-22 18:49:43 +00:00
Paul MARTZ
b345512b23 2.8 branch: From Ryan Pavlik: This change keeps the Program osgWrapper in sync with osg::Program after changes in r12336. 2011-05-22 18:36:40 +00:00
Paul MARTZ
9f2030cbcd 2.8 branch: Set SO version in CMakeLists.txt so it gets baked into the binary file names. 2011-05-12 20:43:03 +00:00
Paul MARTZ
7ab3207732 2.8 branch: This is Ryan Pavlik's introduction of a new output Option (OutputRelativeTextures) for the dot OSG plugin to write texture files into a subfolder. 2011-05-12 00:52:58 +00:00
Paul MARTZ
baa210b4a9 Typo fix. 2011-05-11 23:15:46 +00:00
Paul MARTZ
27c359a69a 2.8 branch: Fix from Ryan Pavlik for wrappers. 2011-05-11 01:04:21 +00:00
Paul MARTZ
85281a6d1b 2.8 branch: This is a wholesale update of all OpenFlight plugin source files from trunk. The 2.8.x FLT plugin is now in sync with trunk r12297 (April 19 2011). This commit includes the osgSim MultiSwitch changes in r11971. 2011-05-05 01:59:10 +00:00
Paul MARTZ
b6ef8c9b6c 2.8 branch: This change adds improved support for RTT (child) Camera nodes to the OcclusionQueryNode. Prior to this change, OQN used the top-level camera to index into a map of results, which was unsatisfactory in the RTT case. This change has not been made to svn trunk at this time, and will need to be merged. 2011-05-03 19:54:28 +00:00
Paul MARTZ
19d6e20cc7 2.8 branch: Merging r11760 from trunk. This change enables apps to derive from OcclusionQueryNode. 2011-05-03 17:03:49 +00:00
Paul MARTZ
578f54beba Fix typo "noitfy"->"notify". 2011-05-03 16:49:01 +00:00
Paul MARTZ
2f7167d011 2.8 branch: Uniform lookup by cached name ID. Trunk revisions r11952, r11998, and r12074. 2011-05-02 22:13:01 +00:00
Paul MARTZ
288fb20eb6 2.8 branch: Bump version# to 2.8.5 and SO# to 74. Backport the Notify macro modifications and CMake variable to compile out notification. 2011-05-02 17:59:02 +00:00
Paul MARTZ
18d9206a5e 2.8 branch, from Sukender: Fixes output file names for VS2010 builds so that Windows DLLs contain the SO version number. 2011-04-07 01:58:09 +00:00
Robert Osfield
eddbbe28fa Fixed build against latest ffmpeg versions 2011-03-28 18:15:53 +00:00
Paul MARTZ
71eb974c1b Bump version# to 2.8.4. 2011-03-28 15:41:25 +00:00
Paul MARTZ
f4be375ab8 2.8 branch: Merging r11354 from trunk to fix OpenThreads CMake INSTALL target issues in VS2010. 2011-03-28 02:38:46 +00:00
Paul MARTZ
38b454f824 2.8 branch: Enabling VS2010 builds. 2011-03-28 02:32:58 +00:00
Paul MARTZ
fb91677fce 2.8 branch: Removing non-existant Qt examples. 2010-04-03 16:01:09 +00:00
Paul MARTZ
dab855f141 2.8 branch: Improvements for building COLLADA. CMake only, does not change the actual COLLADA plugin (it's same as 2.8.2). Merged in this commit: r9759, r9952, r10336, r10626, and r10637. 2010-04-01 21:29:09 +00:00
Paul MARTZ
01b510865f 2.8 branch: This change brings the PNG plugin up to sync with trunk head. It adds the OSG_CPP_EXCEPTIONS_AVAILABLE CMake option and adds PNG plugin compatibility with multiple versions of libPNG. Merged from trunk: 10763 and 11121. 2010-04-01 17:41:08 +00:00
Paul MARTZ
6c08cc5937 2.8 branch: Updated XCode project file. 2010-03-31 23:27:59 +00:00
Paul MARTZ
7f3fe7baed 2.8 branch: Fix multiply defined symbols in static link by qualifying FBX and 3DS plugin symbols with namespaces. 2010-03-31 20:22:17 +00:00
Paul MARTZ
ae233b9392 2.8 branch: Fixes for mingw build. Merges 10963 and 10965 from trunk. 2010-03-30 15:23:18 +00:00
Paul MARTZ
1712176900 2.8 branch: Merging 11286 from trunk. "Added a compile test for pthread_setaffinity_np to workaround problem with the FreeBSD pthread lib containing the function but the pthread.h header not containing it." 2010-03-25 20:02:30 +00:00
Paul MARTZ
967e2b7926 2.8 branch: (2nd attempt. Previous commit appears to have been a no-op.) Merging 11289 from trunk to add pixel format getter to GraphicsWindowCocoa. 2010-03-25 19:56:50 +00:00
Paul MARTZ
64d4e6a913 2.8 branch: Merging 11289 from trunk to add pixel format getter to GraphicsWindowCocoa. 2010-03-25 19:46:38 +00:00
Paul MARTZ
ae33aeed8a 2.8 branch: Updated XCode project file from Stephan, includes ply plugin. 2010-03-25 19:37:22 +00:00
Paul MARTZ
49bf375b68 2.8 branch: Fix for 64bit OS X compiles. Merged r10006 from trunk. 2010-03-23 15:00:24 +00:00
Paul MARTZ
40a0c1cde2 2.8 branch: From Stephan Huber: Adding updated XCode project file. 2010-03-23 14:49:51 +00:00
Paul MARTZ
bfd9ec30ca 2.8 branch: Removing outdated OpenThreads folder, per Stephan Huber's request. 2010-03-23 14:46:14 +00:00
Paul MARTZ
599715e1d1 2.8 branch: Fix animations. This is a merge of r10362. 2010-03-23 02:07:10 +00:00
Paul MARTZ
3fc3fc060f 2.8 branch: OpenThreads fix for OSX. Merged 10927 from trunk. 2010-03-22 22:24:42 +00:00
Paul MARTZ
29199a9a68 2.8 branch. Merge r9904 from trunk (req'd for OS X). 2010-03-22 15:24:18 +00:00
Paul MARTZ
b8a76a0ce0 2.8 branch. 2nd attempt: The main point of this commit is to eliminate static initializers for OS X. Merges: 9894, 11207, 11263, and 11273. 2010-03-22 15:09:17 +00:00
Paul MARTZ
a927748a73 2.8 branch: Hm, mysteriously, the ply plugin seems to be missing changes that were previously merged. This commit brings them up to date with svn trunk as of r11237. 2010-03-22 14:55:52 +00:00
Paul MARTZ
5d53cb13d5 2.8 branch: Change "Matrices" to "Materials" in StatsHandler. This change was made on trunk in 10601, but 10601 was too extensive to merge onto the 2.8 branch. 2010-03-21 22:15:45 +00:00
Paul MARTZ
aa3766ca70 2.8 branch: Back out r11267. This is a reverse merge of r9894, r11207, and r11263. 2010-03-21 21:21:59 +00:00