Changeset 8570

Timestamp:

07/12/08 14:00:58

Author:

robert

Message:

From Doug McCorkle?, "Attached is patch that corrects/improves the following issues with the OBJ loader:

1. Added options to control wether the osgUtil::Tessellator or osgUtil::TriStripVisitor? are run. By default they still run just as before.
2. Added support for the Emissive material. The data was being read from the mtl file but was never being applied to the model.
3. This is the main bug addressed, when a model is read in with an alpha value specified like:

newmtl Material8

Ns 24
d 0.33
illum 2
Kd 0.204 0.204 0.204
Ks 0 0 0
Ka 0.153 0.153 0.153

where the alpha value is d. The loader would then overwrite the alpha value when reading the diffuse, specular, and ambient colors. I have changed all the material color readers to only set the values they read and to use the default colors specified in the constructor of the obj class. With these changes, the obj reader now handles opacity correctly if the alpha value is specified before the material colo"

Files:

• OpenSceneGraph/trunk/src/osgPlugins/obj/ReaderWriterOBJ.cpp (modified) (8 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/obj/obj.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/src/osgPlugins/obj/ReaderWriterOBJ.cpp

@@ -123 +123 @@
-    osg::Geometry* convertElementListToGeometry(obj::Model& model, obj::Model::ElementList& elementList, bool& rotate) const;
-    
-
+
+
-
-    inline osg::Vec3 transformVertex(const osg::Vec3& vec, const bool rotate) const ;
@@ -268 +269 @@
-            osg_material->setAmbient(osg::Material::FRONT_AND_BACK,material.ambient);
-            osg_material->setDiffuse(osg::Material::FRONT_AND_BACK,material.diffuse);
+            osg_material->setEmission(osg::Material::FRONT_AND_BACK,material.emissive);
+
-            if (material.illum == 2) {
-                osg_material->setSpecular(osg::Material::FRONT_AND_BACK,material.specular);
@@ -277 +280 @@
-            if (material.ambient[3]!=1.0 ||
-                material.diffuse[3]!=1.0 ||
-
+
+
-            {
-                osg::notify(osg::INFO)<<"Found transparent material"<<std::endl;
@@ -293 +297 @@
-        load_material_texture( model, material, stateset.get(), material.map_opacity,  TEXTURE_UNIT_OPACITY );
-        
+        if (isTransparent)
+        {
+            stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+            stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+        }
+
-        materialToStateSetMap[material.name] = stateset.get();
-        
-    }
-}
@@ -551 +560 @@
-}
-
-
+
+
-{
-
@@ -580 +590 @@
-        
-            // tesseleate any large polygons
-
-
-
+
+
+
+
+
+
-            // tri strip polygons to improve graphics peformance
-
-
-
+
+
+
+
+
+
-            // if no normals present add them.
-            if (!geometry->getNormalArray() || geometry->getNormalArray()->getNumElements()==0)
-            {
-t
-t
+
+
-            }
-
@@ -642 +658 @@
-        model.readOBJ(fin, local_opt.get());
-        
-
+
+
-        bool rotate = true;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return node;
-    }
@@ -663 +697 @@
-        model.readOBJ(fin, options);
-        
-
+
+
-        bool rotate = true;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return node;
-    }

OpenSceneGraph/trunk/src/osgPlugins/obj/obj.cpp

@@ -156 +156 @@
-                    unsigned int fieldsRead = sscanf(line+3,"%f %f %f %f", &r, &g, &b, &a);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                else if (strncmp(line,"Kd ",3)==0)
@@ -165 +183 @@
-                    unsigned int fieldsRead = sscanf(line+3,"%f %f %f %f", &r, &g, &b, &a);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                else if (strncmp(line,"Ks ",3)==0)
@@ -174 +210 @@
-                    unsigned int fieldsRead = sscanf(line+3,"%f %f %f %f", &r, &g, &b, &a);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                else if (strncmp(line,"Ke ",3)==0)
@@ -183 +237 @@
-                    unsigned int fieldsRead = sscanf(line+3,"%f %f %f %f", &r, &g, &b, &a);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                else if (strncmp(line,"Tf ",3)==0)
@@ -192 +264 @@
-                    unsigned int fieldsRead = sscanf(line+3,"%f %f %f %f", &r, &g, &b, &a);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                else if (strncmp(line,"sharpness ",10)==0)