12a0b9ab6dFrom Bernardt Duvenhage: "I noticed that in 'src/OpenThreads/pthreads/CMakeLists.txt' a '!' has been written instead of 'NOT' within an if statement expression.
Robert Osfield
2010-04-29 15:23:43 +00:00
b028a59720From Michael Platings, "I've updated the FBX plugin to use the latest version of the FBX SDK. I've checked in the plugin files myself, but I need you to check in this change to FindFBX.cmake to change the SDK directory."
Robert Osfield
2010-04-29 11:59:51 +00:00
4012841053Fixed handling of Terrain/CoordinateSystem node so that the code now handles the fact that Terrain now subclasses from CoordinateSystemNode.
Robert Osfield
2010-04-29 09:46:14 +00:00
a4718ef88bUpdated wrappers
Robert Osfield
2010-04-28 22:08:48 +00:00
a6c7fee246From Alok Priyadarshi, "1. Replaced APIENTRY to GL_APIENTRY which is used by OpenGL ES headers. For desktop GL GL_APIENTRY has been defined as APIENTRY."
Robert Osfield
2010-04-28 21:22:44 +00:00
c019e2f76dFixed typo
Robert Osfield
2010-04-28 21:10:29 +00:00
5435f6cf50From Wang Rui, "Two small bugs were just found when I was writing examples for my book in process: a wrong definition of the OSG_FATAL macro, and wrong logic inside the KeySwitchMatrixManipulator::getDistance() function. I believe both were slips."
Robert Osfield
2010-04-28 20:33:40 +00:00
363f32536bFrom Farshid Lashkari, "There's a subtle bug in osgDB::getFileExtension where it returns an incorrect value if the filename does not contain an extension but a sub-directory contains a dot character. I've modified the function so that it checks for this case."
Robert Osfield
2010-04-28 20:21:28 +00:00
0adf26ec6eFrom Wang Rui, "The osgManipulator serializers are ready now. I need to modify the META_OSGMANIPULATOR_Object macro to ensure these classes could work with their wrappers, and a few naming styles should be changed as well. Fortunately everything seems to compile fine under Windows and my new Ubuntu system.
Robert Osfield
2010-04-28 20:16:44 +00:00
22dfe6f8d1From John Ivar Haugland and Michael Platings, JIV:"I deleted a line from the ReaderWriterDAE.cpp file that was introduced in rev 11341. I got a crash on this line when the options pointer was NULL." MP:"Good spot John. The next line is also unnecessary and can be removed as well (attached, plus some minor code beautifying)"
Robert Osfield
2010-04-28 20:10:53 +00:00
8b8ca09ab1Added support for passing options to the .dot plugin
Robert Osfield
2010-04-28 18:53:34 +00:00
b459fb4a25Added support for passing in an options string to control the orientation of the generated graph
Robert Osfield
2010-04-28 18:52:58 +00:00
f27678dbb9Introduced the use of ref_ptr<> in read show methods
Robert Osfield
2010-04-28 17:29:31 +00:00
bff3fcbe72Removed redundent files
Robert Osfield
2010-04-28 17:18:01 +00:00
dbbe73304aAdded support for using graphviz dot for graphics visualization via <graph>filename</graph> token.
Robert Osfield
2010-04-28 14:56:38 +00:00
4143f2f839Fixed typo
Robert Osfield
2010-04-28 14:55:42 +00:00
b86431fdf7Added colours and different style to drawable and statesets
Robert Osfield
2010-04-28 14:55:07 +00:00
324ddd0ca3No longer removes redundant nodes because node structure may be important.
Michael PLATINGS
2010-04-28 14:05:47 +00:00
dfda4ce35fReplaced afprintf usage with std::string to fix memory leak and improve portability of code.
Robert Osfield
2010-04-28 10:15:16 +00:00
7fb49c6d2fFrom Stephan Huber: updated xcode-project
Stephan Maximilian HUBER
2010-04-26 10:07:49 +00:00
117d949d1fFrom Roland Smeenk and Robert Osfield, improvements to the indentation of comments.
Robert Osfield
2010-04-23 16:35:44 +00:00
64acd4df54From Hatwig Wiesmann, "osg::TransferFunction1D::assignToImage may assign NaN values to the image in case an underflow inside the method occurs. This underflow can be reproduced by the following call sequence:
Robert Osfield
2010-04-23 09:29:50 +00:00
75fc7b6598Fixed warnings
Robert Osfield
2010-04-23 08:58:57 +00:00
07328f3d17From Mourad Boufarguine, "This submissions fixes the problem of the difference of std::*::size_type between 32bit and 64 bit platforms. It wraps the reading and writing of std::*::size_type values using the osgDB::InputStream::readSize and osgDB::OutputStream::writeSize methods."
Robert Osfield
2010-04-23 08:55:23 +00:00
5d0b84edd0From Marcin Hajder, "This submission contains Texture2DMultisample osg implementation.
Robert Osfield
2010-04-22 17:02:22 +00:00
3f7454fd8cFrom Farshid Lashkari, "I've attached a small fix so that osgDB::convertStringFromUTF8toCurrentCodePage actually performs the conversion onto the destination string."
Robert Osfield
2010-04-22 16:08:26 +00:00
f67942cf03From Alok Priyadashi, "The attached patch fixes - compile errors on windows when compiled with UNICODE flag - warnings for duplicate WIN32_LEAN_AND_MEAN. I think this should better fixed by adding WIN32_LEAN_AND_MEAN to vcproj preprocessor list."
Robert Osfield
2010-04-22 16:01:38 +00:00
25bc487763From John Ivar Haugland, "I have added the serializer for UserData in osg::Object. See the attached modified file: src\osgWrappers\serializers\osg\Object.cpp"
Robert Osfield
2010-04-22 13:07:49 +00:00
1a38137551Updated ChangeLog, and AUTHORS files
Robert Osfield
2010-04-22 11:20:31 +00:00
9e2ec85420From Tim Moore, added check to whether validConfigs is empty.
Robert Osfield
2010-04-22 10:13:05 +00:00
60b906b9feAdded a temporary /* */ around the check against _traits->vsync to avoid the errors reported with the current usage of RestoreContext for setting the vsync.
Robert Osfield
2010-04-22 08:59:52 +00:00
be0e573f80From Torben Dannhauer, fixed typo
Robert Osfield
2010-04-22 07:32:11 +00:00
9eebb2eb23From Ulrich Hertlien with little bits from Robert Osfield and Chris Hanson, added provisionl support for controlling sync to vblank.
Robert Osfield
2010-04-21 17:16:13 +00:00
6e03d73efeChanged "Sorted" label to "Sorted Drawables"
Robert Osfield
2010-04-21 16:44:38 +00:00
a475da35e3From Mourad Boufarguine, "When compiling the example on VS9, the compiler complain about undefined GL_DEPTH_COMPONENT32F and GL_DEPTH_COMPONENT32F_NV. So I added them to include/osg/FrameBufferObject. The example builds fine and is working for me without crashs unless it is ran whithout argument. I added couple of lines to check for arguments number and print the example usage when needed."
Robert Osfield
2010-04-21 16:37:28 +00:00
6b9bbc7ca9From Wang Rui, "The OSG book I'm working on will focus on helping beginners build latest OSG source code with Visual Studio 2010 express, without setting too many options and without facing unexpected errors. But at present, the compilation process will fail because the INSTALL project 'cannot find' generated DLLs while copying files. I have looked into the build directory and found that the places of generated file folders were just different from previous VS versions. In this case, the old hack in OsgMacroUtils.cmake may become invalid:
Robert Osfield
2010-04-20 16:27:54 +00:00
5e70c17f2aFrom Serge Lages, "Currently if multiple event callbacks are nested on one node, only the first will be called. The proposed fix checks if there is a nested callback."
Robert Osfield
2010-04-20 13:52:28 +00:00
3bef6f9eaeImplemented Colin MacDonald's recommended change of "unsigned short" to "unsigned" to solve big endian problem under Solaris. Also added comment to highlight the oddity of the mixing of types in the associated lib3ds code.
Robert Osfield
2010-04-20 13:34:57 +00:00
2c64536a09Replaced tabs with four spaces
Robert Osfield
2010-04-20 11:38:38 +00:00
5a50387eb9UPdated wrappers
Robert Osfield
2010-04-20 11:34:19 +00:00
31e8e37dbdFrom Jason Beverage, "Here is a fix to the curl plugin CMake to allow it to link against the CURL_LIBRARY_DEBUG and ZLIB_LIBRARY_DEBUG. Previously it linked the debug version against the release libs, which was causing a hang when running in debug mode on Windows."
Robert Osfield
2010-04-20 11:23:08 +00:00
6a73dfc193From Farshid Lashkari, "Anaglyphic stereo does not seem to work properly when performing pre-render stages. I believe the reason is that the pre-render stages are performed with the last applied color mask, which is cyan. I've fixed this by resetting the color mask before performing the pre-render stages."
Robert Osfield
2010-04-20 11:13:27 +00:00
eef7da35d1Fixed the background quad size to fit all the camera stats labels
Robert Osfield
2010-04-20 11:05:22 +00:00
7c38643a77From Tim Moore, "I noticed that the "Materials" statistic in the camera scene stats display seemed to be identical to the number of drawables. In fact, it displays the nummat member of osgUtil::Statistics, but that variable has nothing to do with materials. nummat tracks the number of matrices associated with Drawable objects in a RenderBin; as I understand it, Drawables pretty much always have a model-view matrix tied to them in RenderBins, so this statistic doesn't seem very useful. So, I added statistics for the number of StateGraph objects in RenderBins and also for the number of Drawables in the "fine grain ordering" of RenderBins. The latter corresponds to the number of Drawables in the scene that are sorted by some criteria other than graphics state; usually that is distance for semi-transparent objects, though it could be traversal order. These two statistics give an idea of the number of graphic state changes happening in a visible scene: each StateGraph implies a state change, and there could be a change for each sorted object too. You can also subtract the number of sorted Drawables from the total number of Drawables and get an idea of how many Drawables are being drawn for each StateGraph. "
Robert Osfield
2010-04-20 10:59:44 +00:00
92a6b0020dChanged the AbmientBias type from Vec2d to Vec2 as use of double is inappropriate.
Robert Osfield
2010-04-20 10:35:33 +00:00
a8c4fd8761From Wang Rui, "The new osgShadow and osgFX serializers are attached, and some modifications of the osgShadow header naming styles as well. The osgDB::Serializer header is also changed to add new Vec2 serializer macros because of the needs of osgShadow classes. It should compile fine on both Windows and Linux. But I have only done a few tests to generate .osgb, .osgt and .osgx formats with these new wrappers."
Robert Osfield
2010-04-20 10:29:04 +00:00
a0781cba6cFrom Mourad Boufarguine, "This submission fixes osgDAE::toString(*) unresolved external symbols compile errors (on VS)."
Robert Osfield
2010-04-20 09:48:45 +00:00
b1658ee6dfFrom Farshid Lashkari, "I noticed that osg::State::getInitialViewMatrix returns the monocular view matrix when rendering in stereo. I've made some changes to osgUtil::RenderStage & SceneView so that it will return the correct view matrix depending on which eye is currently being rendered." & "I made a small change to the previous patch so that osg::State::getInitialViewMatrix works correctly with pre/post render stages as well."
Robert Osfield
2010-04-19 14:49:42 +00:00
c091b5c2d1From Stephan Huber and Mathieu Marache, "attached you'll find framework support for os x via cmake. Please credit Mathieu Marache, he added the last missing piece to this puzzle.
Robert Osfield
2010-04-19 13:44:42 +00:00
a8332528f4From Martins Innus,"Here's a fix to allow the serializer to compile on the Mac 10.4 SDK. The definition of GLint seems to be different accross the SDKs. Its defined as "long" in 10.4. I have no idea if this is the correct way to go about this, but it compiles on my end."
Robert Osfield
2010-04-19 12:09:21 +00:00
c0e9fcbb67From Tim Moore, "This contains a couple of fixes to support changing FrameBufferObject configurations on the fly; the user changes the camera attachments and calls Renderer::setCameraRequiresSetUp(). The major part of this submission is a comprehensive example of setting up floating point depth buffers. The user can change the near plane value and cycle through the available combinations of depth format and multisample buffer formats."
Robert Osfield
2010-04-19 11:43:06 +00:00
488eac94f7From Wang Rui, "Attached is the osgAnimation wrappers for serialize IO operations. A few headers and the osgAnimation sources are also modified to make everything goes well, including:
Robert Osfield
2010-04-19 10:35:18 +00:00
6ec106b31aFrom Paul Martz, fixes for static build
Robert Osfield
2010-04-19 09:39:39 +00:00
3b3e8459e2From Stephan Huber: updated XCode project
Stephan Maximilian HUBER
2010-04-19 08:41:00 +00:00
70d78c0713From Colin McDonald, "The new 3ds plugin isn't working at all on big-endian machines, due to a byte order issue.
Robert Osfield
2010-04-15 18:40:40 +00:00
51d377c9f6Ran dos2unix on header files
Robert Osfield
2010-04-15 18:38:32 +00:00
6b73cef997Ran dos2unix on lib3ds files
Robert Osfield
2010-04-15 18:38:03 +00:00
7ee549bb06From J.P. Delport, Fix for invalid iterator dereference in DatabasePager.
Robert Osfield
2010-04-15 12:51:41 +00:00
3700263e08From Sukender, "After discussion with Paul Martz, here is a fix for 3DS reader/writer (on rev. 11315) + some changes. Changelog:
Robert Osfield
2010-04-15 11:49:33 +00:00
31ec835002From Jason Beverage, "Here is a small fix to the DatabasePager to fix a crash if you were running with the OSG_NOTIFY_LEVEL set to INFO.
Robert Osfield
2010-04-15 11:45:10 +00:00
7db9f18619From Chris Hanson, build fixes for Solaris-64
Robert Osfield
2010-04-15 11:41:37 +00:00
72e6867679Changed std::pair declaration to ListTriangle::value_type to avoid Solaris compile errors
Robert Osfield
2010-04-15 11:40:49 +00:00
9045d03a0bRemoved the setting of the DatabasePager thread affinity, and moved the setting of the DatabasePager thread priotity to after the creation of the threads
Robert Osfield
2010-04-15 11:02:22 +00:00
d5fafcecbdUpdated the plugin to be compatible with version 2011.2 of the FBX SDK
Michael PLATINGS
2010-04-14 16:43:50 +00:00
b6a5754127Added minimum frame delay of 1/100th second when using on demand rendering to avoid creating a CPU lock.
Robert Osfield
2010-04-14 13:39:43 +00:00
9df9778658Updated wrappers
Robert Osfield
2010-04-14 10:43:16 +00:00
c69ddd6bd5Added BufferData::ModifiedCallback to provide a mechanism for tracking when a osg::Image::dirty() has been called to signify that an image has been modified.
Robert Osfield
2010-04-13 18:42:58 +00:00
8e53cfe6fcAdded support for double precision geometry
Michael PLATINGS
2010-04-13 14:50:31 +00:00
88f1b8f19aFrom Michael Platings with tweaks from Robert Osfield, added Options::s/getPrecisionHint(..) to allow apps to hint to plugins about how to handle double precision geometry data.
Robert Osfield
2010-04-13 13:06:27 +00:00
51924431cdFixed warnings
Robert Osfield
2010-04-13 09:42:53 +00:00
ccd34b375bupdated wrappers
Robert Osfield
2010-04-13 09:42:36 +00:00
25cd2970c5osgAnimation now stores times as doubles
Michael PLATINGS
2010-04-12 16:35:15 +00:00
5d64318597From Sukender: Fixed FBX writer: now handles double precision arrays (vertices, normals, texcoords)
Michael PLATINGS
2010-04-12 15:04:25 +00:00
fccda08491Added corner dirty options to TerrainTechnique, added experimental code paths in GeometryTechnique for accounting for neighbouring corner tiles - optionally compiled out in this check-in.
Robert Osfield
2010-04-09 08:52:40 +00:00
dab855f1412.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.
Paul MARTZ
2010-04-01 21:29:09 +00:00
656efbf03fRemoved getNeighbours() method to avoid problems with introspection wrappers
Robert Osfield
2010-04-01 21:18:39 +00:00
47cdee3611Removed TerrainNeightbours class from wrapping to avoid associated build errors
Robert Osfield
2010-04-01 21:15:17 +00:00
a8bbf0a809Added support for boundary equalization to GeometryTechnique
Robert Osfield
2010-04-01 21:06:56 +00:00
15afc29018Added window size event handler
Robert Osfield
2010-04-01 21:04:36 +00:00
01b510865f2.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.
Paul MARTZ
2010-04-01 17:41:08 +00:00
7f3fe7baed2.8 branch: Fix multiply defined symbols in static link by qualifying FBX and 3DS plugin symbols with namespaces.
Paul MARTZ
2010-03-31 20:22:17 +00:00
ae233b93922.8 branch: Fixes for mingw build. Merges 10963 and 10965 from trunk.
Paul MARTZ
2010-03-30 15:23:18 +00:00
31e526f253Added TerainHandler event handler to provide 'v'/'V' and 'r'/'R' key controls for change vertical scale and sample ratio respectively.
Robert Osfield
2010-03-29 08:49:20 +00:00
8547536387From Jean-Sebastien Guay, "When the StatsHandler tries to find a context to add itself to, it will first look for a GraphicsWindow, and if none is found it will look for a GraphicsContext. This enables apps that do all their rendering to offscreen contexts (pbuffer) to still use the StatsHandler."
Robert Osfield
2010-03-26 11:09:10 +00:00
7fd81fdd06Updated wrappers
Robert Osfield
2010-03-26 11:07:43 +00:00
3f39a66035From Jim Brooks, fix for FreeBSD build where FIND_LIBRARY(DL_LIBRARY..) return NOT_FOUND.
Robert Osfield
2010-03-26 09:01:49 +00:00
17121769002.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."
Paul MARTZ
2010-03-25 20:02:30 +00:00
967e2b79262.8 branch: (2nd attempt. Previous commit appears to have been a no-op.) Merging 11289 from trunk to add pixel format getter to GraphicsWindowCocoa.
Paul MARTZ
2010-03-25 19:56:50 +00:00
64d4e6a9132.8 branch: Merging 11289 from trunk to add pixel format getter to GraphicsWindowCocoa.
Paul MARTZ
2010-03-25 19:46:38 +00:00
ae33aeed8a2.8 branch: Updated XCode project file from Stephan, includes ply plugin.
Paul MARTZ
2010-03-25 19:37:22 +00:00
35fa541350Change time type from float to double in osgAnimation
Cedric Pinson
2010-03-25 17:50:29 +00:00
fe5527f332From Mathias Froehlich, "I added some features to the vrml plugin.
Robert Osfield
2010-03-25 14:19:01 +00:00
ecf7a7e3e4From Stephan Huber, "attached you'll find a small enhancement for GraphicsWindowCocoa. My submision adds a getter for the pixel-format. I need this for some custom software so I can integrate CoreVideo-playback with osg. "
Robert Osfield
2010-03-25 14:14:46 +00:00
75d1de3d15Fixed warning
Robert Osfield
2010-03-25 14:12:28 +00:00
Robert Osfield