553d860d48From Brad Christiansen, "Attached is a very small change to allow the Collada libs for VS 2010 to be found automatically."
Robert Osfield
2010-11-22 10:37:49 +00:00
f103d02cf7From Katherina Plugge, "if using multitexturing and converting osg files to OpenFlight texture coordinates get corrupted. The texture coordinates for slot 1 and following are not computed correctly (see thread http://forum.openscenegraph.org/viewtopic.php?t=6993).
Robert Osfield
2010-11-19 18:26:02 +00:00
6b711582deFrom Sukender, fix for precision of Plane::asVec4()
Robert Osfield
2010-11-19 18:07:17 +00:00
92d6daaf70Commented out debug output
Robert Osfield
2010-11-19 17:47:53 +00:00
acf548ac90Update SOVERSION
Robert Osfield
2010-11-19 17:47:30 +00:00
426d2a50d8Update Text wrappers to handle new Color member
Robert Osfield
2010-11-19 09:57:56 +00:00
ade360819eUpdated SO version to reflect changes in API of osgText
Robert Osfield
2010-11-19 09:57:34 +00:00
5849634082Moved text color into TextBase, added support for colour into Text3D
Robert Osfield
2010-11-18 17:59:55 +00:00
a5b83edc76Added resetting of the freetype size when getting Glyph3D glyph's as otherwise use of 2D and 3D Text would cause incorrect text sizing.
Robert Osfield
2010-11-18 17:18:31 +00:00
265673baccImproved handling of pending orphaned texture objects and max texture pool size.
Robert Osfield
2010-11-18 12:03:06 +00:00
c005e46d16From Jean-Sebastien Guay, Changed debug info in State::frameCompleted() to OSG_INFO
Robert Osfield
2010-11-17 14:06:26 +00:00
a9b90b9652Added texture pool handler to print out results from texture pool
Robert Osfield
2010-11-17 10:19:25 +00:00
c358c48db9Added quite size test.
Robert Osfield
2010-11-17 10:16:45 +00:00
07c4cfd97dFrom Sherman Wilcox, "added the following to the ADD_LIBRARY list -- ${OPENSCENEGRAPH_VERSIONINFO_RC}"
Robert Osfield
2010-11-15 17:21:30 +00:00
4dd9de7f13Fixed warnings
Robert Osfield
2010-11-12 11:04:53 +00:00
e1ee96b3f2Fixed crash on intialization of static applications by moving the static mutexes inside singleton methods.
Robert Osfield
2010-11-12 09:48:21 +00:00
6cc7e109d3Moved finding of RSVG, Poppler-glib and GtkGl out into their own Find*.cmake modules to enable easier specialization.
Robert Osfield
2010-11-11 16:51:46 +00:00
bda7ef8179From Wang Rui, "I've finally completed the static build support for dotosg wrapper and serialization libraries. My submission mainly includes: 1. Add two new macros USE_DOTOSGWRAPPER_LIBRARY and USE_SERIALIZER_WRAPPER_LIBRARY. Applications using static OSG must include corresponding static-link libraries and use these two macros to predefine native format wrappers. Please see osgstaticviewer and present3D in the attachment for details.
Robert Osfield
2010-11-11 11:47:24 +00:00
be9003d90cFrom Wang Rui, "The latest modification of osg/State uses the GLuint64EXT type, which belongs to GL_EXT_timer_query and should be decalared to avoid compiling errors if the extension is not supported. I've attached this small fix."
Robert Osfield
2010-11-11 10:53:23 +00:00
a80c458285From Mark Sciabica, "It's not Windows API calls that are causing the problem. It's a new templated constructor of std::pair not being able to automatically convert 0 to a pointer. Rather than use preprocessor checks and #defines, I think a cleaner solution is to cast the std::pair arguments to the appropriate types to help the compiler out. I attached an updated version of the file implementing this."
Robert Osfield
2010-11-11 10:42:41 +00:00
68f37c4dcbFrom Tim More and Robert Osfield, implementation of ARB_timer_query based GPU timing stats syncronization.
Robert Osfield
2010-11-10 16:58:58 +00:00
40c6d99c15From Mourad Boufarguine, "This is a small fix to osg::createGeodeForImage to adapt Tex coords to image origin.
Robert Osfield
2010-11-10 12:50:06 +00:00
5868022ca1Added traversal of salve camera subgraphs when the slave camera doesn't share it's scene graph wiht the View's master scene graph.
Robert Osfield
2010-11-09 17:17:13 +00:00
ae27b4caafFrom Wang Rui with small tweak from Robert Osfield, fix of memory leak in gif plugin when using GifImageStream
Robert Osfield
2010-11-09 15:48:46 +00:00
057e109aa0From Wang Rui, "I'm now testing static building of OSG and found a possible bug in the present3D application. As static-link present3d should depend on freetype, png, pdf and some other plugins, any mis-compiling of these plugins will make present3d fail to be built. Some lirbaries like poppler and cairo are not popular under Windows, so it is very common that we don't have osgdb_pdf compiled and thus get errors when building present3d. I've modified the CMakeLists and present3d.cpp to avoid this problem."
Robert Osfield
2010-11-09 14:57:20 +00:00
3fb3ef9f39From Sukender, "As discussed in osg-users, I found output directories with CMake >= 2.8.1 are wrong under MSVC (As Chuck said, it's to be related to CMake, and not MSVC).
Robert Osfield
2010-11-09 14:39:32 +00:00
b7cccf6258Refactored the versioning of serializers so it now uses a _firstVersion and _lastVersion make it possible to specify what range of versions support each serializer.
Robert Osfield
2010-11-09 13:23:43 +00:00
b8a94a6d4eFrom Wang Rui, "I'd like to submit my latest modification of the serialization IO functionalities. It includes two main parts: a version checking macro for handling backward-compatiblity since 3.0, and enhencement of current schema mechanism. I also change the option handling process to use getPluginStringData(), and add new USE_SERIALIZER_WRAPPER macro in the Registry header to allow for static-link usage as well.
Robert Osfield
2010-11-09 12:41:55 +00:00
af22bd70dbFrom Johan Nouvel, "Some times ago, I have coded an osg to vrml2 writer. Today, I have updated our writer to osg 2.9.9. As it works (for our needs at least) I've done and attached a tar.gz file for the VRML2 plugin with a new part to write a VRML2 file from an osg one.
Robert Osfield
2010-11-08 15:49:30 +00:00
be583ef0d6From Jean-Sebastien Guay, "As promised, here is the fix for the background size. I also added another instance variable _lineHeight to clean up the code a bit more.
Robert Osfield
2010-11-08 12:28:31 +00:00
a0607201a2From David Fries and Robert Osfield, fix for handling remote GLX server that declares GL 3.0 support but doesn't actually implement it correctly.
Robert Osfield
2010-11-05 17:31:25 +00:00
752a5e2a3cFrom Javier Taibo, "ere is the new code with Billboard "rotate around axis" functionality.
Robert Osfield
2010-11-05 17:24:50 +00:00
5a0b2760b4From Alexander Irion, "Please find another bugfix for the ReaderWriterGZ. This time, the writing did not work for me - the created output file could not be deflated by zip. "
Robert Osfield
2010-11-05 17:09:58 +00:00
0f22d7bc3fFrom Ulrich Hertlein, "attached is a tiny cleanup for ReaderWriterFFmpeg that provides more accurate descriptions for some extensions and also adds 'm2ts' for MPEG-2 transport streams. "
Robert Osfield
2010-11-05 17:07:17 +00:00
147fdd0430From Sukender, "1. More handled cases in MergeGeometryVisitor - Algorithm doesn't try to merge double and single precision arrays together - Algorithm doesn't try to merge incompatible geometries (ex: one with "vertices + texoords", and another with only vertices)
Robert Osfield
2010-11-05 17:04:08 +00:00
2f51919979From Peter Bear, "Attached is a fix for the detection of GDAL 1.7.0. The previous CMake file only supported up to 1.6, this fix supports 1.7."
Robert Osfield
2010-11-05 11:21:55 +00:00
95c7dc35d0From Alaxandre Irion, "Trying to load the attached texture file "texture.dds.gz" fails and causes the following warning on the console:
Robert Osfield
2010-11-05 10:29:18 +00:00
1c6e33bc7eFrom Wang Rui, "Attached is a fix to the latest PVR plugin to make it compile under MSVC. I've added definition to uint_32 and replaced std::max() with osg::maximum(), because it is not supported by some VisualStudio versions."
Robert Osfield
2010-11-05 09:12:28 +00:00
2aaf0ed297From Fabien Lavingotte and Robert Osfield, Fixed handling of texture pool size when TextureObject::setAllocate(..) is called.
Robert Osfield
2010-11-04 17:53:58 +00:00
286d4bceaaFrom Jan Klimke, "I did recently some work understanding the osgAnimation classes. Here the osganimationsolid example seems not to be very helpful at the moment. There are basically no comments in it and additionally there is a second animation defined which was simply not working (wrong channel type for angle animation). I added some comments and fixed the example to contain 2 working animations by now. I think this could help others who are trying to understand the osgAnimation plugin.
Robert Osfield
2010-11-04 15:24:00 +00:00
f7b33de6fcFrom Jason Beverage, "Here is a small change to the DirectShow plugin to support finding the video and sound pins by type rather than searching for them by name since the names of the pins can change based on what kind of file you are opening. This also removes the need for an explicit check to see if the file is a .wmv file.
Robert Osfield
2010-11-04 13:53:31 +00:00
8f1284d8bcFrom Sukender, "I replaced std::min() with osg::minimum() in RandomRateCounter, to avoid including the STL header (Or else it doesn't compile under MSVC 10)."
Robert Osfield
2010-11-04 11:39:47 +00:00
bb723e14faFrom David Callu, fix in FrameBufferObject when using Texture2Darray and GeometryShader.
Robert Osfield
2010-11-04 11:05:47 +00:00
d2a9f48054From Per Fahlberg, "I have added support for PowerVR texture compression. osg::Texture and osg::Image have been modified to support the texture formats and I have added a plugin to load pvr files. All modified files are in the attached zip. "
Robert Osfield
2010-11-04 11:02:37 +00:00
4ced7dffc4From Wang Rui, "additional FFmpegParameters class in the ffmpeg plugin for setting parameters before opening the video file, which benefits from getPluginStringData() as shown in the ReaderWriter implementation.
Robert Osfield
2010-11-03 10:37:32 +00:00
afa563df57From Wang Rui, "a new parsePluginStringData() method in the osgDB::Options class which will be automatically executed to parse option string to the string data map"
Robert Osfield
2010-11-03 10:37:02 +00:00
1beedce6fcFrom Jean-Sebastien Guay, "For a long time now I've wanted to be able to add custom values into the stats handler's graph. Here is my proposal of how I'd do this. It's surely not perfect and I'm open to suggestions, but I've already made more changes than I wanted to in order to be able to implement this...
Robert Osfield
2010-11-03 10:04:34 +00:00
bdf1912fdaFrom Jean-Sebastien Guay, "For a while now I've been bugged (pun) by a problem in the stats graph I submitted a long time ago. When it scrolled, sometimes it would scroll too little, leading to an empty space at the left that would grow as time went by. I was in that code today for something else so I fixed it. "
Robert Osfield
2010-11-03 09:51:12 +00:00
2d28026654From David Fries, "Fix remote X11 crash querying GL_NUM_EXTENSIONS
Robert Osfield
2010-11-03 09:28:28 +00:00
079b1c293eFrom Chuck Seberino, "Here is a minor fix for the vrml plugin when building with Visual Studio 2010. 2010 has updated STL/TR1 libraries that create a naming conflict with the current source. The fix is to remove the 'using boost::next' line and use the fully-qualified boost::next to get rid of the ambiguity. Here is the patch and attached changes."
Robert Osfield
2010-11-02 14:00:50 +00:00
526b39060cFrom Brad Christiansen and Robert Osfield, "I have added the new function as suggested. The change was made against trunk from an hour or so ago. I haven't tested the performance yet (and probably won't get a chance till next week) but I have checked my terrains still work. I defaulted the equalization to off as I thought this was best until we can look into why there is the performance hit. ", note from Robert, tweaked the names and enabled the code path.
Robert Osfield
2010-11-02 12:15:18 +00:00
5da431a9a6From Mikhail Izmestev, "There is bug in GLBufferObject::compileBuffer when changed not first buffer entry, then generated new wrong offset. "
Robert Osfield
2010-11-02 11:44:20 +00:00
170da45842Fixed function name
Robert Osfield
2010-11-02 11:27:38 +00:00
316c1a88a9From Javier Taibo, " In current SVN code, when exporting an osgParticle::Particle object to the .osg file format, it crashes if no drawable was set in the particle.
Robert Osfield
2010-11-02 11:19:17 +00:00
112c272452From John Ivar Haugland & Robert Osfield, fix for bug in VisualStudio where it adds an redundent '/n' on the end of the command line arguments for no reason.
Robert Osfield
2010-11-01 17:19:39 +00:00
cc93824605From Alexander Irion, "When a osg::Geometry node is loaded from a ".osgb" file, there is no element buffer object created for the primitives element indices, although _useVertexBufferObjects is enabled. This bug decreases the rendering performance."
Robert Osfield
2010-11-01 17:05:53 +00:00
7b0a500ffcFrom Sukender, fix for incorrect for loop test.
Robert Osfield
2010-11-01 17:02:48 +00:00
fb4d6b16f9From Jan Peciva, "attaching Matrix_implementation fix for two problems:
Robert Osfield
2010-11-01 13:57:44 +00:00
2ce4b9d8e9From Jean-Sebastien Guay, osgDB functions to expand wildcards - required to aid windows consule usage as this doesn't not automatically expand * usage.
Robert Osfield
2010-11-01 11:06:12 +00:00
cd336a7d73From Jean-Sebastien Guay and Robert Osfield, cleaned up the way that unix/windows file separators are managed.
Robert Osfield
2010-11-01 10:52:20 +00:00
862a0c68e3From Mathias Goldau, "Added very brief documentation when to use the triangle mesh class. I generated the make doc_openscenegraph target to verify that this change does not break something. "
Robert Osfield
2010-11-01 10:31:30 +00:00
b5c57c3d68From Mikhail Izmestev, "I have discovered problem with draggers from osgManipulator in HUD.
Robert Osfield
2010-10-29 15:18:34 +00:00
0328691f76From Sherman Wilcox, "there's a bug in the cmake file for the tiff plugin. See attached. The problem was that the output files were not properly setting the debug/release libs due to this cmake bug. What occurred was the release lib was set in all configurations."
Robert Osfield
2010-10-29 09:56:09 +00:00
e47946086b
Robert Osfield
2010-10-29 09:35:54 +00:00
7672cc57c2Added X11_X11_LIB to LIB_EXTRA_LIBS when build X11 version of osgViewer to enable use of Mesa's GLES/EGL implementation
Robert Osfield
2010-10-29 08:33:10 +00:00
95902cd275Fixed warning
Robert Osfield
2010-10-29 08:31:54 +00:00
b3074ad92dCommented out unused ElapsedTimer
Robert Osfield
2010-10-28 15:52:52 +00:00
1b2c689122Added use ObjectWrapper's FinishObjectReadCallback to fix VertexBufferObject handling in osg::Geometry and a call to the TileLoaded callback in osgTerrain.
Robert Osfield
2010-10-28 14:04:57 +00:00
f1b660997bAdded FinishedObjectReadCallback to ObjectWrapper which allows wrappers to register their own handling of post processing of objects once they have been read.
Robert Osfield
2010-10-28 14:04:07 +00:00
b622a99178Added handling of vertex buffer objects into osg::Geometry copy constructor.
Robert Osfield
2010-10-28 14:01:47 +00:00
ea98b1a9f8Improved code style consistency
Robert Osfield
2010-10-28 14:01:10 +00:00
441d832536Quitened down debug messages
Robert Osfield
2010-10-28 14:00:25 +00:00
cb08e7544eFixed getEnableDepthWrites() naming.
Robert Osfield
2010-10-27 13:49:16 +00:00
13a8e92043Added command line options:
Robert Osfield
2010-10-26 14:59:12 +00:00
9978516bf7Added number of primitive sets to on screen stats
Robert Osfield
2010-10-25 13:42:01 +00:00
30dbcf1c72Added -o postfile option to allow the output of processed files
Robert Osfield
2010-10-23 09:51:11 +00:00
a2d99fc805Added StateSetManipulator usage
Robert Osfield
2010-10-22 16:44:52 +00:00
123c0a36c4Added support for enable VBO's and doing simplification.
Robert Osfield
2010-10-22 16:35:28 +00:00
89d09d7712Cleaned up main loop, so it's more readable, seperating out the paging and non paging implementations
Robert Osfield
2010-10-22 12:28:50 +00:00
f91944fbbfAdded paging support to osganalysis example
Robert Osfield
2010-10-22 12:19:22 +00:00
1a292ad8e3Integrated IncementalCompileOperation into DatabasePager.
Robert Osfield
2010-10-21 16:29:23 +00:00
2014e85259Added new osganalysis example as a testbed for profiling peformance of various aspects of OSG/OpenGL and scene graphs.
Robert Osfield
2010-10-21 16:28:23 +00:00
6ed74470b2Introduction of IncrementalCompileOperation support to DatabasePager.
Robert Osfield
2010-10-14 18:16:03 +00:00
00fe3c0417Introduced SubloadCallback::generatdTextureObject() method.
Robert Osfield
2010-10-14 13:35:36 +00:00
297be2290aFrom Wang Rui, warning fix.
Robert Osfield
2010-10-14 12:20:51 +00:00
8640929a2eFrom Brad Christiansen, fix function entry points under Windows to address crash
Robert Osfield
2010-10-14 11:10:16 +00:00
82c01cb72eFrom Wang Rui, QT based OpenThreads implementation
Robert Osfield
2010-10-14 09:31:09 +00:00
b55f75111eAdded support for using a custom osg::Geometry that attempts to force the OpenGL driver to download the texture object to graphics card.
Robert Osfield
2010-10-13 15:03:02 +00:00
ffa75c9c84Changed the _ARB cube map defines to non ARB versions.
Robert Osfield
2010-10-09 11:51:24 +00:00
a9dd08c3baRemoved redudent set up of GL_ cubemap defines as these are now also in include/osg/Texture
Robert Osfield
2010-10-09 11:27:45 +00:00
270a9fc47eTempory fix for regression due to remove of glPushAttrib/glPopAttrib
Robert Osfield
2010-10-08 18:53:16 +00:00
2aa231cd11Disabled the build of Qt examples when building against GLES1 & 2 as Qt GL includes OpenGL headers itself that cause conflict.
Robert Osfield
2010-10-08 18:13:10 +00:00
078b21fa1eBuild fixes for GLES1, GLES2 and GL3
Robert Osfield
2010-10-08 17:13:59 +00:00
9984281553Refactored the Texture3D extension setup in osg::Texture3D and gluBuild3DMipmaps and gluBuild3DMipmapLevels.
Robert Osfield
2010-10-08 11:20:56 +00:00
d23ce985a1Introduced osg namespace to new local GLU functions
Robert Osfield
2010-10-07 11:53:28 +00:00
12e6a23451Introduced new gluScaleImage function that uses a PixelStorageModes structure to pass in details on image packing, rather than relying upon glGet's to get the values.
Robert Osfield
2010-10-07 10:51:22 +00:00
021484440cAdded #define GL_PROXY_TEXTURE_3D
Robert Osfield
2010-10-06 19:09:48 +00:00
477524f254Fixed warning
Robert Osfield
2010-10-06 18:51:53 +00:00
46e798a4dcChanged tabs to 8 spaces
Robert Osfield
2010-10-06 18:37:43 +00:00
e928dfb6c7From Jean-Sebastien Guay and Robert Osfield, build fix for Windows
Robert Osfield
2010-10-06 18:34:36 +00:00
Robert Osfield