TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

using a hexy to keep the segment non-axis-aligned

Browse Source
This commit is contained in:
Zachary Pavlov 2010-04-28 01:57:32 +00:00
parent eabeb00298
commit f1cb508349
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
panda/src/collide/collisionSegment.cxx
View File

@ -28,6 +28,7 @@
#include "bamWriter.h" #include "bamWriter.h"
#include "geom.h" #include "geom.h"
#include "geomLines.h" #include "geomLines.h"
#include "boundingHexahedron.h"
#include "geomVertexWriter.h" #include "geomVertexWriter.h"
TypeHandle CollisionSegment::_type_handle; TypeHandle CollisionSegment::_type_handle;
@ -135,10 +136,20 @@ compute_internal_bounds() const {
LPoint3f pmid = (_a + _b) * 0.5f; LPoint3f pmid = (_a + _b) * 0.5f;
return new BoundingSphere(pmid, csqrt(d2) * 0.5f); return new BoundingSphere(pmid, csqrt(d2) * 0.5f);
} }
LPoint3f min_p(min(_a[0], _b[0]) - .01, min(_a[1], _b[1]) - .01, min(_a[2],_b[2]) - .01);
LPoint3f max_p(max(_a[0], _b[0]) + .01, max(_a[1], _b[1]) + .01, max(_a[2],_b[2]) + .01);
return new BoundingBox(min_p, max_p); LMatrix4f from_segment;
look_at(from_segment, pdelta, LPoint3f(0,0,1), CS_zup_right);
from_segment.set_row(3, _a);
float max_y = sqrt(d2) + 0.01;
PT(BoundingHexahedron) volume =
new BoundingHexahedron(LPoint3f(-0.01, max_y, -0.01), LPoint3f(0.01, max_y, -0.01),
LPoint3f(0.01, max_y, 0.01), LPoint3f(-0.01, max_y, 0.01),
LPoint3f(-0.01, -0.01, -0.01), LPoint3f(0.01, 0.01, -0.01),
LPoint3f(0.01, -0.01, 0.01), LPoint3f(-0.01, -0.01, 0.01));
volume->xform(from_segment);
return volume.p();
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////