Changeset 3048

Timestamp:

10/20/08 02:29:28 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• Material.cpp (modified) (3 diffs)
• Material.h (modified) (1 diff)
• RenderState.cpp (modified) (6 diffs)
• RenderState.h (modified) (4 diffs)
• ResourceManager.cpp (modified) (4 diffs)
• SkyPreetham.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (13 diffs)

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

@@ -33 +33 @@
         mColorWriteEnabled = true;
         /// if lighting is used
-        bool mLightingEnabled = true;
+        mLightingEnabled = true;
 }
 
@@ -92 +92 @@
 
 
+Technique Technique::GetQueryTechnique()
+{
+        Technique tech;
+
+        tech.Init();
+
+        tech.SetColorWriteEnabled(false);
+        tech.SetLightingEnabled(false);
+
+        return tech;
+}
+
+
 /***********************************************/
 /*        class Material implementation        */
@@ -99 +112 @@
 void Material::Render(RenderState *state)
 {
-        if (state->GetRenderPassType() == RenderState::DEFERRED)
-                mTechniques[1]->Render(state);
-        else
-                mTechniques[0]->Render(state);
+        mTechniques[state->GetRenderTechnique()]->Render(state);
 }
 

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

@@ -105 +105 @@
         GPUProgramParameters * const GetVertexProgramParameters() { return &mVertexProgramParameters; }
 
+        static Technique GetQueryTechnique();
 
 protected:

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

@@ -17 +17 @@
 
 RenderState::RenderState():
-mRenderType(FORWARD),
+mRenderTechnique(FORWARD),
 mUseAlphaToCoverage(true),
 mLockCullFaceEnabled(false)
@@ -85 +85 @@
         if (mode == QUERY)
         {
-                if (mRenderType != DEPTH_PASS)
-                {
+                if (mLightingEnabled)
                         glDisable(GL_LIGHTING);
+
+                if (mColorWriteEnabled)
                         glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-                }
 
                 if (mFragmentProgramEnabled)
-                {
                         ResourceManager::GetSingleton()->DisableFragmentProfile();
-                }
                         
                 if (mVertexProgramEnabled)
-                {
                         ResourceManager::GetSingleton()->DisableVertexProfile();
-                }
                 
                 glDepthMask(GL_FALSE);
 
-                static Technique defaultTech;
-                SetState(&defaultTech);
+                /// the query box material
+                static Technique queryTech = Technique::GetQueryTechnique();
+                SetState(&queryTech);
         }
         else // mode returns to render
@@ -111 +108 @@
                 //-- restore render state
 
-                if (mRenderType != DEPTH_PASS)
-                {
+                if (mLightingEnabled)
                         glEnable(GL_LIGHTING);
+
+                if (mColorWriteEnabled)
                         glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-                }
                 
                 if (mFragmentProgramEnabled)
-                {
                         ResourceManager::GetSingleton()->EnableFragmentProfile();
-                }
                         
                 if (mVertexProgramEnabled)
-                {
                         ResourceManager::GetSingleton()->EnableVertexProfile();
-                }
 
                 glDepthMask(GL_TRUE);
@@ -175 +168 @@
         }
 
-        if (mTexturesEnabled && 
-                (!texturing || (mRenderType == DEPTH_PASS) && !mAlphaTestEnabled))
+        if (mTexturesEnabled && !texturing)
         {
                 mTexturesEnabled = false;
@@ -187 +179 @@
         else if (!mTexturesEnabled && texturing)
         {
-                // support only alpha textures in depth pass
-                if ((mRenderType != DEPTH_PASS) || mAlphaTestEnabled)
+                if (mAlphaTestEnabled)
                 {
                         mTexturesEnabled = true;
@@ -282 +273 @@
 
 
-void RenderState::SetRenderPassType(RenderPassType t) 
+void RenderState::SetRenderTechnique(RenderTechnique t) 
 { 
-        mRenderType = t; 
-}
-
-
-RenderState::RenderPassType RenderState::GetRenderPassType() const 
-{
-        return mRenderType; 
+        mRenderTechnique = t; 
+}
+
+
+RenderState::RenderTechnique RenderState::GetRenderTechnique() const 
+{
+        return mRenderTechnique; 
 }
 

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

@@ -25 +25 @@
         };
 
-        /// the used render type for this render pass
-        enum RenderPassType
+        /// the used render technique
+        enum RenderTechnique
         {
                 FORWARD,
-                DEPTH_PASS,
-                DEFERRED
+                DEFERRED,
+                DEPTH_PASS
         };
 
@@ -58 +58 @@
         */
         inline int GetCurrentVboId() const { return mCurrentVboId; }
-        /** Sets the type of rendering used (foreward, depth pass, deferred)
+        /** Sets the render technique (foreward, depth pass, deferred)
         */
-        void SetRenderPassType(RenderPassType t);
+        void SetRenderTechnique(RenderTechnique t);
         /** See Set
         */
-        RenderPassType GetRenderPassType() const;
+        RenderTechnique GetRenderTechnique() const;
         /** If alpha to coverage is instead of alpha testing
         */
@@ -84 +84 @@
 
         int mCurrentVboId;
-
-        RenderPassType mRenderType;
+        /// the current render technique
+        RenderTechnique mRenderTechnique;
 
         bool mUseAlphaToCoverage;
@@ -99 +99 @@
         bool mVertexProgramEnabled;
 
-        bool mUseLighting;
+        bool mLightingEnabled;
         bool mColorWriteEnabled;
 };

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

@@ -118 +118 @@
 
         ///////////////
-        //-- load lod levels
+        //-- load LOD levels
 
         // note: lods must be ordered from smallest distance to largest
@@ -126 +126 @@
         for (int i = 0; i < numLODs; ++ i)
         {
+                // the distance until the next LOD level is used
                 float dist;
                 str.read(reinterpret_cast<char *>(&dist), sizeof(float));
@@ -158 +159 @@
         //-- hack: add tree animation (should be done per material script!)
 
-        if (numLODs > 1)
+        if (0)//numLODs > 1)
         {
                 ShapeContainer::iterator sstart, send;
@@ -320 +321 @@
         deferred->SetVertexProgram(mMrtDefaultVertexProgram);
         
+
+        ///////////
+        //-- add depth pass
+
+        Technique *depthPass = new Technique(*tech);
+        depthPass->SetColorWriteEnabled(false);
+        depthPass->SetLightingEnabled(false);
+
         mat->AddTechnique(deferred);
+        mat->AddTechnique(depthPass);
 
         return mat;

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

@@ -121 +121 @@
         Technique *tech;
 
-        if (state->GetRenderPassType() == RenderState::DEFERRED)
-                tech = mat->GetTechnique(1);
-        else
-                tech = mat->GetTechnique(0);
+        tech = mat->GetTechnique(state->GetRenderTechnique());
 
         GPUProgramParameters *vtxParams = tech->GetVertexProgramParameters();

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

@@ -485 +485 @@
         visualization = new Visualization(bvh, camera, NULL, &state);
         
-        state.SetRenderPassType(RenderState::FORWARD);
+        state.SetRenderTechnique(RenderState::FORWARD);
 
         // frame time is restarted every frame
@@ -819 +819 @@
         glDisable(GL_MULTISAMPLE_ARB);
 
-        state.SetRenderPassType(RenderState::DEFERRED);
+        state.SetRenderTechnique(RenderState::DEFERRED);
 
         loader->EnableVertexProfile();
@@ -905 +905 @@
                 glEnable(GL_MULTISAMPLE_ARB);
                 
-                state.SetRenderPassType(RenderState::FORWARD);
+                state.SetRenderTechnique(RenderState::FORWARD);
                 glEnable(GL_LIGHTING);
 
@@ -919 +919 @@
                 state.SetUseAlphaToCoverage(false);
 
-                state.SetRenderPassType(RenderState::DEPTH_PASS);
+                state.SetRenderTechnique(RenderState::DEPTH_PASS);
 
                 if (!fbo) InitFBO(); fbo->Bind();
@@ -939 +939 @@
                 glEnable(GL_MULTISAMPLE_ARB);
                 
-                state.SetRenderPassType(RenderState::DEPTH_PASS);
+                state.SetRenderTechnique(RenderState::DEPTH_PASS);
 
                 // the scene is rendered withouth any shading   
@@ -951 +951 @@
                 break;
         
-        case RenderState::DEFERRED:
+        case RENDER_DEFERRED:
 
                 if (showShadowMap && !renderLightView)
@@ -1012 +1012 @@
         // this would conveniently solves some issues (e.g, skys without shadows)
 
-        RenderSky();
+        //RenderSky();
 
 
@@ -1048 +1048 @@
 
 
-        state.SetRenderPassType(RenderState::FORWARD);
+        state.SetRenderTechnique(RenderState::FORWARD);
         state.Reset();
 
@@ -1863 +1863 @@
 {
         if ((renderMethod == RENDER_DEFERRED) || (renderMethod == RENDER_DEPTH_PASS_DEFERRED))
-                state.SetRenderPassType(RenderState::DEFERRED);
+                state.SetRenderTechnique(RenderState::DEFERRED);
 
         const bool useToneMapping = 
@@ -1870 +1870 @@
 
         preetham->RenderSkyDome(-light->GetDirection(), camera, &state, !useToneMapping);
-
+        /// once again reset the state
         state.Reset();
 }
@@ -1890 +1890 @@
                 glDisable(GL_LIGHTING);
                 glViewport(0, 0, texWidth, texHeight);
-
+                // rese the state before the final visible objects pass
                 state.Reset();
                 InitDeferredRendering();
@@ -1897 +1897 @@
         {
                 glEnable(GL_LIGHTING);
-                state.SetRenderPassType(RenderState::FORWARD);
+                state.SetRenderTechnique(RenderState::FORWARD);
+                // rese the state before the final visible objects pass
                 state.Reset();
         }
@@ -1955 +1956 @@
         glDisableClientState(GL_NORMAL_ARRAY);
 
-        state.SetRenderPassType(RenderState::DEPTH_PASS);
+        state.SetRenderTechnique(RenderState::DEPTH_PASS);
         
         // hack: disable cull face because of alpha textured balconies