Changeset 10485

Timestamp:

07/16/09 13:42:08 (4 years ago)

Author:

robert

Message:

From Jason Daly, "These are some fixes to the mdl and bsp plugins to handle transparency and lighting better, plus a few other tweaks."

Location:

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins

Files:

• bsp (modified) (1 prop)
• bsp/VBSPEntity.cpp (modified) (9 diffs)
• bsp/VBSPEntity.h (modified) (1 diff)
• bsp/VBSPGeometry.cpp (modified) (2 diffs)
• bsp/VBSPReader.cpp (modified) (6 diffs)
• mdl (modified) (1 prop)
• mdl/MDLReader.cpp (modified) (9 diffs)
• mdl/MDL_README.txt (modified) (1 diff)

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bsp/VBSPEntity.cpp

@@ -316 +316 @@
 
     // Get the class name and process the entity appropriately
-    std::string className = (*param).second;
-    if (className.compare("worldspawn") == 0)
+    class_name = (*param).second;
+    if (class_name.compare("worldspawn") == 0)
     {
         // This is the entity that represents the main geometry of the map
@@ -324 +324 @@
         processWorldSpawn();
     }
-    else if (className.compare(0, 3, "env") == 0)
+    else if (class_name.compare(0, 3, "env") == 0)
     {
         // This is an environmental effect (such as a fire or dust cloud)
@@ -330 +330 @@
         processEnv();
     }
-    else if ((className.compare("func_brush") == 0) ||
-             (className.compare("func_illusionary") == 0) ||
-             (className.compare("func_wall_toggle") == 0) ||
-             (className.compare("func_breakable") == 0))
+    else if ((class_name.compare("func_brush") == 0) ||
+             (class_name.compare("func_illusionary") == 0) ||
+             (class_name.compare("func_wall_toggle") == 0) ||
+             (class_name.compare("func_breakable") == 0))
     {
         // This is secondary map geometry, created along with the main
@@ -340 +340 @@
         processFuncBrush();
     }
-    else if (className.compare(0, 4, "prop") == 0)
+    else if (class_name.compare(0, 4, "prop") == 0)
     {
         // This is a "prop", an external model placed somewhere in the
@@ -347 +347 @@
         processProp();
     }
-    else if (className.compare("infodecal") == 0)
+    else if (class_name.compare("infodecal") == 0)
     {
         // This is a decal, which applies a texture to some surface in the
@@ -354 +354 @@
         processInfoDecal();
     }
-    else if (className.compare(0, 4, "item") == 0)
+    else if (class_name.compare(0, 4, "item") == 0)
     {
         // This is an "item".  Like a prop, these are external models
@@ -368 +368 @@
 ref_ptr<Group> VBSPEntity::createBrushGeometry()
 {
-    int                i;
-    int                numGeoms;
-    VBSPGeometry **    vbspGeomList;
-    Model              currentModel;
-    Face               currentFace;
-    TexInfo            currentTexInfo;
-    TexData            currentTexData;
-    const char *       texName;
-    char               currentTexName[256];
-    int                currentGeomIndex;
-    VBSPGeometry *     currentGeom;
-    ref_ptr<Group>     entityGroup;
-    ref_ptr<Group>     geomGroup;
+    int                 i;
+    int                 numGeoms;
+    VBSPGeometry **     vbspGeomList;
+    Model               currentModel;
+    Face                currentFace;
+    TexInfo             currentTexInfo;
+    TexData             currentTexData;
+    const char *        texName;
+    char                currentTexName[256];
+    int                 currentGeomIndex;
+    VBSPGeometry *      currentGeom;
+    ref_ptr<Group>      entityGroup;
+    ref_ptr<Group>      geomGroup;
+    std::stringstream   groupName;
 
     // Create a list of VBSPGeometry objects for each texdata entry in the
@@ -502 +503 @@
     }
 
+    // Name the entity group
+    groupName << class_name << ":" << entity_model_index;
+    entityGroup->setName(groupName.str());
+
     // Return the group we created
     return entityGroup;
@@ -550 +555 @@
         // Add the model node to the group
         entityGroup->addChild(modelNode.get());
+
+        // Set the group's name
+        entityGroup->setName(class_name + std::string(":") + entity_model);
     }
     else

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bsp/VBSPEntity.h

@@ -33 +33 @@
 
     EntityClass                 entity_class;
+    std::string                 class_name;
 
     typedef std::pair<std::string, std::string>   EntityParameter;

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bsp/VBSPGeometry.cpp

@@ -2 +2 @@
 #include <stdlib.h>
 #include <osg/Geode>
+#include <osgUtil/TriStripVisitor>
 
 #include "VBSPGeometry.h"
@@ -648 +649 @@
         // Add the geometry to the geode
         geode->addDrawable(geometry.get());
+
+        // Now, stripify the geode to convert the POLYGON primitives to
+        // triangle strips
+        osgUtil::TriStripVisitor tsv;
+        geode->accept(tsv);
+        tsv.stripify();
     }
 

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bsp/VBSPReader.cpp

@@ -746 +746 @@
     ref_ptr<Texture>        texture;
     ref_ptr<Texture>        texture2;
+    ref_ptr<Material>       material;
     ref_ptr<BlendFunc>      blend;
     bool                    translucent;
+    double                  alpha;
 
     // Find the material file
@@ -818 +820 @@
     // Assume no transparency unless the properties say otherwise
     translucent = false;
+
+    // Assume fully opaque
+    alpha = 1.0;
 
     // Read the material properties next
@@ -859 +864 @@
                      translucent = true;
             }
+            else if (equalCaseInsensitive(token, "$alpha"))
+            {
+                // Get the translucency setting
+                token = getToken(line, " \t\n\r\"", start);
+
+                // Interpret the setting
+                if (!token.empty())
+                {
+                   alpha = atof(token.c_str());
+                }
+            }
  
             // Try the next token
@@ -874 +890 @@
         // attribute.  This is used for displaced terrain surfaces in HL2 maps.
         stateSet = createBlendShader(texture.get(), texture2.get());
+
+        // Add a material to the state set
+        material = new Material();
+        material->setAmbient(Material::FRONT_AND_BACK,
+                             Vec4(1.0, 1.0, 1.0, 1.0) );
+        material->setDiffuse(Material::FRONT_AND_BACK,
+                             Vec4(1.0, 1.0, 1.0, 1.0) );
+        material->setSpecular(Material::FRONT_AND_BACK,
+                              Vec4(0.0, 0.0, 0.0, 1.0) );
+        material->setShininess(Material::FRONT_AND_BACK, 1.0);
+        material->setEmission(Material::FRONT_AND_BACK,
+                              Vec4(0.0, 0.0, 0.0, 1.0) );
+        material->setAlpha(Material::FRONT_AND_BACK, alpha);
+        stateSet->setAttributeAndModes(material.get(), StateAttribute::ON);
     }
     else if (equalCaseInsensitive(shaderName, "UnlitGeneric"))
@@ -916 +946 @@
         // Create the StateSet
         stateSet = new StateSet();
+
+        // Add a material to the state set
+        material = new Material();
+        material->setAmbient(Material::FRONT_AND_BACK,
+                             Vec4(1.0, 1.0, 1.0, 1.0) );
+        material->setDiffuse(Material::FRONT_AND_BACK,
+                             Vec4(1.0, 1.0, 1.0, 1.0) );
+        material->setSpecular(Material::FRONT_AND_BACK,
+                              Vec4(0.0, 0.0, 0.0, 1.0) );
+        material->setShininess(Material::FRONT_AND_BACK, 1.0);
+        material->setEmission(Material::FRONT_AND_BACK,
+                              Vec4(0.0, 0.0, 0.0, 1.0) );
+        material->setAlpha(Material::FRONT_AND_BACK, alpha);
+        stateSet->setAttributeAndModes(material.get(), StateAttribute::ON);
 
         // Add the texture attribute (or disable texturing if no base texture)
@@ -1082 +1126 @@
         if (propNode.valid())
         {
+            // Add the model to the transform node, and attach the transform
+            // to the scene
             propXform->addChild(propNode.get());
             group->addChild(propXform.get());
+
+            // Name the prop
+            propXform->setName(std::string("prop_static:" + propModel));
         }
         else

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/mdl/MDLReader.cpp

@@ -192 +192 @@
     ref_ptr<Texture>         texture;
     ref_ptr<Texture>         texture2;
+    ref_ptr<Material>        material;
     ref_ptr<BlendFunc>       blend;
     bool                     translucent;
+    double                   alpha;
 
     // Find the material file
@@ -299 +301 @@
     translucent = false;
 
+    // Assume full opacity
+    alpha = 1.0;
+
     // Read the material properties next
     while (!mtlFile->eof())
@@ -342 +347 @@
                 }
             }
+            else if (equalCaseInsensitive(token, "$alpha"))
+            {
+                // Get the translucency setting
+                token = getToken(line, " \t\n\r\"", start);
+
+                // Interpret the setting
+                if (!token.empty())
+                {
+                   alpha = atof(token.c_str());
+                }
+            }
  
             // Try the next token
@@ -380 +396 @@
                                   BlendFunc::ONE_MINUS_SRC_ALPHA);
             stateSet->setAttributeAndModes(blend.get(), StateAttribute::ON);
+            stateSet->setMode(GL_BLEND, StateAttribute::ON);
 
             // Set the rendering hint for this stateset to transparent
@@ -388 +405 @@
     {
         // All other shaders fall back to fixed function
-        // TODO:  LightMappedGeneric shader
 
         // Create the StateSet
         stateSet = new StateSet();
 
+        // Add a material to the state set
+        material = new Material();
+        material->setAmbient(Material::FRONT_AND_BACK,
+                             Vec4(1.0, 1.0, 1.0, 1.0) );
+        material->setDiffuse(Material::FRONT_AND_BACK,
+                             Vec4(1.0, 1.0, 1.0, 1.0) );
+        material->setSpecular(Material::FRONT_AND_BACK,
+                             Vec4(0.0, 0.0, 0.0, 1.0) );
+        material->setShininess(Material::FRONT_AND_BACK, 1.0);
+        material->setEmission(Material::FRONT_AND_BACK,
+                              Vec4(0.0, 0.0, 0.0, 1.0) );
+        material->setAlpha(Material::FRONT_AND_BACK, alpha);
+        stateSet->setAttributeAndModes(material.get(), StateAttribute::ON);
+
         // Add the texture attribute (or disable texturing if no base texture)
         if (texture != NULL)
@@ -400 +430 @@
 
             // See if the material is translucent
-            if (translucent)
+            if ((translucent) || (alpha < 1.0))
             {
                 // Add the blending attribute as well
@@ -407 +437 @@
                 stateSet->setAttributeAndModes(blend.get(),
                                                StateAttribute::ON);
+                stateSet->setMode(GL_BLEND, StateAttribute::ON);
 
                 // Set the rendering hint for this stateset to transparent
@@ -634 +665 @@
     }
 
-    // Open the VVD file that goes with this model
+    // Open the VVD (vertex data) file that goes with this model
     vvdFile = findDataFile(getNameLessExtension(file) + ".vvd",
                            CASE_INSENSITIVE);
@@ -640 +671 @@
     vvdReader->readFile(vvdFile);
 
-    // Open the VTX file that goes with this model (at this point, I don't
-    // see a reason not to always just use the DX9 version)
+    // Open the VTX file (index and primitive data) that goes with this model
+    // (at this point, I don't see a reason not to always just use the DX9
+    // version)
     vtxFile = findDataFile(getNameLessExtension(file) + ".dx90.vtx",
                            CASE_INSENSITIVE);

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/mdl/MDL_README.txt

@@ -9 +9 @@
 engine (Half Life 2, etc) to be loaded by OSG.
 
-I've tested this plugin with dozens of on several HL2 models, as well as some
-3rd party models.
+I've tested this plugin with dozens of HL2 models, as well as some 3rd party
+models.