Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 00:36:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CR feedback

Browse source
This commit is contained in:
ZappoMan 2013-07-15 09:26:19 -07:00
parent 64681fa1e4
commit 8d4f7f8a2a
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/voxels/src/VoxelNode.cpp
View file

@ -363,16 +363,14 @@ float VoxelNode::furthestDistanceToCamera(const ViewFrustum& viewFrustum) const
box.scale(TREE_SCALE); box.scale(TREE_SCALE);
glm::vec3 furthestPoint = viewFrustum.getFurthestPointFromCamera(box); glm::vec3 furthestPoint = viewFrustum.getFurthestPointFromCamera(box);
glm::vec3 temp = viewFrustum.getPosition() - furthestPoint; glm::vec3 temp = viewFrustum.getPosition() - furthestPoint;
float distanceSquared = glm::dot(temp, temp); float distanceToVoxelCenter = sqrtf(glm::dot(temp, temp));
float distanceToVoxelCenter = sqrtf(distanceSquared);
return distanceToVoxelCenter; return distanceToVoxelCenter;
} }
float VoxelNode::distanceToCamera(const ViewFrustum& viewFrustum) const { float VoxelNode::distanceToCamera(const ViewFrustum& viewFrustum) const {
glm::vec3 center = _box.getCenter() * (float)TREE_SCALE; glm::vec3 center = _box.getCenter() * (float)TREE_SCALE;
glm::vec3 temp = viewFrustum.getPosition() - center; glm::vec3 temp = viewFrustum.getPosition() - center;
float distanceSquared = glm::dot(temp, temp); float distanceToVoxelCenter = sqrtf(glm::dot(temp, temp));
float distanceToVoxelCenter = sqrtf(distanceSquared);
return distanceToVoxelCenter; return distanceToVoxelCenter;
} }
@ -384,7 +382,6 @@ float VoxelNode::distanceSquareToPoint(const glm::vec3& point) const {
float VoxelNode::distanceToPoint(const glm::vec3& point) const { float VoxelNode::distanceToPoint(const glm::vec3& point) const {
glm::vec3 temp = point - _box.getCenter(); glm::vec3 temp = point - _box.getCenter();
float distanceSquare = glm::dot(temp, temp); float distance = sqrtf(glm::dot(temp, temp));
float distance = sqrtf(distanceSquare);
return distance; return distance;
} }