Changeset 3295

Timestamp:

02/06/09 17:34:25 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Converter/ObjConverter.cpp (modified) (3 diffs)
• Converter/main.cpp (modified) (2 diffs)
• powerplant.env (added)
• sibenik.env (added)
• src/BvhConstructor.cpp (modified) (1 diff)
• src/SkyPreetham.cpp (modified) (2 diffs)
• src/chcdemo.cpp (modified) (6 diffs)
• src/shaderenv.h (modified) (1 diff)
• src/shaders/globillum.cg (modified) (1 diff)
• toto.txt (modified) (1 diff)
• vienna.env (added)

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

@@ -403 +403 @@
 
 #if 0
+
 bool ObjConverter::WriteFile(const string &filename)
 {
@@ -480 +481 @@
         return true;
 }
+
 #else
+
 bool ObjConverter::WriteFile(const string &filename)
 {
@@ -562 +565 @@
 
 
-        int entityCount = 1;
+        //int entityCount = 1;
+        int entityCount = mNumShapes;
         ofile.write(reinterpret_cast<char *>(&entityCount), sizeof(int));
 
 
         //////////
-        //-- write single scene entity
-
-        // no transformation
-        bool hasTrafo = false;
-        ofile.write(reinterpret_cast<char *>(&hasTrafo), sizeof(bool));
-
-        // a dummy lod
-        int numLODs = 1;
-        ofile.write(reinterpret_cast<char *>(&numLODs), sizeof(int));
-
-        float dist = 0;
-        ofile.write(reinterpret_cast<char *>(&dist), sizeof(float));
-
-        ofile.write(reinterpret_cast<char *>(&mNumShapes), sizeof(int));
+        //-- q: write single scene entity with all shapes or many entities with one shape
 
         // all shapes belong to this scene entity
         for (int i = 0; i < mNumShapes; ++ i)
         {
+                // no transformation
+                bool hasTrafo = false;
+                ofile.write(reinterpret_cast<char *>(&hasTrafo), sizeof(bool));
+
+                // a dummy lod
+                int numLODs = 1;
+                ofile.write(reinterpret_cast<char *>(&numLODs), sizeof(int));
+
+                float dist = 0;
+                ofile.write(reinterpret_cast<char *>(&dist), sizeof(float));
+
+                //ofile.write(reinterpret_cast<char *>(&mNumShapes), sizeof(int));
+                int one = 1;
+                ofile.write(reinterpret_cast<char *>(&one), sizeof(int));
+
                 int shapeId = i;
                 ofile.write(reinterpret_cast<char *>(&shapeId), sizeof(int));

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

@@ -1 @@
-#include "ObjConverter2.h"
+#include "ObjConverter.h"
 #include <iostream>
 #include <time.h>
@@ -10 +10 @@
         int returnCode = 0;
 
-        ObjConverter2 converter;
+        //ObjConverter2 converter;
+        ObjConverter converter;
 
         cout << "converting obj to dem format" << endl;
-#if 0   
+#if 1
         if (!converter.LoadMaterials(model_path + argv[3]))
         {

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

@@ -110 +110 @@
         int bestAxis = 0;
 
-        //  cout<<"Evaluating axis..."<<endl<<flush;
-
         const int initialPlanes = 3;
 

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

@@ -294 +294 @@
         // downscale ambient color
         if (scaleToRange)
+        {
                 ambient *= 8e-6f;
+        }
         else
         {
@@ -342 +344 @@
         // calculate final sun diffuse color.
         if (scaleToRange)
+        {
                 diffuse = color * 3e-5f;
+        }
         else
+        {
                 diffuse = color * 3e-1f;
+        }
 
         // diffuse component should be more saturated (and less blueish) for high sun positions

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

@@ -160 +160 @@
 int visibilitySolutionInitialState = 0;
 
+Vector3 defaultAmbient(0.2f);
+Vector3 defaultDiffuse(1.0f);
+
 
 /// the technique used for rendering
@@ -462 +465 @@
                 env.GetVectorParam(string("camDirection"), camDir);
                 env.GetVectorParam(string("lightDirection"), lightDir);
+                env.GetVectorParam(string("defaultAmbient"), defaultAmbient);
+                env.GetVectorParam(string("defaultDiffuse"), defaultDiffuse);
 
                 env.GetBoolParam(string("useFullScreen"), useFullScreen);
@@ -617 +622 @@
         //LoadModel("toyplane2.dem", dynamicObjects);
         //LoadModel("elephal.dem", dynamicObjects);
-        //LoadModel("sibenik.dem", dynamicObjects);
 
         if (0) LoadPompeiiFloor();
@@ -971 +975 @@
 }
 
-/** Setup sunlight
+/** Setup lighting conditions
 */
 void SetupLighting()
@@ -1011 +1015 @@
         else
         {
-
-                ambient[0] = .2f;
-                ambient[1] = .2f;
-                ambient[2] = .2f;
-
-                diffuse[0] = 1.0f;
-                diffuse[1] = 1.0f;
-                diffuse[2] = 1.0f;
+                ambient[0] = defaultAmbient.x;
+                ambient[1] = defaultAmbient.y;
+                ambient[2] = defaultAmbient.z;
+
+                diffuse[0] = defaultDiffuse.x;
+                diffuse[1] = defaultDiffuse.y;
+                diffuse[2] = defaultDiffuse.z;
         }
 
@@ -1296 +1299 @@
 
                 if (showShadowMap && !renderLightView)
+                {
                         RenderShadowMap(camera->GetFar());
+                }
 
                 //glPushAttrib(GL_VIEWPORT_BIT);

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

@@ -62 +62 @@
 #define NUM_DOF_TABS 16
 
-
 #define USE_GTX
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/globillum.cg

@@ -191 +191 @@
         //-- compute color bleeding + ao
 
-        GiStruct gi = globIllum(IN, colors, noiseTex, samples, normal, eyeSpacePos, w, bl, br, tl, tr, normalize(IN.view), sampleIntensity);
+        GiStruct gi = globIllum(IN, colors, noiseTex, samples, normal, eyeSpacePos, 
+                                    w, bl, br, tl, tr, normalize(IN.view), sampleIntensity);
         
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/toto.txt

@@ -196 +196 @@
 
 find out ssao artifacts on edges (near edge no ambient occlusion)
+
+
+///////////
+
+shadows not working proberly with chc!!! (too many triangles, slow!!)
+
+sibenik: textures dissappear!!