Changeset 2964 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

Timestamp:

09/22/08 18:33:55 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp (modified) (8 diffs)

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

@@ -39 +39 @@
 #include "ObjConverter.h"
 #include "SkyPreetham.h"
+#include "Texture.h"
 
 
@@ -167 +168 @@
 PerfTimer frameTimer, algTimer;
 
+Texture *dirtTexture = NULL;
+
 
 /// the used render type for this render pass
@@ -269 +272 @@
 static CGparameter sMaxDepthParam;
 static CGparameter sMaxDepthParamTex;
+
 static Matrix4x4 oldViewProjMatrix;
 
@@ -454 +458 @@
         camera->SetFar(Magnitude(bvh->GetBox().Diagonal()));
         
+        dirtTexture = new Texture(model_path + "waterstain.jpg");
+        //dirtTexture = new Texture(model_path + "dirt.jpg");
+        dirtTexture->Create();
+
         InitCg();
 
@@ -470 +478 @@
         
         //const string aeroplaneStr = model_path + "toyplane.dem";
-        const string aeroplaneStr = model_path + "city_full.dem";
+        //const string aeroplaneStr = model_path + "city_full.dem";
 
         SceneEntityContainer dummy;
 
-        if (loader->Load(aeroplaneStr, dummy))
-                cout << "successfully loaded " << dummy.size() << " scene entities" << endl;
-        else
-        {
-                cerr << "loading file " << aeroplaneStr << " failed" << endl;
-
-                CleanUp();
-                exit(0);
-        }
-
+        
         string skyDomeStr(model_path + "sky.dem");
 
@@ -496 +495 @@
         }
 
-        aeroplane = dummy[0];
-        skyDome = dummy[1];
+        skyDome = dummy[0];
+
+
+        /*if (loader->Load(aeroplaneStr, dummy))
+                cout << "successfully loaded " << dummy.size() << " scene entities" << endl;
+        else
+        {
+                cerr << "loading file " << aeroplaneStr << " failed" << endl;
+
+                CleanUp();
+                exit(0);
+        }
+
+        aeroplane = dummy[1];
 
         aeroplane->GetTransform()->MultMatrix(transl);
-
+*/
         const float turbitiy = 3.0f;
         preetham = new SkyPreetham(turbitiy, skyDome);
@@ -569 +580 @@
 
                 sMaxDepthParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "maxDepth");
+                RenderState::sDirtTexParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "dirtTex");
+                RenderState::sTexParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "tex");
+
+                cgGLEnableTextureParameter(RenderState::sDirtTexParamTex);
+                cgGLSetTextureParameter(RenderState::sDirtTexParamTex, dirtTexture->GetId());
 
                 cgGLSetParameter1f(sMaxDepthParamTex, MAX_DEPTH_CONST / farDist);
@@ -1086 +1102 @@
         {
                 // actually render the scene geometry using the specified algorithm
-                //traverser->RenderScene();
+                traverser->RenderScene();
+        /*
                 state.Reset();
-        /*      SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
+                aeroplane->Render(&state);
+
+        SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
 
                 for (sit = sceneEntities.begin(); sit != sit_end; ++ sit)
                 {
                         renderQueue->Enqueue(*sit);
-                }*/
-
-                aeroplane->Render(&state);
+                }
 
                 renderQueue->Apply();
+                */
         }