Changeset 2757 for GTP

Timestamp:

06/14/08 01:11:58 (16 years ago)

Author:

mattausch

Message:

loading textured scenes possible

Location:

GTP/trunk/App/Demos/Vis/CHC_revisited

Files:

• BinaryLoader.cpp (modified) (5 diffs)
• BinaryLoader.h (modified) (5 diffs)
• FrustumCullingTraverser.cpp (added)
• FrustumCullingTraverser.h (added)
• StopAndWaitTraverser.cpp (added)
• StopAndWaitTraverser.h (added)
• Texture.cpp (added)
• Texture.h (added)
• chcdemo.cpp (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/BinaryLoader.cpp

@@ -81 +81 @@
 
 
+void BinaryLoader::LoadTextures(ifstream &str)
+{
+        int numTextures;
+        str.read(reinterpret_cast<char *>(&numTextures), sizeof(int));
+
+        for (int i = 0; i < numTextures; ++ i)
+        {
+                // texture
+                int texnameSize;
+                int id;
+
+                str.read(reinterpret_cast<char *>(&id), sizeof(int));
+                str.read(reinterpret_cast<char *>(&texnameSize), sizeof(int));
+
+                char *texname = new char[texnameSize];
+                str.read(texname, sizeof(char) * texnameSize);
+
+                cout << "loading texture " << texname << " with len " << texnameSize << " id: " << id << endl;
+
+                Texture *tex = new Texture(texname);
+
+                mTextureTable[id] = tex;
+        }
+}
+
+
 //Appearance *BinaryLoader::LoadMaterial(igzstream &str)
 Material *BinaryLoader::LoadMaterial(ifstream &str)
@@ -88 +114 @@
         
         // texture
-        int texnameSize;
-
-        str.read(reinterpret_cast<char *>(&texnameSize), sizeof(int));
-
-        if (texnameSize)
-        {
-                char *texname = new char[texnameSize];
-                str.read(texname, sizeof(char) *texnameSize);
-
-
-                cout << "loading texture " << texname << " with len " << texnameSize << endl;
-                Texture *tex = new Texture(texname);
-                
-                mat->SetTexture(tex);
-        }
-        else
-                cout << "no texture " << texnameSize << endl;
+        int texId;
+
+        str.read(reinterpret_cast<char *>(&texId), sizeof(int));
+        //cout << "texid: " << texId << endl;
+
+        if (texId >= 0)
+        {
+                mat->SetTexture(mTextureTable[texId]);
+        }
 
         // material
@@ -158 +176 @@
                 return NULL;
 
-        cout << "vertexcount: " << vertexCount << endl;
+        //cout << "vertexcount: " << vertexCount << endl;
 
         vertices = new Vector3[vertexCount];
@@ -171 +189 @@
         if (texCoordCount)
         {
-                cout << "loading texcoords of size " << texCoordCount << endl;
+                //cout << "loading texcoords of size " << texCoordCount << endl;
                 texcoords = new float[texCoordCount * 2];
                 str.read(reinterpret_cast<char *>(texcoords), sizeof(float) * vertexCount * 2);
@@ -201 +219 @@
         if (!istr.is_open())
                 return false;
+
+        // load the texture table
+        LoadTextures(istr);
 
         // #shapes

GTP/trunk/App/Demos/Vis/CHC_revisited/BinaryLoader.h

@@ -1 @@
-#ifndef _BinaryLoader_H__
-#define _BinaryLoader_H__
+#ifndef __BinaryLoader_H__
+#define __BinaryLoader_H__
 
 // note use forward declaration instead
@@ -6 +6 @@
 #include <iostream>
 #include <fstream>
+#include <map>
+
 #include "common.h"
 
@@ -16 +18 @@
 class Material;
 class Geometry;
+class Texture;
 
 
@@ -26 +29 @@
 protected:
         
+        void LoadTextures(std::ifstream &str);
+
         SceneEntity *LoadSceneEntity(std::ifstream &str);
         Material *LoadMaterial(std::ifstream &str);
@@ -34 +39 @@
         Geometry *LoadGeometry(igzstream &str);
         */
+
+        std::map<int, Texture *> mTextureTable;
 };
 

GTP/trunk/App/Demos/Vis/CHC_revisited/chcdemo.cpp

@@ -146 +146 @@
         BinaryLoader loader;
 
-        const string filename("house_test.dem");
-        //const string filename("city.dem");
+        //const string filename("house_test.dem");
+        const string filename("city.dem");
 
         camera = new Camera(800, 600);
@@ -166 +166 @@
 
         SetupProjection(800, 600, 60, sceneBox);
-        camera->LookAtBox(sceneBox);
-        //camera->LookInBox(sceneBox);
+        //camera->LookAtBox(sceneBox);
+        camera->LookInBox(sceneBox);
         //camera->SetPosition(Vector3(0, 0, -3));
         //camera->SetDirection(Vector3(0, 0, 1));