AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Scaled vertices to always be integers.

Browse Source
This commit is contained in:
David Williams
2007-08-31 22:19:47 +00:00
parent 107c4ae860
commit ca0805bd2f
3 changed files with 101 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
source/SurfaceVertex.cpp
View File

@ -1,3 +1,4 @@
#include "Constants.h"
#include "SurfaceVertex.h"
namespace Ogre
@ -22,32 +23,45 @@ namespace Ogre
//We dont't check the normal here as it may not have been set. But if two vertices have the same position they should have the same normal too.
/*return
(
(abs(position.x - rhs.position.x) <= 0.01) &&
(abs(position.y - rhs.position.y) <= 0.01) &&
(abs(position.z - rhs.position.z) <= 0.01) &&
(abs(alpha - rhs.alpha) <= 0.01)
(position.x == rhs.position.x) &&
(position.y == rhs.position.y) &&
(position.z == rhs.position.z) //&&
//(abs(alpha - rhs.alpha) <= 0.01)
);*/
return
(
(position.x == rhs.position.x) &&
(position.x == rhs.position.y) &&
(position.x == rhs.position.z) &&
(abs(alpha - rhs.alpha) <= 0.01)
);
/*ulong value = 0;
value |= position.x;
value << 10;
value |= position.y;
value << 10;
value |= position.z;
ulong rhsValue = 0;
rhsValue |= rhs.position.x;
rhsValue << 10;
rhsValue |= rhs.position.y;
rhsValue << 10;
rhsValue |= rhs.position.z;
return value == rhsValue;*/
unsigned long offset = (position.x*(OGRE_REGION_SIDE_LENGTH*2+1)*(OGRE_REGION_SIDE_LENGTH*2+1)) + (position.y*(OGRE_REGION_SIDE_LENGTH*2+1)) + (position.z);
unsigned long rhsOffset = (rhs.position.x*(OGRE_REGION_SIDE_LENGTH*2+1)*(OGRE_REGION_SIDE_LENGTH*2+1)) + (rhs.position.y*(OGRE_REGION_SIDE_LENGTH*2+1)) + (rhs.position.z);
return offset == rhsOffset;
}
bool SurfaceVertex::operator < (const SurfaceVertex& rhs) const
{
if((*this) == rhs)
/*if((*this) == rhs)
{
return false;
}
if(alpha < rhs.alpha)
{
return true;
}
if(position.z < rhs.position.z)
}*/
/*if(position.z < rhs.position.z)
{
return true;
}
@ -60,6 +74,27 @@ namespace Ogre
return true;
}
return false;
return false;*/
/*ulong value = 0;
value |= position.x;
value << 10;
value |= position.y;
value << 10;
value |= position.z;
ulong rhsValue = 0;
rhsValue |= rhs.position.x;
rhsValue << 10;
rhsValue |= rhs.position.y;
rhsValue << 10;
rhsValue |= rhs.position.z;
return value < rhsValue;*/
unsigned long offset = (position.x*(OGRE_REGION_SIDE_LENGTH*2+1)*(OGRE_REGION_SIDE_LENGTH*2+1)) + (position.y*(OGRE_REGION_SIDE_LENGTH*2+1)) + (position.z);
unsigned long rhsOffset = (rhs.position.x*(OGRE_REGION_SIDE_LENGTH*2+1)*(OGRE_REGION_SIDE_LENGTH*2+1)) + (rhs.position.y*(OGRE_REGION_SIDE_LENGTH*2+1)) + (rhs.position.z);
return offset < rhsOffset;
}
}