summaryrefslogtreecommitdiffhomepage
path: root/Opcode/OPC_OptimizedTree.cpp
diff options
context:
space:
mode:
authorFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2011-12-08 16:00:07 +0000
committerFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2011-12-08 16:00:07 +0000
commit78e29455c5cb4acce769498a5a32be6a3c6085b4 (patch)
treec71549e69f306cfc302d4c76b48cf99afd7f2f76 /Opcode/OPC_OptimizedTree.cpp
parente33e19d0587146859d48a134ec9fd94e7b7ba5cd (diff)
downloadstarshatter-78e29455c5cb4acce769498a5a32be6a3c6085b4.zip
starshatter-78e29455c5cb4acce769498a5a32be6a3c6085b4.tar.gz
starshatter-78e29455c5cb4acce769498a5a32be6a3c6085b4.tar.bz2
Fixing up faulty references to class "Point" to "IcePoint"
Diffstat (limited to 'Opcode/OPC_OptimizedTree.cpp')
-rw-r--r--Opcode/OPC_OptimizedTree.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Opcode/OPC_OptimizedTree.cpp b/Opcode/OPC_OptimizedTree.cpp
index aed4f64..e2abe60 100644
--- a/Opcode/OPC_OptimizedTree.cpp
+++ b/Opcode/OPC_OptimizedTree.cpp
@@ -348,7 +348,7 @@ bool AABBNoLeafTree::Build(AABBTree* tree)
return true;
}
-inline_ void ComputeMinMax(Point& min, Point& max, const VertexPointers& vp)
+inline_ void ComputeMinMax(IcePoint& min, IcePoint& max, const VertexPointers& vp)
{
// Compute triangle's AABB = a leaf box
#ifdef OPC_USE_FCOMI // a 15% speedup on my machine, not much
@@ -384,8 +384,8 @@ bool AABBNoLeafTree::Refit(const MeshInterface* mesh_interface)
// Bottom-up update
VertexPointers VP;
- Point Min,Max;
- Point Min_,Max_;
+ IcePoint Min,Max;
+ IcePoint Min_,Max_;
udword Index = mNbNodes;
while(Index--)
{
@@ -476,8 +476,8 @@ bool AABBNoLeafTree::Walk(GenericWalkingCallback callback, void* user_data) cons
// a single extents. While extents would be the biggest, the center wouldn't.
#define FIND_MAX_VALUES \
/* Get max values */ \
- Point CMax(MIN_FLOAT, MIN_FLOAT, MIN_FLOAT); \
- Point EMax(MIN_FLOAT, MIN_FLOAT, MIN_FLOAT); \
+ IcePoint CMax(MIN_FLOAT, MIN_FLOAT, MIN_FLOAT); \
+ IcePoint EMax(MIN_FLOAT, MIN_FLOAT, MIN_FLOAT); \
for(udword i=0;i<mNbNodes;i++) \
{ \
if(fabsf(Nodes[i].mAABB.mCenter.x)>CMax.x) CMax.x = fabsf(Nodes[i].mAABB.mCenter.x); \
@@ -494,7 +494,7 @@ bool AABBNoLeafTree::Walk(GenericWalkingCallback callback, void* user_data) cons
if(!gFixQuantized) nbe++; \
\
/* Compute quantization coeffs */ \
- Point CQuantCoeff, EQuantCoeff; \
+ IcePoint CQuantCoeff, EQuantCoeff; \
CQuantCoeff.x = CMax.x!=0.0f ? float((1<<nbc)-1)/CMax.x : 0.0f; \
CQuantCoeff.y = CMax.y!=0.0f ? float((1<<nbc)-1)/CMax.y : 0.0f; \
CQuantCoeff.z = CMax.z!=0.0f ? float((1<<nbc)-1)/CMax.z : 0.0f; \
@@ -521,8 +521,8 @@ bool AABBNoLeafTree::Walk(GenericWalkingCallback callback, void* user_data) cons
if(gFixQuantized) \
{ \
/* Make sure the quantized box is still valid */ \
- Point Max = Nodes[i].mAABB.mCenter + Nodes[i].mAABB.mExtents; \
- Point Min = Nodes[i].mAABB.mCenter - Nodes[i].mAABB.mExtents; \
+ IcePoint Max = Nodes[i].mAABB.mCenter + Nodes[i].mAABB.mExtents; \
+ IcePoint Min = Nodes[i].mAABB.mCenter - Nodes[i].mAABB.mExtents; \
/* For each axis */ \
for(udword j=0;j<3;j++) \
{ /* Dequantize the box center */ \