Commit graph

147 commits

Author SHA1 Message Date
Troye
acc4281555 purge ring inventory; 2021-10-12 00:26:46 -05:00
Lwmte
1bf269052a Fix issues with conflicting filename 2021-09-17 17:14:15 +03:00
Lwmte
1d0ceb0ff4 Fix more stuff 2021-09-16 01:12:19 +03:00
Lwmte
6645840f32 Properly draw UI rects 2021-09-14 19:53:09 +03:00
Lwmte
744325bea2 Revert "Fix regressions"
This reverts commit c1fc33ab52.
2021-09-11 10:13:04 +03:00
Lwmte
c1fc33ab52 Fix regressions 2021-09-11 09:41:29 +03:00
MontyTRC89
8db7df3868 Merge branch 'doors_refactoring'
# Conflicts:
#	TR5Main/Game/door.cpp
#	TR5Main/Game/door.h
#	TR5Main/Game/memory/malloc.cpp
#	TR5Main/Objects/Generic/Switches/cog_switch.cpp
#	TR5Main/Objects/Generic/Switches/crowbar_switch.cpp
#	TR5Main/Objects/Generic/Switches/generic_switch.h
#	TR5Main/Objects/Generic/Switches/turn_switch.cpp
#	TR5Main/Objects/TR4/Object/tr4_obelisk.cpp
#	TR5Main/Renderer/Renderer11Draw.cpp
#	TR5Main/Specific/level.cpp
#	TR5Main/TombEngine.vcxproj
#	TR5Main/TombEngine.vcxproj.filters
2021-09-11 05:38:26 +02:00
Lwmte
3fe6211e4e Further organizing 2021-09-08 18:31:35 +03:00
Lwmte
ba6c260b92 Further code organizing 2021-09-08 18:19:06 +03:00
Lwmte
f293735d11 Move all effect source files to separate directory, rename effect2 to effects 2021-09-08 18:07:48 +03:00
Lwmte
6d9cf3c214 Fix namespace case 2021-08-30 18:03:21 +03:00
MontyTRC89
0ed8181cda Merge branch 'master' of https://github.com/MontyTRC89/TombEngine; Renamed namespaces;
# Conflicts:
#	TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
Lwmte
2bdb851092 Reorder renderer operations, redo debug output (use F10-F11 to switch pages), add debug sphere/box drawing 2021-08-06 11:12:34 +03:00
Lwmte
d4c5304cf0 Fix spheres 4th time, fix alloc of TR4/5 objects 2021-08-05 13:31:42 +03:00
Raildex
915b438f5a Reduced Vertex Count for Bars from 9 to 5
Added define for PI for shaders
Added Primes to Vertex Hash generation
Fixed Debris
2021-08-02 13:16:51 +02:00
Lwmte
d24f30452e Remove gnFrameCounter which is seemingly the same as GlobalCounter 2021-08-02 11:25:53 +03:00
Trxye
c0ca04a806 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
Raildex
29f6660b1e Fixed Animated Textures 2021-03-23 15:38:17 +01:00
asasas9500
10a3d9167a Fix line endings 2020-12-21 13:16:29 -03:00
Raildex
ddc88e9419 Refactor Renderer 2020-10-11 16:47:36 +02:00
Raildex
94eabe8918 Using Smart Pointers 2020-08-09 22:15:32 +02:00
Raildex
b58d18ade2 Refactored functions 2020-08-09 15:25:56 +02:00
Raildex
f92094b7e0 Prepareing RenderpipelineState, not-so-hardcoded shadow map size 2020-08-02 09:02:33 +02:00
Raildex
4006a33ed6 Refactored Constant Buffers 2020-07-23 21:40:07 +02:00
Raildex
2a15e48b5f Refactored Updating Constant Buffers
Half Lambertian Lighting
2020-07-01 21:13:07 +02:00
Raildex
094fd40761 Fixed Cubemap 2020-07-01 16:49:53 +02:00
Raildex
14368db3c6 Semi-working cubemapping.
improved camera functions
2020-07-01 08:46:07 +02:00
Raildex
8bce80a9ab Refactored Rendering. You can now render scene to an arbitrary render target 2020-06-30 10:25:41 +02:00
Raildex
e24ff68b75 Rendering Sprites without Primitive Batch 2020-06-28 20:30:56 +02:00
Raildex
0bfeb84b45 Changed m_moveableObjects and m_staticObjects to vector<optional> 2020-06-28 11:12:52 +02:00
Raildex
c599d0bf1d Moved Files 2020-06-21 20:57:35 +02:00
Raildex
e5ead31064 Putting Renderer into namespace
made g_Renderer a global object
2020-06-21 14:27:12 +02:00
Raildex
1d07a7952e RAII texture2D 2020-06-21 11:51:46 +02:00
Raildex
b635f4df13 Fixed std namespace collisions
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02:00
MontyTRC89
d665551a02 New level format: textures and sprites 2020-06-20 21:20:36 +02:00
Raildex
b8d26691ff Refactored RenderTarget2D 2020-06-16 17:40:32 +02:00
Raildex
d7a949c06a Refactored Index/Vertex Buffer
Now uses ComPtr
2020-06-16 15:11:30 +02:00
Raildex
538e015950 Added new SparkParticle 2020-06-15 16:36:52 +02:00
TokyoSU
b615a98c46 (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
29f0724693 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
MontyTRC89
9a78144600 Decompiled level loading functions; Moved lot of vars in DLL; Added Zlib; 2020-04-22 14:12:10 +02:00
MontyTRC89
7771e8faf1 PHD Math removal 1 2020-04-20 14:17:01 +02:00
Raildex
10c71365ac Refactored Camera Matrix Buffer. Now contains only one precalculated ViewProjection which is calculated ONCE per frame 2020-04-12 22:21:47 +02:00
Raildex
e1c6905367 Added Percentage to the Bars 2020-01-13 22:15:54 +01:00
Raildex
8c3e7e3d33 cherry pick merge conflict 2020-01-13 22:13:32 +01:00
Raildex
c0c1cc60aa New HUD Buffer, new RendererHUDBar struct 2020-01-13 22:10:45 +01:00
Raildex
cbd253c8ca changed SpriteSequences to vector<SpriteSequence> and using vector<RendererSprite*>internally 2020-01-13 22:10:27 +01:00
Raildex
22acd9836e Animated Textures are now internally vector<RendererAnimatedTexture> and AnimatedTextureSets are now vector<RendererAnimatedTextureSet> 2020-01-13 22:10:20 +01:00
Raildex
d2f44aaae2 Splitted Renderer into multiple source files 2020-01-08 20:57:33 +01:00
Raildex
7e99bd70d5 Changed PreallocatedVectors to vector of pointers 2020-01-08 19:31:04 +01:00