Changeset 2575 for GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

Timestamp:

01/03/08 15:53:44 (16 years ago)

Author:

bittner

Message:

big merge: preparation for havran ray caster, check if everything works

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

@@ -5 +5 @@
 #include "ViewCellsManager.h"
 #include "SceneGraph.h"
-#include "Viewcell.h"
+#include "ViewCell.h"
 #include "Beam.h"
 #include "KdTree.h"
@@ -126 +126 @@
 void GlRenderer::RenderTriangle(TriangleIntersectable *object)
 {
-        Triangle3 &t = object->GetItem();
+  Triangle3 *t = &(object->GetItem());
 
         glBegin(GL_TRIANGLES);
-        Vector3 normal = t.GetNormal();
+        Vector3 normal = t->GetNormal();
         glNormal3f(normal.x, normal.y, normal.z);
-        glVertex3f(t.mVertices[0].x, t.mVertices[0].y, t.mVertices[0].z);
-        glVertex3f(t.mVertices[1].x, t.mVertices[1].y, t.mVertices[1].z);
-        glVertex3f(t.mVertices[2].x, t.mVertices[2].y, t.mVertices[2].z);
+        glVertex3f(t->mVertices[0].x, t->mVertices[0].y, t->mVertices[0].z);
+        glVertex3f(t->mVertices[1].x, t->mVertices[1].y, t->mVertices[1].z);
+        glVertex3f(t->mVertices[2].x, t->mVertices[2].y, t->mVertices[2].z);
         glEnd();
 }
@@ -420 +420 @@
                 if ((*oi)->Type() == Intersectable::TRIANGLE_INTERSECTABLE) {
                         TriangleIntersectable *object = (TriangleIntersectable *)*oi;
-                        Triangle3 &t = object->GetItem();
-
-                        Vector3 normal = t.GetNormal();
+                        Triangle3 *t = &(object->GetItem());
+
+                        Vector3 normal = t->GetNormal();
                         glNormal3f(normal.x, normal.y, normal.z);
-                        glVertex3f(t.mVertices[0].x, t.mVertices[0].y, t.mVertices[0].z);
-                        glVertex3f(t.mVertices[1].x, t.mVertices[1].y, t.mVertices[1].z);
-                        glVertex3f(t.mVertices[2].x, t.mVertices[2].y, t.mVertices[2].z);
+                        glVertex3f(t->mVertices[0].x, t->mVertices[0].y, t->mVertices[0].z);
+                        glVertex3f(t->mVertices[1].x, t->mVertices[1].y, t->mVertices[1].z);
+                        glVertex3f(t->mVertices[2].x, t->mVertices[2].y, t->mVertices[2].z);
 
                 }