Changeset 181 for trunk/VUT/GtpVisibilityPreprocessor

Timestamp:

07/18/05 21:22:46 (19 years ago)

Author:

bittner

Message:

bug with find neighbors fixed

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Camera.cpp (modified) (1 diff)
• KdTree.cpp (modified) (1 diff)
• Makefile (modified) (3 diffs)
• SamplingPreprocessor.cpp (modified) (2 diffs)
• preprocessor.pro (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/src/Camera.cpp

@@ -19 +19 @@
 
   
-  
- // QImage image(mWidth, mHeight, 32); changed by matt
+#if QT_VERSION < 0x040000
+  QImage image(mWidth, mHeight, 32);
+#else
   QImage image(mWidth, mHeight, QImage::Format_RGB32);
+#endif
   
   vector<Ray> rays;

trunk/VUT/GtpVisibilityPreprocessor/src/KdTree.cpp

@@ -674 +674 @@
   return NULL;
 }
+
+int
+KdTree::FindNeighbors(KdNode *n,
+                      vector<KdNode *> &neighbors,
+                      bool onlyUnmailed
+                      )
+{
+  stack<KdNode *> nodeStack;
+  
+  nodeStack.push(mRoot);
+
+  AxisAlignedBox3 box = GetBox(n);
+
+  while (!nodeStack.empty()) {
+    KdNode *node = nodeStack.top();
+    nodeStack.pop();
+    if (node->IsLeaf()) {
+      if ( node != n && (!onlyUnmailed || !node->Mailed()) ) 
+        neighbors.push_back(node);
+    } else {
+      KdInterior *interior = (KdInterior *)node;
+      if (interior->mPosition > box.Max(interior->mAxis))
+        nodeStack.push(interior->mBack);
+      else
+        if (interior->mPosition < box.Min(interior->mAxis))
+          nodeStack.push(interior->mFront);
+        else {
+          // random decision
+            nodeStack.push(interior->mBack);
+            nodeStack.push(interior->mFront);
+        }
+    }
+  }
+  
+  return neighbors.size();
+}

trunk/VUT/GtpVisibilityPreprocessor/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (1.07a) (Qt 3.3.2) on: Sat Jul 16 12:10:59 2005
+# Generated by qmake (1.07a) (Qt 3.3.2) on: Mon Jul 18 20:55:14 2005
 # Project:  preprocessor.pro
 # Template: app
@@ -13 +13 @@
 LEX             = flex
 YACC            = byacc
-CFLAGS  =       -nologo -Zm200 -W0 -MD -O2 -GX  -DUNICODE -DQT_DLL -DQT_THREAD_SUPPORT -DQT_NO_DEBUG
-CXXFLAGS        =       -nologo -Zm200 -W0 -MD -O2 -GX  -DUNICODE -DQT_DLL -DQT_THREAD_SUPPORT -DQT_NO_DEBUG
+CFLAGS  =       -nologo -Zm200 -W0 -MDd -Zi -GX  -DUNICODE -DQT_DLL -DQT_THREAD_SUPPORT
+CXXFLAGS        =       -nologo -Zm200 -W0 -MDd -Zi -GX  -DUNICODE -DQT_DLL -DQT_THREAD_SUPPORT
 LEXFLAGS        =
 YACCFLAGS       =-d
 INCPATH =        -I"..\src" -I"..\support\xerces\include" -I"..\support\zlib\include" -I"..\support\boost" -I"$(QTDIR)\include" -I"d:\gametools\svn\trunk\VUT\GtpVisibilityPreprocessor\src" -I"C:\Qt\3.3.2\mkspecs\win32-msvc"
 LINK    =       link
-LFLAGS  =       /NOLOGO delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll /SUBSYSTEM:console /LIBPATH:"../support/expat/lib" /LIBPATH:"../support/xerces/lib" /LIBPATH:"$(QTDIR)\lib"
+LFLAGS  =       /NOLOGO /DEBUG /SUBSYSTEM:console /LIBPATH:"../support/xerces/lib" /LIBPATH:"$(QTDIR)\lib"
 LIBS    =        "qt-mt332.lib" "qtmain.lib" "kernel32.lib" "user32.lib" "gdi32.lib" "comdlg32.lib" "advapi32.lib" "shell32.lib" "ole32.lib" "oleaut32.lib" "uuid.lib" "imm32.lib" "winmm.lib" "wsock32.lib" "winspool.lib" "xerces-c_2.lib" "opengl32.lib" "glu32.lib" "delayimp.lib"
 MOC             =       $(QTDIR)\bin\moc.exe
@@ -167 +167 @@
         -$(DEL_FILE) MeshKdTree.obj
         -$(DEL_FILE) Pvs.obj
+        -$(DEL_FILE) preprocessor.pdb
+        -$(DEL_FILE) preprocessor.ilk
+        -$(DEL_FILE) vc*.pdb
+        -$(DEL_FILE) vc*.idb
+
 
 

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -81 +81 @@
 
       int pvsSize = object->mKdPvs.GetSize();
-      
-    if (0 && pvsSize) {
+
+      
+    if (pvsSize) {
                 // mail all nodes from the pvs
                 Intersectable::NewMail();
@@ -102 +103 @@
         }
 
-    if (pvsSize) {
+    if (0 && pvsSize) {
                 // mail all nodes from the pvs
                 Intersectable::NewMail();

trunk/VUT/GtpVisibilityPreprocessor/src/preprocessor.pro

@@ -13 +13 @@
 
 # debuc config
-CONFIG          += console warn_off thread release
+CONFIG          += console warn_off thread debug
 
 # RELEASE CONFIG