Text archives Help

---

Author: sparker
Date: Wed May 11 00:49:35 2005
New Revision: 286

Modified:
   branches/newPointVector/Core/Geometry/PointVector.h
   branches/newPointVector/Model/Primitives/CMakeLists.txt
   branches/newPointVector/scenes/primtest.cc
Log:
primtest now compiles but still broken


Modified: branches/newPointVector/Core/Geometry/PointVector.h
==============================================================================
--- branches/newPointVector/Core/Geometry/PointVector.h (original)
+++ branches/newPointVector/Core/Geometry/PointVector.h Wed May 11 00:49:35 
2005
@@ -175,10 +175,10 @@
         data[i] = copy.data[i];
     }
 
-        explicit PointT( const VectorT<T,Dim> &copy ) {
-               for (int i=0;i<Dim;++i)
-                 data[i] = copy[i];
-        }
+    explicit PointT( const VectorT<T,Dim> &copy ) {
+      for (int i=0;i<Dim;++i)
+        data[i] = copy[i];
+    }
                
     PointT<T, Dim>& operator=(const PointT<T, Dim>& copy) {
       for(int i=0;i<Dim;i++)

Modified: branches/newPointVector/Model/Primitives/CMakeLists.txt
==============================================================================
--- branches/newPointVector/Model/Primitives/CMakeLists.txt     (original)
+++ branches/newPointVector/Model/Primitives/CMakeLists.txt     Wed May 11 
00:49:35 2005
@@ -4,7 +4,7 @@
      Primitives/PrimitiveCommon.cc
      Primitives/Sphere.cc
      Primitives/SuperEllipsoid.cc
-     # Primitives/Cube.cc
+     Primitives/Cube.cc
      Primitives/Cone.cc
      Primitives/Triangle.cc
 )

Modified: branches/newPointVector/scenes/primtest.cc
==============================================================================
--- branches/newPointVector/scenes/primtest.cc  (original)
+++ branches/newPointVector/scenes/primtest.cc  Wed May 11 00:49:35 2005
@@ -153,10 +153,10 @@
     spinprim = new Sphere(matl, Point(0,0,0), scale/max);
   } else if(primtype == "box"){
     Point p2(scale/max/1.732, scale/max/1.732, scale/max/1.732);
-    spinprim = new Cube(matl, Point(-p2.x(), -p2.y(), -p2.z(), p2.x()*2, 
p2.y()*2, p2.z()*2);
+    spinprim = new Cube(matl, Point(-p2.x(), -p2.y(), -p2.z()), p2.x()*2, 
p2.y()*2, p2.z()*2);
   } 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(-p2.x(), -p2.y(), -p2.z()), 
p2.x()*2, p2.y()*2, p2.z()*2);
     Primitive* o2 = new Sphere(matl, Point(0,0,0), scale/max);
     SphericalMapper* map = new SphericalMapper(Point(0,0,0), scale/max);
     o1->setTexCoordMapper(map);
@@ -188,8 +188,8 @@
          AffineTransform t;
          double a1 = i/static_cast<double>(numx-1)*M_PI*2;
          double a2 = j/static_cast<double>(numy-1)*M_PI*2;
-         t.rotate(a1, Vector(0,1,0));
-         t.rotate(a2, Vector(1,0,0));
+         t.rotate(Vector(0,1,0), a1);
+         t.rotate(Vector(1,0,0), a2);
          t.translate(p);
          group->add(new InstanceRT(spinprim, t));
        }
@@ -237,8 +237,8 @@
          int idx = j*numx+i;
          double scale = (idx+1)/static_cast<double>(numx*numy);
          t.scale(Vector(scale, scale, scale));
-         t.rotate(a1, Vector(0,1,0));
-         t.rotate(a2, Vector(1,0,0));
+         t.rotate(Vector(0,1,0), a1);
+         t.rotate(Vector(1,0,0), a2);
          t.translate(p);
          group->add(new InstanceRST(spinprim, t));
        }
@@ -255,8 +255,8 @@
          int idx = j*numx+i;
          double scale = (idx+1)/static_cast<double>(numx*numy);
          t.scale(Vector(scale, scale, scale));
-         t.rotate(a1, Vector(0,1,0));
-         t.rotate(a2, Vector(1,0,0));
+         t.rotate(Vector(0,1,0), a1);
+         t.rotate(Vector(1,0,0), a2);
          t.translate(p);
          group->add(new Instance(spinprim, t));
        }

---

• [MANTA] r286 - in branches/newPointVector: Core/Geometry Model/Primitives scenes, sparker, 05/11/2005

---

Archive powered by MHonArc 2.6.16.