304214e0dfIntroduced the use of linear interpolation of evelvations when sampling
Robert Osfield
2010-03-25 11:11:35 +00:00
9d35ec1631Added 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.
Robert Osfield
2010-03-24 17:12:05 +00:00
1319e270f6Refactored the way that the RequestQueue's are pruned and highest prioty items taken from them so the operation is now O(n) rather than O(nlogn) where n is the number of requests. The refactoring also cleans up the access of the request lists so that the code is more readable/maintainable.
Robert Osfield
2010-03-24 14:27:00 +00:00
49bf375b682.8 branch: Fix for 64bit OS X compiles. Merged r10006 from trunk.
Paul MARTZ
2010-03-23 15:00:24 +00:00
40a0c1cde22.8 branch: From Stephan Huber: Adding updated XCode project file.
Paul MARTZ
2010-03-23 14:49:51 +00:00
bfd9ec30ca2.8 branch: Removing outdated OpenThreads folder, per Stephan Huber's request.
Paul MARTZ
2010-03-23 14:46:14 +00:00
627a4b78c9Updated wrappers
Robert Osfield
2010-03-23 12:41:02 +00:00
599715e1d12.8 branch: Fix animations. This is a merge of r10362.
Paul MARTZ
2010-03-23 02:07:10 +00:00
3fc3fc060f2.8 branch: OpenThreads fix for OSX. Merged 10927 from trunk.
Paul MARTZ
2010-03-22 22:24:42 +00:00
99b6b268bcFrom Michael Platings, "the attached files fix the DAE importer for animations that don't contain channels for all X, Y and Z components, as exported by SoftImage."
Robert Osfield
2010-03-22 17:55:14 +00:00
29199a9a682.8 branch. Merge r9904 from trunk (req'd for OS X).
Paul MARTZ
2010-03-22 15:24:18 +00:00
b8a76a0ce02.8 branch. 2nd attempt: The main point of this commit is to eliminate static initializers for OS X. Merges: 9894, 11207, 11263, and 11273.
Paul MARTZ
2010-03-22 15:09:17 +00:00
a927748a732.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.
Paul MARTZ
2010-03-22 14:55:52 +00:00
d969034f44Changed private: to protected: to fix build issue under OSX
Robert Osfield
2010-03-22 14:32:19 +00:00
8a39ece376From Chuck Seberino, "have a fix for the reading code in trunk/src/osgPlugins/gz/ReaderWriterGZ.cpp. It seems that the std::istream::readsome method on windows is a no-op (for files. After much head scratching and research I was able to figure out what was going on. I am submitting a fix to replace readsome with read() and gcount(). This change is for all platforms. The previous implementation works fine under linux and OSX, so if you would rather keep things the way they are you can just #ifdef for non-WIN32.
Robert Osfield
2010-03-22 13:13:22 +00:00
8b66d5348eFrom Farshid Lashkari, "I noticed that osg::notify does not output to stderr when using either FATAL or WARN severity levels. There is code in osg::StandardNotifyHandler::notify that will use stderr based on the severity level, but it is disabled by an #if 0. I'm assuming this was a mistake and have re-enabled the code.
Robert Osfield
2010-03-22 12:50:27 +00:00
7e6ddb8588From Stephan Huber: updated xcode-project
Stephan Maximilian HUBER
2010-03-22 10:43:45 +00:00
5d53cb13d52.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.
Paul MARTZ
2010-03-21 22:15:45 +00:00
aa3766ca702.8 branch: Back out r11267. This is a reverse merge of r9894, r11207, and r11263.
Paul MARTZ
2010-03-21 21:21:59 +00:00
b5743c1c9f2.8 branch. The main point of this commit is to eliminate static initializers for OS X. Merges: 9894, 11207, and 11263.
Paul MARTZ
2010-03-21 20:45:30 +00:00
894800115c2.8 branch: Added convenience macros to Version header. This is a merge of r10173 from trunk.
Paul MARTZ
2010-03-21 20:28:17 +00:00
0574e17eaa2.8 branch: Updating wrappers.
Paul MARTZ
2010-03-21 00:35:14 +00:00
9e1362445c2.8 branch: Mergine recent changes to FBX. Revisions in this commit: r11251, r11252, r11262.
Paul MARTZ
2010-03-20 23:19:35 +00:00
994e7ece43From Ulrich Hertlein, changed init() call to _init().
Robert Osfield
2010-03-20 09:45:59 +00:00
03d5b81a6fWorkaround for files exported from SoftImage that don't tag skeleton nodes correctly.
Michael PLATINGS
2010-03-19 20:12:19 +00:00
f053c6c567From Paul Martz: This is a fix to get the FBX plugin to compile on OS X
Michael PLATINGS
2010-03-19 18:28:20 +00:00
a1af64be802.8 branch: Fix for FBX plugin on OS X.
Paul MARTZ
2010-03-19 18:21:22 +00:00
5612a4640fAdded a minimum tiles size of 16 to prevent down sampling from being overly aggressive.
Robert Osfield
2010-03-19 17:09:30 +00:00
f02caa53712.8 branch: This is a simple copy from trunk, no fancy merges, just to get the osgmovie example up to date. Effectively, this is osgmovie as of trunk rev up to and including r10963.
Paul MARTZ
2010-03-19 16:57:12 +00:00
04e4fa74ccAdded new osgterrain example that is simplified to just basic setup and control osgTerrain nodes, leaving the osgthreadedterrain as the more complex example.
Robert Osfield
2010-03-19 16:31:48 +00:00
e9cd6b140fRenamed source file
Robert Osfield
2010-03-19 16:30:56 +00:00
6d1a94c7852.8 branch: Merge r11182 from trunk to update the FindQuickTime.cmake script.
Paul MARTZ
2010-03-19 16:03:47 +00:00
1163ebb25b2.8 branch: Add up-to-date ffmpeg plugin. This commint merges the following revisions from trunk: 9910, 9912, 9933, 9948, 9960, 9965, 9968-9969, 9990, 10030, 10053, 10082, 10161, 10391-10392, 10408, 10414, 10422, 10538, 10809, 10851, 10892, 10925, 10961, 11165, and 11177.
Paul MARTZ
2010-03-19 15:56:12 +00:00
515e421e1eRenamed osgterrain to osgthreadedterrain to better reflect it's functionality.
Robert Osfield
2010-03-19 14:55:35 +00:00
328c19dad9Fixed an infinite loop when loading a malformed file.
Michael PLATINGS
2010-03-19 10:19:41 +00:00
660cb74877Workaround for models with inverted transparency
Michael PLATINGS
2010-03-18 19:02:12 +00:00
c3b7a04cf1Added StateSet event handler to osgfont and osgtext to aid with debugging
Robert Osfield
2010-03-18 17:10:48 +00:00
4563195a182.8 branch: Updated FindInventor.cmake from trunk revision 11033.
Paul MARTZ
2010-03-18 16:18:46 +00:00
1590f6be3bAdded in a test of using the utility classes in include/osgUtil/MeshOptimizers to see if they could improve peformance.
Robert Osfield
2010-03-18 15:04:27 +00:00
0c1503275bRemoved the sizeAdjustment code as it was leading to incorrect tex coord generation and clipping of the left handside of the text glyphs.
Robert Osfield
2010-03-18 14:41:33 +00:00
00ca9965762.8 branch: This is a merge of 9855 to remove the reference to the src/osgPlugins/OpenAL directory.
Paul MARTZ
2010-03-17 20:55:30 +00:00
7ab4faeae12.8 branch: Merge revision 10520 from trunk to fix memory leaks.
Paul MARTZ
2010-03-17 20:47:50 +00:00
4e90ccb13a2.8 branch: This is part II of the backport of the 3ds plugin to the 2.8 branch. It includes these revisions from trunk: 10128, 10805, 10853, 10914, 10932, 10938, 10941-10942, 10945, 11056, 11123, 11173, 11180, 11194, and 11203. After merging these revisions, the 3ds code was modified to use the old-style osg::notify (instead of the new OSG_NOTIFY).
Paul MARTZ
2010-03-17 19:47:56 +00:00
5c70f4828f2.8 branch: This is part II of the new ply plugin. This commit merges the following trunk revisions: 10088, 10149, and 11237
Paul MARTZ
2010-03-17 19:02:38 +00:00
bdcba7220c2.8 branch: This adds the new ffmpeh plugin, up to a point. Further changes look messy, but will try to merge them. Revisions merged in this commit: 9816-9818, 9826-9827, 9837-9843, 9847, 9850, 9854, 9856-9857, 9860-9861, 9865, 9869, and 9885.
Paul MARTZ
2010-03-17 17:41:14 +00:00
cfa9c3682f2.8 branch: This is part I of an attempt to add the new ply plugin and also bring the 3ds plugin up to date (writer capability, etc). Revisions merged from trunk in this commit: 10012, 10013, 10014, 10040, 10041, 10079, 10080, 9906, 10057, and 10076.
Paul MARTZ
2010-03-17 16:59:50 +00:00
8f8f217ee72.8 branch: Updates for dds and OpenFlight plugins. Revisions merged from trunk in this commit: 9959, 10084, 10264, 10283, 10440, 10491, 10761, and 11159.
Paul MARTZ
2010-03-17 14:59:25 +00:00
031aaf23d0From J.P. Delport, "attached an updated FindGDAL that finds 1.6.0 version in Debian unstable. Could also be added to VPB.
Robert Osfield
2010-03-17 14:36:16 +00:00
ec0faff6442.8 branch: Minor bug fixes for ac and 3dc plugins. Merges these revisions from trunk: 10010, 10758, and 11175.
Paul MARTZ
2010-03-17 14:33:47 +00:00
28105bacc1From Glenn Waldron, "The PLY plugin only works for a file that includes both vertices and faces. This patch adds support for PLY files that include only vertices (a point cloud)."
Robert Osfield
2010-03-17 14:32:32 +00:00
0661901016disabled timing debug info
Robert Osfield
2010-03-17 11:35:52 +00:00
3dcb5d8de1From Stephan Huber: updated XCode project
Stephan Maximilian HUBER
2010-03-17 10:33:48 +00:00
201e73c3c12.8 branch: Fix issue with osgDB::concatPaths. This commit merges svn trunk revision 10818 to the 2.8 branch.
Paul MARTZ
2010-03-16 21:07:33 +00:00
afd2c05f6dUpdated wrappers
Robert Osfield
2010-03-16 18:53:42 +00:00
d5aea9c0f2Updated various serialization support for .osg, .osgt/b/x and .ive.
Robert Osfield
2010-03-16 18:44:27 +00:00
c4e82f0221Added BlendingPolicy support into osgTerrain::Terrain.
Robert Osfield
2010-03-16 18:43:59 +00:00
1537af6235Added osgTerrain::TerrainTile::set/getBlendingPolicy(BlendingPolicy) to enable control over whether the tile should have blending enabled on it.
Robert Osfield
2010-03-16 12:05:41 +00:00
d10ce23e62Fixed recursive call due to missing _
Robert Osfield
2010-03-15 20:09:23 +00:00
cb3868872e2.8 branch: Latest Inventor plugin. Revisions from trunk included in this commit: 11032 and 11034.
Paul MARTZ
2010-03-15 20:06:25 +00:00
18b8d05d1f2.8 branch: Enhancement and bug fixes for OcclusionQueryNode. Revisions merged from trunk include: 10933 and 11127.
Paul MARTZ
2010-03-15 19:34:42 +00:00
ae10c4ef892.8 branch: THis change brings the quicktime plugin up to date with current svn head trunk. Revisions merged from trunk in the commit include: 9769, 9932, 10788, 10891, 11019, and 11035.
Paul MARTZ
2010-03-15 19:06:05 +00:00
62223734792.8 branch: Backport latest ImageIO plugin from trunk. This commit includes the following svn trunk revisions: 9880, 10623, 10854, and 10855.
Paul MARTZ
2010-03-15 17:48:28 +00:00
5be809ab042.8 branch: Support for OS X 10.6. Several changes to GraphicsWIndowCocoa and DarwinUtils. The following trunk revisions were merged in this commit: 9879, 9895, 10208, 10340, 10417, 10456, 10622, 10858, and 10887.
Paul MARTZ
2010-03-15 17:20:43 +00:00
ec56528d58From Jean-Sebastien Guay, "This small one-line change allows us to load a geometry shader with the extension .geom with osgDB::readShaderFile() which will return an osg::Shader* with the type already set to GEOMETRY. Very convenient. :-)
Robert Osfield
2010-03-15 15:10:50 +00:00
2b7fb78c75From Farshid Lashkari, "I noticed that CMake forces a high stack size by default for all MSVC projects. This can cause problems for applications that use a lot of threads. I've added a new option MSVC_USE_DEFAULT_STACK_SIZE that will remove the explicit stack size and use the default MSVC size. Apparently this was only necessary for very old versions of MSVC but it's still around. I would argue that this option should be on by default, but I've left it off for now.
Robert Osfield
2010-03-15 15:01:21 +00:00
1b6adccdc4From Wang Rui, "Here is a small fix in the eventTraversal() function of both viewer and composite viewer class.
Robert Osfield
2010-03-15 14:47:22 +00:00
b40c1b355cUpdated wrappers
Robert Osfield
2010-03-15 10:32:29 +00:00
9015ff7084Refactored Texture::Extensions to simplify it and make it more efficient.
Robert Osfield
2010-03-15 10:32:03 +00:00
bc9b28a0c9Added return into ReaderWriterOSG2::prepareReading(..) to prevent bug associated with result being discarded.
Robert Osfield
2010-03-14 08:56:21 +00:00
da79cd85e4Merge 11009 to 2.8 branch (just examples directory).
Paul MARTZ
2010-03-13 23:08:16 +00:00
211764ca2d2.8 branch: Updates to osgAnimation examples.
Paul MARTZ
2010-03-13 23:01:27 +00:00
8041a24a4f2.8 branch: Additional fix for FBX usage of 2.8-style osgDB::ReaderWriter::Options.
Paul MARTZ
2010-03-13 22:26:17 +00:00
b011470dfeBackport FBX plugin to 2.8 branch. Modified FBX to use the old osgDB::ReaderWriter::Options namespace. This commit includes a merge of r11111 (osgDB UTF mods).
Paul MARTZ
2010-03-13 22:20:15 +00:00
3155b1722cMerge 11009 to 2.8 branch, but only the parts applicable to the bvh plugin to get it to build with current osgAnimation.
Paul MARTZ
2010-03-13 21:43:43 +00:00
40fc0eb263Merge 10671-10672 to 2.8 branch. This is a continuration of the backport of osgAnimation. (Note prev rev log message should read "11206" not "11026".)
Paul MARTZ
2010-03-13 21:38:17 +00:00
38e68ed7f12.8 branch: backport of osgAnimation from svn head 11026.
Paul MARTZ
2010-03-13 20:55:16 +00:00
15fd3bdcc22.8 branch: Bump revision number to 2.8.3, so version to 65.
Paul MARTZ
2010-03-13 18:10:28 +00:00
1858366514Merge 10664 to 2.8 branch (MSFBO workaround for OS X).
Paul MARTZ
2010-03-13 18:09:26 +00:00
f27c103ec7Refactored the initialization of OSX windowing settings so that it's done on demand rather than on startup.
Robert Osfield
2010-03-13 11:28:00 +00:00
b8b536257cAdded initializer
Robert Osfield
2010-03-12 09:32:23 +00:00
04c2bbf594Changed ssize_t to int to fix windows build error
Robert Osfield
2010-03-12 09:10:12 +00:00
7a44b43474From Time Moore, "This submission implements 3 optimizations for meshes. INDEX_MESH turns DrawArrays style geometry into DrawElements, uniquifying the vertices in the process. This is useful for certain loaders, like ac3d, which just spit out DrawArrays. VERTEX_POSTTRANSFORM and VERTEX_PRETRANSFORM optimize mesh triangle and vertex order for the caches on a modern GPU, using Tom Forsyth's algorithm. I describe this and the big difference it makes (38% improvement on a very large mesh) in my blog, http://shiny-dynamics.blogspot.com/2010/03/vertex-cache-optimization-for-osg.html."
Robert Osfield
2010-03-11 18:15:20 +00:00
4dcf21d707From Sukender, "I had some conflicts when updating but they seem resolved now. Attached files (four files) are against rev. 11200. Changelog: - Replaced exceptions with assert() or OSG_NOTIFY - Replaced osg::notify() with OSG_NOTIFY - Changed braces and tabs to fit OSG coding convention - Cleaned a few things in code (names, added deallocations upon error)"
Robert Osfield
2010-03-11 16:53:35 +00:00
6c07be375cClean up of initialization of statics/use of getenv
Robert Osfield
2010-03-11 16:46:01 +00:00
9ab856323dAdded export for PerContextShader.
Robert Osfield
2010-03-11 14:48:54 +00:00
dce80220e8Cleaned up the registration of wrappers so that they are done on demand.
Robert Osfield
2010-03-11 10:24:20 +00:00
90bc608020Fixed warning
Robert Osfield
2010-03-11 10:17:50 +00:00
08bd7dedc1From David Fries,"This improves the out of box detection of the 3rd party libraries for Windows. If the 3rdparty directory isn't available it will use the directory names subversion uses such as 3rdParty_win32binaries_vs71 3rdParty_win32binaries_vs80sp1 3rdParty_win32binaries_vs90sp1. That helps when as we are building both vs71 and vs80, and probably vs90 in the future at the same time in addition to not having to rename the directory once it is downloaded. It also adds the _i suffix to match some of the libraries. "
Robert Osfield
2010-03-10 17:23:58 +00:00
23c7fd2f61From David Fries,"We are needing to compile Debug, Release, and MinSizeWithDebInfo, but currently only Debug appends "d" so the Release and MinSizeWithDebInfo (and MinSizeRel) all produce the same filenames. This set of changes lets each build type have a cmake defined string appended, defaulting to Release none, Debug d, RelWithDebInfo rd, MinSizeRel s. But a user still can have Release, RelWithDebInfo, and MinSizeRel to produce the same filenames. It does so by setting the preprocessor define OSG_LIBRARY_POSTFIX in src/osgDB/CMakeLists.txt to one of the previously defined cmake variables CMAKE_DEBUG_POSTFIX CMAKE_RELEASE_POSTFIX CMAKE_RELWITHDEBINFO_POSTFIX CMAKE_MINSIZEREL_POSTFIX. This method cuts down on the #ifdef _DEBUG #else preprocessor directives in Registry.cpp as the extension is always passed in OSG_LIBRARY_POSTFIX. That and __MINGW32__ didn't have the _DEBUG check which looks like a bug."
Robert Osfield
2010-03-10 17:19:35 +00:00
08612666faFrom Roger James, "Here is a small stability fix to the dae reader which seems to have dropped out of the latest version."
Robert Osfield
2010-03-10 16:31:30 +00:00
1e1c79f257Updated version
Robert Osfield
2010-03-10 16:31:15 +00:00
e70c304533From Sukender, "I've fixed positions for 3DS writer. Points in 3DS must be in world coordinates and I added what was missing. And by refactoring a bit of code, I may have fixed some StateSets related bugs (was ignoring StateSets for osg::Groups). I also added support for Billboard's points, so now "osgconv lz.osg lz.3ds" has an acceptable output. However, there is no rotation depending on billboards' axis, hence the notice "Warning: 3DS writer is incomplete for Billboards (rotation not implemented).". You may want to remove this notice (or lower the notify severity) if you feel 3DS doesn't have to handle such rotations. The attached archive contains 3 files from 3DS plugin, against rev. 11162.
Robert Osfield
2010-03-10 16:05:52 +00:00
3a9ac70f94Updated wrappers
Robert Osfield
2010-03-10 14:44:12 +00:00
53ae54aac8Update SO version number to 66 to skip over 65 value planned to 2.8.3
Robert Osfield
2010-03-10 14:29:05 +00:00
950d282f55From Vincent Bourdier, addition of out of memory read result.
Robert Osfield
2010-03-10 14:28:18 +00:00
e082b01f26From Wang Rui, "I've initially added the XML support of the new native osg format, using osgDB::XmlParser. The extension for XML-formatted scenes is .osgx, corresponding to .osgb for binary and .osgt for ascii. It could either be rendered in osgviewer or edited by common web browsers and xml editors because of a range of changes to fit the XML syntax. For example, the recorded class names are slight modified, from 'osg::Geode' to 'osg--Geode'.
Robert Osfield
2010-03-10 13:48:41 +00:00
ce19b37981From John Ivar Haugland, "This is a fix to InputStream.cpp. (revision 11114) . I have attached the modified file.
Robert Osfield
2010-03-10 13:37:19 +00:00
6da42d9cd6From Wang Rui, QWidgetImage class that enables QWidgets to be used as an interactive osg::Image that can be assigned to textures.
Robert Osfield
2010-03-10 13:24:53 +00:00
a5c33886daFrom Laurens Voerman, "as I work in Visual Studio, the introduction of the new osg2 reader/writer gave me a confusing project list, especially the three projects named "Plugins osg". The attached patch changes the project names to "Plugins osg depricated xxx" and "Plugins osg serializer xxx" therefore keeping them close together in the Solution Explorer. "
Robert Osfield
2010-03-10 12:56:33 +00:00
Robert Osfield