Changeset 2961

Timestamp:

09/21/08 23:42:44 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Converter (added)
• Converter.vcproj (added)
• Converter/ObjConverter.cpp (added)
• Converter/ObjConverter.h (added)
• Converter/gzstream.cpp (added)
• Converter/gzstream.h (added)
• Converter/main.cpp (added)
• FriendlyCulling.sln (modified) (2 diffs)
• FriendlyCulling.vcproj (modified) (1 diff)
• data/city/model/sky.dem (added)
• src/ObjConverter.cpp (modified) (1 diff)
• src/ObjConverter.h (modified) (1 diff)
• src/ResourceManager.cpp (modified) (6 diffs)
• src/SceneEntity.cpp (modified) (1 diff)
• src/SkyPreetham.cpp (modified) (1 diff)
• src/Transform3.h (modified) (1 diff)
• src/chcdemo.cpp (modified) (9 diffs)
• src/common.h (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.sln

@@ -2 +2 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chc_revisited", "FriendlyCulling.vcproj", "{03661866-4093-4B02-B26A-028EA91AF023}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "friendlyculling", "FriendlyCulling.vcproj", "{03661866-4093-4B02-B26A-028EA91AF023}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Converter", "Converter.vcproj", "{93A522E1-76F0-4D46-9C97-30DC2DDB531D}"
 EndProject
 Global
@@ -14 +16 @@
                 {03661866-4093-4B02-B26A-028EA91AF023}.Release|Win32.ActiveCfg = Release|Win32
                 {03661866-4093-4B02-B26A-028EA91AF023}.Release|Win32.Build.0 = Release|Win32
+                {93A522E1-76F0-4D46-9C97-30DC2DDB531D}.Debug|Win32.ActiveCfg = Debug|Win32
+                {93A522E1-76F0-4D46-9C97-30DC2DDB531D}.Debug|Win32.Build.0 = Debug|Win32
+                {93A522E1-76F0-4D46-9C97-30DC2DDB531D}.Release|Win32.ActiveCfg = Release|Win32
+                {93A522E1-76F0-4D46-9C97-30DC2DDB531D}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

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

@@ -248 +248 @@
                         </File>
                         <File
-                                RelativePath=".\src\ObjConverter.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\src\ObjConverter.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath=".\src\PerformanceGraph.cpp"
                                 >

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

@@ -6 +6 @@
 #include "Material.h"
 #include "Texture.h"
-#include <map>
 
 

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

@@ -1 @@
-#ifndef __ObjConverter_H
-#define __ObjConverter_H
+#ifndef _OBJCONVERTER_H
+#define _OBJCONVERTER_H
 
 #include "common.h"

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

@@ -42 +42 @@
         if (!hasTrafo)
         {
+                // identity
                 trafo = new Transform3();
         }
@@ -72 +73 @@
                 str.read(reinterpret_cast<char *>(&numShapes), sizeof(int));
 
+                
                 LODLevel *lodLevel = new LODLevel(dist);
 
@@ -102 +104 @@
         int numTextures;
         str.read(reinterpret_cast<char *>(&numTextures), sizeof(int));
-
+        
         for (int i = 0; i < numTextures; ++ i)
         {
-                // texture
+                // load texture name
                 int texnameSize;
-
                 str.read(reinterpret_cast<char *>(&texnameSize), sizeof(int));
 
@@ -201 +202 @@
         
         // end of file reached
-        if (str.eof())
-                return NULL;
+        if (str.eof()) return NULL;
 
         //cout << "vertexcount: " << vertexCount << endl;
@@ -218 +218 @@
         {
                 texcoords = new float[texCoordCount * 2];
-                str.read(reinterpret_cast<char *>(texcoords), sizeof(float) * vertexCount * 2);
+                str.read(reinterpret_cast<char *>(texcoords), sizeof(float) * texCoordCount * 2);
         }
         else
@@ -225 +225 @@
         }
         
-#if 0
-        // construct normals
-        for (int i = 0; i < vertexCount; i += 3)
-        {
-                Triangle3 tri(vertices[i], vertices[i + 1], vertices[i + 2]);
-
-                normals[i] = tri.GetNormal();
-                normals[i+1] = tri.GetNormal();
-                normals[i+2] = tri.GetNormal();
-        }
-#endif
 
         return new Geometry(vertices, normals, texcoords, vertexCount, true);

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

@@ -152 +152 @@
 AxisAlignedBox3 SceneEntity::GetTransformedBoundingBox() const
 {
-        if (mTransform->IsIdentity())
-                return mBox;
+        if (mTransform->IsIdentity()) return mBox;
 
         Matrix4x4 mat = mTransform->GetMatrix();

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

@@ -114 +114 @@
 
         const float scaleFactor = 80.0f;
+        //const float scaleFactor = 5.0f;
 
         position.z -= 3 * scaleFactor;

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

@@ -38 +38 @@
         /** See Get
         */
-        inline void SetMatrix(const Matrix4x4 &trafo) { mMatrix = trafo; }
+        inline void SetMatrix(const Matrix4x4 &trafo) { mIsIdentity = false; mMatrix = trafo; }
         /** Right multiplies with the given matrix.
         */
-        inline void MultMatrix(const Matrix4x4 &trafo);
+        void MultMatrix(const Matrix4x4 &trafo);
         /** Resets trafo to identiy.
         */

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

@@ -1 @@
-// occquery.cpp : Defines the entry point for the console application.
+// chcdemo.cpp : Defines the entry point for the console application.
 //
 #include "glInterface.h"
@@ -149 +149 @@
 bool flyMode = true;
 
-SceneEntityContainer skyGeometry;
-
 bool leftKeyPressed = false;
 bool rightKeyPressed = false;
@@ -415 +413 @@
 
 
+        glEnable(GL_MULTISAMPLE_ARB);
+        glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST);
+
+        LeftMotion(0, 0);
+        MiddleMotion(0, 0);
+
+        perfGraph = new PerformanceGraph(1000);
+
+        loader = new ResourceManager();
+
+        //const string filename("data/city/model/city.dem");
+        const string filename = string(model_path + "city.dem");
+
+        if (loader->Load(filename, sceneEntities))
+                cout << "scene " << filename << " loaded" << endl;
+        else
+        {
+                cerr << "loading scene " << filename << " failed" << endl;
+                CleanUp();
+                exit(0);
+        }
+
+        const string bvh_filename = string(model_path + "city.bvh");
+        BvhLoader bvhLoader;
+        bvh = bvhLoader.Load(bvh_filename, sceneEntities);
+
+        if (!bvh)
+        {
+                cerr << "loading bvh " << bvh_filename << " failed" << endl;
+                CleanUp();
+                exit(0);
+        }
+
+        
         Vector3 cubeCenter(470.398f, 240.364f, 182.5f);
-        AxisAlignedBox3 box(cubeCenter - Vector3(2.0f), cubeCenter + Vector3(2.0f));
+        /*AxisAlignedBox3 box(cubeCenter - Vector3(2.0f), cubeCenter + Vector3(2.0f));
 
         Material *mat = new Material(RgbaColor(1, 0.4, 0.4, 0));
         Transform3 *tf = new Transform3();
         cube = SceneEntityConverter().ConvertBox(box, mat, tf);
-
-        //aeroplane = ObjConverter().Load(model_path + "toyplane.obj");
-        //if (!aeroplane)       cerr << "loadig plane failed" << endl;
-
-        skyDome = ObjConverter().Load(model_path + "sky.obj");
-        if (!skyDome) cerr << "loadig plane failed" << endl;
-
-        const float turbitiy = 3.0f;
-        preetham = new SkyPreetham(turbitiy, skyDome);
-
-        glEnable(GL_MULTISAMPLE_ARB);
-        glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST);
-
-        LeftMotion(0, 0);
-        MiddleMotion(0, 0);
-
-        perfGraph = new PerformanceGraph(1000);
-
-        loader = new ResourceManager();
-
-        //const string filename("data/city/model/city.dem");
-        const string filename = string(model_path + "city.dem");
-
-        if (loader->Load(filename, sceneEntities))
-                cout << "scene " << filename << " loaded" << endl;
+*/
+
+        Matrix4x4 transl = TranslationMatrix(cubeCenter);
+        
+        const string aeroplaneStr = model_path + "toyplane.dem";
+
+        SceneEntityContainer dummy;
+
+        if (loader->Load(aeroplaneStr, dummy))
+                cout << "successfully loaded " << dummy.size() << " scene entities" << endl;
         else
         {
-                cerr << "loading scene " << filename << " failed" << endl;
+                cerr << "loading file " << aeroplaneStr << " failed" << endl;
+
                 CleanUp();
                 exit(0);
         }
 
-        SceneEntityContainer dummy;
-
-        const string envname = string(model_path + "env.dem");
-
-        if (loader->Load(envname, skyGeometry))
-                cout << "sky box " << filename << " loaded" << endl;
-        else
-        {
-                cerr << "loading sky box " << filename << " failed" << endl;
-                CleanUp();
-                exit(0);
-        }
-
-        const string bvh_filename = string(model_path + "city.bvh");
-        BvhLoader bvhLoader;
-        bvh = bvhLoader.Load(bvh_filename, sceneEntities);
-
-        if (!bvh)
-        {
-                cerr << "loading bvh " << bvh_filename << " failed" << endl;
-                CleanUp();
-                exit(0);
-        }
+        aeroplane = dummy[0];
+        aeroplane->GetTransform()->MultMatrix(transl);
+        dummy.clear();
+
 
         // set far plane based on scene extent
@@ -488 +487 @@
         SkyPreetham::Init(sCgContext);
 
+        
+        string skyDomeStr(model_path + "sky.dem");
+
+        if (loader->Load(skyDomeStr, dummy))
+                cout << "successfully loaded " << dummy.size() << " scene entities" << endl;
+        else
+        {
+                cerr << "loading file " << skyDomeStr << " failed" << endl;
+
+                CleanUp();
+                exit(0);
+        }
+
+        skyDome = dummy[0];
+        
+        const float turbitiy = 3.0f;
+        preetham = new SkyPreetham(turbitiy, skyDome);
 
         // initialize the render traverser
@@ -628 +644 @@
 void InitGLstate() 
 {
-        glClearColor(0.4f, 0.4f, 0.4f, 1.0f);
+        glClearColor(1.4f, 0.4f, 0.4f, 1.0f);
         
         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@@ -1087 +1103 @@
         
 
-
         ///////////////
         //-- render sky
@@ -1095 +1110 @@
 
         RenderSky();
-        
+
+        //state.Reset(); glEnable(GL_TEXTURE_2D);
+        aeroplane->Render(&state);
+
 
         if ((renderMethod == RENDER_DEFERRED) ||
                 (renderMethod == RENDER_DEPTH_PASS_DEFERRED))
         {
-                //glPopAttrib();
                 FrameBufferObject::Release();
 
@@ -1954 +1971 @@
 void RenderSky()
 {
-        //glEnable(GL_LIGHTING);
         cgGLEnableProfile(RenderState::sCgVertexProfile);
 
@@ -1960 +1976 @@
                 state.SetRenderPassType(RenderState::DEFERRED);
 
-        SceneEntityContainer::const_iterator sit, sit_end = skyGeometry.end();
-
-        //      for (sit = skyGeometry.begin(); sit != sit_end; ++ sit)
-        //              (*sit)->Render(&state);
-
-        //cube->Render(&state);
-        //aeroplane->Render(&state);
-        //glEnable(GL_LIGHTING);
-
         preetham->RenderSkyDome(-light->GetDirection(), camera, &state);
-        
+
         cgGLDisableProfile(RenderState::sCgVertexProfile);
         cgGLDisableProfile(RenderState::sCgFragmentProfile);

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

@@ -163 +163 @@
 // Clears a container (i.e., a vector of pointers) and deletes the pointers
 #ifndef CLEAR_CONTAINER
-#define CLEAR_CONTAINER(co) do { for (size_t _i = 0; _i < (int)(co).size(); ++ _i) { \
+#define CLEAR_CONTAINER(co) do { for (size_t _i = 0; _i < (co).size(); ++ _i) { \
         DEL_PTR((co)[_i]);} \
         (co).clear(); } \