- Timestamp:
- 05/27/08 08:13:17 (3 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Source/System/Cluster/Window/SortLast/OSGPipelineComposer.inl
r1198 r1249 64 64 tile = getComposeTileBuffer(x,y); 65 65 66 if(tile->depth.min == (DepthT)-1&&67 tile->depth.max == (DepthT)-1) {66 if(tile->depth.min == DepthT(-1) && 67 tile->depth.max == DepthT(-1)) { 68 68 if(!reuseEmpty) { 69 69 reuseEmpty=result; 70 70 result++; 71 71 count++; 72 reuseEmpty->min = (DepthT)-1;72 reuseEmpty->min = DepthT(-1); 73 73 reuseEmpty->max = 0; 74 74 } … … 174 174 DepthInfo *dst = &depthInfo[_composeTilesX * _composeTilesY * channel]; 175 175 for(c=0; c<depthCount.min ; ++c) { 176 if(src->min == (DepthT)-1) {176 if(src->min == DepthT(-1)) { 177 177 while(src->max--) { 178 dst->min = (DepthT)-1;179 dst->max = (DepthT)-1;178 dst->min = DepthT(-1); 179 dst->max = DepthT(-1); 180 180 dst->occlude = false; 181 181 dst++; … … 206 206 depthInfo[x+_composeTilesX*y + _composeTilesX*_composeTilesY*id]; 207 207 208 if(_groupInfo[id]->depth.min == (DepthT)(-1))208 if(_groupInfo[id]->depth.min == DepthT(-1)) 209 209 _statistics.noGeo++; 210 210 } … … 217 217 _groupInfo[id1]->depth.max < 218 218 _groupInfo[id2]->depth.min && 219 _groupInfo[id2]->depth.min != (DepthT)-1)219 _groupInfo[id2]->depth.min != DepthT(-1)) 220 220 { 221 _groupInfo[id2]->depth.max = (DepthT)-1;222 _groupInfo[id2]->depth.min = (DepthT)-1;221 _groupInfo[id2]->depth.max = DepthT(-1); 222 _groupInfo[id2]->depth.min = DepthT(-1); 223 223 _groupInfo[id2]->depth.occlude = false; 224 224 _statistics.occluded++; … … 236 236 for(id = 1 ; id < count ; ++id) 237 237 { 238 if(_groupInfo[id]->depth.min != (DepthT)(-1))238 if(_groupInfo[id]->depth.min != DepthT(-1)) 239 239 { 240 240 if(dmin < _groupInfo[id]->depth.min) … … 253 253 _groupInfo[id]->trans.first = true; 254 254 _groupInfo[id]->trans.empty = false; 255 if(_groupInfo[id]->depth.min == (DepthT)(-1))255 if(_groupInfo[id]->depth.min == DepthT(-1)) 256 256 { 257 257 _groupInfo[id]->trans.empty = true; … … 460 460 461 461 tile = getComposeTileBuffer(readTile->header.x,readTile->header.y); 462 srcDepth = (DepthT*)(readTile->data + tile->colorSize); 463 srcColor = (ColorT*)(readTile->data); 464 dstDepth = (DepthT*)(tile->data + tile->colorSize); 465 dstColor = (ColorT*)(tile->data); 462 srcDepth = 463 reinterpret_cast<DepthT*>(readTile->data + tile->colorSize); 464 srcColor = reinterpret_cast<ColorT*>(readTile->data); 465 dstDepth = reinterpret_cast<DepthT*>(tile->data + tile->colorSize); 466 dstColor = reinterpret_cast<ColorT*>(tile->data); 466 467 if(readTile->header.depth) 467 468 { … … 473 474 474 475 // compose 475 srcDepthEnd = (DepthT*)(readTile->data +476 tile->dataSize);476 srcDepthEnd = reinterpret_cast<DepthT*>(readTile->data + 477 tile->dataSize); 477 478 while(srcDepth < srcDepthEnd) 478 479 { … … 499 500 500 501 // compose 501 dstDepthEnd = (DepthT*)(tile->data +502 tile->dataSize);502 dstDepthEnd = reinterpret_cast<DepthT*>(tile->data + 503 tile->dataSize); 503 504 while(dstDepth < dstDepthEnd) 504 505 { 505 if(*dstDepth == (DepthT)-1)506 if(*dstDepth == DepthT(-1)) 506 507 *dstColor = *srcColor; 507 508 dstDepth++; … … 652 653 y > top || (y+h) <= bottom) 653 654 { 654 tile->depth.min = (DepthT)-1;655 tile->depth.max = (DepthT)-1;655 tile->depth.min = DepthT(-1); 656 tile->depth.max = DepthT(-1); 656 657 tile->depth.occlude = false; 657 658 tile->empty = true; … … 731 732 } 732 733 #else 733 depthPtr = (DepthT*)(tile->data + tile->colorSize);734 depthPtr = reinterpret_cast<DepthT*>(tile->data + tile->colorSize); 734 735 // new version 735 occlude = checkDepth<DepthT, (DepthT)-1>(736 occlude = checkDepth<DepthT, DepthT(-1)>( 736 737 depthPtr, 737 738 depthMin, … … 739 740 w*h); 740 741 #endif 741 if(depthMin == (DepthT)-1)742 if(depthMin == DepthT(-1)) 742 743 tile->empty = true; 743 744 else
