Commit graph

92 commits

Author SHA1 Message Date
Lwmte
e879038220 Fix namespace case 2021-08-30 18:03:21 +03:00
Lwmte
dd3b6fa4e5 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
MontyTRC89
109b7d6e18 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine; Renamed namespaces;
# Conflicts:
#	TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
hispidence
acebbad182 Clean up some warnings. 2021-08-12 22:10:05 +01:00
Lwmte
117309292b Fix gunflash drawing 2021-08-06 13:41:37 +03:00
Lwmte
07dcf6da5b Fix #273 2021-08-02 19:42:07 +03:00
Nils
95bec0e3b0 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
054dafeeac 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
1ccd6eb160 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
bf053b6049 Fixed cylindrical billboards 2021-04-16 14:34:40 +02:00
MontyTRC89
976ce7a316 Fixed SameZone(); Adding picking to Baddy 1-2; 2021-04-16 10:13:59 +02:00
MontyTRC89
8c07826651 Fixed energy arcs 2021-04-16 06:46:54 +02:00
MontyTRC89
bc84a2bf03 Temporary fixes to AI; Decompiling energy arcs WIP; 2021-04-13 06:08:33 +02:00
Nils
dcb82993e6 Animated Texture progress
Refactored Bucket Rendering
2021-03-14 16:30:37 +01:00
Nils
bcbad2d87c Refactor Renderer 2020-10-11 16:47:36 +02:00
Nils
ea9afa7413 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
Nils
42f585c5a7 Fixed Spark direction 2020-09-29 17:16:27 +02:00
Nils
d6ed3b8878 Added parameter to SetupRIpple to specifiy sprite 2020-09-21 15:20:59 +02:00
Nils
c0ac790b77 NonPremultiplied Alphablending for rooms and horizon 2020-09-18 11:41:20 +02:00
Nils
853564ade6 Updated DirectXTK
Fixed Smoke Sequence
m_spritesToDraw is now vector<RendererSpriteToDraw> instead of vector<RendererSpriteToDraw*>
2020-09-18 08:57:50 +02:00
Nils
860a076ad1 Added Boat foam, Skidoo snow trail 2020-09-15 08:10:38 +02:00
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