Changeset 2610 for GTP/trunk/Lib/Vis


Ignore:
Timestamp:
01/17/08 22:21:03 (17 years ago)
Author:
bittner
Message:

pixel error computation revival

Location:
GTP/trunk/Lib/Vis/Preprocessing/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • GTP/trunk/Lib/Vis/Preprocessing/src/CombinedPreprocessor.cpp

    r2593 r2610  
    149149           
    150150          if (renderer) { 
     151                cout<<"Evaluating render error"<<endl; 
    151152                ComputeRenderError(); 
     153                cout<<"Evaluating render error"<<endl; 
    152154          } 
    153155        } 

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

    r2608 r2610  
    11############################################################################# 
    22# Makefile for building: preprocessor 
    3 # Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 17. I 17:18:38 2008 
     3# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 17. I 22:17:44 2008 
    44# Project:  preprocessor.pro 
    55# Template: app 
    … …  
    7171                C:\Qt\4.1.2\mkspecs\features\debug_and_release.prf \ 
    7272                C:\Qt\4.1.2\mkspecs\features\default_post.prf \ 
     73                C:\Qt\4.1.2\mkspecs\features\qt.prf \ 
     74                C:\Qt\4.1.2\mkspecs\features\win32\opengl.prf \ 
     75                C:\Qt\4.1.2\mkspecs\features\moc.prf \ 
    7376                C:\Qt\4.1.2\mkspecs\features\win32\thread.prf \ 
    7477                C:\Qt\4.1.2\mkspecs\features\warn_off.prf \ 
    … …  
    8992C:\Qt\4.1.2\mkspecs\features\debug_and_release.prf: 
    9093C:\Qt\4.1.2\mkspecs\features\default_post.prf: 
     94C:\Qt\4.1.2\mkspecs\features\qt.prf: 
     95C:\Qt\4.1.2\mkspecs\features\win32\opengl.prf: 
     96C:\Qt\4.1.2\mkspecs\features\moc.prf: 
    9197C:\Qt\4.1.2\mkspecs\features\win32\thread.prf: 
    9298C:\Qt\4.1.2\mkspecs\features\warn_off.prf: 
    … …  
    110116distclean: release-distclean debug-distclean FORCE 
    111117        -$(DEL_FILE) Makefile 
     118 
     119release-mocclean: $(MAKEFILE).Release 
     120        $(MAKE) -f $(MAKEFILE).Release mocclean 
     121debug-mocclean: $(MAKEFILE).Debug 
     122        $(MAKE) -f $(MAKEFILE).Debug mocclean 
     123mocclean: release-mocclean debug-mocclean 
     124 
     125release-mocables: $(MAKEFILE).Release 
     126        $(MAKE) -f $(MAKEFILE).Release mocables 
     127debug-mocables: $(MAKEFILE).Debug 
     128        $(MAKE) -f $(MAKEFILE).Debug mocables 
     129mocables: release-mocables debug-mocables 
    112130FORCE: 
    113131 

  • GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

    r2609 r2610  
    12441244        } 
    12451245 
     1246         
    12461247        if (rays.size() > 10000)  
    12471248        { 

  • GTP/trunk/Lib/Vis/Preprocessing/src/SG08/run_test_arena

    r2607 r2610  
    22 
    33#COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+" 
    4 COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -preprocessor_detect_empty_viewspace+ -total_samples=500000000" 
     4COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -preprocessor_detect_empty_viewspace+ -total_samples=1000000000" 
    55 
    66 
    … …  
    88VIEWCELLS=../data/Arena/viewcells-5000.xml.gz 
    99 
    10 PREFIX=../work/plots/osp-arena-SG08 
     10PREFIX=../work/plots/osp-arena-SG08a 
    1111 
    1212# $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    … …  
    1818# # n - no origin mutation, q=2, reverse samples 
    1919 
    20 # $COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    21 # -preprocessor_visibility_file=$PREFIX-r-reference.xml \ 
    22 # -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \ 
    23 # -preprocessor_histogram_file=$PREFIX-r-reference.hlog 
     20$COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     21-preprocessor_visibility_file=$PREFIX-r-reference.xml \ 
     22-view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \ 
     23-preprocessor_histogram_file=$PREFIX-r-reference.hlog 
    2424 
    25 # $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    26 # -rss_distributions=direction -view_cells_filter_max_size=1 \ 
    27 # -preprocessor_visibility_file=$PREFIX-r-reference-global.xml \ 
    28 # -preprocessor_stats=$PREFIX-r-reference-global.log \ 
    29 # -preprocessor_histogram_file=$PREFIX-r-reference-global.hlog 
     25$COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     26 -rss_distributions=direction -view_cells_filter_max_size=1 \ 
     27 -preprocessor_visibility_file=$PREFIX-r-reference-global.xml \ 
     28 -preprocessor_stats=$PREFIX-r-reference-global.log \ 
     29 -preprocessor_histogram_file=$PREFIX-r-reference-global.hlog 
    3030 
    3131# -total_samples=500000000000 -total_time=12208 \ 
    … …  
    4545# ### selected tests 
    4646 
    47 $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    48 -mutation_silhouette_prob=0.5 \ 
    49 -mutation_reverse_samples_distance=1.0 \ 
    50 -mutation_radius_origin=1.0 \ 
    51 -mutation_radius_termination=1.0 \ 
    52 -mutation_use_unsucc_count_importance- \ 
    53 -mutation_use_pass_importance- \ 
    54 -mutation_buffer_size=500000 \ 
    55 -rss_distributions=mutation+object_direction+spatial \ 
    56 -preprocessor_stats=$PREFIX-combined-m5-2.log  
     47# $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     48# -mutation_silhouette_prob=0.5 \ 
     49# -mutation_reverse_samples_distance=1.0 \ 
     50# -mutation_radius_origin=1.0 \ 
     51# -mutation_radius_termination=1.0 \ 
     52# -mutation_use_unsucc_count_importance- \ 
     53# -mutation_use_pass_importance- \ 
     54# -mutation_buffer_size=500000 \ 
     55# -rss_distributions=mutation+object_direction+spatial \ 
     56# -preprocessor_stats=$PREFIX-combined-m5-2.log  
    5757 
    5858 

  • GTP/trunk/Lib/Vis/Preprocessing/src/SG08/run_test_pixel

    r2607 r2610  
    33 
    44#COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+" 
    5 COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -samples_per_pass=500000 -samples_per_evaluation=10000000 -total_samples=500000000" 
     5#COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -samples_per_pass=500000 -samples_per_evaluation=10000000 -total_samples=500000000 -preprocessor_pvs_rendererror_samples=10000 -preprocessor_evaluatePixelError+" 
     6COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_pass=1000000 -samples_per_evaluation=2000000 -total_samples=500000000 -preprocessor_pvs_rendererror_samples=10000 -preprocessor_evaluatePixelError+" 
    67 
    78#SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d" 
    … …  
    3435#VIEWCELLS=../data/vienna/vienna-seq-viewcells-20000.xml.gz 
    3536 
    36 PREFIX=../work/plots/osp-PIXEL3-1e5 
     37PREFIX=../work/plots/osp-vienna-SG08-PIXEL 
    3738 
    3839#SCENE=../data/atlanta/atlanta2.x3d 

  • GTP/trunk/Lib/Vis/Preprocessing/src/SceneGraph.h

    r2609 r2610  
    3636        virtual bool IsLeaf() const { return false; } 
    3737        virtual void UpdateBox(); 
     38 
     39        ~SceneGraphInterior(); 
    3840 
    3941//protected: 

  • GTP/trunk/Lib/Vis/Preprocessing/src/X3dParser.cpp

    r2609 r2610  
    55#include <stdlib.h> 
    66#include <iostream> 
     7 
    78#include <xercesc/util/PlatformUtils.hpp> 
    89 
    … …  
    2021#include <xercesc/sax/SAXParseException.hpp> 
    2122#include <xercesc/sax/SAXException.hpp> 
     23 
    2224 
    2325#include "X3dParser.h" 
    … …  
    102104X3dParseHandlers::~X3dParseHandlers() 
    103105{ 
    104         assert(mTransformations.empty()); 
    105         if (0 && !mTransformations.empty()) 
    106                 cout << "error: transformation stack size: " << (int)mTransformations.size() << endl; 
     106  //  assert(mTransformations.empty()); 
     107  if (0 && !mTransformations.empty()) 
     108        cout << "error: transformation stack size: " << (int)mTransformations.size() << endl; 
    107109} 
    108110 

  • GTP/trunk/Lib/Vis/Preprocessing/src/default.env

    r2608 r2610  
    5454        useGlDebugger false 
    5555# 0 = INTERNAL  1 = MLRT 2 = HAVRAN 
    56         rayCastMethod 2 
     56        rayCastMethod 1 
    5757         
    5858#       type sampling 

  • GTP/trunk/Lib/Vis/Preprocessing/src/havran/configh.h

    r2608 r2610  
    1414#define __CONFIGH_H__ 
    1515 
     16 
    1617#if defined(_MSC_VER) 
    1718// use perftimer only on msvc 
    … …  
    1920#define __SSE__ 
    2021// If we support the use of SSE instructions for ray shooting 
    21 #define _USE_HAVRAN_SSE 
     22//#define _USE_HAVRAN_SSE 
    2223#endif 
    2324 

  • GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp

    r2608 r2610  
    299299        pt = new QtPreprocessorThread(preprocessor);     
    300300         
    301         if (0 && preprocessor->mUseGlRenderer && (importRandomViewCells || frames)) 
    302         { 
     301        if (preprocessor->mUseGlRenderer && (importRandomViewCells || frames)) 
     302 
     303          { 
    303304                QGLFormat f; 
    304305                f.setStencil(true); 
    305306                QGLFormat::setDefaultFormat(f); 
    306  
    307307                // NOTE: render texture should be power of 2 and square 
    308308                // renderer must be initialised 
    309309                // $$matt 
    310310                preprocessor->renderer =  
    311                         new QtGlRendererBuffer(512, 512, 
    312                         preprocessor->mSceneGraph, 
    313                         preprocessor->mViewCellsManager, 
    314                         preprocessor->mKdTree); 
    315         } 
    316  
     311                  new QtGlRendererBuffer(512, 512, 
     312                                                                 preprocessor->mSceneGraph, 
     313                                                                 preprocessor->mViewCellsManager, 
     314                                                                 preprocessor->mKdTree); 
     315                 
     316          } 
     317         
    317318        if (preprocessor->mUseGlRenderer || preprocessor->mUseGlDebugger) 
    318319        { 

  • GTP/trunk/Lib/Vis/Preprocessing/src/preprocessor.pro

    r2608 r2610  
    55TEMPLATE = app 
    66 
    7 CONFIG -= qt 
     7#CONFIG -= qt 
    88 
    99TARGET = preprocessor 
    … …  
    2828unix:INCLUDEPATH += ../support/src/xerces-c-src_2_7_0/include 
    2929 
    30 INCLUDEPATH += ../src ../src/Timer ../src/QtInterface $$NONGTP/Xerces/xerces/include  $$NONGTP/Zlib/include $$NONGTP/Boost $$NONGTP/Devil/include 
     30#XERCES = $$NONGTP/Xerces/xerces 
     31XERCES = $$NONGTP/Xerces/xerces-c_2_8_0 
     32   
     33INCLUDEPATH += ../src ../src/Timer ../src/QtInterface $$XERCES/include  $$NONGTP/Zlib/include $$NONGTP/Boost $$NONGTP/Devil/include 
    3134 
    32 win32:LIBPATH += GL $$NONGTP/Xerces/xerces/lib $$NONGTP/Devil/lib \ 
     35win32:LIBPATH += GL $$XERCES/lib $$NONGTP/Devil/lib \ 
    3336  $$NONGTP/glut $$NONGTP/Boost/lib $$NONGTP/Zlib/lib  
    3437 
    … …  
    5760CONFIG(release) { 
    5861win32:LIBS += xerces-c_2.lib  
     62#win32:LIBS += xerces-c_static_2.lib  
    5963} 
    6064 
    6165CONFIG(debug) { 
    6266win32:LIBS += xerces-c_2D.lib  
     67#win32:LIBS += xerces-c_static_2D.lib  
    6368} 
    6469 
Note: See TracChangeset for help on using the changeset viewer.