Changeset 3372 for GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter.cpp

Timestamp:

05/19/09 19:17:41 (15 years ago)

Author:

mattausch

Message:

reverted but now a good version

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter.cpp (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter.cpp

@@ -168 +168 @@
         geom->mMaterial = mat;
 
-        static int count = 0;
-        if (count ++ < 10)
         cout << "creating new geometry with " << numElements << " vertices" << endl;
 
@@ -206 +204 @@
 
 
-bool ObjConverter::Convert(const string &filename, 
-                                                   const std::string &outputFilename)
+bool ObjConverter::Convert(const string &filename, const std::string &outputFilename)
 {
         mNumShapes = 0;
@@ -361 +358 @@
                 str.write(reinterpret_cast<char *>(geom->mTexcoords), sizeof(float) * texCoordCount * 2);
         
+
+        ///////
+        //-- texture
+/*
+#ifdef USE_TEXTURE
+        int texId = 0;
+#else
+        int texId = -1;
+#endif
+
+        str.write(reinterpret_cast<char *>(&texId), sizeof(int));
+
+        bool alphaTestEnabled = false;
+        //bool cullFaceEnabled = false;
+        bool cullFaceEnabled = true;
+
+        str.write(reinterpret_cast<char *>(&alphaTestEnabled), sizeof(bool));
+        str.write(reinterpret_cast<char *>(&cullFaceEnabled), sizeof(bool));
+
+        // material
+        bool hasMaterial = true;
+        //bool hasMaterial = false;
+        str.write(reinterpret_cast<char *>(&hasMaterial), sizeof(bool));
+        
+        if (hasMaterial)
+        {
+                SimpleVec ambient, diffuse, spec, emm;
+
+                ambient.x = ambient.y = ambient.z = 0.2f;
+                //diffuse.x = diffuse.y = diffuse.z = 1.0f;
+                diffuse.x = 0.7f; diffuse.y = 0.5f; diffuse.z = 0.2f;
+                spec.x    = spec.y    = spec.z    =  .0f;
+                emm = spec;
+
+                // only write rgb part of the material
+                str.write(reinterpret_cast<char *>(&ambient), sizeof(SimpleVec));
+                str.write(reinterpret_cast<char *>(&diffuse), sizeof(SimpleVec));
+                str.write(reinterpret_cast<char *>(&spec), sizeof(SimpleVec));
+                str.write(reinterpret_cast<char *>(&emm), sizeof(SimpleVec));
+        }
+*/
 }
 
@@ -369 +407 @@
         ogzstream ofile(filename.c_str());
 
-        if (!ofile.is_open()) return false;
+        if (!ofile.is_open())
+                return false;
         
 
@@ -409 +448 @@
         {
                 WriteGeometry(ofile, *it);
-
-                int texId = 0;
-                ofile.write(reinterpret_cast<char *>(&texId), sizeof(int));
-
-                bool alphaTestEnabled = false;
-                //bool cullFaceEnabled = false;
-                bool cullFaceEnabled = true;
-
-                ofile.write(reinterpret_cast<char *>(&alphaTestEnabled), sizeof(bool));
-                ofile.write(reinterpret_cast<char *>(&cullFaceEnabled), sizeof(bool));
-
-                // material
-                bool hasMaterial = true;
-                ofile.write(reinterpret_cast<char *>(&hasMaterial), sizeof(bool));
-
-                if (hasMaterial)
-                {
-                        SimpleVec ambient, diffuse, spec, emm;
-
-                        ambient.x = ambient.y = ambient.z =  .2f;
-                        diffuse.x = diffuse.y = diffuse.z = 1.0f;
-                        spec.x    = spec.y    = spec.z    =  .0f;
-                        emm = spec;
-
-                        // only write rgb part of the material
-                        ofile.write(reinterpret_cast<char *>(&ambient), sizeof(SimpleVec));
-                        ofile.write(reinterpret_cast<char *>(&diffuse), sizeof(SimpleVec));
-                        ofile.write(reinterpret_cast<char *>(&spec), sizeof(SimpleVec));
-                        ofile.write(reinterpret_cast<char *>(&emm), sizeof(SimpleVec));
-                }
-        }
+        }
+
+        int texId = 0;
+        ofile.write(reinterpret_cast<char *>(&texId), sizeof(int));
+
+        bool alphaTestEnabled = false;
+        //bool cullFaceEnabled = false;
+        bool cullFaceEnabled = true;
+                
+        ofile.write(reinterpret_cast<char *>(&alphaTestEnabled), sizeof(bool));
+        ofile.write(reinterpret_cast<char *>(&cullFaceEnabled), sizeof(bool));
+
+        // material
+        bool hasMaterial = true;
+        ofile.write(reinterpret_cast<char *>(&hasMaterial), sizeof(bool));
+        
+        SimpleVec ambient, diffuse, spec, emm;
+
+        ambient.x = ambient.y = ambient.z = 0.2f;
+        diffuse.x = diffuse.y = diffuse.z = 1.0f;
+        spec.x = spec.y = spec.z = .0f;
+        emm = spec;
+
+        // only write rgb part of the material
+        ofile.write(reinterpret_cast<char *>(&ambient), sizeof(SimpleVec));
+        ofile.write(reinterpret_cast<char *>(&diffuse), sizeof(SimpleVec));
+        ofile.write(reinterpret_cast<char *>(&spec), sizeof(SimpleVec));
+        ofile.write(reinterpret_cast<char *>(&emm), sizeof(SimpleVec));
+
 
         int entityCount = 1;