Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-01 17:28:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
TombEngine/TR5Main/Game/collide.h

129 lines
3.7 KiB
C
Raw Normal View History

First commit
2018-08-19 09:46:58 +02:00
#pragma once
(Broken) Deleted Global Folder - No more enums.h, constants.h, macro.h, etc... - moved all structure in types.h to there respective file.
2020-05-30 15:55:23 +02:00
#include "phd_global.h"
#include "level.h"
First commit
2018-08-19 09:46:58 +02:00
[Update] Project & UPV Prototype - changed __int32/__int16/__int8 to int/short/char respectivly. - added UPV (prototype), lara is killed when enter.
2019-11-27 15:12:35 +01:00
// used by coll->badPos
#define NO_BAD_POS (-NO_HEIGHT)
// used by coll->badNeg
#define NO_BAD_NEG NO_HEIGHT
(Broken) Deleted Global Folder - No more enums.h, constants.h, macro.h, etc... - moved all structure in types.h to there respective file.
2020-05-30 15:55:23 +02:00
struct BOUNDING_BOX
{
short X1;
short X2;
short Y1;
short Y2;
short Z1;
short Z2;
};
Refactor include and moving some structure to right file - started moving structure out of types.h. - fixed ExtraAnim using 0 instead of -1. - changed void(*)(); to function<> for lara routines. - changed short(*)() effect to function<> for CreatureEffect/CreatureEffect2. - renamed guardian to laserhead. - moved some structure to their right place. - renamed TYPE_ZONE to ZoneTypeEnum. - fixed zoneType not using ZoneTypeEnum as variable. - fixed LOT.zone not using ZoneEnumType. - changed "variable : 1" to bool in some structure. - implemented @krys new collision structure and improved it a bit (but commented for "later") - level need #pragma pack(push, 1) #pragma pack(pop) to work (for structure), else it crash at LoadTexturesInfos(). Co-Authored-By: krys <krys@users.noreply.github.com>
2020-05-28 15:17:34 +02:00
struct COLL_FLOOR
{
int floor;
int ceiling;
int type;
int splitFloor;
int splitCeiling;
};
struct COLL_INFO
{
/*
COLL_FLOOR middle; // mid
COLL_FLOOR middle_left; // left
COLL_FLOOR middle_right; // right
COLL_FLOOR front; // front
COLL_FLOOR front_left; // left2
COLL_FLOOR front_right; // right2
*/
int midFloor;
int midCeiling;
int midType;
int midSplitFloor;
int midSplitCeil;
int frontFloor;
int frontCeiling;
int frontType;
int frontSplitFloor;
int frontSplitCeil;
int leftFloor;
int leftCeiling;
int leftType;
int leftSplitFloor;
int leftSplitCeil;
int rightFloor;
int rightCeiling;
int rightType;
int rightSplitFloor;
int rightSplitCeil;
int leftFloor2;
int leftCeiling2;
int leftType2;
int leftSplitFloor2;
int leftSplitCeil2;
int rightFloor2;
int rightCeiling2;
int rightType2;
int rightSplitFloor2;
int rightSplitCeil2;
int radius;
int badPos;
int badNeg;
int badCeiling;
PHD_VECTOR shift;
PHD_VECTOR old;
short oldAnimState;
short oldAnimNumber;
short oldFrameNumber;
short facing;
short quadrant;
short collType; // CT_enum
short* trigger;
signed char tiltX;
signed char tiltZ;
bool hitByBaddie;
bool hitStatic;
bool slopesAreWalls;
bool slopesArePits;
bool lavaIsPit;
bool enableBaddiePush;
bool enableSpaz;
bool hitCeiling;
};
Decompiled UpdateStorm(); Code cleaning;
2020-04-14 06:11:10 +02:00
extern BOUNDING_BOX GlobalCollisionBounds;
(Broken) Deleted Global Folder - No more enums.h, constants.h, macro.h, etc... - moved all structure in types.h to there respective file.
2020-05-30 15:55:23 +02:00
constexpr auto MAX_ITEMS = 1024;
extern ITEM_INFO* CollidedItems[MAX_ITEMS];
extern MESH_INFO* CollidedMeshes[MAX_ITEMS];
First commit
2018-08-19 09:46:58 +02:00
Decompiled UpdateStorm(); Code cleaning;
2020-04-14 06:11:10 +02:00
void GenericSphereBoxCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll);
Added Sophia - deleted all the __cdecl except for the #define function. because /Gd enable the __cdecl for function by default. - added the commented code in FireWeapon for TR3 entity (some function is missing)
2019-12-02 14:49:19 +01:00
int CollideStaticObjects(COLL_INFO* coll, int x, int y, int z, short roomNumber, int hite);
int GetCollidedObjects(ITEM_INFO* collidingItem, int radius, int flag1, ITEM_INFO** collidedItems, MESH_INFO** collidedMeshes, int flag2);
int TestWithGlobalCollisionBounds(ITEM_INFO* item, ITEM_INFO* lara, COLL_INFO* coll);
void TrapCollision(short itemNumber, ITEM_INFO* l, COLL_INFO* c);
void TestForObjectOnLedge(ITEM_INFO* item, COLL_INFO* coll);
void ShiftItem(ITEM_INFO* item, COLL_INFO* coll);
Added TestLaraSlide, UpdateLaraRoom, TranslateItem, AnimateLara; Fixed partially pistols;
2019-12-04 18:51:23 +01:00
void UpdateLaraRoom(ITEM_INFO* item, int height);
Changed mgLOS to TR5 instead of using TR3 one - changed mgLOS from TR3 to TR5. - changed a bit GetTiltType() that normally return short. - changed a bit CollideStaticObjects() and LaraBaddieCollision() to use "vector<short>" instead of "array". - fixed GetCollidedObjects() where "collidedItems[numItems] = NULL" is called before last return. - created GetRoomList() to get the roomList with vector or array return. - structured some function.
2019-12-17 17:37:53 +01:00
short GetTiltType(FLOOR_INFO* floor, int x, int y, int z);
Decompiled 2/3 of COLLIDE.CPP; Decompiled some rope functions; Refactoring;
2019-12-07 08:36:13 +01:00
int FindGridShift(int x, int z);
int TestBoundsCollideStatic(short* bounds, PHD_3DPOS* pos, int radius);
int ItemPushLaraStatic(ITEM_INFO* item, short* bounds, PHD_3DPOS* pos, COLL_INFO* coll);
Fixed AiPickupCollision; Fixed setup flags of many objects; Fixed item savegames; Refactored inventory; Added InitialseShootSwitch;
2020-01-12 08:02:48 +01:00
void AIPickupCollision(short itemNumber, ITEM_INFO* l, COLL_INFO* c);
Decompiled 2/3 of COLLIDE.CPP; Decompiled some rope functions; Refactoring;
2019-12-07 08:36:13 +01:00
void ObjectCollision(short itemNumber, ITEM_INFO* l, COLL_INFO* c);
void AlignLaraPosition(PHD_VECTOR* vec, ITEM_INFO* item, ITEM_INFO* l);
void TriggerLaraBlood();
int ItemPushLara(ITEM_INFO* item, ITEM_INFO* l, COLL_INFO* coll, int spazon, char bigpush);
Changed mgLOS to TR5 instead of using TR3 one - changed mgLOS from TR3 to TR5. - changed a bit GetTiltType() that normally return short. - changed a bit CollideStaticObjects() and LaraBaddieCollision() to use "vector<short>" instead of "array". - fixed GetCollidedObjects() where "collidedItems[numItems] = NULL" is called before last return. - created GetRoomList() to get the roomList with vector or array return. - structured some function.
2019-12-17 17:37:53 +01:00
int TestLaraPosition(short* bounds, ITEM_INFO* item, ITEM_INFO* l);
Decompiled 2/3 of COLLIDE.CPP; Decompiled some rope functions; Refactoring;
2019-12-07 08:36:13 +01:00
int Move3DPosTo3DPos(PHD_3DPOS* src, PHD_3DPOS* dest, int velocity, short angAdd);
int MoveLaraPosition(PHD_VECTOR* pos, ITEM_INFO* item, ITEM_INFO* l);
Decompiled TestBoundsCollide and CreatureCollision
2019-12-07 09:51:50 +01:00
int TestBoundsCollide(ITEM_INFO* item, ITEM_INFO* l, int radius);
Changed mgLOS to TR5 instead of using TR3 one - changed mgLOS from TR3 to TR5. - changed a bit GetTiltType() that normally return short. - changed a bit CollideStaticObjects() and LaraBaddieCollision() to use "vector<short>" instead of "array". - fixed GetCollidedObjects() where "collidedItems[numItems] = NULL" is called before last return. - created GetRoomList() to get the roomList with vector or array return. - structured some function.
2019-12-17 17:37:53 +01:00
void CreatureCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll);
Fix GetCollisionInfo()
2019-12-29 01:40:55 -03:00
void GetCollisionInfo(COLL_INFO* coll, int xPos, int yPos, int zPos, int roomNumber, int objectHeight);
Decompiled LaraBaddieCollision
2019-12-08 08:01:55 +01:00
void LaraBaddieCollision(ITEM_INFO* item, COLL_INFO* coll);
Added CalcItemToFloorRotation Added CalcItemToFloorRotation function (collide.cpp) which calculates XZ tangents and applies to item rot Co-Authored-By: TokyoSU <tokyosu@users.noreply.github.com>
2020-05-22 12:55:03 +02:00
void CalcItemToFloorRotation(ITEM_INFO* item, short rotY, int radiusZ, int radiusX); // new function for rotating item along XZ slopes
Reference in a new issue Copy permalink