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

From Michael Platings, "Here's the all-new, all-dancing DAE plugin, with support for reading

Browse Source 
osgAnimation. It's been tested with the majority of the samples in the
COLLADA test repository and works with all of them either as well as, or
better than, the version of the plugin currently in SVN.

Known issue: vertex animation (AKA morphing) doesn't work at present,
but that's a relatively unpopular method of animating so it's not high
on my priority list."

Follow up email:
"I've been informed that the previous DAE submission didn't build on
unix, so here's the submission again with the fixes.  Thanks to Gregory Potdevin and Benjamin Bozou.
Also, my apologies to Roland for not crediting his part in making DAE
animation happen, my work was indeed built on top of his work. Thanks
also to Marius Heise and of course Cedric Pinson."

Changes by Robert Osfield, fixed compile issues when compile without C* automatic conversion enabled in ref_ptr<>
and constructor initialization fixes to address some warnings under gcc.
This commit is contained in:
Robert Osfield
2010-02-26 14:41:50 +00:00
parent e9fa0bc5e3
commit bbca791251
22 changed files with 4812 additions and 1577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgPlugins/dae/daeRSceneObjects.cpp
View File

@@ -27,9 +27,9 @@
#include <osg/CameraView>
#include <osg/LightModel>
using namespace osgdae;
using namespace osgDAE;
osg::Node* daeReader::processOsgMultiSwitch(domTechnique* teq)
osg::Group* daeReader::processOsgMultiSwitch(domTechnique* teq)
{
osgSim::MultiSwitch* msw = new osgSim::MultiSwitch;
@@ -86,7 +86,7 @@ osg::Node* daeReader::processOsgMultiSwitch(domTechnique* teq)
return msw;
}
osg::Node* daeReader::processOsgSwitch(domTechnique* teq)
osg::Group* daeReader::processOsgSwitch(domTechnique* teq)
{
osg::Switch* sw = new osg::Switch;
@@ -112,7 +112,7 @@ osg::Node* daeReader::processOsgSwitch(domTechnique* teq)
return sw;
}
osg::Node* daeReader::processOsgSequence(domTechnique* teq)
osg::Group* daeReader::processOsgSequence(domTechnique* teq)
{
osg::Sequence* sq = new osg::Sequence;
@@ -219,7 +219,7 @@ osg::Node* daeReader::processOsgSequence(domTechnique* teq)
}
osg::Node* daeReader::processOsgLOD(domTechnique* teq)
osg::Group* daeReader::processOsgLOD(domTechnique* teq)
{
osg::LOD* lod = new osg::LOD;
@@ -323,7 +323,7 @@ osg::Node* daeReader::processOsgLOD(domTechnique* teq)
// 0..* <extra>
osg::Node* daeReader::processLight( domLight *dlight )
{
if (m_numlights >= 7)
if (_numlights >= 7)
{
osg::notify( osg::WARN ) << "More than 8 lights may not be supported by OpenGL driver." << std::endl;
}
@@ -343,12 +343,12 @@ osg::Node* daeReader::processLight( domLight *dlight )
osg::Light* light = new osg::Light();
light->setPosition(osg::Vec4(0,0,0,1));
light->setLightNum(m_numlights);
light->setLightNum(_numlights);
// Enable OpenGL lighting
_rootStateSet->setMode(GL_LIGHTING, osg::StateAttribute::ON);
// Enable this OpenGL light
_rootStateSet->setMode(GL_LIGHT0 + m_numlights++, osg::StateAttribute::ON);
_rootStateSet->setMode(GL_LIGHT0 + _numlights++, osg::StateAttribute::ON);
// Set ambient of lightmodel to zero
// Ambient lights are added as separate lights with only an ambient term