Manta Interactive Ray Tracer Development Mailing List

Text archives Help


[MANTA] r1137 - in trunk: Model/Primitives scenes


Chronological Thread 
  • From: knolla@sci.utah.edu
  • To: manta@sci.utah.edu
  • Subject: [MANTA] r1137 - in trunk: Model/Primitives scenes
  • Date: Mon, 3 Jul 2006 15:57:00 -0600 (MDT)

Author: knolla
Date: Mon Jul  3 15:57:00 2006
New Revision: 1137

Modified:
   trunk/Model/Primitives/IsosurfaceGridVolume.cc
   trunk/Model/Primitives/IsosurfaceGridVolume.h
   trunk/scenes/gridisovol.cc
Log:
added command-line isovalue to grid volumes

Modified: trunk/Model/Primitives/IsosurfaceGridVolume.cc
==============================================================================
--- trunk/Model/Primitives/IsosurfaceGridVolume.cc      (original)
+++ trunk/Model/Primitives/IsosurfaceGridVolume.cc      Mon Jul  3 15:57:00 
2006
@@ -9,10 +9,9 @@
 using namespace Manta;
 using namespace SCIRun;
 
-IsosurfaceGridVolume::IsosurfaceGridVolume(char* filebase, int _mc_depth, 
Material* _matl)
-: PrimitiveCommon(_matl)
+IsosurfaceGridVolume::IsosurfaceGridVolume(char* filebase, int _mc_depth, 
double isovalue, Material* _matl)
+: PrimitiveCommon(_matl), isoval((ST)isovalue)
 {
-    isoval = 22;
     mc_depth = _mc_depth;
 
     this->filebase=strdup(filebase);

Modified: trunk/Model/Primitives/IsosurfaceGridVolume.h
==============================================================================
--- trunk/Model/Primitives/IsosurfaceGridVolume.h       (original)
+++ trunk/Model/Primitives/IsosurfaceGridVolume.h       Mon Jul  3 15:57:00 
2006
@@ -57,7 +57,7 @@
         BrickArray3<VMCell>* macrocells;
         char* filebase;
 
-        IsosurfaceGridVolume(char* filebase, int _mc_depth, Material* _matl);
+        IsosurfaceGridVolume(char* filebase, int _mc_depth, double isovalue, 
Material* _matl);
         ~IsosurfaceGridVolume();
         
         void preprocess( PreprocessContext const &context );

Modified: trunk/scenes/gridisovol.cc
==============================================================================
--- trunk/scenes/gridisovol.cc  (original)
+++ trunk/scenes/gridisovol.cc  Mon Jul  3 15:57:00 2006
@@ -42,6 +42,7 @@
        
     string filename = "";
     int macrocells = 3;
+    double isovalue = 20;
        
        Vector plane_point;
        Vector plane_normal;
@@ -57,11 +58,16 @@
         else if (args[i] == "-macrocells") {
                        if (!getIntArg(i, args, macrocells))
                                throw IllegalArgument("octisovol -macrocells 
<#macrocells>", i, args);
-               }        
+               }
+        else if (args[i] == "-isovalue") {
+                       if (!getDoubleArg(i, args, isovalue))
+                               throw IllegalArgument("octisovol -isovalue 
<isovalue>", i, args);
+               }      
                else {
                        cerr << "Read built grid volume:" << endl;
                        cerr << "-file <filename>"             << endl;
             cerr << "-macrocells <#macrocells>" << endl;
+            cerr << "-isovalue <isovalue>" << endl;
                        throw IllegalArgument( "gridisovol", i, args );
                }
        }
@@ -77,7 +83,7 @@
     
     //Material* mat1 = new Phong(Color(RGBColor(0.05f, 0.3f, 0.6f)), 
Color(RGBColor(1.f, 1.f, 1.f)), 50);
     Material* mat1 = new Lambertian(Color(RGBColor(0.05f, 0.3f, 0.6f)));
-    IsosurfaceGridVolume* igv = new IsosurfaceGridVolume(c_filename, 
macrocells, mat1);
+    IsosurfaceGridVolume* igv = new IsosurfaceGridVolume(c_filename, 
macrocells, isovalue, mat1);
     bounds = igv->getBounds();
     group->add(igv);
                




  • [MANTA] r1137 - in trunk: Model/Primitives scenes, knolla, 07/03/2006

Archive powered by MHonArc 2.6.16.

Top of page