Text archives Help

---

Author: abe
Date: Wed Jan 18 19:10:52 2006
New Revision: 849

Modified:
   trunk/fox/disco_demo/Engine/Shaders/AOShader.cc
   trunk/fox/disco_demo/StandAlone/disco_demo.cc
   trunk/fox/disco_demo/scenes/disco_stack.cc
Log:

Fixed small bugs in new implementation.

M    fox/disco_demo/scenes/disco_stack.cc
M    fox/disco_demo/Engine/Shaders/AOShader.cc
M    fox/disco_demo/StandAlone/disco_demo.cc


Modified: trunk/fox/disco_demo/Engine/Shaders/AOShader.cc
==============================================================================
--- trunk/fox/disco_demo/Engine/Shaders/AOShader.cc     (original)
+++ trunk/fox/disco_demo/Engine/Shaders/AOShader.cc     Wed Jan 18 19:10:52 
2006
@@ -211,7 +211,7 @@
     
   ///////////////////////////////////////////////////////////////////////////
   // Decide which directions to shoot based on TilePacket element task id.
-    
+  
   for (int i=0;i<ray_packet.getSize();++i) {
     
     TilePacket::Element &p = tile_packet.get( i );
@@ -236,6 +236,8 @@
         directions[d][1]*V[i] +
         directions[d][2]*W[i];
 
+      p.color = Color(RGB(dir[0],dir[1],dir[2]));
+      
       // Add a ray to the outgoing packet.
       RayPacket::Element &out = secondary_packet.get( secondary_size++ );
 
@@ -363,6 +365,7 @@
       
       // Color the pixel
       sum = 1.0 - (sum/total);
+      
       p.color = p.color * Color(RGB(sum,sum,sum));
     }
   }  

Modified: trunk/fox/disco_demo/StandAlone/disco_demo.cc
==============================================================================
--- trunk/fox/disco_demo/StandAlone/disco_demo.cc       (original)
+++ trunk/fox/disco_demo/StandAlone/disco_demo.cc       Wed Jan 18 19:10:52 
2006
@@ -65,11 +65,9 @@
 
 #include <disco_demo/Engine/ImageTraversers/DiscoImageTraverser.h>
 #include <disco_demo/Engine/Renderers/DiscoRayTracer.h>
-#include <disco_demo/Engine/Shaders/DepthMapShader.h>
 #include <disco_demo/Engine/Shaders/AOShader.h>
 
 using namespace disco;
-using namespace disco::depth_map;
 using namespace disco::ambient_occlusion;
 
 
//////////////////////////////////////////////////////////////////////////////

Modified: trunk/fox/disco_demo/scenes/disco_stack.cc
==============================================================================
--- trunk/fox/disco_demo/scenes/disco_stack.cc  (original)
+++ trunk/fox/disco_demo/scenes/disco_stack.cc  Wed Jan 18 19:10:52 2006
@@ -35,7 +35,6 @@
 
 #include <disco_demo/Engine/ImageTraversers/DiscoImageTraverser.h>
 #include <disco_demo/Engine/Renderers/DiscoRayTracer.h>
-#include <disco_demo/Engine/Shaders/DepthMapShader.h>
 #include <disco_demo/Engine/Shaders/AOShader.h>
 
 #include <vector>

---

• [MANTA] r849 - in trunk/fox/disco_demo: Engine/Shaders StandAlone scenes, abe, 01/18/2006

---

Archive powered by MHonArc 2.6.16.