Changeset 2173

Timestamp:

02/28/07 16:01:10 (17 years ago)

Author:

bittner

Message:

merge

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Makefile (modified) (2 diffs)
• Material.cpp (modified) (1 diff)
• Material.h (modified) (1 diff)
• QtInterface/QtGlRenderer.cpp (modified) (2 diffs)
• VssRay.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: út 20. II 20:32:50 2007
+# Generated by qmake (2.00a) (Qt 4.1.2) on: st 28. II 15:33:08 2007
 # Project:  preprocessor.pro
 # Template: app
@@ -63 +63 @@
         $(MAKE) -f $(MAKEFILE).Debug uninstall
 
-Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc.net\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
+Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc2005\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
                 C:\Qt\4.1.2\mkspecs\features\qt_config.prf \
                 C:\Qt\4.1.2\mkspecs\features\exclusive_builds.prf \

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

@@ -36 +36 @@
 
 #define MAX_COLOR_VALUE 1.0f
+  int band = (int)(value*4.0f);
+  value = value - band;
   
-  switch ((int)(value*4.0f)) {
+  switch (band) {
   case 0:
         color.r = MAX_COLOR_VALUE;

GTP/trunk/Lib/Vis/Preprocessing/src/Material.h

@@ -26 +26 @@
   // (range of hue from 0-240)
 
-  friend RgbColor RainbowMapping(const float value);
+  friend RgbColor RainbowColorMapping(const float value);
   
 };

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -418 +418 @@
                   //              glColor3f(visibility, 0.0f, 0.0f);
 
-                  RgbColor color = RainbowMapping(mTransferFunction*log10(entry.mData.mSumPdf + 1));
+                  RgbColor color = RainbowColorMapping(mTransferFunction*log10(entry.mData.mSumPdf + 1));
                   glColor3f(color.r, color.g, color.b);
                   
@@ -1056 +1056 @@
                 ((float)vc->GetPvs().GetSize() / (float)maxPvs);
           //      c = RgbColor(importance, 1.0f - importance, 0.0f);
-          c = RainbowMapping(importance);
+          c = RainbowColorMapping(importance);
           
         }

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

@@ -2 +2 @@
 #include "AxisAlignedBox3.h"
 #include "SamplingStrategy.h"
+#include "Ray.h"
 
 namespace GtpVisibilityPreprocessor {