Changeset 8562

Timestamp:

07/11/08 19:35:13

Author:

robert

Message:

From Mathias Froehlich, "Due to the recent data variance changes/discussion:
Change the ac3d loader that can as such only deliver static models to set the
data variance to static for the returned model.
"

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ac/ac3d.cpp (modified) (14 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ac/ac3d.cpp

@@ -245 +245 @@
-{
-    osg::BlendFunc* blendFunc = new osg::BlendFunc;
+    blendFunc->setDataVariance(osg::Object::STATIC);
-    blendFunc->setSource(osg::BlendFunc::SRC_ALPHA);
-    blendFunc->setDestination(osg::BlendFunc::ONE_MINUS_SRC_ALPHA);
@@ -259 +260 @@
-        mMaterial(new osg::Material),
-        mColorArray(new osg::Vec4Array(1))
-
+
+
+
+
-
-    void readMaterial(std::istream& stream)
@@ -328 +332 @@
-    {
-        mTexture2D = new osg::Texture2D;
+        mTexture2D->setDataVariance(osg::Object::STATIC);
-        mTexture2D->setWrap(osg::Texture2D::WRAP_S, osg::Texture2D::REPEAT);
-        mTexture2D->setWrap(osg::Texture2D::WRAP_T, osg::Texture2D::REPEAT);
@@ -362 +367 @@
-            return;
-        osg::TexEnv* texEnv = new osg::TexEnv;
+        texEnv->setDataVariance(osg::Object::STATIC);
-        texEnv->setMode(osg::TexEnv::MODULATE);
-        stateSet->setTextureAttribute(0, texEnv);
@@ -394 +400 @@
-    {
-        osg::Light* light = new osg::Light;
+        light->setDataVariance(osg::Object::STATIC);
-        light->setLightNum(mLightIndex++);
-        return light;
@@ -618 +625 @@
-        _vertexSet(vertexSet),
-        _flags(flags)
-
+
+
+
-
-    virtual bool beginPrimitive(unsigned nRefs) = 0;
@@ -670 +679 @@
-        _texCoords(new osg::Vec2Array)
-    {
+        _geometry->setDataVariance(osg::Object::STATIC);
+        _vertices->setDataVariance(osg::Object::STATIC);
+        _texCoords->setDataVariance(osg::Object::STATIC);
-        _geometry->setVertexArray(_vertices.get());
-        _geometry->setTexCoordArray(0, _texCoords.get());
@@ -885 +897 @@
-        } else {
-            osg::CullFace* cullFace = new osg::CullFace;
+            cullFace->setDataVariance(osg::Object::STATIC);
-            cullFace->setMode(osg::CullFace::BACK);
-            stateSet->setAttribute(cullFace);
@@ -892 +905 @@
-        // Flat or smooth shading
-        osg::ShadeModel* shadeModel = new osg::ShadeModel;
+        shadeModel->setDataVariance(osg::Object::STATIC);
-        if (isSmooth())
-            shadeModel->setMode(osg::ShadeModel::SMOOTH);
@@ -901 +915 @@
-        osg::Geometry* geometry = new osg::Geometry;
-        _geode->addDrawable(geometry);
+        geometry->setDataVariance(osg::Object::STATIC);
-        geometry->setColorArray(material.getColorArray());
-        geometry->setColorBinding(osg::Geometry::BIND_OVERALL);
-        geometry->setNormalBinding(osg::Geometry::BIND_PER_VERTEX);
-        osg::Vec3Array* normalArray = new osg::Vec3Array;
+        normalArray->setDataVariance(osg::Object::STATIC);
-        geometry->setNormalArray(normalArray);
-        osg::Vec3Array* vertexArray = new osg::Vec3Array;
+        vertexArray->setDataVariance(osg::Object::STATIC);
-        geometry->setVertexArray(vertexArray);
-        osg::Vec2Array* texcoordArray = 0;
@@ -912 +929 @@
-        {
-            texcoordArray = new osg::Vec2Array;
+            texcoordArray->setDataVariance(osg::Object::STATIC);
-            geometry->setTexCoordArray(0, texcoordArray);
-        }
@@ -1079 +1097 @@
-    osg::ref_ptr<VertexSet> vertexSet = new VertexSet;
-    osg::ref_ptr<osg::Group> group = new osg::Group;
+    group->setDataVariance(osg::Object::STATIC);
-    osg::Vec2 textureOffset(0, 0);
-    osg::Vec2 textureRepeat(1, 1);
@@ -1312 +1331 @@
-                ac3dLight->setSpecular(osg::Vec4(1.0f,1.0f,0.5f,1.0f));
-                
-
+
+
-                ac3dLightSource->setLight(ac3dLight);
-                ac3dLightSource->setLocalStateSetModes(osg::StateAttribute::ON);
@@ -1330 +1350 @@
-{
-    FileData fileData(options);
-
-
+n
+n
-    if (node)
-      node->setName("World");