Changeset 3371 for GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter

Timestamp:

05/19/09 12:02:26 (16 years ago)

Author:

mattausch

Message:

fehler tritt nicht auf!!

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter

Files:

• ObjConverter.cpp (modified) (5 diffs)
• ObjConverter2.cpp (modified) (1 diff)
• main.cpp (modified) (3 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;
 
@@ -204 +206 @@
 
 
-bool ObjConverter::Convert(const string &filename, const std::string &outputFilename)
+bool ObjConverter::Convert(const string &filename, 
+                                                   const std::string &outputFilename)
 {
         mNumShapes = 0;
@@ -358 +361 @@
                 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));
-        }
-*/
 }
 
@@ -407 +369 @@
         ogzstream ofile(filename.c_str());
 
-        if (!ofile.is_open())
-                return false;
+        if (!ofile.is_open()) return false;
         
 
@@ -448 +409 @@
         {
                 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));
-        
-        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 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 entityCount = 1;

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

@@ -129 +129 @@
                                 for (int j = 0; j < 3; ++ j)
                                 {
-                                        //if (tIndices[idx[j]] >= (int)texcoords.size())
-                                                //cerr << "error: texcoord indices exceed array size " << texcoords.size() << " " << tIndices[idx[j]] << endl;
                                         const int tidx = min((int)texcoords.size() - 1, tIndices[idx[j]]);
-
                                         faceTexcoords.push_back(texcoords[tidx]);
                                 }

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

@@ -1 @@
-//#include "ObjConverter.h"
-#include "PlyConverter.h"
+#include "ObjConverter.h"
+//#include "PlyConverter.h"
 #include <iostream>
 #include <time.h>
@@ -12 +12 @@
 
         //ObjConverter2 converter;
-        //ObjConverter converter;
-        PlyConverter converter;
+        ObjConverter converter;
+        //PlyConverter converter;
 
         cout << "converting obj to dem format" << endl;
@@ -60 +60 @@
 
         cout << "conversion successful" << endl;
-        cout << "press any key" << std::cin.get();
+        //cout << "press any key" << std::cin.get();
 
         return 0;