- Timestamp:
- 06/28/06 17:50:02 (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoLodStripsLibrary.cpp
r1058 r1069 17 17 // Constructors. 18 18 //----------------------------------------------------------------------------- 19 LodStripsLibrary::LodStripsLibrary( std::string name, Mesh *geomesh, CREATEMULTIINDEXDATAFUNC midfun)20 :create_ multi_index_data_func(midfun?midfun:DefaultMultiIndexDataCreator)19 LodStripsLibrary::LodStripsLibrary(std::string name, Mesh *geomesh, CREATEINDEXDATAFUNC idfun) 20 :create_index_data_func(idfun?idfun:DefaultIndexDataCreator) 21 21 { 22 22 const char *name_of_file; … … 241 241 242 242 //----------------------------------------------------------------------------- 243 // Gets the maximum level of detail.244 //-----------------------------------------------------------------------------245 uint32 LodStripsLibrary::MaxLod()246 {247 return mMaxLod;248 }249 250 //-----------------------------------------------------------------------------251 // Gets the minimum level of detail.252 //-----------------------------------------------------------------------------253 uint32 LodStripsLibrary::MinLod()254 {255 return mMinLod;256 }257 258 //-----------------------------------------------------------------------------259 243 // Returns the number of vertices of the highest LOD. 260 244 //----------------------------------------------------------------------------- … … 386 370 mTotalFaces = 0; 387 371 388 unsigned int * strip_sizes = new unsigned int[mFileStrips.size()]; 372 // unsigned int * strip_sizes = new unsigned int[mFileStrips.size()]; 373 unsigned int total_strip_size = 0; 389 374 for (i = 0; i < mFileStrips.size(); i++) 390 375 { 391 strip_sizes[i]= t = int(mFileStrips[i].size());376 total_strip_size += t = int(mFileStrips[i].size()); 392 377 if (t>max) 393 378 max = t; … … 406 391 407 392 // Copy strips. 408 dataRetrievalInterface=create_ multi_index_data_func(mFileStrips.size(),strip_sizes);409 dataRetrievalInterface->Begin(); 410 for (i = 0; i < mFileStrips.size(); i++)411 { 412 for (j = 0; j < mFileStrips[i].size(); j++ )393 dataRetrievalInterface=create_index_data_func(total_strip_size); 394 dataRetrievalInterface->Begin(); 395 for (int ii = 0, i = 0; i < mFileStrips.size(); i++) 396 { 397 for (j = 0; j < mFileStrips[i].size(); j++,ii++) 413 398 { 414 399 mStrips[i].push_back(mFileStrips[i][j]); 415 dataRetrievalInterface->SetIndex(i ,j,mFileStrips[i][j]);400 dataRetrievalInterface->SetIndex(ii,mFileStrips[i][j]); 416 401 } 417 402 … … 434 419 } 435 420 436 delete[] strip_sizes;421 // delete[] strip_sizes; 437 422 } 438 423 … … 593 578 { 594 579 dataRetrievalInterface->Begin(); 595 for (int i=0; i<mTotalStrips; i++) 596 { 597 unsigned int j=0; 598 for (SmallIntVector::iterator it=mStrips[i].begin(); it!=mStrips[i].end(); it++, j++) 599 dataRetrievalInterface->SetIndex(i,j,*it); 600 dataRetrievalInterface->SetNumValidIndices(i,j); 580 for (int i=0, ii=0; i<mTotalStrips; i++) 581 { 582 for (SmallIntVector::iterator it=mStrips[i].begin(); it!=mStrips[i].end(); it++, ii++) 583 dataRetrievalInterface->SetIndex(ii,*it); 584 dataRetrievalInterface->SetNumValidIndices(ii); 601 585 } 602 586 dataRetrievalInterface->End();
Note: See TracChangeset
for help on using the changeset viewer.