a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 09:20:02 +00:00
Code Issues Projects Releases Wiki Activity

collision fixes

Browse source
This commit is contained in:
aap 2020-07-27 15:38:12 +02:00
parent e2d56f00dd
commit 2e8048d0fe
6 changed files with 142 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

150
src/core/Collision.cpp
View file

@ -395,7 +395,7 @@ CCollision::TestVerticalLineBox(const CColLine &line, const CColBox &box)
} }
bool bool
CCollision::TestLineTriangle(const CColLine &line, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane) CCollision::TestLineTriangle(const CColLine &line, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane)
{ {
float t; float t;
CVector normal; CVector normal;
@ -410,9 +410,9 @@ CCollision::TestLineTriangle(const CColLine &line, const CVector *verts, const C
// find point of intersection // find point of intersection
CVector p = line.p0 + (line.p1-line.p0)*t; CVector p = line.p0 + (line.p1-line.p0)*t;
const CVector &va = verts[tri.a]; const CVector &va = verts[tri.a].Get();
const CVector &vb = verts[tri.b]; const CVector &vb = verts[tri.b].Get();
const CVector &vc = verts[tri.c]; const CVector &vc = verts[tri.c].Get();
CVector2D vec1, vec2, vec3, vect; CVector2D vec1, vec2, vec3, vect;
// We do the test in 2D. With the plane direction we // We do the test in 2D. With the plane direction we
@ -505,15 +505,16 @@ CCollision::TestLineSphere(const CColLine &line, const CColSphere &sph)
bool bool
CCollision::TestSphereTriangle(const CColSphere &sphere, CCollision::TestSphereTriangle(const CColSphere &sphere,
const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane) const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane)
{ {
// If sphere and plane don't intersect, no collision // If sphere and plane don't intersect, no collision
if(Abs(plane.CalcPoint(sphere.center)) > sphere.radius) float planedist = plane.CalcPoint(sphere.center);
if(Abs(planedist) > sphere.radius)
return false; return false;
const CVector &va = verts[tri.a]; const CVector &va = verts[tri.a].Get();
const CVector &vb = verts[tri.b]; const CVector &vb = verts[tri.b].Get();
const CVector &vc = verts[tri.c]; const CVector &vc = verts[tri.c].Get();
// calculate two orthogonal basis vectors for the triangle // calculate two orthogonal basis vectors for the triangle
CVector vec2 = vb - va; CVector vec2 = vb - va;
@ -537,23 +538,29 @@ CCollision::TestSphereTriangle(const CColSphere &sphere,
int testcase = insideAB + insideAC + insideBC; int testcase = insideAB + insideAC + insideBC;
float dist = 0.0f; float dist = 0.0f;
if(testcase == 1){ switch(testcase){
case 1:
// closest to a vertex // closest to a vertex
if(insideAB) dist = (sphere.center - vc).Magnitude(); if(insideAB) dist = (sphere.center - vc).Magnitude();
else if(insideAC) dist = (sphere.center - vb).Magnitude(); else if(insideAC) dist = (sphere.center - vb).Magnitude();
else if(insideBC) dist = (sphere.center - va).Magnitude(); else if(insideBC) dist = (sphere.center - va).Magnitude();
else assert(0); else assert(0);
}else if(testcase == 2){ break;
case 2:
// closest to an edge // closest to an edge
// looks like original game as DistToLine manually inlined
if(!insideAB) dist = DistToLine(&va, &vb, &sphere.center); if(!insideAB) dist = DistToLine(&va, &vb, &sphere.center);
else if(!insideAC) dist = DistToLine(&va, &vc, &sphere.center); else if(!insideAC) dist = DistToLine(&va, &vc, &sphere.center);
else if(!insideBC) dist = DistToLine(&vb, &vc, &sphere.center); else if(!insideBC) dist = DistToLine(&vb, &vc, &sphere.center);
else assert(0); else assert(0);
}else if(testcase == 3){ break;
case 3:
// center is in triangle // center is in triangle
return true; dist = Abs(planedist);
}else break;
assert(0); // front fell off default:
assert(0);
}
return dist < sphere.radius; return dist < sphere.radius;
} }
@ -572,21 +579,24 @@ CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColMod
if(!TestLineBox(newline, model.boundingBox)) if(!TestLineBox(newline, model.boundingBox))
return false; return false;
for(i = 0; i < model.numSpheres; i++) for(i = 0; i < model.numSpheres; i++){
if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_TRANSPARENT_CLOTH) if(ignoreSeeThrough && IsSeeThrough(model.spheres[i].surface)) continue;
if(TestLineSphere(newline, model.spheres[i])) if(TestLineSphere(newline, model.spheres[i]))
return true; return true;
}
for(i = 0; i < model.numBoxes; i++) for(i = 0; i < model.numBoxes; i++){
if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_TRANSPARENT_CLOTH) if(ignoreSeeThrough && IsSeeThrough(model.boxes[i].surface)) continue;
if(TestLineBox(newline, model.boxes[i])) if(TestLineBox(newline, model.boxes[i]))
return true; return true;
}
CalculateTrianglePlanes(&model); CalculateTrianglePlanes(&model);
for(i = 0; i < model.numTriangles; i++) for(i = 0; i < model.numTriangles; i++){
if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_TRANSPARENT_CLOTH) if(ignoreSeeThrough && IsSeeThrough(model.triangles[i].surface)) continue;
if(TestLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i])) if(TestLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i]))
return true; return true;
}
return false; return false;
} }
@ -861,16 +871,16 @@ CCollision::ProcessLineSphere(const CColLine &line, const CColSphere &sphere, CC
bool bool
CCollision::ProcessVerticalLineTriangle(const CColLine &line, CCollision::ProcessVerticalLineTriangle(const CColLine &line,
const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane,
CColPoint &point, float &mindist, CStoredCollPoly *poly) CColPoint &point, float &mindist, CStoredCollPoly *poly)
{ {
float t; float t;
CVector normal; CVector normal;
const CVector &p0 = line.p0; const CVector &p0 = line.p0;
const CVector &va = verts[tri.a]; const CVector &va = verts[tri.a].Get();
const CVector &vb = verts[tri.b]; const CVector &vb = verts[tri.b].Get();
const CVector &vc = verts[tri.c]; const CVector &vc = verts[tri.c].Get();
// early out bound rect test // early out bound rect test
if(p0.x < va.x && p0.x < vb.x && p0.x < vc.x) return false; if(p0.x < va.x && p0.x < vb.x && p0.x < vc.x) return false;
@ -935,6 +945,7 @@ CCollision::ProcessVerticalLineTriangle(const CColLine &line,
if(CrossProduct2D(vec2-vec1, vect-vec1) < 0.0f) return false; if(CrossProduct2D(vec2-vec1, vect-vec1) < 0.0f) return false;
if(CrossProduct2D(vec3-vec1, vect-vec1) > 0.0f) return false; if(CrossProduct2D(vec3-vec1, vect-vec1) > 0.0f) return false;
if(CrossProduct2D(vec3-vec2, vect-vec2) < 0.0f) return false; if(CrossProduct2D(vec3-vec2, vect-vec2) < 0.0f) return false;
if(t >= mindist) return false;
point.point = p; point.point = p;
point.normal = normal; point.normal = normal;
point.surfaceA = 0; point.surfaceA = 0;
@ -960,16 +971,12 @@ CCollision::IsStoredPolyStillValidVerticalLine(const CVector &pos, float z, CCol
return false; return false;
// maybe inlined? // maybe inlined?
CColTriangle tri;
tri.a = 0;
tri.b = 1;
tri.c = 2;
CColTrianglePlane plane; CColTrianglePlane plane;
plane.Set(poly->verts, tri); plane.Set(poly->verts[0], poly->verts[1], poly->verts[2]);
const CVector &va = poly->verts[tri.a]; const CVector &va = poly->verts[0];
const CVector &vb = poly->verts[tri.b]; const CVector &vb = poly->verts[1];
const CVector &vc = poly->verts[tri.c]; const CVector &vc = poly->verts[2];
CVector p0 = pos; CVector p0 = pos;
CVector p1(pos.x, pos.y, z); CVector p1(pos.x, pos.y, z);
@ -1034,7 +1041,7 @@ CCollision::IsStoredPolyStillValidVerticalLine(const CVector &pos, float z, CCol
bool bool
CCollision::ProcessLineTriangle(const CColLine &line , CCollision::ProcessLineTriangle(const CColLine &line ,
const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane,
CColPoint &point, float &mindist) CColPoint &point, float &mindist)
{ {
float t; float t;
@ -1053,9 +1060,9 @@ CCollision::ProcessLineTriangle(const CColLine &line ,
// find point of intersection // find point of intersection
CVector p = line.p0 + (line.p1-line.p0)*t; CVector p = line.p0 + (line.p1-line.p0)*t;
const CVector &va = verts[tri.a]; const CVector &va = verts[tri.a].Get();
const CVector &vb = verts[tri.b]; const CVector &vb = verts[tri.b].Get();
const CVector &vc = verts[tri.c]; const CVector &vc = verts[tri.c].Get();
CVector2D vec1, vec2, vec3, vect; CVector2D vec1, vec2, vec3, vect;
switch(plane.dir){ switch(plane.dir){
@ -1101,6 +1108,7 @@ CCollision::ProcessLineTriangle(const CColLine &line ,
if(CrossProduct2D(vec2-vec1, vect-vec1) < 0.0f) return false; if(CrossProduct2D(vec2-vec1, vect-vec1) < 0.0f) return false;
if(CrossProduct2D(vec3-vec1, vect-vec1) > 0.0f) return false; if(CrossProduct2D(vec3-vec1, vect-vec1) > 0.0f) return false;
if(CrossProduct2D(vec3-vec2, vect-vec2) < 0.0f) return false; if(CrossProduct2D(vec3-vec2, vect-vec2) < 0.0f) return false;
if(t >= mindist) return false;
point.point = p; point.point = p;
point.normal = normal; point.normal = normal;
point.surfaceA = 0; point.surfaceA = 0;
@ -1113,7 +1121,7 @@ CCollision::ProcessLineTriangle(const CColLine &line ,
bool bool
CCollision::ProcessSphereTriangle(const CColSphere &sphere, CCollision::ProcessSphereTriangle(const CColSphere &sphere,
const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane,
CColPoint &point, float &mindistsq) CColPoint &point, float &mindistsq)
{ {
// If sphere and plane don't intersect, no collision // If sphere and plane don't intersect, no collision
@ -1122,9 +1130,9 @@ CCollision::ProcessSphereTriangle(const CColSphere &sphere,
if(Abs(planedist) > sphere.radius || distsq > mindistsq) if(Abs(planedist) > sphere.radius || distsq > mindistsq)
return false; return false;
const CVector &va = verts[tri.a]; const CVector &va = verts[tri.a].Get();
const CVector &vb = verts[tri.b]; const CVector &vb = verts[tri.b].Get();
const CVector &vc = verts[tri.c]; const CVector &vc = verts[tri.c].Get();
// calculate two orthogonal basis vectors for the triangle // calculate two orthogonal basis vectors for the triangle
CVector normal; CVector normal;
@ -1151,25 +1159,31 @@ CCollision::ProcessSphereTriangle(const CColSphere &sphere,
int testcase = insideAB + insideAC + insideBC; int testcase = insideAB + insideAC + insideBC;
float dist = 0.0f; float dist = 0.0f;
CVector p; CVector p;
if(testcase == 1){ switch(testcase){
case 1:
// closest to a vertex // closest to a vertex
if(insideAB) p = vc; if(insideAB) p = vc;
else if(insideAC) p = vb; else if(insideAC) p = vb;
else if(insideBC) p = va; else if(insideBC) p = va;
else assert(0); else assert(0);
dist = (sphere.center - p).Magnitude(); dist = (sphere.center - p).Magnitude();
}else if(testcase == 2){ break;
case 2:
// closest to an edge // closest to an edge
// looks like original game as DistToLine manually inlined
if(!insideAB) dist = DistToLine(&va, &vb, &sphere.center, p); if(!insideAB) dist = DistToLine(&va, &vb, &sphere.center, p);
else if(!insideAC) dist = DistToLine(&va, &vc, &sphere.center, p); else if(!insideAC) dist = DistToLine(&va, &vc, &sphere.center, p);
else if(!insideBC) dist = DistToLine(&vb, &vc, &sphere.center, p); else if(!insideBC) dist = DistToLine(&vb, &vc, &sphere.center, p);
else assert(0); else assert(0);
}else if(testcase == 3){ break;
case 3:
// center is in triangle // center is in triangle
dist = Abs(planedist); dist = Abs(planedist);
p = sphere.center - normal*planedist; p = sphere.center - normal*planedist;
}else break;
assert(0); // front fell off default:
assert(0);
}
if(dist >= sphere.radius || dist*dist >= mindistsq) if(dist >= sphere.radius || dist*dist >= mindistsq)
return false; return false;
@ -1203,18 +1217,21 @@ CCollision::ProcessLineOfSight(const CColLine &line,
return false; return false;
float coldist = mindist; float coldist = mindist;
for(i = 0; i < model.numSpheres; i++) for(i = 0; i < model.numSpheres; i++){
if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_TRANSPARENT_CLOTH) if(ignoreSeeThrough && IsSeeThrough(model.spheres[i].surface)) continue;
ProcessLineSphere(newline, model.spheres[i], point, coldist); ProcessLineSphere(newline, model.spheres[i], point, coldist);
}
for(i = 0; i < model.numBoxes; i++) for(i = 0; i < model.numBoxes; i++){
if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_TRANSPARENT_CLOTH) if(ignoreSeeThrough && IsSeeThrough(model.boxes[i].surface)) continue;
ProcessLineBox(newline, model.boxes[i], point, coldist); ProcessLineBox(newline, model.boxes[i], point, coldist);
}
CalculateTrianglePlanes(&model); CalculateTrianglePlanes(&model);
for(i = 0; i < model.numTriangles; i++) for(i = 0; i < model.numTriangles; i++){
if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_TRANSPARENT_CLOTH) if(ignoreSeeThrough && IsSeeThrough(model.triangles[i].surface)) continue;
ProcessLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i], point, coldist); ProcessLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i], point, coldist);
}
if(coldist < mindist){ if(coldist < mindist){
point.point = matrix * point.point; point.point = matrix * point.point;
@ -1243,24 +1260,27 @@ CCollision::ProcessVerticalLine(const CColLine &line,
return false; return false;
float coldist = mindist; float coldist = mindist;
for(i = 0; i < model.numSpheres; i++) for(i = 0; i < model.numSpheres; i++){
if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_TRANSPARENT_CLOTH) if(ignoreSeeThrough && IsSeeThrough(model.spheres[i].surface)) continue;
ProcessLineSphere(newline, model.spheres[i], point, coldist); ProcessLineSphere(newline, model.spheres[i], point, coldist);
}
for(i = 0; i < model.numBoxes; i++) for(i = 0; i < model.numBoxes; i++){
if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_TRANSPARENT_CLOTH) if(ignoreSeeThrough && IsSeeThrough(model.boxes[i].surface)) continue;
ProcessLineBox(newline, model.boxes[i], point, coldist); ProcessLineBox(newline, model.boxes[i], point, coldist);
}
CalculateTrianglePlanes(&model); CalculateTrianglePlanes(&model);
TempStoredPoly.valid = false; TempStoredPoly.valid = false;
for(i = 0; i < model.numTriangles; i++) for(i = 0; i < model.numTriangles; i++){
if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_TRANSPARENT_CLOTH) if(ignoreSeeThrough && IsSeeThrough(model.triangles[i].surface)) continue;
ProcessVerticalLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i], point, coldist, &TempStoredPoly); ProcessVerticalLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i], point, coldist, &TempStoredPoly);
}
if(coldist < mindist){ if(coldist < mindist){
point.point = matrix * point.point; point.point = matrix * point.point;
point.normal = Multiply3x3(matrix, point.normal); point.normal = Multiply3x3(matrix, point.normal);
if(poly && TempStoredPoly.valid){ if(TempStoredPoly.valid && poly){
*poly = TempStoredPoly; *poly = TempStoredPoly;
poly->verts[0] = matrix * poly->verts[0]; poly->verts[0] = matrix * poly->verts[0];
poly->verts[1] = matrix * poly->verts[1]; poly->verts[1] = matrix * poly->verts[1];
@ -1959,7 +1979,7 @@ CColLine::Set(const CVector &p0, const CVector &p1)
} }
void void
CColTriangle::Set(const CVector *, int a, int b, int c, uint8 surf, uint8 piece) CColTriangle::Set(const CompressedVector *, int a, int b, int c, uint8 surf, uint8 piece)
{ {
this->a = a; this->a = a;
this->b = b; this->b = b;
@ -1968,12 +1988,8 @@ CColTriangle::Set(const CVector *, int a, int b, int c, uint8 surf, uint8 piece)
} }
void void
CColTrianglePlane::Set(const CVector *v, CColTriangle &tri) CColTrianglePlane::Set(const CVector &va, const CVector &vb, const CVector &vc)
{ {
const CVector &va = v[tri.a];
const CVector &vb = v[tri.b];
const CVector &vc = v[tri.c];
normal = CrossProduct(vc-va, vb-va); normal = CrossProduct(vc-va, vb-va);
normal.Normalise(); normal.Normalise();
dist = DotProduct(normal, va); dist = DotProduct(normal, va);
@ -2063,7 +2079,7 @@ CColModel::GetLinkPtr(void)
void void
CColModel::GetTrianglePoint(CVector &v, int i) const CColModel::GetTrianglePoint(CVector &v, int i) const
{ {
v = vertices[i]; v = vertices[i].Get();
} }
CColModel& CColModel&
@ -2142,7 +2158,7 @@ CColModel::operator=(const CColModel &other)
if(vertices) if(vertices)
RwFree(vertices); RwFree(vertices);
if(numVerts){ if(numVerts){
vertices = (CVector*)RwMalloc(numVerts*sizeof(CVector)); vertices = (CompressedVector*)RwMalloc(numVerts*sizeof(CompressedVector));
for(i = 0; i < numVerts; i++) for(i = 0; i < numVerts; i++)
vertices[i] = other.vertices[i]; vertices[i] = other.vertices[i];
} }

32
src/core/Collision.h
View file

@ -10,6 +10,19 @@
#define MAX_COLLISION_POINTS 32 #define MAX_COLLISION_POINTS 32
#endif #endif
struct CompressedVector
{
#ifdef COMPRESSED_COL_VECTORS
int16 x, y, z;
CVector Get(void) const { return CVector(x, y, z)/128.0f; };
void Set(float x, float y, float z) { this->x = x*128.0f; this->y = y*128.0f; this->z = z*128.0f; };
#else
float x, y, z;
CVector Get(void) const { return CVector(x, y, z); };
void Set(float x, float y, float z) { this->x = x; this->y = y; this->z = z; };
#endif
};
struct CColSphere struct CColSphere
{ {
CVector center; CVector center;
@ -51,7 +64,7 @@ struct CColTriangle
uint16 c; uint16 c;
uint8 surface; uint8 surface;
void Set(const CVector *v, int a, int b, int c, uint8 surf, uint8 piece); void Set(const CompressedVector *v, int a, int b, int c, uint8 surf, uint8 piece);
}; };
struct CColTrianglePlane struct CColTrianglePlane
@ -60,7 +73,8 @@ struct CColTrianglePlane
float dist; float dist;
uint8 dir; uint8 dir;
void Set(const CVector *v, CColTriangle &tri); void Set(const CVector &va, const CVector &vb, const CVector &vc);
void Set(const CompressedVector *v, CColTriangle &tri) { Set(v[tri.a].Get(), v[tri.b].Get(), v[tri.c].Get()); }
void GetNormal(CVector &n) const { n = normal; } void GetNormal(CVector &n) const { n = normal; }
float CalcPoint(const CVector &v) const { return DotProduct(normal, v) - dist; }; float CalcPoint(const CVector &v) const { return DotProduct(normal, v) - dist; };
}; };
@ -94,11 +108,11 @@ struct CColModel
int16 numBoxes; int16 numBoxes;
int16 numTriangles; int16 numTriangles;
int32 level; int32 level;
bool ownsCollisionVolumes; bool ownsCollisionVolumes; // missing on PS2
CColSphere *spheres; CColSphere *spheres;
CColLine *lines; CColLine *lines;
CColBox *boxes; CColBox *boxes;
CVector *vertices; CompressedVector *vertices;
CColTriangle *triangles; CColTriangle *triangles;
CColTrianglePlane *trianglePlanes; CColTrianglePlane *trianglePlanes;
@ -136,18 +150,18 @@ public:
static bool TestSphereBox(const CColSphere &sph, const CColBox &box); static bool TestSphereBox(const CColSphere &sph, const CColBox &box);
static bool TestLineBox(const CColLine &line, const CColBox &box); static bool TestLineBox(const CColLine &line, const CColBox &box);
static bool TestVerticalLineBox(const CColLine &line, const CColBox &box); static bool TestVerticalLineBox(const CColLine &line, const CColBox &box);
static bool TestLineTriangle(const CColLine &line, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane); static bool TestLineTriangle(const CColLine &line, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane);
static bool TestLineSphere(const CColLine &line, const CColSphere &sph); static bool TestLineSphere(const CColLine &line, const CColSphere &sph);
static bool TestSphereTriangle(const CColSphere &sphere, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane); static bool TestSphereTriangle(const CColSphere &sphere, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane);
static bool TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough); static bool TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough);
static bool ProcessSphereSphere(const CColSphere &s1, const CColSphere &s2, CColPoint &point, float &mindistsq); static bool ProcessSphereSphere(const CColSphere &s1, const CColSphere &s2, CColPoint &point, float &mindistsq);
static bool ProcessSphereBox(const CColSphere &sph, const CColBox &box, CColPoint &point, float &mindistsq); static bool ProcessSphereBox(const CColSphere &sph, const CColBox &box, CColPoint &point, float &mindistsq);
static bool ProcessLineBox(const CColLine &line, const CColBox &box, CColPoint &point, float &mindist); static bool ProcessLineBox(const CColLine &line, const CColBox &box, CColPoint &point, float &mindist);
static bool ProcessVerticalLineTriangle(const CColLine &line, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindist, CStoredCollPoly *poly); static bool ProcessVerticalLineTriangle(const CColLine &line, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindist, CStoredCollPoly *poly);
static bool ProcessLineTriangle(const CColLine &line , const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindist); static bool ProcessLineTriangle(const CColLine &line , const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindist);
static bool ProcessLineSphere(const CColLine &line, const CColSphere &sphere, CColPoint &point, float &mindist); static bool ProcessLineSphere(const CColLine &line, const CColSphere &sphere, CColPoint &point, float &mindist);
static bool ProcessSphereTriangle(const CColSphere &sph, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindistsq); static bool ProcessSphereTriangle(const CColSphere &sph, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindistsq);
static bool ProcessLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough); static bool ProcessLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough);
static bool ProcessVerticalLine(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough, CStoredCollPoly *poly); static bool ProcessVerticalLine(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough, CStoredCollPoly *poly);
static int32 ProcessColModels(const CMatrix &matrixA, CColModel &modelA, const CMatrix &matrixB, CColModel &modelB, CColPoint *spherepoints, CColPoint *linepoints, float *linedists); static int32 ProcessColModels(const CMatrix &matrixA, CColModel &modelA, const CMatrix &matrixB, CColModel &modelB, CColPoint *spherepoints, CColPoint *linepoints, float *linedists);

10
src/core/FileLoader.cpp
View file

@ -264,12 +264,12 @@ CFileLoader::LoadCollisionModel(uint8 *buf, CColModel &model, char *modelname)
int32 numVertices = *(int16*)buf; int32 numVertices = *(int16*)buf;
buf += 4; buf += 4;
if(numVertices > 0){ if(numVertices > 0){
model.vertices = (CVector*)RwMalloc(numVertices*sizeof(CVector)); model.vertices = (CompressedVector*)RwMalloc(numVertices*sizeof(CompressedVector));
for(i = 0; i < numVertices; i++){ for(i = 0; i < numVertices; i++){
model.vertices[i] = *(CVector*)buf; model.vertices[i].Set(*(float*)buf, *(float*)(buf+4), *(float*)(buf+8));
if(Abs(model.vertices[i].x) >= 256.0f || if(Abs(*(float*)buf) >= 256.0f ||
Abs(model.vertices[i].y) >= 256.0f || Abs(*(float*)(buf+4)) >= 256.0f ||
Abs(model.vertices[i].z) >= 256.0f) Abs(*(float*)(buf+8)) >= 256.0f)
printf("%s:Collision volume too big\n", modelname); printf("%s:Collision volume too big\n", modelname);
buf += 12; buf += 12;
} }

10
src/core/SurfaceTable.h
View file

@ -54,6 +54,16 @@ enum
struct CColPoint; struct CColPoint;
inline bool
IsSeeThrough(uint8 surfType)
{
switch(surfType)
case SURFACE_GLASS:
case SURFACE_TRANSPARENT_CLOTH:
return true;
return false;
}
class CSurfaceTable class CSurfaceTable
{ {
static float ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS]; static float ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS];

1
src/core/config.h
View file

@ -158,6 +158,7 @@ enum Config {
#if defined GTA_PS2 #if defined GTA_PS2
# define GTA_PS2_STUFF # define GTA_PS2_STUFF
# define RANDOMSPLASH # define RANDOMSPLASH
# define COMPRESSED_COL_VECTORS
#elif defined GTA_PC #elif defined GTA_PC
# define GTA3_1_1_PATCH # define GTA3_1_1_PATCH
//# define GTA3_STEAM_PATCH //# define GTA3_STEAM_PATCH

16
src/render/Glass.cpp
View file

@ -424,10 +424,10 @@ CGlass::RenderEntityInGlass(CEntity *entity)
ASSERT(col!=nil); ASSERT(col!=nil);
if ( col->numTriangles >= 2 ) if ( col->numTriangles >= 2 )
{ {
CVector a = object->GetMatrix() * col->vertices[0]; CVector a = object->GetMatrix() * col->vertices[0].Get();
CVector b = object->GetMatrix() * col->vertices[1]; CVector b = object->GetMatrix() * col->vertices[1].Get();
CVector c = object->GetMatrix() * col->vertices[2]; CVector c = object->GetMatrix() * col->vertices[2].Get();
CVector d = object->GetMatrix() * col->vertices[3]; CVector d = object->GetMatrix() * col->vertices[3].Get();
if ( object->bGlassCracked ) if ( object->bGlassCracked )
{ {
@ -613,10 +613,10 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed,
CColModel *col = object->GetColModel(); CColModel *col = object->GetColModel();
ASSERT(col!=nil); ASSERT(col!=nil);
CVector a = object->GetMatrix() * col->vertices[0]; CVector a = object->GetMatrix() * col->vertices[0].Get();
CVector b = object->GetMatrix() * col->vertices[1]; CVector b = object->GetMatrix() * col->vertices[1].Get();
CVector c = object->GetMatrix() * col->vertices[2]; CVector c = object->GetMatrix() * col->vertices[2].Get();
CVector d = object->GetMatrix() * col->vertices[3]; CVector d = object->GetMatrix() * col->vertices[3].Get();
float minx = Min(Min(a.x, b.x), Min(c.x, d.x)); float minx = Min(Min(a.x, b.x), Min(c.x, d.x));
float maxx = Max(Max(a.x, b.x), Max(c.x, d.x)); float maxx = Max(Max(a.x, b.x), Max(c.x, d.x));