[cig-commits] r11252 - cs/benchmark/cigma/trunk/scratch/cg/src

[luis at geodynamics.org]

Author: luis
Date: 2008-02-26 04:52:06 -0800 (Tue, 26 Feb 2008)
New Revision: 11252

Modified:
   cs/benchmark/cigma/trunk/scratch/cg/src/MainWindow.cpp
   cs/benchmark/cigma/trunk/scratch/cg/src/RenderPoints.h
Log:
Changed headers in MainWindow.cpp


Modified: cs/benchmark/cigma/trunk/scratch/cg/src/MainWindow.cpp
===================================================================
--- cs/benchmark/cigma/trunk/scratch/cg/src/MainWindow.cpp	2008-02-26 12:52:05 UTC (rev 11251)
+++ cs/benchmark/cigma/trunk/scratch/cg/src/MainWindow.cpp	2008-02-26 12:52:06 UTC (rev 11252)
@@ -1,14 +1,17 @@
+#include <iostream>
+#include <cstdlib>
+#include <ctime>
+#include <cmath>
+
 #include "MainWindow.h"
+#include "vtkRenderer.h"
+#include "vtkRenderWindow.h"
+
 #include "OrientationAxes.h"
 #include "RenderPoints.h"
+#include "RenderTetrahedron.h"
 
-#include "vtkRenderer.h"
 
-#include <iostream>
-#include <cstdlib>
-#include <ctime>
-#include <cmath>
-
 // ---------------------------------------------------------------------------
 
 
@@ -24,7 +27,9 @@
     ren->SetBackground(25./256, 51./256, 102./256);
     qvtkWidget->GetRenderWindow()->AddRenderer(ren);
     AddOrientationAxes(qvtkWidget);
-    RenderPoints(ren);
+
+    //RenderPoints(ren);
+    RenderTetra(ren);
 }
 
 

Modified: cs/benchmark/cigma/trunk/scratch/cg/src/RenderPoints.h
===================================================================
--- cs/benchmark/cigma/trunk/scratch/cg/src/RenderPoints.h	2008-02-26 12:52:05 UTC (rev 11251)
+++ cs/benchmark/cigma/trunk/scratch/cg/src/RenderPoints.h	2008-02-26 12:52:06 UTC (rev 11252)
@@ -5,17 +5,18 @@
 #include <cmath>
 #include "vtkRenderer.h"
 #include "vtkRenderWindow.h"
+
 #include "vtkFloatArray.h"
 #include "vtkPoints.h"
 #include "vtkPolyVertex.h"
 #include "vtkUnstructuredGrid.h"
+
 #include "vtkOutlineFilter.h"
 #include "vtkDataSetMapper.h"
 #include "vtkPolyDataMapper.h"
 #include "vtkActor.h"
 #include "vtkProperty.h"
 
-using namespace std;
 
 void RenderPoints(vtkRenderer *ren)
 {