diff options
| author | Marc Gilleron <marc.gilleron@gmail.com> | 2018-01-17 01:45:48 +0100 |
|---|---|---|
| committer | Marc Gilleron <marc.gilleron@gmail.com> | 2018-01-17 01:45:48 +0100 |
| commit | b9ba10a7173bff491b32e653950dab6df0afb2c9 (patch) | |
| tree | d4f3a634e4f6b9f362dcb7e58d957a467c5bb84d /src/core/Transform.cpp | |
| parent | 7dde412e26315447edf2f46661143082b5becf32 (diff) | |
| download | redot-cpp-b9ba10a7173bff491b32e653950dab6df0afb2c9.tar.gz | |
Renamed AABB::pos --> AABB::position
Diffstat (limited to 'src/core/Transform.cpp')
| -rw-r--r-- | src/core/Transform.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/core/Transform.cpp b/src/core/Transform.cpp index c756d23..36b9226 100644 --- a/src/core/Transform.cpp +++ b/src/core/Transform.cpp @@ -90,10 +90,10 @@ AABB Transform::xform(const AABB& p_aabb) const { Vector3 x=basis.get_axis(0)*p_aabb.size.x; Vector3 y=basis.get_axis(1)*p_aabb.size.y; Vector3 z=basis.get_axis(2)*p_aabb.size.z; - Vector3 pos = xform( p_aabb.pos ); + Vector3 pos = xform( p_aabb.position ); //could be even further optimized AABB new_aabb; - new_aabb.pos=pos; + new_aabb.position=pos; new_aabb.expand_to( pos+x ); new_aabb.expand_to( pos+y ); new_aabb.expand_to( pos+z ); @@ -108,20 +108,20 @@ AABB Transform::xform_inv(const AABB& p_aabb) const { /* define vertices */ Vector3 vertices[8]={ - Vector3(p_aabb.pos.x+p_aabb.size.x, p_aabb.pos.y+p_aabb.size.y, p_aabb.pos.z+p_aabb.size.z), - Vector3(p_aabb.pos.x+p_aabb.size.x, p_aabb.pos.y+p_aabb.size.y, p_aabb.pos.z), - Vector3(p_aabb.pos.x+p_aabb.size.x, p_aabb.pos.y, p_aabb.pos.z+p_aabb.size.z), - Vector3(p_aabb.pos.x+p_aabb.size.x, p_aabb.pos.y, p_aabb.pos.z), - Vector3(p_aabb.pos.x, p_aabb.pos.y+p_aabb.size.y, p_aabb.pos.z+p_aabb.size.z), - Vector3(p_aabb.pos.x, p_aabb.pos.y+p_aabb.size.y, p_aabb.pos.z), - Vector3(p_aabb.pos.x, p_aabb.pos.y, p_aabb.pos.z+p_aabb.size.z), - Vector3(p_aabb.pos.x, p_aabb.pos.y, p_aabb.pos.z) + Vector3(p_aabb.position.x+p_aabb.size.x, p_aabb.position.y+p_aabb.size.y, p_aabb.position.z+p_aabb.size.z), + Vector3(p_aabb.position.x+p_aabb.size.x, p_aabb.position.y+p_aabb.size.y, p_aabb.position.z), + Vector3(p_aabb.position.x+p_aabb.size.x, p_aabb.position.y, p_aabb.position.z+p_aabb.size.z), + Vector3(p_aabb.position.x+p_aabb.size.x, p_aabb.position.y, p_aabb.position.z), + Vector3(p_aabb.position.x, p_aabb.position.y+p_aabb.size.y, p_aabb.position.z+p_aabb.size.z), + Vector3(p_aabb.position.x, p_aabb.position.y+p_aabb.size.y, p_aabb.position.z), + Vector3(p_aabb.position.x, p_aabb.position.y, p_aabb.position.z+p_aabb.size.z), + Vector3(p_aabb.position.x, p_aabb.position.y, p_aabb.position.z) }; AABB ret; - ret.pos=xform_inv(vertices[0]); + ret.position=xform_inv(vertices[0]); for (int i=1;i<8;i++) { |