Changeset 1359 for GTP


Ignore:
Timestamp:
09/13/06 18:03:30 (18 years ago)
Author:
mattausch
Message:

worked on global object sorting

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

Legend:

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

    r1357 r1359  
    227227                "BvHierarchy.Construction.renderCostDecreaseWeight", mRenderCostDecreaseWeight); 
    228228         
    229         Environment::GetSingleton()->GetBoolValue("BvHierarchy.useGlobalSort", mUseGlobalSorting); 
    230  
    231  
    232         /////////////////// 
     229        Environment::GetSingleton()->GetBoolValue("BvHierarchy.Construction.useGlobalSorting", mUseGlobalSorting); 
     230 
     231 
     232        ///////////////////////////////// 
    233233        //-- debug output 
     234 
    234235        Debug << "******* Bvh hierarchy options ******** " << endl; 
    235236    Debug << "max depth: " << mTermMaxDepth << endl; 
     
    11531154        Debug << "\nbvh render cost\n"  
    11541155                  << "back p: " << pBack / viewSpaceVol << " front p " << pFront / viewSpaceVol << endl 
    1155                   << "new rc: " << newRenderCost / viewSpaceVol << endl;*/ 
     1156                  << "new rc: " << newRenderCost / viewSpaceVol << endl; 
    11561157#endif 
    1157  
    11581158        return newRenderCost; 
    11591159} 
     
    15961596        for (int i = 0; i < 3; ++ i) 
    15971597        { 
     1598                frontData.mSortedObjects[i] = new ObjectContainer(); 
     1599                backData.mSortedObjects[i] = new ObjectContainer(); 
     1600 
    15981601                frontData.mSortedObjects[i]->reserve((int)sc.mFrontObjects.size()); 
    15991602                backData.mSortedObjects[i]->reserve((int)sc.mFrontObjects.size()); 
  • GTP/trunk/Lib/Vis/Preprocessing/src/Environment.cpp

    r1314 r1359  
    23902390                                   "bvh_construction_render_cost_decrease_weight=", 
    23912391                                   "0.99"); 
    2392  
    2393  
    2394 /*******************************************************************/ 
    2395 /*               Hierarchy Manager related options                 */ 
    2396 /*******************************************************************/ 
     2392         
     2393        RegisterOption("BvHierarchy.Construction.useGlobalSorting", 
     2394                                        optBool, 
     2395                                        "bvh_construction_use_global_sorting=", 
     2396                                        "false"); 
     2397 
     2398         
     2399        /*******************************************************************/ 
     2400        /*               Hierarchy Manager related options                 */ 
     2401        /*******************************************************************/ 
    23972402 
    23982403        RegisterOption("Hierarchy.subdivisionStats", 
     
    24352440                                        "hierarchy_construction_repair_queue=", 
    24362441                                        "true"); 
     2442 
    24372443 
    24382444        ////////////////////////////////////////////////////////////////////////////////// 
  • GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

    r1344 r1359  
    10061006                                                                  ) 
    10071007{ 
    1008   cout << "internal ray" << endl; 
     1008  //cout << "internal ray" << endl; 
    10091009  int hits = 0; 
    10101010  static Ray ray; 
  • GTP/trunk/Lib/Vis/Preprocessing/src/VssTree.cpp

    r1302 r1359  
    280280    delete root; 
    281281         
    282   root = new VssTreeLeaf(NULL, rays.size()); 
     282  root = new VssTreeLeaf(NULL, (int)rays.size()); 
    283283  // first construct a leaf that will get subdivide 
    284284  VssTreeLeaf *leaf = (VssTreeLeaf *) root; 
     
    321321  cout<<"Dirr Bbox = "<<dirBBox<<endl; 
    322322 
    323   stat.rays = leaf->rays.size(); 
     323  stat.rays = (int)leaf->rays.size(); 
    324324  leaf->UpdatePvsSize(); 
    325325  leaf->ComputeEntropyImportance(); 
Note: See TracChangeset for help on using the changeset viewer.