Cedric Pinson
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
2009-10-21 15:45:13 +00:00
Robert Osfield
9382800576
Added stats handler
2009-10-21 14:14:22 +00:00
Robert Osfield
23cfcb423f
Removed the disabling of display lists in osg::Geometry to bring it back to it's original behaviour
2009-10-21 14:11:00 +00:00
Robert Osfield
2785ea4dfb
Added support for automatic vertex aliasing to new ArrayDispatchers, and updated wrappers
2009-10-21 14:09:12 +00:00
Robert Osfield
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.
2009-10-21 11:18:13 +00:00
Robert Osfield
b7ffae25ce
Updated wrappers
2009-10-20 22:14:59 +00:00
Robert Osfield
6a56b6e6be
Refactored osg::Geometry::drawImplementation(..) to use new osg::ArrayDispatchers that encapsulate the task
...
of dispatch osg::Array data as OpenGL attributes.
2009-10-20 19:34:24 +00:00
Robert Osfield
b0057e258c
Fixed typo of osg_ModelViewMatrix
2009-10-20 13:15:01 +00:00
Stephan Maximilian HUBER
c500d5baf5
From Stephan Huber: updated XCode project
2009-10-19 11:06:53 +00:00
Robert Osfield
1ca1d31482
Fixed computation of osg_NormalMatrix
2009-10-19 08:58:52 +00:00
Robert Osfield
eb9ff0a311
Added support for multitexturing and vertex attributes to GLBeginEndAdapter
2009-10-17 19:22:14 +00:00
Robert Osfield
73ae1637c0
Fixed VS warning
2009-10-17 11:14:03 +00:00
Robert Osfield
37b77a2665
Updated wrappers
2009-10-16 18:50:42 +00:00
Robert Osfield
a0eba771e8
Updated wrappers
2009-10-16 17:22:20 +00:00
Robert Osfield
aefd1513f4
Ported osg::Geometry across to supporting the aliasing of vertex, color and normal etc. calls to Vertex Attributes.
...
Added support for automatic aliasing of vertex, normal, color etc. arrays to Vertex Attribute equivelants.
Added new osg::GLBeginEndAdapter class for runtime conversion from glBegin/glEnd codes to vertex arrray equivelants.
Added automatic shader source conversion from gl_ to osg_ builtins.
2009-10-16 16:26:27 +00:00
Robert Osfield
9e2567cb88
Made the use of the new projection and modelview matrix uniforms optional
2009-10-11 06:05:19 +00:00
Robert Osfield
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.
...
Attached is a version of PrimitiveSet that includes GL2Extensions."
2009-10-11 05:52:11 +00:00
Robert Osfield
98b36d202c
Updated Contributors list to fix for typo's in the ChangeLog, and updated the AUTHORS file for 2.9.6.
2009-10-10 14:50:16 +00:00
Robert Osfield
d59477c8f7
Updated ChangeLog, wrappers and Contributors lists
2009-10-10 11:28:42 +00:00
Robert Osfield
20930ac3a6
From Simon Julier, "Please find attached FindCOLLADA.cmake with a patch for a framework naming issue for Mac platforms.
...
The collada dom Makefiles actually build a framework called Collada14Dom.framework (debug: Collada14Dom-d.framework). The current CMake rules, however, only look for collada14dom. Normally, the difference in case wouldn't matter but the rule fails on case sensitive HPFS partitions.
"
2009-10-10 11:26:10 +00:00
Robert Osfield
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.
"
2009-10-10 11:06:30 +00:00
Robert Osfield
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."
2009-10-10 11:00:35 +00:00
Robert Osfield
972e68113d
From Mathias Froehlich, "This change eliminate an orphan stats block that sticks somewhere in the
...
screen stats display."
2009-10-10 10:58:39 +00:00
Robert Osfield
2c4b60cafc
Updated wrappers
2009-10-10 10:54:33 +00:00
Robert Osfield
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.
This is against the subversion trunk."
2009-10-10 10:07:40 +00:00
Robert Osfield
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."
2009-10-10 10:00:13 +00:00
Robert Osfield
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."
2009-10-10 09:53:10 +00:00
Robert Osfield
590aabb4fa
From Stephane Lamoliatte, "Here is a patch wich add two missing GL modes in the osg plug'in."
2009-10-10 09:45:47 +00:00
Robert Osfield
0ef684f6b5
To fix warning removed unncessary , from end to enum list.
2009-10-10 09:44:40 +00:00
Robert Osfield
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.
"
2009-10-10 09:41:28 +00:00
Robert Osfield
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."
2009-10-10 09:38:10 +00:00
Robert Osfield
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."
2009-10-10 09:35:16 +00:00
Robert Osfield
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...
...
This is fixed in the file attached."
2009-10-10 09:26:06 +00:00
Robert Osfield
61544f51b6
From Bob Kuehne, "imageio plugin fix, mac os x : remove double-qualified ctor - illegal syntax under gcc 4.2.1"
2009-10-10 09:23:03 +00:00
Robert Osfield
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."
2009-10-10 09:20:39 +00:00
Robert Osfield
f6166d1119
Introduced new uniforms for tracking the modelview and project matrices in shaders using non built-ins.
2009-10-09 13:39:11 +00:00
Robert Osfield
ba8d38b885
Added use of binding of vertex attributes to names
2009-10-09 10:39:55 +00:00
Robert Osfield
1babe771e7
Added remapping of gl_ and ftransform() variables to osg_ equivalents.
2009-10-08 16:23:40 +00:00
Robert Osfield
1cfe017209
Implemented remapping of gl_ builtins vertex attributes to osg_ equivlants.
2009-10-08 15:58:23 +00:00
Robert Osfield
3f55f3f140
New osgvertexattributes example designed to test conversion of fixed function scene graphs to use vertex shaders
...
and vertex attributes.
2009-10-08 14:29:54 +00:00
Stephan Maximilian HUBER
58b3fe2664
From Stephan Huber: updated XCode project
2009-10-08 14:13:49 +00:00
Robert Osfield
4ba7a58c85
Fixed vertex attribute access bug
2009-10-08 13:33:41 +00:00
Robert Osfield
2f3c1d0ff8
Quitened down debug messages
2009-10-08 10:44:01 +00:00
Robert Osfield
68b661c93b
Cleaned up the #define's for when GLU is not available
2009-10-08 09:27:54 +00:00
Robert Osfield
b9f42413a1
Fixed warning
2009-10-08 07:54:37 +00:00
Robert Osfield
2d26cbe7ab
Introduced optional build against the GLU library, using optional compile paths to enable/disable GLU related function.
...
To toggle the use of the GLU library adjust the OSG_GLU_AVAILABLE variable via ccmake . or CMakeSetup.
2009-10-07 19:42:32 +00:00
Robert Osfield
6992e8eedf
Fixed handling of rescale of image
2009-10-07 18:50:01 +00:00
Robert Osfield
284f75a111
Fixed setUsage typo in PixelDataBufferObject, and fixed data pointer management in Texture::applyTexImage2D_subload().
2009-10-07 13:02:51 +00:00
Robert Osfield
dff56a15c6
From J.P. Delport, fixed bug caused by a typo in PixelBufferObject constructor
2009-10-07 12:54:14 +00:00
Robert Osfield
ae7dfc5796
Fixed warnigns
2009-10-07 09:39:45 +00:00
