Changeset 6296

Timestamp:

03/01/07 13:10:52

Author:

robert

Message:

From David Gurhrie, "Here is the updated txp loader code that we modified before to store
some of the material codes in the userdata field. It now takes an
option string to enable adding the extra data and doesn't add it by
default."

Files:

• OpenSceneGraph/trunk/src/osgPlugins/txp/ReaderWriterTXP.cpp (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/txp/TXPArchive.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/txp/TXPArchive.h (modified) (5 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/txp/TXPParser.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osgPlugins/txp/ReaderWriterTXP.cpp

@@ -55 +55 @@
-            if (archive) 
-            {
+                if (options && options->getOptionString().find("loadMaterialsToStateSet")!=std::string::npos)
+                {
+                   archive->SetMaterialAttributesToStateSetVar(true);
+                }
+
-                int id = _archiveId++;
-                archive->setId(id);

OpenSceneGraph/trunk/src/osgPlugins/txp/TXPArchive.cpp

@@ -70 +70 @@
-    _majorVersion(-1),
-    _minorVersion(-1),
-
+
+
-{
-}
@@ -195 +196 @@
-        osg_state_set->setAttributeAndModes(osg_material, osg::StateAttribute::ON);
-        
+        SetUserDataToMaterialAttributes(*osg_state_set, *mat);
+
-        if( alpha < 1.0f )
-        {

OpenSceneGraph/trunk/src/osgPlugins/txp/TXPArchive.h

@@ -37 +37 @@
-#include "trpage_sys.h"
-#include "trpage_read.h"
+#include "trpage_geom.h"
-
-#include <osg/Referenced>
@@ -44 +45 @@
-#include <osg/Node>
-#include <osg/PagedLOD>
+#include <osg/Array>
-#include <osgSim/LightPointNode>
-#include <osgText/Font>
@@ -167 +169 @@
-        return GetTexMapEntry(id).get();
-    }
- 
+
-    // Returns scenegraph representing the Tile.
-    // For version 2.1 and over this function can only be call
@@ -199 +201 @@
-        minorVer = _minorVersion;
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    protected:
-
@@ -253 +279 @@
-
-    bool _isMaster;
-
+
+
+
-    };
-

OpenSceneGraph/trunk/src/osgPlugins/txp/TXPParser.cpp

@@ -491 +491 @@
-            osg_material->setAlpha(osg::Material::FRONT_AND_BACK ,(float)alpha);
-            osg_state_set->setAttributeAndModes(osg_material, osg::StateAttribute::ON);
-
+
+
+
-            if( alpha < 1.0f )
-            {
@@ -1458 +1460 @@
-                tmp_ss = (*_parse->getMaterials())[matId];
-            }
-(sset!=0L) && 
+
-            {
-                if(tmp_ss.valid())
-
+          
-                    osg::StateAttribute* texenv0 = tmp_ss->getTextureAttribute(0,osg::StateAttribute::TEXENV);
-                    if(texenv0) 
@@ -1468 +1470 @@
-                    if(tex0) 
-                        sset->setTextureAttributeAndModes(n_mat,tex0,osg::StateAttribute::ON);
+                    // submitted by a. danklefsen
+                    // Alion science and Technology 2/12/07
+                    // copy fid/smc codes over to this new state set from the prev state set.
+                    sset->setUserData(tmp_ss->getUserData());
-                }
-//                sset->merge(*tmp_ss.get());
@@ -1602 +1608 @@
-    else
-    {
-erse
+ser
-    }
-