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

Timestamp:

05/23/08 17:47:22 (16 years ago)

Author:

mattausch

Message:

implemented dynamic object placement / removal

File:

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

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

@@ -551 +551 @@
         glPopMatrix();
 
-        if (1)
-        {
-                // test the box of the object
+        if (0)
+        {
+                // render the box of the object
                 AxisAlignedBox3 box = leaf->GetBox();
                 RenderBox(box);
@@ -590 +590 @@
         Intersectable::NewMail();
 
-#if DYNAMIC_OBJECTS_HACK
         Preprocessor *p = mViewCellsManager->GetPreprocessor();
         // handle dynamic objects
@@ -599 +598 @@
                 _RenderDynamicObject(*dit);
         }
-#endif
+
         _RenderSceneTrianglesWithDrawArrays();
 
@@ -606 +605 @@
 
 
-void
-GlRendererBuffer::EvalQueryWithItemBuffer()
-{
-        // read back the texture
-        glReadPixels(0, 0,
-                GetWidth(), GetHeight(),
-                GL_RGBA,
-                GL_UNSIGNED_BYTE,
-                mPixelBuffer);
-
-
-        unsigned int *p = mPixelBuffer;
-
-        for (int y = 0; y < GetHeight(); y++)
-        {
-                for (int x = 0; x < GetWidth(); x++, p++) 
-                {
-                        unsigned int id = (*p) & 0xFFFFFF;
-
-                        if (id != 0xFFFFFF)
-                        {
-                                ++ mObjects[id]->mCounter;
-                        }
-                }
-        }
-}
-
+
+Preprocessor *GlRenderer::GetPreprocessor()
+{
+        return mViewCellsManager->GetPreprocessor();
+}
 
 
@@ -648 +625 @@
         mPixelBuffer = NULL; 
         // implement width and height in subclasses
+}
+
+
+void
+GlRendererBuffer::EvalQueryWithItemBuffer()
+{
+        // read back the texture
+        glReadPixels(0, 0,
+                GetWidth(), GetHeight(),
+                GL_RGBA,
+                GL_UNSIGNED_BYTE,
+                mPixelBuffer);
+
+
+        unsigned int *p = mPixelBuffer;
+
+        for (int y = 0; y < GetHeight(); y++)
+        {
+                for (int x = 0; x < GetWidth(); x++, p++) 
+                {
+                        unsigned int id = (*p) & 0xFFFFFF;
+
+                        if (id != 0xFFFFFF)
+                        {
+                                ++ mObjects[id]->mCounter;
+                        }
+                }
+        }
 }