Commit graph

116 commits

Author SHA1 Message Date
asasas9500
219fe4c1db Fix namespace 2020-06-21 14:31:35 -03:00
asasas9500
b53eb41bbb Merge branch 'DiagonalCollisions' into NoShifts 2020-06-21 14:09:31 -03:00
KrysB4k
cd417799f3 Merge branch 'master' into DiagonalCollisions 2020-06-21 14:33:31 +02:00
Nils Gaitzsch
c860919616 Fixed std namespace collisions
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02:00
asasas9500
8b477d26e1 Remove shifts 2020-06-09 14:02:39 -03:00
asasas9500
64923f91aa Merge branch 'DiagonalCollisions' into NoShifts 2020-06-09 12:09:00 -03:00
asasas9500
bea10b9bdf Revert "Remove shifts"
This reverts commit 29c96cbca9.
2020-06-09 11:31:53 -03:00
KrysB4k
dec07d9c7f Revert "Added ChocolateFans functions"
This reverts commit c3f4b5c62f.
2020-06-09 16:26:14 +02:00
KrysB4k
c3f4b5c62f Added ChocolateFans functions
SnapToDiagonal() and SnapToQuadrant replace the angle switchcases in some of Lara's anim collision functions
2020-06-08 16:29:03 +02:00
KrysB4k
3a2e2a4b61 Merge branch 'master' into DiagonalCollisions 2020-06-07 20:32:00 +02:00
KrysB4k
4dd61dace9 GetOrthogonalIntersect() bug fix
Fixed dir value calculation
2020-06-07 20:13:00 +02:00
TokyoSU
024a2e5612 Refactored Crocodile
- Refactored the bat a bit.
- Improved crocodile code style.
- Fixed crocodile attack range.
- Fixed crocodile water/land transition.
- Fixed crocodile not aligning to floor rotation.
- Simplified CalcItemToFloorRotation() and added a description to inform and warn the user.
2020-06-07 09:30:14 +02:00
KrysB4k
9af4e39456 Added GetOrthogonalIntersect()
GetOrthogonalIntersect() replaces bloated dir switch case in functions like TestLaraVault() and similar
2020-06-07 02:49:38 +02:00
asasas9500
b3b4d22476 Move COLL_TYPE, HEIGHT_TYPES, HEADINGS and OCTANTS to control.h 2020-06-06 19:05:54 -03:00
asasas9500
89a7801212 Merge branch 'master' into NoShifts 2020-06-06 18:37:21 -03:00
KrysB4k
bf60b8cff2 Merge branch 'master' into DiagonalCollisions 2020-06-06 23:17:16 +02:00
asasas9500
ea975e554b Create RotateBoundingBox() 2020-06-06 17:55:05 -03:00
asasas9500
4f3a87664a Merge branch 'DiagonalCollisions' into NoShifts 2020-06-06 16:00:44 -03:00
asasas9500
8dfe41f8d1 Move COLL_TYPE, HEIGHT_TYPES and HEADINGS to collide.h; Create OCTANTS, SnapToQuadrant(), GetQuadrant(), SnapToDiagonal() and GetOctant() 2020-06-06 15:48:38 -03:00
KrysB4k
2943609195 Add GetDiagonalIntersect()
GetDiagonalIntersect() returns Vector2 with x and z coordinates aligned to diagonal, offset by LARA_RAD
2020-06-06 20:37:19 +02:00
asasas9500
29c96cbca9 Remove shifts 2020-06-05 12:27:55 -03:00
asasas9500
dcfe21be4a Fix signs 2020-06-05 11:57:30 -03:00
asasas9500
a627e08583 Improve collision vectors 2020-06-04 15:09:54 -03:00
TokyoSU
ee59d27517 (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
Krys
dbac993499 First tests for diagonal collision
This branch tests the diagonal collisions. So far only the running splat, walking splat and vaults work with diagonal collision. Jumping splat, getting out of water still needs some work
2020-05-28 20:59:46 +02:00
TokyoSU
9045a2206d Partially finished Entity Folder Refactoring
- Less Compile Time
- ObjectInfo now use std::function.
- added isPickup and isPuzzleHole in ObjectInfo.
- Renamed EVIL_LARA to LARA_DOPPELGANGER (DOPPELGANGER in xml)
- Removed TR1 Larson/Pierre and TR1 Raptor.
2020-05-27 19:07:34 +02:00
TokyoSU
9c1c4517d7
New project format (#206)
* Starting Reformat the project

- New Import Method, no more "../../" in import,
- New Entity Folder Structure, less compile time

* Refactoring the Project

- added precompiled header with default import like microsoft or directx.
- fix many double import.
- fix math.h confliting math.h from
microsoft.
- fix effects.h confliting Effects.h from DirectX.
- refactored TR4 entity folder and how it's loaded.

* Update Some Code Before Switching to Master

* Finished the NewProjectFormat Template

- need to finish entity in the master later.

* Added Monty NewFileFormat

* Fixed Monty NewFileFormat Include

* Revert "Fixed Monty NewFileFormat Include"

This reverts commit ebf0afca10.

* Trying to fix conflits for NewFileFormat

* Fixed .filters

* Last Commit in NewProjectFormat
2020-05-27 09:21:20 +02:00
Krys
9b0139e901 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
Montagna Marco
3cf3b1d2dc Fixed look camera; Fixed bugs with gunflashes and smoke positions; 2020-04-29 06:43:53 +02:00
Montagna Marco
dc07c30969 Refactored OBJET_INFO to ObjectInfo 2020-04-27 15:28:54 +02:00
Montagna Marco
2f306993a8 Added missing changes from last commit; Fixed WndProc for exiting game when window is closed; 2020-04-27 06:38:50 +02:00
Montagna Marco
8a02a323b1 Partially fixed spheres; Fixed swap meshes; partially fixed Lara firing; 2020-04-26 10:55:33 +02:00
Montagna Marco
20bd242052 Started math refactoring 2020-04-25 16:23:53 +02:00
Montagna Marco
85e462f6a2 First EXE build successfully 2020-04-24 19:15:05 +02:00
Montagna Marco
9f05715977 Decompiled level loading functions; Moved lot of vars in DLL; Added Zlib; 2020-04-22 14:12:10 +02:00
Montagna Marco
32bafa9893 PHD Math removal 1 2020-04-20 14:17:01 +02:00
Montagna Marco
4246d8ae46 Decompiled UpdateStorm(); Code cleaning; 2020-04-14 06:11:10 +02:00
Montagna Marco
3966738e86 Fixed repository 2 2020-04-01 19:26:35 +02:00
Montagna Marco
3f35e4de4f Refactoring 1 2020-04-01 13:09:14 +02:00
asasas9500
68daee7d6a Place function markers; Remove collision from ID_ANIMATING13, ID_ANIMATING14, ID_ANIMATING15 and ID_ANIMATING16 2020-01-27 00:13:39 -03:00
Montagna Marco
c69cdeee40 Fixed AiPickupCollision; Fixed setup flags of many objects; Fixed item savegames; Refactored inventory; Added InitialseShootSwitch; 2020-01-12 08:02:48 +01:00
TokyoSU
c89394d528 Fix Swamp Flag, Added Old/New Object ID
- fixed swamp flag.
- fixed phd_PopDxMatrix() not being used anymore.
- deleted ENV_FLAG_SFX_ALWAYS and ENV_FLAG_PITCH_SHIFT and use the sound.h define instead.
- fixed loadlevel update progress not correct at 90%.
- updated GAME_OBJECT_ID, now you can use the new one, but TR5_DEBUG is defined by default to use the old one !
2019-12-31 14:56:02 +01:00
asasas9500
9933a57a02 Fix GetCollisionInfo() 2019-12-29 01:40:55 -03:00
asasas9500
f3f31bc71f Improve cupboard functions; Fix Move3DPosTo3DPos(); Add lara rotation to diagnostics 2019-12-19 15:13:13 -03:00
TokyoSU
3228c77fc7 Changed for() for LaraBaddieCollison() room detect
- changed -ANGLE(180) since it's the same without it.
2019-12-17 18:46:17 +01:00
TokyoSU
177a9c9197 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
Montagna Marco
a409ea8f3e Fixed statics collision 2019-12-15 09:10:52 +01:00
Montagna Marco
49a435a5c3 Fixed GetTiltType; Fixed and added GetFloorHeight; 2019-12-14 08:43:34 +01:00
asasas9500
741af9d25f Fix ItemNewRoomNo not multiplied by 2; Fix wrong quadrants and directions 2019-12-11 18:09:44 -03:00
Montagna Marco
d098c0f400 Fixed GetFloor, GetChange; Disabled GetCollisionInfo (bugged); Fixed signed char in FLOOR_INFO; 2019-12-10 18:25:48 +01:00