FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 3ae394f6a0 From Stephan Huber: updated XCode project Stephan Maximilian HUBER 2009-10-22 08:28:43 +00:00
  • 4d1a844fb1 Making 2.8.2b release. OpenSceneGraph-2.8.2b Paul MARTZ 2009-10-21 22:39:49 +00:00
  • 5c7990156d ChangeLog: Update ChangeLog. Paul MARTZ 2009-10-21 22:37:29 +00:00
  • 7269f71c47 Add CMake-controllable option to avoid doing a glBlitFramebuffer into depth to resolve multisampling. This works arouns a hang on OS X with NVIDIA GeForce 8800 and v1.5.49 drivers. Paul MARTZ 2009-10-21 21:45:55 +00:00
  • 32fb841e58 From Paul Martz: Branch of the 2.8.2 release to add workaround for issue on OS X NVIDIA driver 1.5.49. glBlitFramebuffer on both color and depth locks the OS X desktop. Fix is a CMake-controlled switch, when enabled, the glBlitFramebuffer does not blit depth. This produces acceptable results because apps doing RTT generally don't need to resolve MSFBO to depth. Paul MARTZ 2009-10-21 20:13:37 +00:00
  • 9b04a9379b Added Translatef, Scalef, Rotatef methods, and fixed Color4f method. Robert Osfield 2009-10-21 16:42:12 +00:00
  • b0db1a6171 Removed redundent spaces Robert Osfield 2009-10-21 16:41:41 +00:00
  • 5e6415696f Removed remaining glBegin/glEnd usage Robert Osfield 2009-10-21 16:40:45 +00:00
  • e96642f864 Conveted osgText across to using GLBeginEndAdapter instead og glBegin/glEnd Robert Osfield 2009-10-21 16:31:37 +00:00
  • 04ddb2dee5 Converted all glBegin/glEnd code across to using osg::GLBeginEndAdapter Robert Osfield 2009-10-21 16:16:31 +00:00
  • 126462bb0b Added stats handler to track performance effects of new GLBeginEndAdapter usage Robert Osfield 2009-10-21 15:48:11 +00:00
  • 4372ec3cba From Cedric Pinson, this commit contains the following change: * Change ref_ptr to observer_ptr to avoid cross reference and leak in Skinning * Set invalidate to true to re run the check visitor in Skeleton * Shallow copy Sampler in channel copy constructor * Add accessor in VertexInfluence * Remove dead code in Timeline.cpp * Dont force linking in Bone::UpdateBone, the decision is done by the user or the manager * Add offset in timeline stats to display each manager on the screen * Add a flag in animation manager base to enable or not automatic link when modifying the manager Cedric Pinson 2009-10-21 15:45:13 +00:00
  • 9382800576 Added stats handler Robert Osfield 2009-10-21 14:14:22 +00:00
  • 23cfcb423f Removed the disabling of display lists in osg::Geometry to bring it back to it's original behaviour Robert Osfield 2009-10-21 14:11:00 +00:00
  • 2785ea4dfb Added support for automatic vertex aliasing to new ArrayDispatchers, and updated wrappers Robert Osfield 2009-10-21 14:09:12 +00:00
  • 9499b19b43 Moved the ArrayDispatchers management so that osg::State now has a ArrayDispatchers object that any osg::Geometry can reuse, and optimized the implementation to reduce the CPU overhead. Robert Osfield 2009-10-21 11:18:13 +00:00
  • b7ffae25ce Updated wrappers Robert Osfield 2009-10-20 22:14:59 +00:00
  • 6a56b6e6be Refactored osg::Geometry::drawImplementation(..) to use new osg::ArrayDispatchers that encapsulate the task of dispatch osg::Array data as OpenGL attributes. Robert Osfield 2009-10-20 19:34:24 +00:00
  • b0057e258c Fixed typo of osg_ModelViewMatrix Robert Osfield 2009-10-20 13:15:01 +00:00
  • c500d5baf5 From Stephan Huber: updated XCode project Stephan Maximilian HUBER 2009-10-19 11:06:53 +00:00
  • 1ca1d31482 Fixed computation of osg_NormalMatrix Robert Osfield 2009-10-19 08:58:52 +00:00
  • eb9ff0a311 Added support for multitexturing and vertex attributes to GLBeginEndAdapter Robert Osfield 2009-10-17 19:22:14 +00:00
  • 73ae1637c0 Fixed VS warning Robert Osfield 2009-10-17 11:14:03 +00:00
  • 37b77a2665 Updated wrappers Robert Osfield 2009-10-16 18:50:42 +00:00
  • a0eba771e8 Updated wrappers Robert Osfield 2009-10-16 17:22:20 +00:00
  • aefd1513f4 Ported osg::Geometry across to supporting the aliasing of vertex, color and normal etc. calls to Vertex Attributes. Robert Osfield 2009-10-16 16:26:27 +00:00
  • 9e2567cb88 Made the use of the new projection and modelview matrix uniforms optional Robert Osfield 2009-10-11 06:05:19 +00:00
  • f479eb174c From Paul Martz, "A recent change to add the new geometry shader primitive types has broken the build on Windows. On Windows, those types are declared in the header GL2Extensions, but the PrimitiveSet header (which uses those types) fails to include that header, causing compile errors. Robert Osfield 2009-10-11 05:52:11 +00:00
  • 98b36d202c Updated Contributors list to fix for typo's in the ChangeLog, and updated the AUTHORS file for 2.9.6. Robert Osfield 2009-10-10 14:50:16 +00:00
  • d59477c8f7 Updated ChangeLog, wrappers and Contributors lists Robert Osfield 2009-10-10 11:28:42 +00:00
  • 20930ac3a6 From Simon Julier, "Please find attached FindCOLLADA.cmake with a patch for a framework naming issue for Mac platforms. Robert Osfield 2009-10-10 11:26:10 +00:00
  • 3fce07e5e5 From Cesar L.B. Silveira, "I have written these few lines of code which allow setting the label of an osgWidget::Label with an osgText::String. I had to do this on a project I'm working on, because I needed UTF-8 strings on my labels, and using setLabel with std::string was not working. " Robert Osfield 2009-10-10 11:06:30 +00:00
  • 058d31d7b5 From Mathias Froehlich, "Tha attached change adapt previous attemps to get our application using osg through microsofts application verifier. The current change should work a little better ... The change is based on rev 10605." Robert Osfield 2009-10-10 11:00:35 +00:00
  • 972e68113d From Mathias Froehlich, "This change eliminate an orphan stats block that sticks somewhere in the screen stats display." Robert Osfield 2009-10-10 10:58:39 +00:00
  • 2c4b60cafc Updated wrappers Robert Osfield 2009-10-10 10:54:33 +00:00
  • ef1c9d9e3c From David Fries, "The Extensions object was calling _gl_get_query_objectui64v but checking _gl_get_query_objectuiv_arb which is a different function pointer. Changed to check the function being called. Robert Osfield 2009-10-10 10:07:40 +00:00
  • a601754450 From Chris Denham, "I discovered a memory leak in the ZIP plugin, which was caused by a missing call to CloseZip. I attach a modified ReaderWriterZIP.cpp (based on version 2.9.5 revision 10374). This includes a little bit of code tidying, but the only functional change is a test of the return value of OpenZip and the addition of a call to CloseZip." Robert Osfield 2009-10-10 10:00:13 +00:00
  • ae440bfaef From Wojciech Lewandowski, "ref_ptr usage changes made on 9th of June broke VirtualProgram used in osgShaderCompositor example. Taking the opportunity I modified the code a little to use earth sphere as default model. Cow.osg used previously was not looking good in advanced example. I also changed default to advanced example, because its more informative with labels describing virtual programs used to render the objects." Robert Osfield 2009-10-10 09:53:10 +00:00
  • 590aabb4fa From Stephane Lamoliatte, "Here is a patch wich add two missing GL modes in the osg plug'in." Robert Osfield 2009-10-10 09:45:47 +00:00
  • 0ef684f6b5 To fix warning removed unncessary , from end to enum list. Robert Osfield 2009-10-10 09:44:40 +00:00
  • 10deffdc41 From Stephane Lamoliatte, "Here is a patch wich improves the support for geometry shaders in OpenSceneGraph. It adds new PrimitiveSet constants for the specific geometry shader primitive types : - LINES_ADJACENCY - LINE_STRIP_ADJACENCY - TRIANGLES_ADJACENCY - TRIANGLE_STRIP_ADJACENCY It also adds some missing features to the glsl reader plug'in. " Robert Osfield 2009-10-10 09:41:28 +00:00
  • 41b0c923e6 From Roger James, "When you merged my last set of changes into FindCOLLADA.cmake you omitted the changes to find the DOM22 libraries. Collada 1.4 DOM 2.2 seems to work OK for me on windows platforms. I have attached the changes again if you want to apply them." Robert Osfield 2009-10-10 09:38:10 +00:00
  • e1b3874fd2 From Cedric Pinson, "Here an update of osganimationtimeline example, the callback did not follow the callback api, i updated to fix this, then the callback are called correctly." Robert Osfield 2009-10-10 09:35:16 +00:00
  • 0aed782a47 From Jean-Sebastien Guay, "osgWidget::Window::setWindow() calls parented() (which does an addChild()) on the new window, but it does not call unparented() (which does a removeChild()) on the old window before. So it works fine if there was no window previously, but if an app creates new windows and calls setWindow() to replace the previous one, they will all add up instead and be on top of each other... Robert Osfield 2009-10-10 09:26:06 +00:00
  • 61544f51b6 From Bob Kuehne, "imageio plugin fix, mac os x : remove double-qualified ctor - illegal syntax under gcc 4.2.1" Robert Osfield 2009-10-10 09:23:03 +00:00
  • 01b5bf97f4 From Bob Kuehne, "fix for 10.6/darwin: this fix changes what i believe to be a typo in the os x darwinutils file from ID to id, the proper objective-c name for a type." Robert Osfield 2009-10-10 09:20:39 +00:00
  • f6166d1119 Introduced new uniforms for tracking the modelview and project matrices in shaders using non built-ins. Robert Osfield 2009-10-09 13:39:11 +00:00
  • ba8d38b885 Added use of binding of vertex attributes to names Robert Osfield 2009-10-09 10:39:55 +00:00
  • 1babe771e7 Added remapping of gl_ and ftransform() variables to osg_ equivalents. Robert Osfield 2009-10-08 16:23:40 +00:00
  • 1cfe017209 Implemented remapping of gl_ builtins vertex attributes to osg_ equivlants. Robert Osfield 2009-10-08 15:58:23 +00:00
  • 3f55f3f140 New osgvertexattributes example designed to test conversion of fixed function scene graphs to use vertex shaders and vertex attributes. Robert Osfield 2009-10-08 14:29:54 +00:00
  • 58b3fe2664 From Stephan Huber: updated XCode project Stephan Maximilian HUBER 2009-10-08 14:13:49 +00:00
  • 4ba7a58c85 Fixed vertex attribute access bug Robert Osfield 2009-10-08 13:33:41 +00:00
  • 2f3c1d0ff8 Quitened down debug messages Robert Osfield 2009-10-08 10:44:01 +00:00
  • 68b661c93b Cleaned up the #define's for when GLU is not available Robert Osfield 2009-10-08 09:27:54 +00:00
  • b9f42413a1 Fixed warning Robert Osfield 2009-10-08 07:54:37 +00:00
  • 2d26cbe7ab Introduced optional build against the GLU library, using optional compile paths to enable/disable GLU related function. Robert Osfield 2009-10-07 19:42:32 +00:00
  • 6992e8eedf Fixed handling of rescale of image Robert Osfield 2009-10-07 18:50:01 +00:00
  • 284f75a111 Fixed setUsage typo in PixelDataBufferObject, and fixed data pointer management in Texture::applyTexImage2D_subload(). Robert Osfield 2009-10-07 13:02:51 +00:00
  • dff56a15c6 From J.P. Delport, fixed bug caused by a typo in PixelBufferObject constructor Robert Osfield 2009-10-07 12:54:14 +00:00
  • ae7dfc5796 Fixed warnigns Robert Osfield 2009-10-07 09:39:45 +00:00
  • 69557c060b Fixed the TextureObject's + GLBufferObject reassignment to a new set. Robert Osfield 2009-10-06 13:42:12 +00:00
  • e6a1429335 Refactored the ::getOrCreate*Object() methods to clean them up and fix a bug in the getOrCreateElementsBuffers method. Robert Osfield 2009-10-06 09:28:41 +00:00
  • 98c79e4918 From Andreas Goebel, fix to bug in ShapeDrawable::accept(PrimitiveFunctor) implementation for cylinder Robert Osfield 2009-10-05 13:41:16 +00:00
  • 5d3b8fe2b0 Added missing export Robert Osfield 2009-10-04 08:52:01 +00:00
  • de88eb197c Removed erroneous inclusion of extra GLBufferObjectManager qualifier that broke Windows build Robert Osfield 2009-10-03 15:10:13 +00:00
  • 32b21dbb89 Introduced new GLBufferObject pool for managing the memory footprint taken up by VertexBufferObejct, ElementBufferObject and PixelBufferObject. Robert Osfield 2009-10-03 09:25:23 +00:00
  • f75013d534 Introduced new BufferObject design + implementation in preperation of implementing a pool system for buffer objects Robert Osfield 2009-10-01 20:19:42 +00:00
  • cfac6a7809 From Michael Platings, In Target, the default constructor is explicitly called on _target. This is necessary for FloatTarget and DoubleTarget so that _target is initialised to 0, otherwise you get a junk value. In MorphGeometry.cpp, UpdateMorph::link now links channels of the same index to the same target. Previously a new FloatTarget was created for each channel, so multiple animations didn't work. Cedric Pinson 2009-10-01 17:08:16 +00:00
  • 2eff3daaab Fixed warning about max texture size being smaller than the currently used texture pool size Robert Osfield 2009-09-27 15:21:05 +00:00
  • 1fce3c0ad1 Added handling of resetting of the texture object format Robert Osfield 2009-09-27 15:14:57 +00:00
  • e59f654290 Added status collection to full range of texture classes Robert Osfield 2009-09-27 14:38:38 +00:00
  • 9a1cd7072f Improved the computation of the TextureProfile _size value, fixed the computation up of the miplevels Robert Osfield 2009-09-26 16:28:42 +00:00
  • 4d75729650 Added stats collection to new Texture Pool code, and improved TexturePool implementation. Robert Osfield 2009-09-25 18:05:54 +00:00
  • 6bc9c626f4 Fixed warning Robert Osfield 2009-09-25 18:03:49 +00:00
  • a74af20b54 Added return at end of to fix warning Robert Osfield 2009-09-24 10:11:32 +00:00
  • 216849f73a From Jean-Sebastien Guay, fixed Widows build and updated the SO version Robert Osfield 2009-09-23 15:16:34 +00:00
  • 0c0f96ac3d Moved setting of TexturePoolSize into State. Robert Osfield 2009-09-23 14:54:13 +00:00
  • d56499025b Introduced memory pool size management Robert Osfield 2009-09-23 13:51:20 +00:00
  • 3d75054e2c Preliminary work on support for a texture object pool that is designed to help manage resources down the GPU more tightly. Robert Osfield 2009-09-22 18:45:24 +00:00
  • 26925be4f4 Change win32 external library to wsock32.lib Robert Osfield 2009-09-20 09:26:26 +00:00
  • c1d67b7e17 Added Ws2_32.lib to link of dicom plugin under Win32 Robert Osfield 2009-09-19 09:18:42 +00:00
  • 3c03682b4c Introduced new osgQtBrowser example. Robert Osfield 2009-09-17 13:40:53 +00:00
  • b59556e2e6 Updated wrappers Robert Osfield 2009-09-14 16:07:27 +00:00
  • e53876bae9 Fixed bug in interpolation of colour values Robert Osfield 2009-09-11 13:08:49 +00:00
  • 16312a4aa0 Added tf-255 option to volume tag Robert Osfield 2009-09-10 16:39:05 +00:00
  • 2b3d76aade From Cedric Pinson, Fix createKeyframeContainerFromTargetValue to recreate its sampler from scratch to not change keyframe container of another sampler Cedric Pinson 2009-09-09 18:13:24 +00:00
  • 1e768c0631 Added reset of the ImageDetails values of TexelOffset and TexelScale. Robert Osfield 2009-09-09 15:22:04 +00:00
  • 251ec3c4f0 Added support for using the ImageDetails to fill in the Locator and TexelScale/Offset values in the ImageLayer Robert Osfield 2009-09-09 13:31:32 +00:00
  • 13a7ecebde Added support for "--output filename.osg" command line option to avoid debugging of generated presentations Robert Osfield 2009-09-09 13:23:49 +00:00
  • d28b052fb7 From Cedric Pinson, remove unsused files include/osgAnimation/AnimationManager and src/osgAnimation/AnimationManager.cpp Cedric Pinson 2009-09-09 09:54:29 +00:00
  • 9b95a78e5d From Michael Platings, I have removed Target::normalize() as calling it was incorrect - the interpolation is already done in such a way that the Target's value is always normalized. Finally, I have fixed TemplateTarget<osg::Quat>::lerp() as it was giving incorrect results when interpolating between some small rotations. From Cedric Pinson, i renamed the method in channel to be more general. Adjusted the CubicBezier key constructor to use a single value as input. Cedric Pinson 2009-09-09 09:52:54 +00:00
  • a851b0b412 Tweaked debugging info Robert Osfield 2009-09-08 15:36:44 +00:00
  • 5c2e89ac28 Fixed the set up of osgVolume::ImageLayer scale and offset. Robert Osfield 2009-09-08 15:36:28 +00:00
  • b2a3d84d08 Added filter for .filename files Robert Osfield 2009-09-07 12:51:00 +00:00
  • 8f16d2d9a5 updated XCode project Stephan Maximilian HUBER 2009-09-07 12:21:03 +00:00
  • 7201ce1960 Updated volume setup code to use the new ImageDetails structure. Robert Osfield 2009-09-07 10:54:08 +00:00
  • 0b3284072d Added check for null masterLocator Robert Osfield 2009-09-07 10:50:48 +00:00
  • b9e4313029 Fixed assingment of layerLocator Robert Osfield 2009-09-07 08:30:54 +00:00
  • 80be1d9dd6 Fixed empty lines Robert Osfield 2009-09-04 09:11:49 +00:00