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

Merge pull request #5090 from ericrius1/lineClamping

Browse source 
clamping line points between 0 and TREE_SCALE
This commit is contained in:
Clément Brisset 2015-06-10 18:04:10 +02:00
commit 059b29da83
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/entities/src/LineEntityItem.cpp
View file

@ -18,6 +18,7 @@
#include "EntityTree.h" #include "EntityTree.h"
#include "EntitiesLogging.h" #include "EntitiesLogging.h"
#include "EntityTreeElement.h" #include "EntityTreeElement.h"
#include "OctreeConstants.h"
@ -90,8 +91,8 @@ void LineEntityItem::setLinePoints(const QVector<glm::vec3>& points) {
for (int i = 0; i < points.size(); i++) { for (int i = 0; i < points.size(); i++) {
glm::vec3 point = points.at(i); glm::vec3 point = points.at(i);
// Make sure all of our points are valid numbers. // Make sure all of our points are valid numbers.
// Must be greater than 0 because vector component is set to 0 if it is invalid data // Must be greater than 0 because vector component is set to 0 if it is invalid data. Also should never be greater than TREE_SCALE
if (point.x > 0 && point.y > 0 && point.z > 0){ if ( (point.x > 0 && point.x < TREE_SCALE) && (point.y > 0 && point.y < TREE_SCALE) && (point.z > 0 && point.z < TREE_SCALE) ) {
sanitizedPoints << point; sanitizedPoints << point;
} else { } else {
++invalidPoints; ++invalidPoints;