d8e3225cd8Fixed warnings
Robert Osfield
2010-12-17 11:46:42 +00:00
348870d7baAdded --speed <ratio> command line parameter to osgviewer to enable control of the speed that animation paths are played back at.
Robert Osfield
2010-12-17 11:19:29 +00:00
634dd421fcFixed the GLBufferObjectSet::deleteAllGLBufferObjets() and TextureObjectSet::deletaAllTextureObjects() methods and improved the checkConsistency() usage so it's now possible to switch if off completed from being compiled in.
Robert Osfield
2010-12-17 10:59:05 +00:00
95feb34ffaFixed the size computation
Robert Osfield
2010-12-15 19:44:29 +00:00
8b8dda86afRemoved no longer used static member variables
Robert Osfield
2010-12-15 16:30:48 +00:00
0e7cedab3aImprovements to GLBufferObject and TextureObject pools
Robert Osfield
2010-12-15 12:34:16 +00:00
c26a241c55Added report of ration of current size to max target size for buffer.
Robert Osfield
2010-12-14 20:22:34 +00:00
cac4f3afb5Added --speed option and output of buffer object and texture object pool stats at the end of the animation path.
Robert Osfield
2010-12-14 20:07:41 +00:00
3580108b3aAdded AnimationCompletedCallback, s/getTimeScale and s/getTimeOffset() method to enable finer control of AnimationPathManipulator.
Robert Osfield
2010-12-14 20:07:00 +00:00
65f95fe3feAdded methods for checking sizes of various buffer object/texture object pool sizes.
Robert Osfield
2010-12-14 19:29:01 +00:00
4b4b438d44Removed redundent MinimumNumberOfTextureObjectsToRetainInCache static variable
Robert Osfield
2010-12-14 15:28:31 +00:00
5f8def64ffImproved the parsing of output filename
Robert Osfield
2010-12-14 14:32:16 +00:00
b44baea35cAdded GLBufferObjectManager::reportStats()
Robert Osfield
2010-12-14 13:43:32 +00:00
bc07bab9a7From Alan Dickenson, "I modified the CPack CMake files to provide the ability to easily create packages of the OpenSceneGraph components.
Robert Osfield
2010-12-14 10:42:08 +00:00
cc348f86cbMoved Performer and Inventor plugins into block protected to only compile when not using GLES.
Robert Osfield
2010-12-14 08:58:27 +00:00
c0937c1614From Wang Rui, "A modified version is attached. The blank while generating is in fact used to avoid dual update traversals of the scene, which is not allowed in my application (but I forgot the reason ;-) Now the blank problem will disappear.
Robert Osfield
2010-12-14 08:53:20 +00:00
3145837629Renamed osgviewerQtContext to osgviewerQt, and removed deprecated examples from CMakeLists.txt
Robert Osfield
2010-12-13 17:54:27 +00:00
10fb8183ecMoved osgviewerQT and osgviewQtWidget to deprecated as osgviewerQtContext will no be the main Qt example
Robert Osfield
2010-12-13 17:50:57 +00:00
29a8ea2e88Moved osgbrowser into svn/trunk.
Robert Osfield
2010-12-13 17:50:00 +00:00
a4b0ca0310Move osgcegui into deprecated
Robert Osfield
2010-12-13 17:49:37 +00:00
c8081c52c8Have moved FindXUL.cmake to deprecated
Robert Osfield
2010-12-13 17:37:42 +00:00
bf6d45a531Have moved gecko plugin to deprecated
Robert Osfield
2010-12-13 17:36:02 +00:00
543b2ee56eAdded resizeGLObjectBuffers(uint) and relaseGLObjects(State*) to BufferData.
Robert Osfield
2010-12-13 17:09:31 +00:00
eb9510eb72Moved GraphicsWindowQt from osgviewerQtContext into osgQt.
Robert Osfield
2010-12-13 16:25:50 +00:00
c4fded0629Fixed warnings
Robert Osfield
2010-12-13 13:41:42 +00:00
1402583d17From Wang Rui, "Attachment is an example of rendering 3D scenes to high resolution screenshots.
Robert Osfield
2010-12-13 13:37:37 +00:00
c665fdc973Form Richard Schmidt, "The following features were added:
Robert Osfield
2010-12-13 12:16:57 +00:00
a345a04254From Wang Rui, "I implemented a customized viewer event traversal here to read state changes from the DirectInput devices and add events to the event queue. I've tested with the keyboard and joystick supports. Because of only having a very old 6-button gamepad, I can't do more experiments. Hope this will bring more ideas to those who face similar problems, especially simulation game designers. :)
Robert Osfield
2010-12-13 11:34:33 +00:00
14a12afb6cFrom Eduardo Poyart, "The attached patch fixes a race condition that caused OSG to try to render the scene before the window is realized. It works ok in my osgviewerWX-derived application under Linux."
Robert Osfield
2010-12-13 10:46:18 +00:00
ea5d88e54fAdded TODO notes
Robert Osfield
2010-12-12 10:00:57 +00:00
d9ab15bd4cFrom Wojciech Lewandowski, added docs on Swap Method env vars and command line options
Robert Osfield
2010-12-12 09:58:45 +00:00
c12b04368aFrom Trajce Nikolov, "attached is a fix for the txp loader (in TileMapper). The code was giving wrong parent tile ids using the stack - I implemented differnt approach for that"
Robert Osfield
2010-12-12 09:52:29 +00:00
244e751146From David Fries, "The ffmpeg lockmanager was introduced in ffmpeg 52 30 1, but later backported to 52 20 1, so add that to the version check in ReaderWriterFFmpeg.cpp."
Robert Osfield
2010-12-12 09:40:16 +00:00
b4dad9bac3From David Fries, "Avoid a terrapage crash with outstanding requests to a removed archive file. ReaderWriterTXP::getArchiveName will create an archive if it doesn't exist. This is causing a crash if the terrain is removed and there are outstanding database requests in the database pager. The request will create a new archive, and as the archive is newly create doesn't have the materials etc to support the subtile that was just loaded. To fix the problem getArchiveName will only return existing archives. createArchiveName was added to create archives. "
Robert Osfield
2010-12-12 09:37:14 +00:00
c959bab0a6From Wojciech Lewandowski, "As suggested I have added missing method to PerContextProgram. Tested with our programs.
Robert Osfield
2010-12-12 09:22:09 +00:00
df5210f729From Wang Rui, "I've found a possible bug in the new SmoothingVisitor implementation (with a great 'crease angle' feature), which will crash if the normal array is already set but without BIND_PER_VERTEX. I just believe that we should reallocate the normal array in these cases, as the old implementation does. "
Robert Osfield
2010-12-12 08:56:58 +00:00
08d21d8777Introuced a local typedef of the index array type to keep the functor parameters consistent
Robert Osfield
2010-12-12 08:54:58 +00:00
09ebb061c2From Cedric Pinson, "Here a small fix about gdal plugin used to read dem file, if you dont setup the log level to INFO it does not work. It's because of this line: OSG_INFO << " GetGeoTransform == "<< dataset->GetGeoTransform(geoTransform)<<"
Robert Osfield
2010-12-11 15:12:09 +00:00
017a03ffe5Refactor of DatabasePage/IncrementalCompileOperation to use the IncrementalCompileOperator for compiling objects
Robert Osfield
2010-12-10 15:27:19 +00:00
c040b25699Build fixes to keep up with changes in head inclusions/API in osgDB
Robert Osfield
2010-12-10 13:22:21 +00:00
8707758429Added handling of CoordinateSystemNode when they decorate a loaded model, copying the contents of the CoordinateSystemNode across to the Terrain node
Robert Osfield
2010-12-09 12:16:11 +00:00
067695bec4Updated version number for 2.9.11 dev release
Robert Osfield
2010-12-08 11:01:37 +00:00
3d67b7a7ebFrom Ulrich Hertlein, "attached are patches to osgTerrain that fix some typos and add a bit of documentation. "
Robert Osfield
2010-12-08 10:34:29 +00:00
ebeed76643Added protection against the Registry from being deleted prior to the proxy objects unregistering themselves
Robert Osfield
2010-12-08 09:54:23 +00:00
1b42084217Fixes for benign threading memory contentions.
Robert Osfield
2010-12-08 09:52:58 +00:00
b2cf978ae3Renamed YES and NO enums with more description names that don't overlap with iOS #define's
Robert Osfield
2010-12-06 10:35:02 +00:00
76e8a1a1faUpdated ChangeLog and AUTHORS for release
Robert Osfield
2010-12-03 19:04:50 +00:00
bc4f2c1209From Johannes Bauerle, "When trying to use the osgText functionality in an osg application built without support for the fixed function pipeline I got a lot of warning messages about invalid calls. I found two indirect calls to the glTexEnv in the file Text.cpp:
Robert Osfield
2010-12-03 17:50:38 +00:00
c70679107dRemoved redundent call.
Robert Osfield
2010-12-03 17:20:32 +00:00
9df56ad858Commented out debug message
Robert Osfield
2010-12-03 14:24:23 +00:00
06509b9769Introduced bool Texture2D::textureObjectValid(State) and bool SubloadCallback::textureObjectValid(Texture2D&,State&) method to make it tell Texture2D::apply() whether the texture object is still valid or whether it's no longed valid for the any changes to the image attached to the Texture
Robert Osfield
2010-12-03 14:18:16 +00:00
0754a78ddbFrom Ulrich Hertlein, "Attached; here's a summary of the changes: - CMakeLists.txt -- don't look for GL when compiling for iOS (device or simulator), look for OGLES instead -- use architecture i386 for simulator -- removed iphoneos-version-min for simulator
Robert Osfield
2010-12-02 14:20:52 +00:00
65aee287e7From Mathias Froehlich, "Attached are most of the fixes that are required to build osg on solaris and hpux. I have skipped irix this time as irix is too dead to keep osg building there.
Robert Osfield
2010-12-02 14:13:54 +00:00
e26eab96f4Ran dos2unix to fix line endings
Robert Osfield
2010-12-02 14:01:54 +00:00
88a76e7b69From Brad Christiansen, commented out debug messages
Robert Osfield
2010-12-02 13:53:10 +00:00
ca0a556579Removed redudent makeCurrentImplementation() that was causing a crash in osgscreencapture.
Robert Osfield
2010-12-02 09:39:31 +00:00
487af07753Updated AUTHORS and Contributors.cpp to reflect new ChangeLog correctly
Robert Osfield
2010-12-01 20:14:34 +00:00
a38f5140ffFrom Jason Daly, "OK, I dug a bit into the CMake scripts and found a fairly obvious solution to the QtWebkit issue on RHEL 6 (see my other message on osg-users). I just moved the osgQtWidgets example in examples/CMakeLists.txt under the check for QtWebKit.
Robert Osfield
2010-12-01 19:49:03 +00:00
79f154c30fUpdated ChangeLog
Robert Osfield
2010-12-01 14:03:10 +00:00
78b15f8e17From Fabien Lavignotte, "I use Texture2D::copyTexImage2D to generate some textures at each frame on a PagedLOD databases. There was some performance problems after a long run, because textures created with copyTexImage2D were not reused. After investigation, there is a problem with the Texture Pool when a texture object is created with an empty profile, and then move after creation to TextureObjectSet with good profile using setAllocated method. I have just changed a little bit the code of Texture2D::copyTexImage2D, to generate the texture object with the good profile at the start."
Robert Osfield
2010-12-01 13:33:31 +00:00
9c0e56d7a0From "Matthew Roberso, I've attached a small fix to the src/osgWrappers/serializers/osg/Texture2DArray.cpp against the svn head r11965 it simply calls setTextureDepth before attempting to load the individual textures into the array. Currently without that the loading fails with the following printout "Warning: Texture2DArray::setImage(..) failed, the given layer number is bigger then the size of the texture array." and the texture array is empty if loaded from an osga/b."
Robert Osfield
2010-11-30 16:22:37 +00:00
e9cd13f120Fixed the readObject method so it could handle reading from a file contains any valid type of osg::Object
Robert Osfield
2010-11-30 14:36:37 +00:00
55749eda59Added passing of existingObj parameter
Robert Osfield
2010-11-30 12:34:06 +00:00
a7ff553925From Stephan Huber, compile fix for iOS
Robert Osfield
2010-11-30 11:34:33 +00:00
5723050580From Ulrich Hertlein and Stephan Huber, improves to iOS build
Robert Osfield
2010-11-30 09:26:18 +00:00
60457486b0From Wang Rui, Compile fixes
Robert Osfield
2010-11-30 08:12:06 +00:00
e5a9eaa711From Tim Moore, "Here is initial support for uniform buffer objects. The binding between a buffer object and an indexed target is implemented as a new StateAttribute, UniformBufferBinding. I've included an example program based on the code in the ARB_uniform_buffer_object specification.
Robert Osfield
2010-11-29 17:43:27 +00:00
0739c15e0aRemoved deperecated variables that are no longer used.
Robert Osfield
2010-11-29 09:32:43 +00:00
b523cb15c1From Tomas Holgarth and Stephan Huber, " attached you'll find the second part of the IOS-submission. It contains
Robert Osfield
2010-11-26 18:19:28 +00:00
d8d47199f2From Katharina Plugge, fix for regression in handling of multitexturing.
Robert Osfield
2010-11-26 17:37:42 +00:00
b9ae28d344From Eduardo Poyart, OSG patch: made it read ancillary IndexedStrings into MultiSwitch
Robert Osfield
2010-11-26 17:35:06 +00:00
3f6c837a5aUpdated ChangeLog
Robert Osfield
2010-11-26 17:32:10 +00:00
ebfcb17744From Marin Platings and Robert Osfield, fix of Uniform unique ID by making osg::Object::setName() virtual.
Robert Osfield
2010-11-26 13:54:11 +00:00
4820157fedFrom Martin Beck, " recently we noticed a little mistake for 3DS files using instances of the same meshs: Every groupnode gets the same name instead of the (correct) instance name of the object. The fix only consists of two additional lines which check whether an instance_name is given for the object and then uses this one instead of the node name."
Robert Osfield
2010-11-26 12:44:53 +00:00
896b8c58d4From Fabien Lavignotte, "There was a small bug when using the new serializer with AnimationPath. The serializer assumes NO_LOOPING is the defaut for LoopMode, but in fact it is LOOP. The new serializer avoids to write default values in text mode, so the loop mode is not always correctly set."
Robert Osfield
2010-11-26 12:23:56 +00:00
1a69b98ca1Removed debug messages
Robert Osfield
2010-11-26 12:22:06 +00:00
8a929ea923From Magnus Kessler, "Typo in usage string of examples/osganalysis
Robert Osfield
2010-11-26 10:31:34 +00:00
d7b161078aFrom Thomas Hogarth and Stephan Huber, "attached you'll find part one of iphone-support. It includes
Robert Osfield
2010-11-25 16:06:04 +00:00
1bd55d732dFrom Tim Moore, fix to stats timing
Robert Osfield
2010-11-25 13:00:24 +00:00
cdfbb7a753From Michael Platings, To address performance bottleneck that occurs when using large number of uniforms introduced a name to uniqued ID scheme for Uniforms so comparisons can be done on a uint rather than a string.
Robert Osfield
2010-11-25 12:30:38 +00:00
4b4e02e45bFrom Hartwig Wiesmann, "in the files Image, Observer and TerrainTechnique unused parameters exist resulting in a couple of compiler warnings (depending on the compiler settings though). The attached patches comment out the unused parameter names. "
Robert Osfield
2010-11-25 12:07:59 +00:00
509980d515From Magnus Kessler, "applications/osgconv: fix typo in tool options
Robert Osfield
2010-11-25 11:59:33 +00:00
c89c2502edRemoved default assignement of GeometryTechnique as the TerrainTechniquePrototype.
Robert Osfield
2010-11-25 11:40:09 +00:00
c1da825a7bFrom Wang Rui, "I'd like to provide a quick updates of the new tessellation shader serializers and dotosgwrappers. It includes reading/writing supports for the two new shader types and the GL_PATCHES enum. The setParameterfv() method is not wrapped at present because it is still not finished.
Robert Osfield
2010-11-24 20:26:08 +00:00
1a227bf35eFrom Jean-Sebastien Guay, build fixes for windows.
Robert Osfield
2010-11-24 20:20:57 +00:00
5c97f0a7edAdded workaround for AMD/ATI driver bug
Robert Osfield
2010-11-24 17:01:09 +00:00
043ae090a5From Tim Moore, Fix for drivers that don't properly support timer extensions.
Robert Osfield
2010-11-24 10:38:28 +00:00
e2a315ee49From Wojciech Lewandowski, "1: fix for a issue with MinimalShadowMap and LightSpacePerspectiveShadowMapVB techniques ignoring minLightMargin parameter. 2: minor tweak for a DebugHUD drawn improperly case when multiple slave views shared one window. It now uses slave view viewport to correctly position DebugHUD. 3: deactivated ConvexPolyhedron notifications (they were accidentaly activated when you replaced osg::notify calls with OSG_NOTIFY macro). These warnings are useful only for shadow map developer working on shadow volume optimizations. So there is no sense in having them active all the time."
Robert Osfield
2010-11-24 10:09:04 +00:00
0ee0aad0feMoved TextNode from osgText into example/osgtext3D in prep for 3.0
Robert Osfield
2010-11-23 17:33:43 +00:00
d7747685b3From Holger Helmich, Tessellation shader support
Robert Osfield
2010-11-23 14:50:31 +00:00
5b3691e602From David Callu, "Here a fix for pssm.
Robert Osfield
2010-11-23 11:11:58 +00:00
04b6a0888bBuild fixes for building OSG with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF
Robert Osfield
2010-11-22 19:38:18 +00:00
ca9771f7baFixed typo
Robert Osfield
2010-11-22 19:18:00 +00:00
1cbaadd7b2From Michael Platings, "the attached cmake file recognises the latest version of the FBX SDK, and now works correctly on 64 bit Windows."
Robert Osfield
2010-11-22 17:39:43 +00:00
78cdf41d53From Michael Platings, "the build is broken if you have the OSG_REF_PTR_IMPLICIT_OUTPUT_CONVERSION turned off - the attached files fix this."
Robert Osfield
2010-11-22 17:37:35 +00:00
e36c4d3a3bFrom Stephan Huber, "attached you'll find a proposal for handling multi-touch-events with osgGA. My approach is to bundle all touchpoints into one custom data structure which is attached to an GUIEventAdapter.
Robert Osfield
2010-11-22 17:30:44 +00:00
27afe58f77Fixed indentation
Robert Osfield
2010-11-22 15:52:20 +00:00
0235448cd1From Johan Nouvel, "I've attached ReaderWriterVRML2.h. It is the same as the previous one, I've just add supportsOption() calls."
Robert Osfield
2010-11-22 11:31:35 +00:00
9b70348cedFixed typo of commercial
Robert Osfield
2010-11-22 11:22:03 +00:00
1d7222f59fFrom Hartwig Wiesmann, fix to font search path under OSX.
Robert Osfield
2010-11-22 10:41:04 +00:00