Commit graph

71 commits

Author SHA1 Message Date
Montagna Marco
3ca820c7f3 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main; Weapons fixes; 2020-08-16 06:58:47 +02:00
Montagna Marco
30f9b1f653 Refactoring weapons; Added new shatter fields to static meshes datat structs; 2020-08-15 07:27:14 +02:00
Nils Gaitzsch
a752f49d57 Using Smart Pointers 2020-08-09 22:15:32 +02:00
Nils Gaitzsch
11b2e2cd61 Refactored functions 2020-08-09 15:25:56 +02:00
Nils Gaitzsch
a587b08792 Merge branch 'master' into renderdatarefactor
# Conflicts:
#	TR5Main/Renderer/Renderer11Draw.cpp
2020-07-26 08:58:44 +02:00
Nils Gaitzsch
d5aff8914b Refactored Constant Buffers 2020-07-23 21:40:07 +02:00
Montagna Marco
18994dd59e Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
Nils Gaitzsch
31995742ef Normal Mapping first test 2020-07-18 14:53:26 +02:00
Montagna Marco
9f373c691a Pathfinding refactoring 2020-07-11 21:16:04 +02:00
Montagna Marco
2a1c491c7e Hairs done on GPU now 2020-07-07 07:32:33 +02:00
Montagna Marco
e88d24347b Refactored again room and eshes geometry loading 2020-07-05 06:20:36 +02:00
Nils Gaitzsch
822ec19f08 Merge branch 'master' into renderdatarefactor
# Conflicts:
#	TR5Main/Renderer/Render11Helper.cpp
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/Renderer/Renderer11Draw.cpp
#	TR5Main/Renderer/Renderer11Frame.cpp
#	TR5Main/Renderer/Renderer11Lara.cpp
2020-07-03 10:09:13 +02:00
Montagna Marco
439db540e3 New level format: meshes 2020-07-03 07:05:33 +02:00
Nils Gaitzsch
d6f4239dae Refactored Updating Constant Buffers
Half Lambertian Lighting
2020-07-01 21:13:07 +02:00
Nils Gaitzsch
15e4dc712b Semi-working cubemapping.
improved camera functions
2020-07-01 08:46:07 +02:00
Nils Gaitzsch
932bb84ff4 Merge branch 'master' into renderdatarefactor
# Conflicts:
#	TR5Main/Renderer/Render11Helper.cpp
#	TR5Main/Renderer/Renderer11Compatibility.cpp
2020-06-29 15:02:18 +02:00
Montagna Marco
e0aaae0a3e Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-29 13:29:45 +02:00
Nils Gaitzsch
e91456b632 Re-added Primitive batch for "3D sprites" 2020-06-28 21:42:45 +02:00
Nils Gaitzsch
3dd642f649 Rendering Sprites without Primitive Batch 2020-06-28 20:30:56 +02:00
Montagna Marco
8da773758f New file format: rooms geometry 2020-06-28 15:51:33 +02:00
Nils Gaitzsch
723b2a9361 Changed m_moveableObjects and m_staticObjects to vector<optional> 2020-06-28 11:12:52 +02:00
Nils Gaitzsch
3781370e06 Putting Renderer into namespace
made g_Renderer a global object
2020-06-21 14:27:12 +02:00
Nils Gaitzsch
08f3910e4d RAII texture2D 2020-06-21 11:51:46 +02:00
Nils Gaitzsch
c860919616 Fixed std namespace collisions
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02:00
Montagna Marco
1cddd102d0 New level format: textures and sprites 2020-06-20 21:20:36 +02:00
Nils Gaitzsch
a82a338795 Refactored Index/Vertex Buffer
Now uses ComPtr
2020-06-16 15:11:30 +02:00
Nils Gaitzsch
aff227e84a Fixed Billboard Matrix 2020-06-15 19:59:38 +02:00
Nils Gaitzsch
7b5731b704 Added Explosion Sprites and Drips 2020-06-15 19:59:08 +02:00
Nils Gaitzsch
a5ac894c0b Put State Change out of Sprite Render Loop 2020-06-15 18:52:10 +02:00
Nils Gaitzsch
315181220a Added new SparkParticle 2020-06-15 16:36:52 +02:00
Nils Gaitzsch
fe7adddaa7 Tweaked Ripples 2020-06-15 16:11:13 +02:00
Nils Gaitzsch
25f383e42c Added new TriggerGunSmokeParticle Function 2020-06-15 16:10:09 +02:00
Gancian
175f0e40d1 Updated Smoke, Flares 2020-06-15 15:57:40 +02:00
Nils Gaitzsch
59af8f701b Added separate Fire Sprite Sequence 2020-06-15 14:53:42 +02: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
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
TokyoSU
d66e608c74 Fixed and Implemented TonyBoss 2020-05-14 18:39:17 +02:00
Montagna Marco
1bb0546753 Fixed math function names; Fixed effects rendering; Fixed Lara matrices; 2020-05-01 06:33:43 +02:00
Montagna Marco
dc07c30969 Refactored OBJET_INFO to ObjectInfo 2020-04-27 15:28:54 +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
Nils Gaitzsch
88fa651295 Added new Bubble routines 2020-04-13 13:36:23 +02:00
Nils Gaitzsch
d26d656c46 Fixed super huge Splashes 2020-04-12 23:58:31 +02:00
Nils Gaitzsch
6bae6784ec Refactored Camera Matrix Buffer. Now contains only one precalculated ViewProjection which is calculated ONCE per frame 2020-04-12 22:21:47 +02:00
Montagna Marco
1ebf4a5229 Fixed chase camera; Moved Camera in DLL; 2020-04-12 06:50:43 +02:00
Nils Gaitzsch
39827616ba Fixing Debris Ambient Color 2020-04-06 09:52:06 +02:00
Nils Gaitzsch
bc86d6b131 Added Radius-like shatter 2020-04-05 17:36:24 +02:00
Montagna Marco
c12d345976 Fixed GUARDIAN death; Added X angle to shockwaves; Reset Use/combine selected index after combine or separe; Code cleaning; 2020-04-05 08:15:56 +02:00
Montagna Marco
3f35e4de4f Refactoring 1 2020-04-01 13:09:14 +02:00