Changeset 2981

Timestamp:

09/30/08 00:32:16 (16 years ago)

Author:

mattausch

Message:

debug version

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• ResourceManager.cpp (modified) (2 diffs)
• ResourceManager.h (modified) (1 diff)
• SkyPreetham.cpp (modified) (4 diffs)
• chcdemo.cpp (modified) (3 diffs)

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

@@ -164 +164 @@
         str.read(reinterpret_cast<char *>(&texId), sizeof(int));
 
-        if (texId >= 0)
+        if (0)//texId >= 0)
                 mat->SetTexture(mTextureTable[texId]);
         
@@ -182 +182 @@
                 str.read(reinterpret_cast<char *>(&mat->mEmmisiveColor), sizeof(Vector3));
                 str.read(reinterpret_cast<char *>(&mat->mSpecularColor), sizeof(Vector3));
+
+                mat->mAmbientColor = RandomColor();
+                mat->mDiffuseColor = RgbaColor(0,0,0,1);
         }
 

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

@@ -60 +60 @@
         ShapeContainer mShapes;
 
+
         ////////
 

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

@@ -76 +76 @@
                 cgGLLoadProgram(sCgMrtFragmentSkyDomeProgram);
 
-                /*sMaxDepthParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "maxDepth");
-                Material::sDiffuseParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "diffuse");
-                Material::sAmbientParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "ambient");
-
+                /*
                 cgGLSetParameter1f(sMaxDepthParam, MAX_DEPTH_CONST / farDist);
                 */
@@ -91 +88 @@
 mSkyDome(skyDome),
 mTurbidity(turbitity)
-//      mSunQuad(NULL)
+//, mSunQuad(NULL)
 {
         CreateSunQuad();
@@ -283 +280 @@
 
         // downscale ambient color
-        //ambient *= 5e-5f;
-        ambient *= 1e-1f;
+        if (1)
+                ambient *= 5e-5f;
+        else
+                ambient *= 1e-1f;
 
         // simulate the sun intensity by modulating the ambient term.
@@ -321 +320 @@
 
         // Calculate final sun diffuse color.
-        diffuse = color * 3e-1f;
+        if (1)
+                diffuse = color * 1.7e-4f;
+        else
+                diffuse = color * 3e-1f;
+
         diffuse *= (2.0f - 1.0f * DotProd(sunDir, Vector3::UNIT_Z()));
-        //diffuse = color;
         
 

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

@@ -658 +658 @@
         // the diffuse color buffer
         fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
-
         // the positions buffer
         fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
-
         // the normals buffer
         fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
-
         // another color buffer
         fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
@@ -1138 +1135 @@
                 //traverser->RenderScene();
 
-        /*
-                state.Reset();
-                aeroplane->Render(&state);
-*/
-
 #if 0
                 SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
@@ -1155 +1147 @@
                         renderQueue->Enqueue(*sit);
 #endif
+                        
                 renderQueue->Apply();
         }