Ignore:
Timestamp:
01/22/07 16:59:09 (18 years ago)
Author:
bittner
Message:

timer start

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

Legend:

Unmodified
Added
Removed
  • GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp

    r2003 r2014  
    767767                if (!node->IsLeaf()) 
    768768                { 
    769                         KdInterior *in = dynamic_cast<KdInterior *>(node); 
     769                        KdInterior *in = (KdInterior *)node; 
    770770                        position = in->mPosition; 
    771771                        axis = in->mAxis; 
     
    812812                { 
    813813                        // compute intersection with all objects in this leaf 
    814                         KdLeaf *leaf = dynamic_cast<KdLeaf *>(node); 
     814                  KdLeaf *leaf = (KdLeaf *)node; 
    815815 
    816816                        // add view cell to intersections 
  • GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

    r2013 r2014  
    11############################################################################# 
    22# Makefile for building: preprocessor 
    3 # Generated by qmake (2.00a) (Qt 4.1.2) on: po 22. I 16:06:29 2007 
     3# Generated by qmake (2.00a) (Qt 4.1.2) on: po 22. I 16:16:03 2007 
    44# Project:  preprocessor.pro 
    55# Template: app 
  • GTP/trunk/Lib/Vis/Preprocessing/src/RayCaster.cpp

    r2013 r2014  
    235235  int hits = 0; 
    236236 
     237 
    237238#if DEBUG_RAYCAST 
    238239  static int id=0; 
     
    291292 
    292293          if (!pruneInvalidRays || hitA.mObject) { 
     294#if DEBUG_RAYCAST 
     295                Debug<<"PR2a"<<flush; 
     296#endif 
     297                 
    293298                VssRay *vssRay = mVssRayPool.Alloc(); 
    294                 cerr<<vssRay<<endl; 
     299 
     300#if DEBUG_RAYCAST 
     301                Debug<<"PR2b"<<flush; 
     302#endif 
    295303                *vssRay = VssRay( 
    296304                                                 !castDoubleRay ? simpleRay.mOrigin : clipB, 
     
    301309                                                 simpleRay.mPdf 
    302310                                                 ); 
     311#if DEBUG_RAYCAST 
     312                Debug<<"PR2c"<<flush; 
     313#endif 
    303314 
    304315                if (validA) 
     
    320331                { 
    321332                  VssRay *vssRay = mVssRayPool.Alloc(); 
    322                   cerr<<vssRay<<endl; 
    323333                                 
    324334                  *vssRay = VssRay( 
  • GTP/trunk/Lib/Vis/Preprocessing/src/RayCaster.h

    r2013 r2014  
    55#include <string> 
    66#include "Vector3.h" 
     7#include "VssRay.h" 
    78 
    89using namespace std; 
     
    6869  // pool of vss rays to be used in one pass of the sampling 
    6970  struct VssRayPool { 
    70         VssRayPool():mRays(), mIndex(0) {} 
    71  
     71        VssRayPool():mRays(NULL), mIndex(0) {} 
     72        ~VssRayPool() { 
     73          if (mRays) 
     74                delete mRays; 
     75        } 
     76         
    7277        void Reserve(const int number) { 
    73           mRays.reserve(number); 
     78          if (mRays) 
     79                delete mRays; 
     80          mRays = new VssRay[number]; 
    7481        } 
     82         
    7583        void Clear() { 
    7684          mIndex = 0; 
    7785        } 
    7886        VssRay *Alloc() { 
    79           VssRay *result = &mRays[mIndex]; 
    80           mIndex++; 
    81           return result; 
     87          return mRays + mIndex++; 
    8288        } 
    83         vector<VssRay> mRays; 
     89 
     90        VssRay *mRays; 
    8491        int mIndex; 
    8592  }; 
  • GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

    r2004 r2014  
    2525#include "SceneGraph.h" 
    2626 
     27#include "PerfTimer.h" 
    2728 
    2829 
     
    23662367                return 0.0f; 
    23672368 
    2368         ViewCellContainer viewCells; 
    2369  
     2369        static ViewCellContainer viewCells; 
     2370 
     2371           
    23702372        static Ray hray; 
    23712373        hray.Init(ray); 
     
    23832385        ViewCell::NewMail(); 
    23842386 
     2387        viewCells.clear(); 
     2388         
    23852389        // traverse the view space subdivision 
    23862390        CastLineSegment(origin, termination, viewCells); 
  • GTP/trunk/Lib/Vis/Preprocessing/src/VssRay.h

    r1989 r2014  
    9393  KdNode *mOriginNode; 
    9494 
    95  
     95  VssRay() {} 
     96   
    9697  VssRay( 
    9798                 const Vector3 &origin, 
  • GTP/trunk/Lib/Vis/Preprocessing/src/preprocessor.pro

    r1989 r2014  
    2525unix:INCLUDEPATH += ../support/src/xerces-c-src_2_7_0/include 
    2626 
    27 INCLUDEPATH += ../src ../src/QtInterface $$NONGTP/Xerces/xerces/include  $$NONGTP/Zlib/include $$NONGTP/Boost $$NONGTP/Devil/include 
     27INCLUDEPATH += ../src ../src/Timer ../src/QtInterface $$NONGTP/Xerces/xerces/include  $$NONGTP/Zlib/include $$NONGTP/Boost $$NONGTP/Devil/include 
    2828 
    2929win32:LIBPATH += GL $$NONGTP/Xerces/xerces/lib $$NONGTP/Devil/lib \ 
  • GTP/trunk/Lib/Vis/Preprocessing/src/run_test2

    r2013 r2014  
    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-" 
     4COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -samples_per_pass=1000000" 
    55 
    66#SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d" 
     
    5555 -preprocessor_histogram_file=$PREFIX-i-mixed-bvh-n4i.hlog 
    5656 
    57 $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    58  -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \ 
    59  -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4i.xml \ 
    60  -preprocessor_stats=$PREFIX-i-mixed-b1-n4i.log \ 
    61  -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4i.hlog 
     57#$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     58# -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \ 
     59# -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4i.xml \ 
     60# -preprocessor_stats=$PREFIX-i-mixed-b1-n4i.log \ 
     61# -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4i.hlog 
    6262 
    6363 
Note: See TracChangeset for help on using the changeset viewer.