Text archives Help
- From: edwards@sci.utah.edu
- To: rtrt@sci.utah.edu
- Subject: [MANTA] r279 - trunk/scenes
- Date: Tue, 10 May 2005 15:50:09 -0600 (MDT)
Author: edwards
Date: Tue May 10 15:50:09 2005
New Revision: 279
Modified:
trunk/scenes/primtest.cc
Log:
Added Disk and Hemisphere primitives to primtest scene.
Modified: trunk/scenes/primtest.cc
==============================================================================
--- trunk/scenes/primtest.cc (original)
+++ trunk/scenes/primtest.cc Tue May 10 15:50:09 2005
@@ -19,6 +19,8 @@
#include <Model/Instances/InstanceST.h>
#include <Model/Instances/InstanceT.h>
#include <Model/Primitives/Cube.h>
+#include <Model/Primitives/Disk.h>
+#include <Model/Primitives/Hemisphere.h>
#include <Model/Primitives/Parallelogram.h>
#include <Model/Primitives/Sphere.h>
#include <Model/Primitives/SuperEllipsoid.h>
@@ -174,6 +176,10 @@
o1->setTexCoordMapper(map);
o2->setTexCoordMapper(map);
spinprim = new Difference(o1, o2);
+ } else if (primtype == "disk") {
+ spinprim = new Disk(matl, Point(0.0, 0.0, 0.0), Vector(0.0, 0.0, 1.0),
scale / max, Vector(1.0, 0.0, 0.0), 0.25 * M_PI, 1.75 * M_PI);
+ } else if (primtype == "hemisphere") {
+ spinprim = new Hemisphere(matl, Point(0.0, 0.0, 0.0), scale / max,
Vector(0.0, 0.0, 1.0));
} else {
throw IllegalArgument("Unknown primitive type for primtest: "+primtype,
0, args);
}
- [MANTA] r279 - trunk/scenes, edwards, 05/10/2005
Archive powered by MHonArc 2.6.16.