Skip to content

Commit c993804

Browse files
committed
move gl stuff to renderer
1 parent a3e608b commit c993804

File tree

17 files changed

+40
-43
lines changed

17 files changed

+40
-43
lines changed

RTEA.vcxproj

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,9 @@
787787
<ClInclude Include="Resources\Credits.h" />
788788
<ClInclude Include="Resources\resource.h" />
789789
<ClInclude Include="Source\Renderer\Draw.h" />
790-
<ClInclude Include="Source\Renderer\Image.h" />
791790
<ClInclude Include="Source\Renderer\RenderTarget.h" />
792791
<ClInclude Include="Source\Renderer\Shader.h" />
793-
<ClInclude Include="Source\Renderer\SpriteRenderer.h" />
794-
<ClInclude Include="Source\Renderer\VertexArray.h" />
792+
<ClInclude Include="Source\Renderer\BigTexture.h" />
795793
<ClInclude Include="Source\System\AllegroTools.h" />
796794
<ClInclude Include="Source\System\Atom.h" />
797795
<ClInclude Include="Source\System\Base64\base64.h" />
@@ -800,7 +798,7 @@
800798
<ClInclude Include="Source\System\Entity.h" />
801799
<ClInclude Include="Source\System\GameVersion.h" />
802800
<ClInclude Include="Source\System\GenericSavedData.h" />
803-
<ClInclude Include="Source\System\GLCheck.h" />
801+
<ClInclude Include="Source\Renderer\GLCheck.h" />
804802
<ClInclude Include="Source\System\InputMapping.h" />
805803
<ClInclude Include="Source\System\InputScheme.h" />
806804
<ClInclude Include="Source\System\NetworkMessages.h" />
@@ -830,10 +828,10 @@
830828
<ClInclude Include="Source\System\Vector.h" />
831829
<ClInclude Include="Source\System\Writer.h" />
832830
<ClInclude Include="Source\System\MicroPather\micropather.h" />
833-
<ClInclude Include="Source\System\raylib\raylib.h" />
834-
<ClInclude Include="Source\System\raylib\rlconfig.h" />
835-
<ClInclude Include="Source\System\raylib\rlgl.h" />
836-
<ClInclude Include="Source\System\raylib\rlutil.h" />
831+
<ClInclude Include="Source\Renderer\raylib\raylib.h" />
832+
<ClInclude Include="Source\Renderer\raylib\rlconfig.h" />
833+
<ClInclude Include="Source\Renderer\raylib\rlgl.h" />
834+
<ClInclude Include="Source\Renderer\raylib\rlutil.h" />
837835
<ClInclude Include="Source\Managers\AchievementMan.h" />
838836
<ClInclude Include="Source\Managers\ActivityMan.h" />
839837
<ClInclude Include="Source\Managers\AudioMan.h" />
@@ -1043,35 +1041,34 @@
10431041
<ClCompile Include="Source\Menus\InventoryMenuGUI.cpp" />
10441042
<ClCompile Include="Source\Renderer\RenderTarget.cpp" />
10451043
<ClCompile Include="Source\Renderer\Shader.cpp" />
1046-
<ClCompile Include="Source\Renderer\SpriteRenderer.cpp" />
1047-
<ClCompile Include="Source\Renderer\VertexArray.cpp" />
1044+
<ClCompile Include="Source\Renderer\BigTexture.cpp" />
10481045
<ClCompile Include="Source\System\AllegroTools.cpp" />
10491046
<ClCompile Include="Source\System\Atom.cpp" />
10501047
<ClCompile Include="Source\System\Base64\base64.cpp" />
10511048
<ClCompile Include="Source\System\Controller.cpp" />
10521049
<ClCompile Include="Source\System\Entity.cpp" />
10531050
<ClCompile Include="Source\System\GenericSavedData.cpp" />
1054-
<ClCompile Include="Source\System\glad\gl.c">
1051+
<ClCompile Include="Source\Renderer\glad\gl.c">
10551052
<PrecompiledHeader>NotUsing</PrecompiledHeader>
10561053
<CompileAs>CompileAsC</CompileAs>
10571054
</ClCompile>
1058-
<ClCompile Include="Source\System\raylib\rlgl.c" >
1055+
<ClCompile Include="Source\Renderer\raylib\rlgl.c" >
10591056
<PrecompiledHeader>NotUsing</PrecompiledHeader>
10601057
<CompileAs>CompileAsC</CompileAs>
10611058
</ClCompile>
1062-
<ClCompile Include="Source\System\raylib\rlutils.c" >
1059+
<ClCompile Include="Source\Renderer\raylib\rlutils.c" >
10631060
<PrecompiledHeader>NotUsing</PrecompiledHeader>
10641061
<CompileAs>CompileAsC</CompileAs>
10651062
</ClCompile>
1066-
<ClCompile Include="Source\System\raylib\rtextures.c" >
1063+
<ClCompile Include="Source\Renderer\raylib\rtextures.c" >
10671064
<PrecompiledHeader>NotUsing</PrecompiledHeader>
10681065
<CompileAs>CompileAsC</CompileAs>
10691066
</ClCompile>
1070-
<ClCompile Include="Source\System\raylib\rshapes.c" >
1067+
<ClCompile Include="Source\Renderer\raylib\rshapes.c" >
10711068
<PrecompiledHeader>NotUsing</PrecompiledHeader>
10721069
<CompileAs>CompileAsC</CompileAs>
10731070
</ClCompile>
1074-
<ClCompile Include="Source\System\GLCheck.cpp" />
1071+
<ClCompile Include="Source\Renderer\GLCheck.cpp" />
10751072
<ClCompile Include="Source\System\InputMapping.cpp" />
10761073
<ClCompile Include="Source\System\InputScheme.cpp" />
10771074
<ClCompile Include="Source\System\GraphicalPrimitive.cpp" />

RTEA.vcxproj.filters

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<Filter Include="System\Base64">
4747
<UniqueIdentifier>{6f517ec6-8c53-4d34-b320-c408e1fd374d}</UniqueIdentifier>
4848
</Filter>
49-
<Filter Include="System\glad">
49+
<Filter Include="Renderer\glad">
5050
<UniqueIdentifier>{a92cf676-7096-4641-ae98-d02861c1acde}</UniqueIdentifier>
5151
</Filter>
5252
<Filter Include="Renderer">
@@ -96,17 +96,17 @@
9696
<ClInclude Include="Source\System\MicroPather\micropather.h">
9797
<Filter>System\MicroPather</Filter>
9898
</ClInclude>
99-
<ClInclude Include="Source\System\raylib\raylib.h">
100-
<Filter>System\raylib</Filter>
99+
<ClInclude Include="Source\Renderer\raylib\raylib.h">
100+
<Filter>Renderer\raylib</Filter>
101101
</ClInclude>
102-
<ClInclude Include="Source\System\raylib\rlgl.h">
103-
<Filter>System\raylib</Filter>
102+
<ClInclude Include="Source\Renderer\raylib\rlgl.h">
103+
<Filter>Renderer\raylib</Filter>
104104
</ClInclude>
105-
<ClInclude Include="Source\System\raylib\rlutils.h">
106-
<Filter>System\raylib</Filter>
105+
<ClInclude Include="Source\Renderer\raylib\rlutils.h">
106+
<Filter>Renderer\raylib</Filter>
107107
</ClInclude>
108-
<ClInclude Include="Source\System\raylib\rlconfig.h">
109-
<Filter>System\raylib</Filter>
108+
<ClInclude Include="Source\Renderer\raylib\rlconfig.h">
109+
<Filter>Renderer\raylib</Filter>
110110
</ClInclude>
111111
<ClInclude Include="Source\Managers\AchievementMan.h">
112112
<Filter>Managers</Filter>
@@ -621,7 +621,7 @@
621621
<ClInclude Include="Source\Entities\AEJetpack.h">
622622
<Filter>Entities</Filter>
623623
</ClInclude>
624-
<ClInclude Include="Source\System\GLCheck.h">
624+
<ClInclude Include="Source\Renderer\GLCheck.h">
625625
<Filter>System</Filter>
626626
</ClInclude>
627627
<ClInclude Include="Source\Menus\SaveLoadMenuGUI.h">
@@ -697,17 +697,17 @@
697697
<ClCompile Include="Source\System\MicroPather\micropather.cpp">
698698
<Filter>System\MicroPather</Filter>
699699
</ClCompile>
700-
<ClInclude Include="Source\System\raylib\rlgl.c">
701-
<Filter>System\raylib</Filter>
700+
<ClInclude Include="Source\Renderer\raylib\rlgl.c">
701+
<Filter>Renderer\raylib</Filter>
702702
</ClInclude>
703-
<ClInclude Include="Source\System\raylib\rlutils.c">
704-
<Filter>System\raylib</Filter>
703+
<ClInclude Include="Source\Renderer\raylib\rlutils.c">
704+
<Filter>Renderer\raylib</Filter>
705705
</ClInclude>
706-
<ClInclude Include="Source\System\raylib\rtextures.c">
707-
<Filter>System\raylib</Filter>
706+
<ClInclude Include="Source\Renderer\raylib\rtextures.c">
707+
<Filter>Renderer\raylib</Filter>
708708
</ClInclude>
709-
<ClInclude Include="Source\System\raylib\rshapes.c">
710-
<Filter>System\raylib</Filter>
709+
<ClInclude Include="Source\Renderer\raylib\rshapes.c">
710+
<Filter>Renderer\raylib</Filter>
711711
</ClInclude>
712712
<ClCompile Include="Source\Managers\AchievementMan.cpp">
713713
<Filter>Managers</Filter>
@@ -1220,10 +1220,10 @@
12201220
<ClCompile Include="Source\System\RTEStackTrace.cpp">
12211221
<Filter>System</Filter>
12221222
</ClCompile>
1223-
<ClCompile Include="Source\System\glad\gl.c">
1224-
<Filter>System\glad</Filter>
1223+
<ClCompile Include="Source\Renderer\glad\gl.c">
1224+
<Filter>Renderer\glad</Filter>
12251225
</ClCompile>
1226-
<ClCompile Include="Source\System\GLCheck.cpp">
1226+
<ClCompile Include="Source\Renderer\GLCheck.cpp">
12271227
<Filter>System</Filter>
12281228
</ClCompile>
12291229
<ClCompile Include="external\sources\tracy\public\TracyClient.cpp">
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Source/Renderer/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,10 @@ sources += files(
22
'RenderTarget.cpp',
33
'Shader.cpp',
44
'BigTexture.cpp',
5+
'glad/gl.c',
6+
'raylib/rlgl.c',
7+
'raylib/rshapes.c',
8+
'raylib/rtextures.c',
9+
'raylib/rlutils.c',
10+
'GLCheck.cpp',
511
)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)