Commit graph

85 commits

Author SHA1 Message Date
Lwmte
ed9fc47d27 Fix blending modes issue (#281)
Only for rooms and some objects but not for Lara or most effects
2021-08-01 15:54:54 +03:00
MontyTRC89
906703b1ab Merge branch 'AnimTextures'; Fixed doors init;
# Conflicts:
#	TR5Main/Renderer/Renderer11.h
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/TR5Main.vcxproj.filters
2021-05-25 05:58:44 +02:00
MontyTRC89
e748a0c947 Fixed cylindrical billboards 2021-04-16 14:34:40 +02:00
MontyTRC89
4ae7d54e6b Fixed SameZone(); Adding picking to Baddy 1-2; 2021-04-16 10:13:59 +02:00
MontyTRC89
7a93fb25fa Fixed energy arcs 2021-04-16 06:46:54 +02:00
MontyTRC89
14e9a09598 Temporary fixes to AI; Decompiling energy arcs WIP; 2021-04-13 06:08:33 +02:00
Raildex
d57c2f65c9 Animated Texture progress
Refactored Bucket Rendering
2021-03-14 16:30:37 +01:00
Raildex
ddc88e9419 Refactor Renderer 2020-10-11 16:47:36 +02:00
Raildex
ac61f71386 Refactored framework.h
Removed Renderer headers from framework.h
Removed bass headers from framework.h
Removed windows-related headers to avoid nameclashes with std::min and std::max
added <algorithm> for general-purpose functions (like std::min/max)
Added NOMINMAX define to project
Minor Refactorings
2020-09-29 21:43:56 +02:00
Raildex
3e8930ef50 Fixed Spark direction 2020-09-29 17:16:27 +02:00
Raildex
85b4a2ff1c Added parameter to SetupRIpple to specifiy sprite 2020-09-21 15:20:59 +02:00
Raildex
0335034673 NonPremultiplied Alphablending for rooms and horizon 2020-09-18 11:41:20 +02:00
Raildex
dde82ac151 Updated DirectXTK
Fixed Smoke Sequence
m_spritesToDraw is now vector<RendererSpriteToDraw> instead of vector<RendererSpriteToDraw*>
2020-09-18 08:57:50 +02:00
Raildex
9dc7ab6d18 Added Boat foam, Skidoo snow trail 2020-09-15 08:10:38 +02:00
MontyTRC89
5c381bd888 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main; Weapons fixes; 2020-08-16 06:58:47 +02:00
MontyTRC89
971800fc94 Refactoring weapons; Added new shatter fields to static meshes datat structs; 2020-08-15 07:27:14 +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
f3d8b9130c Merge branch 'master' into renderdatarefactor
# Conflicts:
#	TR5Main/Renderer/Renderer11Draw.cpp
2020-07-26 08:58:44 +02:00
Raildex
4006a33ed6 Refactored Constant Buffers 2020-07-23 21:40:07 +02:00
MontyTRC89
83bba01a99 Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
Raildex
89882e8e42 Normal Mapping first test 2020-07-18 14:53:26 +02:00
MontyTRC89
9867a6d24c Pathfinding refactoring 2020-07-11 21:16:04 +02:00
MontyTRC89
36fe66d617 Hairs done on GPU now 2020-07-07 07:32:33 +02:00
MontyTRC89
538dbb3682 Refactored again room and eshes geometry loading 2020-07-05 06:20:36 +02:00
Raildex
88b23f4ecd 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
MontyTRC89
7ff7397fa7 New level format: meshes 2020-07-03 07:05:33 +02:00
Raildex
2a15e48b5f Refactored Updating Constant Buffers
Half Lambertian Lighting
2020-07-01 21:13:07 +02:00
Raildex
14368db3c6 Semi-working cubemapping.
improved camera functions
2020-07-01 08:46:07 +02:00
Raildex
b0fb8f11a3 Merge branch 'master' into renderdatarefactor
# Conflicts:
#	TR5Main/Renderer/Render11Helper.cpp
#	TR5Main/Renderer/Renderer11Compatibility.cpp
2020-06-29 15:02:18 +02:00
MontyTRC89
eaf358f6ae Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-29 13:29:45 +02:00
Raildex
ee4e2cdb5a Re-added Primitive batch for "3D sprites" 2020-06-28 21:42:45 +02:00
Raildex
e24ff68b75 Rendering Sprites without Primitive Batch 2020-06-28 20:30:56 +02:00
MontyTRC89
71f307a356 New file format: rooms geometry 2020-06-28 15:51:33 +02:00
Raildex
0bfeb84b45 Changed m_moveableObjects and m_staticObjects to vector<optional> 2020-06-28 11:12:52 +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
d7a949c06a Refactored Index/Vertex Buffer
Now uses ComPtr
2020-06-16 15:11:30 +02:00
Raildex
18155a3f14 Fixed Billboard Matrix 2020-06-15 19:59:38 +02:00
Raildex
7e14b0843e Added Explosion Sprites and Drips 2020-06-15 19:59:08 +02:00
Raildex
464a8a7351 Put State Change out of Sprite Render Loop 2020-06-15 18:52:10 +02:00
Raildex
538e015950 Added new SparkParticle 2020-06-15 16:36:52 +02:00
Raildex
6d21d1a621 Tweaked Ripples 2020-06-15 16:11:13 +02:00
Raildex
8e06949b8a Added new TriggerGunSmokeParticle Function 2020-06-15 16:10:09 +02:00
Gancian
fcae4db754 Updated Smoke, Flares 2020-06-15 15:57:40 +02:00
Raildex
1861d92675 Added separate Fire Sprite Sequence 2020-06-15 14:53:42 +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