Changeset 3039

Timestamp:

10/17/08 17:07:44 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• Material.cpp (modified) (1 diff)
• RenderState.cpp (modified) (3 diffs)
• ResourceManager.cpp (modified) (1 diff)
• SkyPreetham.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (3 diffs)

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

@@ -73 +73 @@
 void Material::Render(RenderState *state)
 {
-        state->SetState(this);
-
         glMaterialfv(GL_FRONT, GL_AMBIENT, (float *)&mAmbientColor.r);
         glMaterialfv(GL_FRONT, GL_DIFFUSE, (float *)&mDiffuseColor.r);
         glMaterialfv(GL_FRONT, GL_EMISSION, (float *)&mEmmisiveColor.r);
         glMaterialfv(GL_FRONT, GL_SPECULAR, (float *)&mSpecularColor.r);
+
+        state->SetState(this);
 }
 

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

@@ -65 +65 @@
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
-        //ResourceManager::GetSingleton()->DisableFragmentProfile();
-        //ResourceManager::GetSingleton()->DisableVertexProfile();
+        ResourceManager::GetSingleton()->DisableFragmentProfile();
+        ResourceManager::GetSingleton()->DisableVertexProfile();
 }
 
@@ -194 +194 @@
                         {                       
                                 mCurrentFragmentProgram = mat->GetFragmentProgram();
-                                mCurrentFragmentProgram->Bind();
+                                mCurrentFragmentProgram->Bind();                        
                         }
                         
@@ -203 +203 @@
                 if (mat->GetVertexProgram())
                 {
-                        if  (mat->GetVertexProgram() != mCurrentVertexProgram)
+                        if (mat->GetVertexProgram() != mCurrentVertexProgram)
                         {
                                 mCurrentVertexProgram = mat->GetVertexProgram();
                                 mCurrentVertexProgram->Bind();
                         }
-
+                
                         mat->GetVertexProgramParameters()->UpdateParameters();
                 }

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

@@ -420 +420 @@
 
         mMrtDefaultVertexProgram = CreateVertexProgram("mrt", "vtx");
-        mMrtDefaultFragmentProgram = CreateFragmentProgram("mrt", "fragtex");//CreateFragmentProgram("mrt", "frag");
+        mMrtDefaultFragmentProgram = CreateFragmentProgram("mrt", "frag");
         mMrtDefaultFragmentTexProgram = CreateFragmentProgram("mrt", "fragtex");
         mMrtDefaultFragmentTexProgram->AddParameter("tex", 0);

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

@@ -138 +138 @@
         }
 
+        mSkyDome->GetShape(0)->GetMaterial()->GetVertexProgramParameters()->UpdateParameters();
+        mSkyDome->GetShape(0)->GetMaterial()->GetVertexProgram()->Bind();
+
         // Render sky dome.
         mSkyDome->Render(state);

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

@@ -1900 +1900 @@
                 glViewport(0, 0, texWidth, texHeight);
 
+                state.Reset();
                 InitDeferredRendering();
         }
@@ -1906 +1907 @@
                 glEnable(GL_LIGHTING);
                 state.SetRenderPassType(RenderState::FIXED);
+                state.Reset();
         }
 
@@ -1918 +1920 @@
 
         state.SetUseAlphaToCoverage(true);
-        state.Reset();
+        
 
         //cout << "visible: " << (int)traverser->GetVisibleObjects().size() << endl;