Merge branch 'miami' into lcs

# Conflicts: # premake5.lua
2025-01-08 20:25:28 +00:00 · 2021-07-18 00:05:51 +03:00 · 2021-07-18 00:05:51 +03:00 · 7a034142c9
parent ec5a07b049 c937bdbfea
commit 7a034142c9
77 changed files with 10 additions and 10 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -13,7 +13,7 @@
    "src/modelinfo",
    "src/objects",
    "src/peds",
-    "src/render",
+    "src/renderer",
    "src/rw",
    "src/save",
    "src/skel",
--- a/codewarrior/reVC.mcp.xml
+++ b/codewarrior/reVC.mcp.xml
@ -187,7 +187,7 @@
                    </SETTING>
                    <SETTING>
                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>..\src\render</VALUE></SETTING>
+                            <SETTING><NAME>Path</NAME><VALUE>..\src\renderer</VALUE></SETTING>
                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
                        </SETTING>
@ -6712,7 +6712,7 @@
                    </SETTING>
                    <SETTING>
                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>..\src\render</VALUE></SETTING>
+                            <SETTING><NAME>Path</NAME><VALUE>..\src\renderer</VALUE></SETTING>
                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
                        </SETTING>
@ -14909,7 +14909,7 @@
                <PATHFORMAT>Windows</PATHFORMAT>
            </FILEREF>
        </GROUP>
-        <GROUP><NAME>render</NAME>
+        <GROUP><NAME>renderer</NAME>
            <FILEREF>
                <TARGETNAME>Debug</TARGETNAME>
                <PATHTYPE>Name</PATHTYPE>
--- a/premake5.lua
+++ b/premake5.lua
@ -86,7 +86,7 @@ workspace "reLCS"
 		linkoptions { "-fsanitize=address" }
 	end
-	filter { "system:windows" }
+	filter { "system:windows" }
 		configurations { "Vanilla" }
 		platforms {
 			"win-x86-RW34_d3d8-mss",
@ -273,7 +273,7 @@ project "reLCS"
 	files { addSrcFiles("src/modelinfo") }
 	files { addSrcFiles("src/objects") }
 	files { addSrcFiles("src/peds") }
-	files { addSrcFiles("src/render") }
+	files { addSrcFiles("src/renderer") }
 	files { addSrcFiles("src/rw") }
 	files { addSrcFiles("src/save") }
 	files { addSrcFiles("src/skel") }
@ -304,7 +304,7 @@ project "reLCS"
 	includedirs { "src/modelinfo" }
 	includedirs { "src/objects" }
 	includedirs { "src/peds" }
-	includedirs { "src/render" }
+	includedirs { "src/renderer" }
 	includedirs { "src/rw" }
 	includedirs { "src/save/" }
 	includedirs { "src/skel/" }
@ -322,9 +322,9 @@ project "reLCS"
 		includedirs { "vendor/ogg/include" }
 		includedirs { "vendor/opus/include" }
 		includedirs { "vendor/opusfile/include" }
-	end
+	end
-
+
-	filter "configurations:Vanilla"
+	filter "configurations:Vanilla"
 		defines { "VANILLA_DEFINES" }
 	filter "platforms:*mss"
--- a/src/renderer/2dEffect.h
+++ b/src/renderer/2dEffect.h
--- a/src/renderer/Antennas.cpp
+++ b/src/renderer/Antennas.cpp
--- a/src/renderer/Antennas.h
+++ b/src/renderer/Antennas.h
--- a/src/renderer/Clouds.cpp
+++ b/src/renderer/Clouds.cpp
--- a/src/renderer/Clouds.h
+++ b/src/renderer/Clouds.h
--- a/src/renderer/Console.cpp
+++ b/src/renderer/Console.cpp
--- a/src/renderer/Console.h
+++ b/src/renderer/Console.h
--- a/src/renderer/Coronas.cpp
+++ b/src/renderer/Coronas.cpp
--- a/src/renderer/Coronas.h
+++ b/src/renderer/Coronas.h
--- a/src/renderer/Credits.cpp
+++ b/src/renderer/Credits.cpp
--- a/src/renderer/Credits.h
+++ b/src/renderer/Credits.h
--- a/src/renderer/CutsceneShadow.cpp
+++ b/src/renderer/CutsceneShadow.cpp
--- a/src/renderer/CutsceneShadow.h
+++ b/src/renderer/CutsceneShadow.h
--- a/src/renderer/Draw.cpp
+++ b/src/renderer/Draw.cpp
--- a/src/renderer/Draw.h
+++ b/src/renderer/Draw.h
--- a/src/renderer/Fluff.cpp
+++ b/src/renderer/Fluff.cpp
--- a/src/renderer/Fluff.h
+++ b/src/renderer/Fluff.h
--- a/src/renderer/Font.cpp
+++ b/src/renderer/Font.cpp
--- a/src/renderer/Font.h
+++ b/src/renderer/Font.h
--- a/src/renderer/Glass.cpp
+++ b/src/renderer/Glass.cpp
--- a/src/renderer/Glass.h
+++ b/src/renderer/Glass.h
--- a/src/renderer/Hud.cpp
+++ b/src/renderer/Hud.cpp
--- a/src/renderer/Hud.h
+++ b/src/renderer/Hud.h
--- a/src/renderer/Instance.cpp
+++ b/src/renderer/Instance.cpp
--- a/src/renderer/Instance.h
+++ b/src/renderer/Instance.h
--- a/src/renderer/Lines.cpp
+++ b/src/renderer/Lines.cpp
--- a/src/renderer/Lines.h
+++ b/src/renderer/Lines.h
--- a/src/renderer/MBlur.cpp
+++ b/src/renderer/MBlur.cpp
--- a/src/renderer/MBlur.h
+++ b/src/renderer/MBlur.h
--- a/src/renderer/Occlusion.cpp
+++ b/src/renderer/Occlusion.cpp
--- a/src/renderer/Occlusion.h
+++ b/src/renderer/Occlusion.h
--- a/src/renderer/Particle.cpp
+++ b/src/renderer/Particle.cpp
--- a/src/renderer/Particle.h
+++ b/src/renderer/Particle.h
--- a/src/renderer/ParticleMgr.cpp
+++ b/src/renderer/ParticleMgr.cpp
--- a/src/renderer/ParticleMgr.h
+++ b/src/renderer/ParticleMgr.h
--- a/src/renderer/ParticleType.h
+++ b/src/renderer/ParticleType.h
--- a/src/renderer/PlayerSkin.cpp
+++ b/src/renderer/PlayerSkin.cpp
--- a/src/renderer/PlayerSkin.h
+++ b/src/renderer/PlayerSkin.h
--- a/src/renderer/PointLights.cpp
+++ b/src/renderer/PointLights.cpp
--- a/src/renderer/PointLights.h
+++ b/src/renderer/PointLights.h
--- a/src/renderer/RenderBuffer.cpp
+++ b/src/renderer/RenderBuffer.cpp
--- a/src/renderer/RenderBuffer.h
+++ b/src/renderer/RenderBuffer.h
--- a/src/renderer/Renderer.cpp
+++ b/src/renderer/Renderer.cpp
--- a/src/renderer/Renderer.h
+++ b/src/renderer/Renderer.h
--- a/src/renderer/Rubbish.cpp
+++ b/src/renderer/Rubbish.cpp
--- a/src/renderer/Rubbish.h
+++ b/src/renderer/Rubbish.h
--- a/src/renderer/ShadowCamera.cpp
+++ b/src/renderer/ShadowCamera.cpp
--- a/src/renderer/ShadowCamera.h
+++ b/src/renderer/ShadowCamera.h
--- a/src/renderer/Shadows.cpp
+++ b/src/renderer/Shadows.cpp
--- a/src/renderer/Shadows.h
+++ b/src/renderer/Shadows.h
--- a/src/renderer/Skidmarks.cpp
+++ b/src/renderer/Skidmarks.cpp
--- a/src/renderer/Skidmarks.h
+++ b/src/renderer/Skidmarks.h
--- a/src/renderer/SpecialFX.cpp
+++ b/src/renderer/SpecialFX.cpp
--- a/src/renderer/SpecialFX.h
+++ b/src/renderer/SpecialFX.h
--- a/src/renderer/Sprite.cpp
+++ b/src/renderer/Sprite.cpp
--- a/src/renderer/Sprite.h
+++ b/src/renderer/Sprite.h
--- a/src/renderer/Sprite2d.cpp
+++ b/src/renderer/Sprite2d.cpp
--- a/src/renderer/Sprite2d.h
+++ b/src/renderer/Sprite2d.h
--- a/src/renderer/TexList.cpp
+++ b/src/renderer/TexList.cpp
--- a/src/renderer/TexList.h
+++ b/src/renderer/TexList.h
--- a/src/renderer/Timecycle.cpp
+++ b/src/renderer/Timecycle.cpp
--- a/src/renderer/Timecycle.h
+++ b/src/renderer/Timecycle.h
--- a/src/renderer/VarConsole.cpp
+++ b/src/renderer/VarConsole.cpp
--- a/src/renderer/VarConsole.h
+++ b/src/renderer/VarConsole.h
--- a/src/renderer/WaterCannon.cpp
+++ b/src/renderer/WaterCannon.cpp
--- a/src/renderer/WaterCannon.h
+++ b/src/renderer/WaterCannon.h
--- a/src/renderer/WaterCreatures.cpp
+++ b/src/renderer/WaterCreatures.cpp
--- a/src/renderer/WaterCreatures.h
+++ b/src/renderer/WaterCreatures.h
--- a/src/renderer/WaterLevel.cpp
+++ b/src/renderer/WaterLevel.cpp
--- a/src/renderer/WaterLevel.h
+++ b/src/renderer/WaterLevel.h
--- a/src/renderer/Weather.cpp
+++ b/src/renderer/Weather.cpp
--- a/src/renderer/Weather.h
+++ b/src/renderer/Weather.h
--- a/src/renderer/WindModifiers.cpp
+++ b/src/renderer/WindModifiers.cpp
--- a/src/renderer/WindModifiers.h
+++ b/src/renderer/WindModifiers.h