diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-07-15 17:19:32 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2021-07-17 23:04:26 +0200 |
commit | d0404cbdb77bd82abf578ce28093990db94743f2 (patch) | |
tree | 1a7232c3dcdd6c371ab5fbde0fc6bf04c5bc7005 | |
parent | Merge pull request #1217 from Nopey/master (diff) | |
download | re3-d0404cbdb77bd82abf578ce28093990db94743f2.tar re3-d0404cbdb77bd82abf578ce28093990db94743f2.tar.gz re3-d0404cbdb77bd82abf578ce28093990db94743f2.tar.bz2 re3-d0404cbdb77bd82abf578ce28093990db94743f2.tar.lz re3-d0404cbdb77bd82abf578ce28093990db94743f2.tar.xz re3-d0404cbdb77bd82abf578ce28093990db94743f2.tar.zst re3-d0404cbdb77bd82abf578ce28093990db94743f2.zip |
-rw-r--r-- | .vscode/settings.json | 2 | ||||
-rw-r--r-- | codewarrior/re3.mcp.xml | 6 | ||||
-rw-r--r-- | premake5.lua | 4 | ||||
-rw-r--r-- | src/renderer/2dEffect.h (renamed from src/render/2dEffect.h) | 0 | ||||
-rw-r--r-- | src/renderer/Antennas.cpp (renamed from src/render/Antennas.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Antennas.h (renamed from src/render/Antennas.h) | 0 | ||||
-rw-r--r-- | src/renderer/Clouds.cpp (renamed from src/render/Clouds.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Clouds.h (renamed from src/render/Clouds.h) | 0 | ||||
-rw-r--r-- | src/renderer/Console.cpp (renamed from src/render/Console.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Console.h (renamed from src/render/Console.h) | 0 | ||||
-rw-r--r-- | src/renderer/Coronas.cpp (renamed from src/render/Coronas.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Coronas.h (renamed from src/render/Coronas.h) | 0 | ||||
-rw-r--r-- | src/renderer/Credits.cpp (renamed from src/render/Credits.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Credits.h (renamed from src/render/Credits.h) | 0 | ||||
-rw-r--r-- | src/renderer/Draw.cpp (renamed from src/render/Draw.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Draw.h (renamed from src/render/Draw.h) | 0 | ||||
-rw-r--r-- | src/renderer/Fluff.cpp (renamed from src/render/Fluff.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Fluff.h (renamed from src/render/Fluff.h) | 0 | ||||
-rw-r--r-- | src/renderer/Font.cpp (renamed from src/render/Font.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Font.h (renamed from src/render/Font.h) | 0 | ||||
-rw-r--r-- | src/renderer/Glass.cpp (renamed from src/render/Glass.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Glass.h (renamed from src/render/Glass.h) | 0 | ||||
-rw-r--r-- | src/renderer/Hud.cpp (renamed from src/render/Hud.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Hud.h (renamed from src/render/Hud.h) | 0 | ||||
-rw-r--r-- | src/renderer/Instance.cpp (renamed from src/render/Instance.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Instance.h (renamed from src/render/Instance.h) | 0 | ||||
-rw-r--r-- | src/renderer/Lines.cpp (renamed from src/render/Lines.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Lines.h (renamed from src/render/Lines.h) | 0 | ||||
-rw-r--r-- | src/renderer/MBlur.cpp (renamed from src/render/MBlur.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/MBlur.h (renamed from src/render/MBlur.h) | 0 | ||||
-rw-r--r-- | src/renderer/Particle.cpp (renamed from src/render/Particle.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Particle.h (renamed from src/render/Particle.h) | 0 | ||||
-rw-r--r-- | src/renderer/ParticleMgr.cpp (renamed from src/render/ParticleMgr.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/ParticleMgr.h (renamed from src/render/ParticleMgr.h) | 0 | ||||
-rw-r--r-- | src/renderer/ParticleType.h (renamed from src/render/ParticleType.h) | 0 | ||||
-rw-r--r-- | src/renderer/PlayerSkin.cpp (renamed from src/render/PlayerSkin.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/PlayerSkin.h (renamed from src/render/PlayerSkin.h) | 0 | ||||
-rw-r--r-- | src/renderer/PointLights.cpp (renamed from src/render/PointLights.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/PointLights.h (renamed from src/render/PointLights.h) | 0 | ||||
-rw-r--r-- | src/renderer/RenderBuffer.cpp (renamed from src/render/RenderBuffer.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/RenderBuffer.h (renamed from src/render/RenderBuffer.h) | 0 | ||||
-rw-r--r-- | src/renderer/Renderer.cpp (renamed from src/render/Renderer.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Renderer.h (renamed from src/render/Renderer.h) | 0 | ||||
-rw-r--r-- | src/renderer/Rubbish.cpp (renamed from src/render/Rubbish.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Rubbish.h (renamed from src/render/Rubbish.h) | 0 | ||||
-rw-r--r-- | src/renderer/Shadows.cpp (renamed from src/render/Shadows.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Shadows.h (renamed from src/render/Shadows.h) | 0 | ||||
-rw-r--r-- | src/renderer/Skidmarks.cpp (renamed from src/render/Skidmarks.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Skidmarks.h (renamed from src/render/Skidmarks.h) | 0 | ||||
-rw-r--r-- | src/renderer/SpecialFX.cpp (renamed from src/render/SpecialFX.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/SpecialFX.h (renamed from src/render/SpecialFX.h) | 0 | ||||
-rw-r--r-- | src/renderer/Sprite.cpp (renamed from src/render/Sprite.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Sprite.h (renamed from src/render/Sprite.h) | 0 | ||||
-rw-r--r-- | src/renderer/Sprite2d.cpp (renamed from src/render/Sprite2d.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Sprite2d.h (renamed from src/render/Sprite2d.h) | 0 | ||||
-rw-r--r-- | src/renderer/TexList.cpp (renamed from src/render/TexList.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/TexList.h (renamed from src/render/TexList.h) | 0 | ||||
-rw-r--r-- | src/renderer/Timecycle.cpp (renamed from src/render/Timecycle.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Timecycle.h (renamed from src/render/Timecycle.h) | 0 | ||||
-rw-r--r-- | src/renderer/WaterCannon.cpp (renamed from src/render/WaterCannon.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/WaterCannon.h (renamed from src/render/WaterCannon.h) | 0 | ||||
-rw-r--r-- | src/renderer/WaterLevel.cpp (renamed from src/render/WaterLevel.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/WaterLevel.h (renamed from src/render/WaterLevel.h) | 0 | ||||
-rw-r--r-- | src/renderer/Weather.cpp (renamed from src/render/Weather.cpp) | 0 | ||||
-rw-r--r-- | src/renderer/Weather.h (renamed from src/render/Weather.h) | 0 |
65 files changed, 6 insertions, 6 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json index 10cb5627..fee80960 100644 --- 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", diff --git a/codewarrior/re3.mcp.xml b/codewarrior/re3.mcp.xml index b18e2bcc..ca20ec2a 100644 --- a/codewarrior/re3.mcp.xml +++ b/codewarrior/re3.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>
@@ -6424,7 +6424,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>
@@ -14281,7 +14281,7 @@ <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
</GROUP>
- <GROUP><NAME>render</NAME>
+ <GROUP><NAME>renderer</NAME>
<FILEREF>
<TARGETNAME>Debug</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
diff --git a/premake5.lua b/premake5.lua index 0a8faa07..25090dc6 100644 --- a/premake5.lua +++ b/premake5.lua @@ -264,7 +264,7 @@ project "re3" 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") }
@@ -293,7 +293,7 @@ project "re3" includedirs { "src/modelinfo" }
includedirs { "src/objects" }
includedirs { "src/peds" }
- includedirs { "src/render" }
+ includedirs { "src/renderer" }
includedirs { "src/rw" }
includedirs { "src/save/" }
includedirs { "src/skel/" }
diff --git a/src/render/2dEffect.h b/src/renderer/2dEffect.h index a8013b34..a8013b34 100644 --- a/src/render/2dEffect.h +++ b/src/renderer/2dEffect.h diff --git a/src/render/Antennas.cpp b/src/renderer/Antennas.cpp index 5e30aca2..5e30aca2 100644 --- a/src/render/Antennas.cpp +++ b/src/renderer/Antennas.cpp diff --git a/src/render/Antennas.h b/src/renderer/Antennas.h index 47cb1dad..47cb1dad 100644 --- a/src/render/Antennas.h +++ b/src/renderer/Antennas.h diff --git a/src/render/Clouds.cpp b/src/renderer/Clouds.cpp index 957844a5..957844a5 100644 --- a/src/render/Clouds.cpp +++ b/src/renderer/Clouds.cpp diff --git a/src/render/Clouds.h b/src/renderer/Clouds.h index 4d8cd2c8..4d8cd2c8 100644 --- a/src/render/Clouds.h +++ b/src/renderer/Clouds.h diff --git a/src/render/Console.cpp b/src/renderer/Console.cpp index 8ea5b7a3..8ea5b7a3 100644 --- a/src/render/Console.cpp +++ b/src/renderer/Console.cpp diff --git a/src/render/Console.h b/src/renderer/Console.h index 9f22236f..9f22236f 100644 --- a/src/render/Console.h +++ b/src/renderer/Console.h diff --git a/src/render/Coronas.cpp b/src/renderer/Coronas.cpp index e9f9e662..e9f9e662 100644 --- a/src/render/Coronas.cpp +++ b/src/renderer/Coronas.cpp diff --git a/src/render/Coronas.h b/src/renderer/Coronas.h index 46eb4315..46eb4315 100644 --- a/src/render/Coronas.h +++ b/src/renderer/Coronas.h diff --git a/src/render/Credits.cpp b/src/renderer/Credits.cpp index 60581793..60581793 100644 --- a/src/render/Credits.cpp +++ b/src/renderer/Credits.cpp diff --git a/src/render/Credits.h b/src/renderer/Credits.h index e049ce76..e049ce76 100644 --- a/src/render/Credits.h +++ b/src/renderer/Credits.h diff --git a/src/render/Draw.cpp b/src/renderer/Draw.cpp index f702f188..f702f188 100644 --- a/src/render/Draw.cpp +++ b/src/renderer/Draw.cpp diff --git a/src/render/Draw.h b/src/renderer/Draw.h index 8727e0e0..8727e0e0 100644 --- a/src/render/Draw.h +++ b/src/renderer/Draw.h diff --git a/src/render/Fluff.cpp b/src/renderer/Fluff.cpp index c4cfe7f7..c4cfe7f7 100644 --- a/src/render/Fluff.cpp +++ b/src/renderer/Fluff.cpp diff --git a/src/render/Fluff.h b/src/renderer/Fluff.h index fe3ab256..fe3ab256 100644 --- a/src/render/Fluff.h +++ b/src/renderer/Fluff.h diff --git a/src/render/Font.cpp b/src/renderer/Font.cpp index 6a9944e1..6a9944e1 100644 --- a/src/render/Font.cpp +++ b/src/renderer/Font.cpp diff --git a/src/render/Font.h b/src/renderer/Font.h index 9316ed34..9316ed34 100644 --- a/src/render/Font.h +++ b/src/renderer/Font.h diff --git a/src/render/Glass.cpp b/src/renderer/Glass.cpp index cc45648c..cc45648c 100644 --- a/src/render/Glass.cpp +++ b/src/renderer/Glass.cpp diff --git a/src/render/Glass.h b/src/renderer/Glass.h index 51c5aae9..51c5aae9 100644 --- a/src/render/Glass.h +++ b/src/renderer/Glass.h diff --git a/src/render/Hud.cpp b/src/renderer/Hud.cpp index bba8c525..bba8c525 100644 --- a/src/render/Hud.cpp +++ b/src/renderer/Hud.cpp diff --git a/src/render/Hud.h b/src/renderer/Hud.h index adfdf1fc..adfdf1fc 100644 --- a/src/render/Hud.h +++ b/src/renderer/Hud.h diff --git a/src/render/Instance.cpp b/src/renderer/Instance.cpp index be6d73d6..be6d73d6 100644 --- a/src/render/Instance.cpp +++ b/src/renderer/Instance.cpp diff --git a/src/render/Instance.h b/src/renderer/Instance.h index 693cfdf1..693cfdf1 100644 --- a/src/render/Instance.h +++ b/src/renderer/Instance.h diff --git a/src/render/Lines.cpp b/src/renderer/Lines.cpp index b5c85149..b5c85149 100644 --- a/src/render/Lines.cpp +++ b/src/renderer/Lines.cpp diff --git a/src/render/Lines.h b/src/renderer/Lines.h index f2694fc0..f2694fc0 100644 --- a/src/render/Lines.h +++ b/src/renderer/Lines.h diff --git a/src/render/MBlur.cpp b/src/renderer/MBlur.cpp index 8e5fba2a..8e5fba2a 100644 --- a/src/render/MBlur.cpp +++ b/src/renderer/MBlur.cpp diff --git a/src/render/MBlur.h b/src/renderer/MBlur.h index e2e5d38c..e2e5d38c 100644 --- a/src/render/MBlur.h +++ b/src/renderer/MBlur.h diff --git a/src/render/Particle.cpp b/src/renderer/Particle.cpp index 76ddde50..76ddde50 100644 --- a/src/render/Particle.cpp +++ b/src/renderer/Particle.cpp diff --git a/src/render/Particle.h b/src/renderer/Particle.h index 7f02e318..7f02e318 100644 --- a/src/render/Particle.h +++ b/src/renderer/Particle.h diff --git a/src/render/ParticleMgr.cpp b/src/renderer/ParticleMgr.cpp index 3387d471..3387d471 100644 --- a/src/render/ParticleMgr.cpp +++ b/src/renderer/ParticleMgr.cpp diff --git a/src/render/ParticleMgr.h b/src/renderer/ParticleMgr.h index 0100bb65..0100bb65 100644 --- a/src/render/ParticleMgr.h +++ b/src/renderer/ParticleMgr.h diff --git a/src/render/ParticleType.h b/src/renderer/ParticleType.h index 8d352c44..8d352c44 100644 --- a/src/render/ParticleType.h +++ b/src/renderer/ParticleType.h diff --git a/src/render/PlayerSkin.cpp b/src/renderer/PlayerSkin.cpp index f0fae45a..f0fae45a 100644 --- a/src/render/PlayerSkin.cpp +++ b/src/renderer/PlayerSkin.cpp diff --git a/src/render/PlayerSkin.h b/src/renderer/PlayerSkin.h index e0214ce0..e0214ce0 100644 --- a/src/render/PlayerSkin.h +++ b/src/renderer/PlayerSkin.h diff --git a/src/render/PointLights.cpp b/src/renderer/PointLights.cpp index 84ac4ab2..84ac4ab2 100644 --- a/src/render/PointLights.cpp +++ b/src/renderer/PointLights.cpp diff --git a/src/render/PointLights.h b/src/renderer/PointLights.h index 9e94328f..9e94328f 100644 --- a/src/render/PointLights.h +++ b/src/renderer/PointLights.h diff --git a/src/render/RenderBuffer.cpp b/src/renderer/RenderBuffer.cpp index 6120dfe2..6120dfe2 100644 --- a/src/render/RenderBuffer.cpp +++ b/src/renderer/RenderBuffer.cpp diff --git a/src/render/RenderBuffer.h b/src/renderer/RenderBuffer.h index 485d24e3..485d24e3 100644 --- a/src/render/RenderBuffer.h +++ b/src/renderer/RenderBuffer.h diff --git a/src/render/Renderer.cpp b/src/renderer/Renderer.cpp index 1c0bd445..1c0bd445 100644 --- a/src/render/Renderer.cpp +++ b/src/renderer/Renderer.cpp diff --git a/src/render/Renderer.h b/src/renderer/Renderer.h index 0322939c..0322939c 100644 --- a/src/render/Renderer.h +++ b/src/renderer/Renderer.h diff --git a/src/render/Rubbish.cpp b/src/renderer/Rubbish.cpp index 8da6b025..8da6b025 100644 --- a/src/render/Rubbish.cpp +++ b/src/renderer/Rubbish.cpp diff --git a/src/render/Rubbish.h b/src/renderer/Rubbish.h index 37f895f3..37f895f3 100644 --- a/src/render/Rubbish.h +++ b/src/renderer/Rubbish.h diff --git a/src/render/Shadows.cpp b/src/renderer/Shadows.cpp index 3884d3bb..3884d3bb 100644 --- a/src/render/Shadows.cpp +++ b/src/renderer/Shadows.cpp diff --git a/src/render/Shadows.h b/src/renderer/Shadows.h index 8c909df3..8c909df3 100644 --- a/src/render/Shadows.h +++ b/src/renderer/Shadows.h diff --git a/src/render/Skidmarks.cpp b/src/renderer/Skidmarks.cpp index 4c662a79..4c662a79 100644 --- a/src/render/Skidmarks.cpp +++ b/src/renderer/Skidmarks.cpp diff --git a/src/render/Skidmarks.h b/src/renderer/Skidmarks.h index c061782d..c061782d 100644 --- a/src/render/Skidmarks.h +++ b/src/renderer/Skidmarks.h diff --git a/src/render/SpecialFX.cpp b/src/renderer/SpecialFX.cpp index 6d96d21a..6d96d21a 100644 --- a/src/render/SpecialFX.cpp +++ b/src/renderer/SpecialFX.cpp diff --git a/src/render/SpecialFX.h b/src/renderer/SpecialFX.h index 2d9f18b1..2d9f18b1 100644 --- a/src/render/SpecialFX.h +++ b/src/renderer/SpecialFX.h diff --git a/src/render/Sprite.cpp b/src/renderer/Sprite.cpp index 3fef0733..3fef0733 100644 --- a/src/render/Sprite.cpp +++ b/src/renderer/Sprite.cpp diff --git a/src/render/Sprite.h b/src/renderer/Sprite.h index ec4c1d1b..ec4c1d1b 100644 --- a/src/render/Sprite.h +++ b/src/renderer/Sprite.h diff --git a/src/render/Sprite2d.cpp b/src/renderer/Sprite2d.cpp index 59622516..59622516 100644 --- a/src/render/Sprite2d.cpp +++ b/src/renderer/Sprite2d.cpp diff --git a/src/render/Sprite2d.h b/src/renderer/Sprite2d.h index 0e12d441..0e12d441 100644 --- a/src/render/Sprite2d.h +++ b/src/renderer/Sprite2d.h diff --git a/src/render/TexList.cpp b/src/renderer/TexList.cpp index 1689837f..1689837f 100644 --- a/src/render/TexList.cpp +++ b/src/renderer/TexList.cpp diff --git a/src/render/TexList.h b/src/renderer/TexList.h index 7e042211..7e042211 100644 --- a/src/render/TexList.h +++ b/src/renderer/TexList.h diff --git a/src/render/Timecycle.cpp b/src/renderer/Timecycle.cpp index 0d94dbd6..0d94dbd6 100644 --- a/src/render/Timecycle.cpp +++ b/src/renderer/Timecycle.cpp diff --git a/src/render/Timecycle.h b/src/renderer/Timecycle.h index d5d7b67a..d5d7b67a 100644 --- a/src/render/Timecycle.h +++ b/src/renderer/Timecycle.h diff --git a/src/render/WaterCannon.cpp b/src/renderer/WaterCannon.cpp index 08898be8..08898be8 100644 --- a/src/render/WaterCannon.cpp +++ b/src/renderer/WaterCannon.cpp diff --git a/src/render/WaterCannon.h b/src/renderer/WaterCannon.h index a37bdd12..a37bdd12 100644 --- a/src/render/WaterCannon.h +++ b/src/renderer/WaterCannon.h diff --git a/src/render/WaterLevel.cpp b/src/renderer/WaterLevel.cpp index 7001c0cf..7001c0cf 100644 --- a/src/render/WaterLevel.cpp +++ b/src/renderer/WaterLevel.cpp diff --git a/src/render/WaterLevel.h b/src/renderer/WaterLevel.h index b797f251..b797f251 100644 --- a/src/render/WaterLevel.h +++ b/src/renderer/WaterLevel.h diff --git a/src/render/Weather.cpp b/src/renderer/Weather.cpp index e57d57d6..e57d57d6 100644 --- a/src/render/Weather.cpp +++ b/src/renderer/Weather.cpp diff --git a/src/render/Weather.h b/src/renderer/Weather.h index 9c670317..9c670317 100644 --- a/src/render/Weather.h +++ b/src/renderer/Weather.h |