Changeset 3118 for GTP

Timestamp:

11/11/08 16:22:02 (16 years ago)

Author:

mattausch

Message:

found error with mrts

Location:

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

Files:

• DeferredRenderer.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (7 diffs)
• shaders/mrt.cg (modified) (1 diff)

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

@@ -72 +72 @@
 
 
-int DeferredRenderer::colorBufferIdx = 3;
+int DeferredRenderer::colorBufferIdx = 0;
 
 
@@ -519 +519 @@
         GLuint oldTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex)->GetTexture();
 
-        cout << colorBufferIdx;
-
         glPushAttrib(GL_VIEWPORT_BIT);
         glViewport(0, 0, mIllumFbo->GetWidth(), mIllumFbo->GetHeight());

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

@@ -463 +463 @@
         //-- load some dynamic stuff
 
-/*      LoadModel("hbuddha.dem", dynamicObjects);
+        LoadModel("hbuddha.dem", dynamicObjects);
         buddha = dynamicObjects.back();
         
@@ -487 +487 @@
                 dynamicObjects.push_back(ent);
         }
-*/
+
 
         ///////////
@@ -522 +522 @@
         preetham = new SkyPreetham(turbitiy, skyDome);
 
-        //CreateAnimation();
+        CreateAnimation();
 
 
@@ -883 +883 @@
         // draw to 3 color buffers
         // a color, normal, and positions buffer
-        DeferredRenderer::colorBufferIdx = 3 - DeferredRenderer::colorBufferIdx;
-        if (sCurrentMrtSet == 0) glDrawBuffers(3, mrt);
-        else glDrawBuffers(3, mrt2);
+        if (sCurrentMrtSet == 0)
+        {
+                DeferredRenderer::colorBufferIdx = 0;
+                glDrawBuffers(3, mrt);
+        }
+        else 
+        {
+                DeferredRenderer::colorBufferIdx = 3;
+                glDrawBuffers(3, mrt2);
+        }
 
         sCurrentMrtSet = 1 - sCurrentMrtSet;
@@ -895 +902 @@
 void MainLoop() 
 {       
-        /*GPUProgramParameters *vtxParams = 
+        GPUProgramParameters *vtxParams = 
                 buddha->GetShape(0)->GetMaterial()->GetTechnique(1)->GetVertexProgramParameters();
 
@@ -908 +915 @@
         dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
 
-*/
+
         /////////////
 
@@ -1136 +1143 @@
 
         /////////////////////////
-
-        /*//motionPath->Move(0.3f);
+        //-- update animations
         motionPath->Move(0.01f);
-        Vector3 oldBuddhaPos = buddhaPos;
-        // new position
-        buddhaPos = motionPath->GetCurrentPosition();
-
-        Vector3 diff = oldBuddhaPos - buddhaPos;
-        //Vector3 diff = buddhaPos - oldBuddhaPos;
-
-        invTrafo = TranslationMatrix(diff);
-        //cout<< "diff " << diff << endl;
-        */
 }
 

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

@@ -63 +63 @@
         // transform the vertex position into post projection space
         OUT.position = mul(glstate.matrix.mvp, IN.position);
-        // the normal has to be correctly transformed with the inverse transpose
-        OUT.normal = mul(glstate.matrix.invtrans.modelview[0], IN.normal);
         // transform the old vertex position into world space
         OUT.worldPos = mul(modelMatrix, IN.position);
         // transform the old vertex position into world space
         OUT.oldWorldPos = mul(oldModelMatrix, IN.position);
-        
+        // the normal has to be correctly transformed with the inverse transpose
+        OUT.normal = mul(glstate.matrix.invtrans.modelview[0], IN.normal);
+
         return OUT;
 }