Changeset 3066 for GTP

Timestamp:

10/24/08 13:17:03 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (1 diff)
• src/Bvh.cpp (modified) (3 diffs)
• src/RenderState.cpp (modified) (1 diff)
• src/RenderState.h (modified) (1 diff)
• src/RenderTraverser.cpp (modified) (1 diff)
• src/ShadowMapping.cpp (modified) (2 diffs)
• src/chcdemo.cpp (modified) (8 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -4 +4 @@
 assumedVisibleFrames=10
 maxBatchSize=50
-#trianglesPerVirtualLeaf=300
-trianglesPerVirtualLeaf=30000
+trianglesPerVirtualLeaf=300
+#trianglesPerVirtualLeaf=30000
 keyForwardMotion=20.0f
 keyRotation=1.5f

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

@@ -200 +200 @@
         
         // nodes are tested using the subnodes from 3 levels below
-        mMaxDepthForTestingChildren = 0;//3;
+        mMaxDepthForTestingChildren = 3;
         //mMaxDepthForTestingChildren = 4;
 
@@ -1109 +1109 @@
 
 
+static Technique GetVizTechnique()
+{
+        Technique tech;
+        tech.Init();
+
+        //tech.SetLightingEnabled(false);
+        //tech.SetDepthWriteEnabled(false);
+
+        tech.SetEmmisive(RgbaColor(1.0f, 1.0f, 1.0f, 1.0f));
+        tech.SetDiffuse(RgbaColor(1.0f, 1.0f, 1.0f, 1.0f));
+        tech.SetAmbient(RgbaColor(1.0f, 1.0f, 1.0f, 1.0f));
+
+        return tech;
+}
+
+
 void Bvh::RenderBoundsForViz(BvhNode *node, 
                                                          RenderState *state, 
                                                          bool useTightBounds)
 {
-        glColor3f(1, 1, 1);
-
-        // hack: for deferred shading we have to define a material
-        static Technique boxMat;
-        boxMat.SetLightingEnabled(false);
-
-        boxMat.SetEmmisive(RgbaColor(1.0f, 1.0f, 1.0f, 1.0f));
-
+        Technique *oldTech = state->GetState();
+        // we set a simple material
+        static Technique boxMat = GetVizTechnique();
         boxMat.Render(state);
 
         if (!useTightBounds)
         {
-                //RenderBoxForViz(node->GetBox());
-                glPolygonMode(GL_FRONT, GL_LINE);
+                RenderBoxForViz(node->GetBox());
+                /*glPolygonMode(GL_FRONT, GL_LINE);
                 RenderBoundingBoxImmediate(node->GetBox());
-                glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+                glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);*/
         }
         else
@@ -1137 +1148 @@
                 }
         }
+
+        if (oldTech) oldTech->Render(state);
 }
 

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

@@ -129 +129 @@
                 /// the query box material
                 static Technique queryTech = GetQueryTechnique();
-                static Technique dummyTech = GetDummyTechnique();
-
-                //if ((float)rand() / RAND_MAX < 0.2)
-                //      SetState(&dummyTech);
-                //else 
-                        SetState(&queryTech);
+                SetState(&queryTech);
         }
 

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

@@ -44 +44 @@
         */
         void SetState(Technique *tech);
+        /** Returns the current render state.
+        */
+        Technique *GetState() { return mCurrentTechnique; }
         /** Returns either query or render mode
         */

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

@@ -83 +83 @@
         else 
         {
-                // for non leafs this renders only the bounding volume (if the flag is set)
                 BvhInterior *interior = static_cast<BvhInterior *>(node);
 

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

@@ -598 +598 @@
         glViewport(0, 0, mSize, mSize);
 
-        glDisable(GL_LIGHTING);
-        glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+        //glDisable(GL_LIGHTING);
+        //glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
 
         glShadeModel(GL_FLAT);
@@ -612 +612 @@
         
         glShadeModel(GL_SMOOTH);
-        glEnable(GL_LIGHTING);
-        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+        //glEnable(GL_LIGHTING);
+        //glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 
 #if 0

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

@@ -56 +56 @@
 #include "ShaderManager.h"
 
+
+
 using namespace std;
 using namespace CHCDemoEngine;
@@ -513 +515 @@
 
         // this fbo basicly stores the scene information we get from standard rendering of a frame
-        // we store colors, normals, positions (for the ssao)
+        // we store diffuse colors, eye space depth and normals
         fbo = new FrameBufferObject(texWidth, texHeight, FrameBufferObject::DEPTH_32);
         //fbo = new FrameBufferObject(texWidth, texHeight, FrameBufferObject::DEPTH_24);
@@ -521 +523 @@
         // the normals buffer
         fbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST);
-        // the positions buffer
-        //fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST);
+        // a rgb buffer which could hold material properties
         fbo->AddColorBuffer(ColorBufferObject::RGB_UBYTE, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST);
         // another color buffer
@@ -669 +670 @@
         RenderTraverser *tr;
         
-        bvh->ResetNodeClassifications();
-
         switch (renderMode)
         {
@@ -703 +702 @@
         tr->SetUseDepthPass((renderMethod == RENDER_DEPTH_PASS) || (renderMethod == RENDER_DEPTH_PASS_DEFERRED));
         tr->SetRenderQueue(renderQueue);
+        tr->SetShowBounds(showBoundingVolumes);
+
+        bvh->ResetNodeClassifications();
+
 
         return tr;
@@ -920 +923 @@
                 // the scene is rendered withouth any shading   
                 glShadeModel(GL_FLAT);
-                glDisable(GL_LIGHTING);
-                glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+                //glDisable(GL_LIGHTING);
+                //glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
 
 
@@ -937 +940 @@
         
                 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-                glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+                //glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
 
 
@@ -1896 +1899 @@
         // draw all objects that have exactly the same depth as the current sample
         glDepthFunc(GL_LEQUAL);
-        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+        //glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 
         glClear(GL_COLOR_BUFFER_BIT);