Text archives Help

---

Author: boulos
Date: Mon Jun 11 18:25:46 2007
New Revision: 1415

Modified:
   trunk/Model/Primitives/CMakeLists.txt
   trunk/StandAlone/manta.cc
Log:
Undoing my unfortunate commit to manta.cc and
CMakeLists.  I wrongly assumed that 
svn commit -F svn-commit.tmp or whatever actually
also stored your "command"...


Modified: trunk/Model/Primitives/CMakeLists.txt
==============================================================================
--- trunk/Model/Primitives/CMakeLists.txt       (original)
+++ trunk/Model/Primitives/CMakeLists.txt       Mon Jun 11 18:25:46 2007
@@ -36,8 +36,6 @@
      Primitives/Sphere.h
      Primitives/SuperEllipsoid.cc
      Primitives/SuperEllipsoid.h
-     Primitives/superellipsoid.cc
-     Primitives/superellipsoid.h
      Primitives/TessellatedCylinder.cc
      Primitives/TessellatedCylinder.h
      Primitives/TexTriangle.cc
@@ -58,5 +56,4 @@
       Primitives/IsosurfaceOctreeVolume.h
      )
 ENDIF(INTEL_COMPILER_VERSION LESS 9.1)
-
 

Modified: trunk/StandAlone/manta.cc
==============================================================================
--- trunk/StandAlone/manta.cc   (original)
+++ trunk/StandAlone/manta.cc   Mon Jun 11 18:25:46 2007
@@ -72,8 +72,6 @@
 #include <iostream>
 #include <sgi_stl_warnings_on.h>
 
-#include <Model/Primitives/superellipsoid.h>
-
 using namespace std;
 using namespace Manta;
 using SCIRun::InternalError;
@@ -618,8 +616,7 @@
   UniformMapper* uniformmap = new UniformMapper();
   floor->setTexCoordMapper(uniformmap);
   world->add(floor);
-  //world->add(new Sphere(red, Vector(0,0,1.2), 1.0));
-  world->add(new superellipsoid(red, Vector(0,0,1.2), 1.0, 1.0, 1.0));
+  world->add(new Sphere(red, Vector(0,0,1.2), 1.0));
   scene->setObject(world);
 
   LightSet* lights = new LightSet();

---

• [MANTA] r1415 - in trunk: Model/Primitives StandAlone, boulos, 06/11/2007

---

Archive powered by MHonArc 2.6.16.