Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Add] Always collide with sphere when trimesh inside.

Browse Source 
[Fix] Fixed silly landing bug.
This commit is contained in:
Rtch90 2018-04-06 22:21:53 +01:00
parent b738fb63e1
commit 37d3c3a16b
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/collider/geom.cpp
View File

@ -37,6 +37,24 @@ vector3d Geom::GetPosition(void) const {
} }
void Geom::CollideSphere(Sphere& sphere, void(*callback)(CollisionContact*)) { void Geom::CollideSphere(Sphere& sphere, void(*callback)(CollisionContact*)) {
/*
* If the geom is actually within the sphere, create a contact so
* that we can't fall into spheres forever and ever and ever..
*/
vector3d v = GetPosition() - sphere.pos;
const double len = v.Length();
if(len < sphere.radius) {
CollisionContact c;
c.pos = GetPosition();
c.normal = (1.0/len)*v;
c.depth = sphere.radius - len;
c.triIdx = 0;
c.userData1 = this->m_data;
c.userData2 = sphere.userData;
c.geomFlag = 0;
(*callback)(&c);
return;
}
for(int i = 0; i < m_geomtree->m_numVertices; i++) { for(int i = 0; i < m_geomtree->m_numVertices; i++) {
vector3d vtx(&m_geomtree->m_vertices[3*i]); vector3d vtx(&m_geomtree->m_vertices[3*i]);
vector3d from = m_orient[!m_orientIdx] * vtx; vector3d from = m_orient[!m_orientIdx] * vtx;
@ -45,13 +63,8 @@ void Geom::CollideSphere(Sphere& sphere, void(*callback)(CollisionContact*)) {
const double len = dir.Length(); const double len = dir.Length();
dir *= 1.0f/len; dir *= 1.0f/len;
vector3d _from(from.x, from.y, from.z);
vector3d _dir(dir.x, dir.y, dir.z);
_dir.Normalize();
/* Collide with lovely sphere! */ /* Collide with lovely sphere! */
const vector3d v = _from - sphere.pos; const vector3d v = from - sphere.pos;
const double b = -vector3d::Dot(v, dir); const double b = -vector3d::Dot(v, dir);
double det = (b*b) - vector3d::Dot(v,v) + (sphere.radius*sphere.radius); double det = (b*b) - vector3d::Dot(v,v) + (sphere.radius*sphere.radius);
if(det > 0) { if(det > 0) {
@ -62,7 +75,7 @@ void Geom::CollideSphere(Sphere& sphere, void(*callback)(CollisionContact*)) {
if(i1 > 0) { if(i1 > 0) {
if(i1 < len) { if(i1 < len) {
CollisionContact c; CollisionContact c;
c.pos = _from + _dir*i1; c.pos = from + dir*i1;
c.normal = vector3d::Normalize(v); c.normal = vector3d::Normalize(v);
c.depth = len - i1; c.depth = len - i1;
c.triIdx = 0; c.triIdx = 0;
@ -95,7 +108,6 @@ void Geom::Collide(Geom* b, void(*callback)(CollisionContact*)) {
isect_t isect; isect_t isect;
isect.dist = len; isect.dist = len;
isect.triIdx = -1; isect.triIdx = -1;
_dir.Normalize();
b->m_geomtree->TraceRay(_from, _dir, &isect); b->m_geomtree->TraceRay(_from, _dir, &isect);
if(isect.triIdx != -1) { if(isect.triIdx != -1) {
CollisionContact c; CollisionContact c;

2
src/ship.cpp
View File

@ -199,6 +199,7 @@ void Ship::Blastoff(void) {
} }
void Ship::TestLanded(void) { void Ship::TestLanded(void) {
m_testLanded = false;
if(m_launchLockTimeout != 0) return; if(m_launchLockTimeout != 0) return;
if(GetFrame()->m_astroBody) { if(GetFrame()->m_astroBody) {
const dReal* vel = dBodyGetLinearVel(m_body); const dReal* vel = dBodyGetLinearVel(m_body);
@ -245,7 +246,6 @@ void Ship::TestLanded(void) {
dBodyDisable(m_body); dBodyDisable(m_body);
ClearThrusterState(); ClearThrusterState();
m_flightState = LANDED; m_flightState = LANDED;
m_testLanded = false;
} }
} }
} }