Changeset 2552 for GTP

Timestamp:

10/04/07 11:57:38 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/src/BatchedQueriesCullingManager.cpp (modified) (1 diff)
• Preprocessing/src/GlRenderer.cpp (modified) (3 diffs)
• Preprocessing/src/GlobalLinesRenderer.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/BatchedQueriesCullingManager.cpp

@@ -91 +91 @@
                                 {
                                         SkipQuery(node);
-
                                         continue;
                                 }

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

@@ -1274 +1274 @@
         glGenTextures(1, &frontDepthMap);
         glBindTexture(GL_TEXTURE_2D, frontDepthMap);
-        
+
         glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, depthMapSize, 
-                                 depthMapSize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
+                depthMapSize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
 
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -1285 +1285 @@
         glGenTextures(1, &backDepthMap);
         glBindTexture(GL_TEXTURE_2D, backDepthMap);
-        
+
         glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, depthMapSize, 
-                                 depthMapSize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
+                depthMapSize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
@@ -1299 +1299 @@
         cgSetErrorCallback(handleCgError);
         sCgContext = cgCreateContext();
-        
+
         if (cgGLIsProfileSupported(CG_PROFILE_ARBFP1))
                 sCgFragmentProfile = CG_PROFILE_ARBFP1;
         else 
         {
-          // try FP30
-          if (cgGLIsProfileSupported(CG_PROFILE_FP30))
-            sCgFragmentProfile = CG_PROFILE_FP30;
-          else 
-          {
-                  Debug << "Neither arbfp1 or fp30 fragment profiles supported on this system" << endl;
-                  exit(1);
-          }
-  }
-
- sCgFragmentProgram = cgCreateProgramFromFile(sCgContext,
-                                                                                           CG_SOURCE, "../src/dual_depth.cg",
-                                                                                           sCgFragmentProfile,
-                                                                                           NULL, 
-                                                                                           NULL);
-
-  if (!cgIsProgramCompiled(sCgFragmentProgram))
-          cgCompileProgram(sCgFragmentProgram);
-
-  cgGLLoadProgram(sCgFragmentProgram);
-  cgGLBindProgram(sCgFragmentProgram);
-
-  Debug << "---- PROGRAM BEGIN ----\n" <<
-          cgGetProgramString(sCgFragmentProgram, CG_COMPILED_PROGRAM) << "---- PROGRAM END ----\n";
-
-#endif
-
-#endif
-  DoneCurrent();
+                // try FP30
+                if (cgGLIsProfileSupported(CG_PROFILE_FP30))
+                        sCgFragmentProfile = CG_PROFILE_FP30;
+                else 
+                {
+                        Debug << "Neither arbfp1 or fp30 fragment profiles supported on this system" << endl;
+                        exit(1);
+                }
+        }
+
+        sCgFragmentProgram = cgCreateProgramFromFile(sCgContext,
+                                                         CG_SOURCE, "../src/dual_depth.cg",
+                                                                                                 sCgFragmentProfile,
+                                                                                                 NULL, 
+                                                                                                 NULL);
+
+        if (!cgIsProgramCompiled(sCgFragmentProgram))
+                cgCompileProgram(sCgFragmentProgram);
+
+        cgGLLoadProgram(sCgFragmentProgram);
+        cgGLBindProgram(sCgFragmentProgram);
+
+        Debug << "---- PROGRAM BEGIN ----\n" <<
+                cgGetProgramString(sCgFragmentProgram, CG_COMPILED_PROGRAM) << "---- PROGRAM END ----\n";
+
+#endif
+
+#endif
+        DoneCurrent();
 }
 

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

@@ -472 +472 @@
         { 
                 //glLoadIdentity();
-                ObjectContainer::const_iterator oit, oit_end = mPreprocessor->mObjects.end();
-
                 Intersectable::NewMail();
-        
                 mRenderer->RenderScene();
         }