Text archives Help

---

Author: sparker
Date: Wed Jan  4 13:48:48 2006
New Revision: 816

Modified:
   branches/vertical/Engine/Control/RTRT.cc
   branches/vertical/Engine/Renderers/Raytracer.cc
   branches/vertical/Model/Textures/TexCoordTexture.cc
   branches/vertical/Model/Textures/TriVerTexture.cc
   branches/vertical/scenes/primtest.cc
Log:
More progress on verticalization


Modified: branches/vertical/Engine/Control/RTRT.cc
==============================================================================
--- branches/vertical/Engine/Control/RTRT.cc    (original)
+++ branches/vertical/Engine/Control/RTRT.cc    Wed Jan  4 13:48:48 2006
@@ -1291,7 +1291,7 @@
     result_rays.computeNormals( render_context );
 
     // Shade.
-    result_rays.hitMaterial(0)->shade( render_context, result_rays );
+    result_rays.getHitMaterial(0)->shade( render_context, result_rays );
   }
   result_color = result_rays.getColor(0);
 }

Modified: branches/vertical/Engine/Renderers/Raytracer.cc
==============================================================================
--- branches/vertical/Engine/Renderers/Raytracer.cc     (original)
+++ branches/vertical/Engine/Renderers/Raytracer.cc     Wed Jan  4 13:48:48 
2006
@@ -55,10 +55,10 @@
   // same object and material to shade with a single shade call
   for(int i = rays.begin();i<rays.end();){
     if(rays.wasHit(i)){
-      const Material* hit_matl = rays.hitMaterial(i);
+      const Material* hit_matl = rays.getHitMaterial(i);
       int end = i+1;
       while(end < rays.end() && rays.wasHit(end) &&
-            rays.hitMaterial(end) == hit_matl)
+            rays.getHitMaterial(end) == hit_matl)
        end++;
       RayPacket subPacket(rays, i, end);
       hit_matl->shade(context, subPacket);

Modified: branches/vertical/Model/Textures/TexCoordTexture.cc
==============================================================================
--- branches/vertical/Model/Textures/TexCoordTexture.cc (original)
+++ branches/vertical/Model/Textures/TexCoordTexture.cc Wed Jan  4 13:48:48 
2006
@@ -46,20 +46,13 @@
   // Compute the texture coordinates.
   rays.computeTextureCoordinates3( context );
     
-  for( int i = 0; i < rays.getSize(); ++i ) {
-    RayPacket::Element &e = rays.get( i );
-
+  for( int i = rays.begin(); i < rays.end(); ++i ) {
+    Point texCoords = rays.getTexCoords(i);
     // Convert the coordinates to a color.
-    results[i] = Color( RGB( (ColorComponent)e.texCoords[0],
-                             (ColorComponent)e.texCoords[1],
+    results[i] = Color( RGB( (ColorComponent)texCoords[0],
+                             (ColorComponent)texCoords[1],
                              (ColorComponent)0 ) );
-
-    
-    // results[i] = Color( RGB( (ColorComponent)1.0,
-    //                         (ColorComponent)1.0,
-    //                         (ColorComponent)0.0 ) );
   }
-
 
 } // end mapValues
   

Modified: branches/vertical/Model/Textures/TriVerTexture.cc
==============================================================================
--- branches/vertical/Model/Textures/TriVerTexture.cc   (original)
+++ branches/vertical/Model/Textures/TriVerTexture.cc   Wed Jan  4 13:48:48 
2006
@@ -17,12 +17,11 @@
   {
     rays.computeTextureCoordinates3( context );
     
-    for( int i = 0; i < rays.getSize(); i++ ) {
-      RayPacket::Element &e = rays.get( i );
-      Point T = e.texCoords;
-      Triangle::TriangleHit& th = 
e.hitInfo.scratchpad<Triangle::TriangleHit>();
+    for( int i = rays.begin(); i < rays.end(); i++ ) {
+      Point T = rays.getTexCoords(i);
+      Triangle::TriangleHit& th = rays.scratchpad<Triangle::TriangleHit>(i);
       const VertexColoredTriangle* vct = 
-         static_cast<const VertexColoredTriangle*>(e.hitInfo.hitPrimitive());
+        static_cast<const VertexColoredTriangle*>(rays.getHitPrimitive(i));
       results[i] = vct->getVertexColor(0)*(1 - th.a - th.b) + 
                    vct->getVertexColor(1)*th.a + vct->getVertexColor(2)*th.b;
     }

Modified: branches/vertical/scenes/primtest.cc
==============================================================================
--- branches/vertical/scenes/primtest.cc        (original)
+++ branches/vertical/scenes/primtest.cc        Wed Jan  4 13:48:48 2006
@@ -214,9 +214,9 @@
         Point p((numx>1 ? i/static_cast<Real>(numx-1) - (Real)0.5 : 
0)*scale*2,
                 (numy>1 ? j/static_cast<Real>(numy-1) - (Real)0.5 : 
0)*scale*2,
                 0);
-  Primitive* prim = new Cube( matl, p-p2, p2.x()*1.156, p2.y()*1.156, 
p2.z()*1.156 );
-  if ( mapr )
-    prim->setTexCoordMapper( mapr );
+        Primitive* prim = new Cube( matl, p-p2, p+p2);
+        if ( mapr )
+          prim->setTexCoordMapper( mapr );
         group->add( prim );
       }
     }
@@ -227,13 +227,13 @@
     spinprim = prim;
   } else if(primtype == "box"){
     Point p2(scale/max/1.732, scale/max/1.732, scale/max/1.732);
-    Primitive* prim = new Cube(matl, Point(-p2.x(), -p2.y(), -p2.z()), 
p2.x()*2, p2.y()*2, p2.z()*2);
+    Primitive* prim = new Cube(matl, Point(-Vector(p2)), p2);
     if ( mapr )
       prim->setTexCoordMapper( mapr );
     spinprim = prim;
   } else if(primtype == "intersection"){
     Point p2(scale/max/1.414, scale/max/1.414, scale/max/1.414);
-    Primitive* o1 = new Cube(matl, Point(-p2.x(), -p2.y(), -p2.z()), 
p2.x()*2, p2.y()*2, p2.z()*2);
+    Primitive* o1 = new Cube(matl, Point(-Vector(p2)), p2);
     Primitive* o2 = new Sphere(matl, Point(0,0,0), scale/max);
     SphericalMapper* map = new SphericalMapper(Point(0,0,0), scale/max);
     o1->setTexCoordMapper( mapr ? mapr : map );
@@ -241,7 +241,7 @@
     spinprim = new Intersection(o1, o2);
   } else if(primtype == "difference"){
     Point p2(scale/max/1.414, scale/max/1.414, scale/max/1.414);
-    Primitive* o1 = new Cube(matl, Point(-p2.x(), -p2.y(), -p2.z()), 
p2.x()*2, p2.y()*2, p2.z()*2);
+    Primitive* o1 = new Cube(matl, Point(-Vector(p2)), p2);
     Primitive* o2 = new Sphere(matl, Point(0,0,0), scale/max);
     Real s = scale/max/(Real)1.414*2*(Real)(1+1.e-10);
     LinearMapper* map = new LinearMapper(Point(0,0,0),

---

• [MANTA] r816 - in branches/vertical: Engine/Control Engine/Renderers Model/Textures scenes, sparker, 01/04/2006

---

Archive powered by MHonArc 2.6.16.