mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-26 18:15:27 +00:00
Code Issues Projects Releases Wiki Activity

CCollision done and fixes

Browse source
This commit is contained in:
aap 2020-07-27 15:43:03 +02:00
parent 6b7a8f96a6
commit c0eb3d10e2
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/Collision.cpp
View file

@ -23,6 +23,8 @@
#include "Camera.h" #include "Camera.h"
#include "ColStore.h" #include "ColStore.h"
//--MIAMI: file done
enum Direction enum Direction
{ {
DIR_X_POS, DIR_X_POS,
@ -36,7 +38,6 @@ enum Direction
eLevelName CCollision::ms_collisionInMemory; eLevelName CCollision::ms_collisionInMemory;
CLinkList<CColModel*> CCollision::ms_colModelCache; CLinkList<CColModel*> CCollision::ms_colModelCache;
//--MIAMI: done
void void
CCollision::Init(void) CCollision::Init(void)
{ {
@ -45,7 +46,6 @@ CCollision::Init(void)
CColStore::Initialise(); CColStore::Initialise();
} }
//--MIAMI: done
void void
CCollision::Shutdown(void) CCollision::Shutdown(void)
{ {
@ -53,7 +53,6 @@ CCollision::Shutdown(void)
CColStore::Shutdown(); CColStore::Shutdown();
} }
//--MIAMI: done
void void
CCollision::Update(void) CCollision::Update(void)
{ {
@ -97,13 +96,11 @@ GetCollisionInSector(CSector &sect)
return (eLevelName)level; return (eLevelName)level;
} }
//--MIAMI: done
void void
CCollision::LoadCollisionWhenINeedIt(bool forceChange) CCollision::LoadCollisionWhenINeedIt(bool forceChange)
{ {
} }
//--MIAMI: done
void void
CCollision::SortOutCollisionAfterLoad(void) CCollision::SortOutCollisionAfterLoad(void)
{ {
@ -111,7 +108,6 @@ CCollision::SortOutCollisionAfterLoad(void)
CStreaming::LoadAllRequestedModels(false); CStreaming::LoadAllRequestedModels(false);
} }
//--MIAMI: done
void void
CCollision::LoadCollisionScreen(eLevelName level) CCollision::LoadCollisionScreen(eLevelName level)
{ {
@ -426,7 +422,6 @@ CCollision::TestSphereTriangle(const CColSphere &sphere,
return dist < sphere.radius; return dist < sphere.radius;
} }
//--MIAMI: DONE
bool bool
CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough, bool ignoreShootThrough) CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough, bool ignoreShootThrough)
{ {
@ -1075,7 +1070,6 @@ CCollision::ProcessSphereTriangle(const CColSphere &sphere,
return true; return true;
} }
//--MIAMI: TODO
bool bool
CCollision::ProcessLineOfSight(const CColLine &line, CCollision::ProcessLineOfSight(const CColLine &line,
const CMatrix &matrix, CColModel &model, const CMatrix &matrix, CColModel &model,
@ -1121,7 +1115,6 @@ CCollision::ProcessLineOfSight(const CColLine &line,
return false; return false;
} }
//--MIAMI: TODO
bool bool
CCollision::ProcessVerticalLine(const CColLine &line, CCollision::ProcessVerticalLine(const CColLine &line,
const CMatrix &matrix, CColModel &model, const CMatrix &matrix, CColModel &model,