Commit graph

139 commits

Author SHA1 Message Date
MontyTRC89
c3a748cc78 Merge branch 'master' into renderer_refactor
# Conflicts:
#	TR5Main/Renderer/Renderer11.cpp
2021-12-24 15:19:12 +01:00
Lwmte
2101d3e65f Reorganize includes tier 2 2021-12-22 16:23:57 +03:00
MontyTRC89
36300d301c Converted MESH* to int in SHATTER_ITEM; Fixed rendering of items and statics; 2021-12-14 17:20:13 +01:00
MontyTRC89
85ba127325 Optimized data uploading from level structs to renderer structs 2021-12-14 10:21:25 +01:00
MontyTRC89
a75325e296 Removed createBillboardMatrix (not used); Set max lights per item to 8; Refactored ShaderLight and RendererLight structs; Refactored partially RendererItem struc; Renamed shadowLight class member; Restored drawing of rooms transparent faces; Disabled again renderToCubemap; Removed duplicate shadow light finder code; Sorting lights by distance from near to far; Added better error messages if shader compile error happens; Cleaned a bit FX files; 2021-12-11 07:17:58 +01:00
MontyTRC89
e9cd048bfe Added bindTexture() function; Made Texture2D, TextureCube and RenderTarget2D inherit from TextureBase class; 2021-12-10 09:17:36 +01:00
MontyTRC89
0401088a9b Moved items and effects to draw from RenderView to RendererRoom 2021-12-09 11:34:58 +01:00
MontyTRC89
ab76219803 Reverted camelCase change in RendererRoom struct 2021-12-09 11:17:56 +01:00
MontyTRC89
f609e97a19 Refactoring RendererRoom struct; Fixed light constant buffer for items; Added more debug variables for transparent faces; 2021-12-09 06:33:19 +01:00
MontyTRC89
8a4d14241f Temporary disabled render to cubemap and underwater dust 2021-12-08 07:41:12 +01:00
MontyTRC89
21b3cc8151 Merge branch 'master' into renderer_refactor
# Conflicts:
#	TR5Main/Renderer/Renderer11DrawEffect.cpp
#	TR5Main/TombEngine.vcxproj.filters
2021-11-23 09:28:40 +01:00
Lwmte
c42032d77f Increase renderer code readability 2021-11-23 03:08:17 +03:00
Lwmte
edcf588c22 Restore drips 2021-11-23 02:53:52 +03:00
MontyTRC89
fc79ec211f Optimized drawing of transparnet vertices; Fixed serious crash with transparent faces; Added debug strings also for release mode; 2021-11-22 06:05:47 +01:00
MontyTRC89
b81f84728e Added items transparent faces drawing; Debug vertices sent to vertex buffer; Optimized a bit packing of transparent draw calls; Optimized vertex buffer for transparent faces; 2021-11-21 07:59:21 +01:00
MontyTRC89
f3144e950e Trying to optimize the rendering of transparent faces 2021-11-16 09:32:13 +01:00
MontyTRC89
bb75bc462f Added transparent faces drawing of statics; Fixed transparent sprites drawing; Refactored a bit transparent faces; 2021-11-15 05:40:32 +01:00
MontyTRC89
13779a8a33 Collecting transparent faces for rooms and sprites; Drawing transparent faces for rooms; Fixed some lighting for GUIDE; 2021-11-13 09:55:37 +01:00
Lwmte
f7545612c9 Use ref in weather iterators 2021-11-10 20:37:27 +03:00
Lwmte
89a0b1020c Fix stuff 2021-11-10 20:16:04 +03:00
Lwmte
914d0e55ed Remove rotation hack 2021-11-10 19:50:27 +03:00
Lwmte
d7c067b874 Fix more trash 2021-11-10 19:37:11 +03:00
Lwmte
bf405e77d4 Update Renderer11DrawEffect.cpp 2021-11-10 19:11:26 +03:00
Lwmte
fee1622c14 Add rain 2021-11-10 18:27:16 +03:00
Lwmte
77d66f89db Draw real snow 2021-11-10 16:21:41 +03:00
Lwmte
cc4b15873b Don't draw footprints on tilt edges 2021-11-03 03:10:57 +03:00
Lwmte
030e096420 Simplify footprint code 2021-11-02 02:01:04 +03:00
Lwmte
46aa7c3554 Fix footprint rotations 2021-11-01 04:10:55 +03:00
Raildex
93e924d341 Fixed Depth Write of Transparent Objects 2021-10-05 19:13:34 +02:00
MontyTRC89
f35d6e80d0 Merge branch 'entities_fixings'
# Conflicts:
#	TR5Main/Renderer/Renderer11Draw.cpp
2021-09-29 05:35:17 +02:00
Lwmte
e6fc5aba77 Cleanup 2021-09-25 16:00:30 +03:00
Raildex
2b0b1ff282 Added newlines 2021-09-25 11:27:47 +02:00
Raildex
7b070e75ad Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
MontyTRC89
8158b5a8df Improved flame emitter 3; Added legacy way for drawing darts, waiting for mesh; 2021-09-24 05:34:44 +02:00
MontyTRC89
c310b904b4 Fixed lightning drawing and clearing 2021-09-23 06:27:59 +02:00
MontyTRC89
14d4ad67ec Fixed lightning draw; Improved darts emitter; 2021-09-22 10:55:48 +02:00
MontyTRC89
4b0d76ed95 Refactored flame emitters, Lara burn and lightning bolts; 2021-09-22 05:51:25 +02:00
Lwmte
e70b87ca90 Merge branch 'master' into coll_info_reorganize 2021-09-19 23:47:31 +03:00
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Lwmte
016be41f97 Move anim structs to animation.h 2021-09-19 18:29:25 +03:00
Raildex
92f1535836 Fixed Corruption of Sprites 2021-09-19 15:20:37 +02:00
Lwmte
8d86c2e97d Rename draw.cpp to animation.cpp which makes more sense, some more edits 2021-09-16 05:06:03 +03:00
Lwmte
b6d55c4ddc Use different sprites for left/right foot 2021-09-14 01:22:08 +03:00
Lwmte
48a9a1d52a Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Lwmte
f293735d11 Move all effect source files to separate directory, rename effect2 to effects 2021-09-08 18:07:48 +03:00
Raildex
b422cafc79 Merge branch 'master' into item_data
# Conflicts:
#	TR5Main/Game/Lara/lara.cpp
#	TR5Main/Game/Lara/lara_collide.cpp
#	TR5Main/Game/Lara/lara_monkey.cpp
#	TR5Main/Game/Lara/lara_struct.h
#	TR5Main/Game/Lara/lara_tests.cpp
#	TR5Main/Game/collide.h
#	TR5Main/Game/control.h
#	TR5Main/Game/effect.h
#	TR5Main/Game/effect2.cpp
#	TR5Main/Game/flipeffect.cpp
#	TR5Main/Game/floordata.h
#	TR5Main/Game/hair.cpp
#	TR5Main/Game/health.cpp
#	TR5Main/Game/items.cpp
#	TR5Main/Game/newinv2.cpp
#	TR5Main/Game/spotcam.cpp
#	TR5Main/Objects/Effects/tr4_bubbles.cpp
#	TR5Main/Objects/TR1/Entity/tr1_ape.cpp
#	TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp
#	TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp
#	TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp
#	TR5Main/Objects/TR2/Entity/tr2_shark.cpp
#	TR5Main/Objects/TR2/Entity/tr2_spider.cpp
#	TR5Main/Objects/TR2/Entity/tr2_yeti.cpp
#	TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
#	TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp
#	TR5Main/Objects/TR3/Entity/tr3_monkey.cpp
#	TR5Main/Objects/TR3/Entity/tr3_raptor.cpp
#	TR5Main/Objects/TR3/Entity/tr3_scuba.cpp
#	TR5Main/Objects/TR3/Entity/tr3_trex.cpp
#	TR5Main/Objects/TR3/Vehicles/kayak.cpp
#	TR5Main/Objects/TR3/Vehicles/minecart.cpp
#	TR5Main/Objects/TR4/Entity/tr4_bat.cpp
#	TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
#	TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp
#	TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
#	TR5Main/Objects/TR4/Entity/tr4_dog.cpp
#	TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp
#	TR5Main/Objects/TR4/Entity/tr4_harpy.cpp
#	TR5Main/Objects/TR4/Entity/tr4_mutant.cpp
#	TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp
#	TR5Main/Objects/TR4/Entity/tr4_troops.cpp
#	TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp
#	TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
#	TR5Main/Objects/TR4/Vehicles/motorbike.cpp
#	TR5Main/Objects/TR5/Entity/tr5_doberman.cpp
#	TR5Main/Objects/TR5/Entity/tr5_imp.cpp
#	TR5Main/Objects/TR5/Entity/tr5_larson.cpp
#	TR5Main/Objects/TR5/Entity/tr5_lion.cpp
#	TR5Main/Objects/TR5/Entity/tr5_reaper.cpp
#	TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
#	TR5Main/Objects/TR5/Object/tr5_rollingball.cpp
#	TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp
#	TR5Main/Renderer/Renderer11Draw2D.cpp
#	TR5Main/Specific/input.cpp
#	TR5Main/Specific/level.cpp
#	TR5Main/TombEngine.vcxproj.filters
2021-08-31 18:20:23 +02:00
Lwmte
6d9cf3c214 Fix namespace case 2021-08-30 18:03:21 +03:00
Raildex
2621fa8f0d Fixed More Include Hell 2021-08-28 13:27:58 +02:00
Lwmte
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +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