Changeset 3359 for GTP/trunk

Timestamp:

04/17/09 09:09:14 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Converter.vcproj (modified) (1 diff)
• Converter/PlyConverter.cpp (modified) (2 diffs)
• src/ResourceManager.cpp (modified) (3 diffs)
• src/Transform3.cpp (modified) (2 diffs)
• src/Transform3.h (modified) (1 diff)
• src/chcdemo.cpp (modified) (4 diffs)

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

@@ -156 +156 @@
                                 AdditionalLibraryDirectories="libs\Zlib\lib"
                                 IgnoreDefaultLibraryNames="libCMT"
-                                GenerateDebugInformation="true"
+                                GenerateDebugInformation="false"
                                 SubSystem="1"
                                 LargeAddressAware="2"

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

@@ -120 +120 @@
 
         v[i ++] = (float)ply_get_argument_value(argument);
-        //printf("here3 %g", ply_get_argument_value(argument));
+        //printf("%g", ply_get_argument_value(argument));
     
         if (eol)
@@ -215 +215 @@
         //if (texCoordCount) str.write(reinterpret_cast<char *>(geom->mTexcoords), sizeof(float) * texCoordCount * 2);
 
-        cout << "here34 " << geom->mNormals.back() << endl;
-
         int texCoordCount = 0;
         str.write(reinterpret_cast<char *>(&texCoordCount), sizeof(int));

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ResourceManager.cpp

@@ -346 +346 @@
         int vertexCount;
         str.read(reinterpret_cast<char *>(&vertexCount), sizeof(int));
-        cout << "vertices: " << vertexCount << endl;
+        
 
         // end of file reached
@@ -382 +382 @@
                 texcoords = NULL;
         }
-
-        cout << "here3: " << normals[vertexCount-1] << endl;
-        cout << "texCoordCount: " << texCoordCount << endl;
-
 
         const bool delGeometry = true;
@@ -422 +418 @@
         if (!istr.is_open()) return 0;
 
-        cout << "here7" << endl;
         cout << "loading textures" << endl;
         

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Transform3.cpp

@@ -40 +40 @@
 {
         mIsIdentity = false;
-        mOldMatrix = mMatrix;
+        //mOldMatrix = mMatrix;
         mMatrix = trafo * mMatrix;
 }
@@ -53 +53 @@
 
 
+void Transform3::InitFrame()
+{
+        mOldMatrix = mMatrix;
 }
+
+
+}

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Transform3.h

@@ -49 +49 @@
         inline bool IsIdentity() const { return mIsIdentity; }
 
+        void InitFrame();
+
 
 protected:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -646 +646 @@
         // sibenik positions
         VertexArray positions;
-        //positions.push_back(Vector3(6.07307, 8.20723, 6.7));
-        positions.push_back(Vector3(6.07307, 8.20723, 6.62));
+        
+        /*positions.push_back(Vector3(6.07307, 8.20723, 6.62));
         positions.push_back(Vector3(-17.1935, 11.1687, 8.8781));
-        positions.push_back(Vector3(1.50032, 31.1943, 19.1f));
+        positions.push_back(Vector3(1.50032, 31.1943, 19.1f));*/
+
+        positions.push_back(Vector3(6.07307, 8.20723, 4.6f));
+        positions.push_back(Vector3(-17.1935, 11.1687, 6.8f));
+        positions.push_back(Vector3(1.50032, 31.1943, 17.6f));
 
 #endif
@@ -671 +675 @@
         }
 
-        const float rotAngle = M_PI / 180.0f;
-        const Matrix4x4 rotMatrix = RotationZMatrix(rotAngle);
+        const float rotAngle = M_PI / 2.0f;
+        const Matrix4x4 rotMatrix = RotationXMatrix(rotAngle);
+        const Matrix4x4 scaleMatrix = ScaleMatrix(14, 14, 14);
+
         // hack: second buddha
-        //dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
-
-        
+        dynamicObjects[2]->GetTransform()->MultMatrix(rotMatrix);
+        dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
+        dynamicObjects[0]->GetTransform()->MultMatrix(rotMatrix);
+        dynamicObjects[0]->GetTransform()->MultMatrix(scaleMatrix);
+        dynamicObjects[1]->GetTransform()->MultMatrix(scaleMatrix);
+        dynamicObjects[2]->GetTransform()->MultMatrix(scaleMatrix);
+
+        cout << "dynamic objects: " << (int)dynamicObjects.size() << endl;
+
+        // hack
         resourceManager->mUseNormalMapping = false;
         resourceManager->mUseSpecialColors = false;
@@ -1146 +1159 @@
 void MainLoop() 
 {       
-        if (buddha)
+        for (size_t i = 0; i < dynamicObjects.size(); ++ i)
+                dynamicObjects[i]->GetTransform()->InitFrame();
+
+        if (0)//buddha)
         {
                 Matrix4x4 oldTrafo = buddha->GetTransform()->GetMatrix();
@@ -1180 +1196 @@
                 dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
 
-                const float rotAngle2 = 0.6f * M_PI / 180.0f;
+                const float rotAngle2 = 0.0033f * M_PI;
 
                 Matrix4x4 rotMatrix2 = RotationZMatrix(rotAngle);