Skip to content

Commit

Permalink
Move MapFormat implementation classes to map/format folder.
Browse files Browse the repository at this point in the history
  • Loading branch information
@codereader
codereader committed Jan 15, 2020
1 parent 20402e4 commit edec9e5
Show file tree
Hide file tree
Showing 22 changed files with 104 additions and 101 deletions.
16 changes: 8 additions & 8 deletions radiant/Makefile.am
View file
Expand Up @@ -120,22 +120,22 @@ darkradiant_SOURCES = main.cpp \
image/ImageLoaderWx.cpp \
image/TGALoader.cpp \
mapdoom3/mapdoom3.cpp \
mapdoom3/Quake3MapFormat.cpp \
mapdoom3/Doom3MapFormat.cpp \
mapdoom3/Doom3MapReader.cpp \
mapdoom3/Doom3PrefabFormat.cpp \
mapdoom3/Quake3MapReader.cpp \
mapdoom3/Doom3MapWriter.cpp \
map/format/Quake3MapFormat.cpp \
map/format/Doom3MapFormat.cpp \
map/format/Doom3MapReader.cpp \
map/format/Doom3PrefabFormat.cpp \
map/format/Quake3MapReader.cpp \
map/format/Doom3MapWriter.cpp \
mapdoom3/primitiveparsers/PatchDef2.cpp \
mapdoom3/primitiveparsers/Patch.cpp \
mapdoom3/primitiveparsers/PatchDef3.cpp \
mapdoom3/primitiveparsers/BrushDef3.cpp \
mapdoom3/primitiveparsers/BrushDef.cpp \
mapdoom3/Quake4MapReader.cpp \
map/format/Quake4MapReader.cpp \
mapdoom3/aas/Doom3AasFileLoader.cpp \
mapdoom3/aas/Doom3AasFileSettings.cpp \
mapdoom3/aas/Doom3AasFile.cpp \
mapdoom3/Quake4MapFormat.cpp \
map/format/Quake4MapFormat.cpp \
md5model/MD5Skeleton.cpp \
md5model/plugin.cpp \
md5model/MD5Model.cpp \
Expand Down
0 radiant/mapdoom3/Doom3MapFormat.cpp → radiant/map/format/Doom3MapFormat.cpp
View file
File renamed without changes.
0 radiant/mapdoom3/Doom3MapFormat.h → radiant/map/format/Doom3MapFormat.h
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions radiant/mapdoom3/Doom3MapReader.cpp → radiant/map/format/Doom3MapReader.cpp
View file
Expand Up @@ -11,10 +11,10 @@
#include "i18n.h"
#include <fmt/format.h>

#include "primitiveparsers/BrushDef.h"
#include "primitiveparsers/BrushDef3.h"
#include "primitiveparsers/PatchDef2.h"
#include "primitiveparsers/PatchDef3.h"
#include "mapdoom3/primitiveparsers/BrushDef.h"
#include "mapdoom3/primitiveparsers/BrushDef3.h"
#include "mapdoom3/primitiveparsers/PatchDef2.h"
#include "mapdoom3/primitiveparsers/PatchDef3.h"

namespace map {

Expand Down
0 radiant/mapdoom3/Doom3MapReader.h → radiant/map/format/Doom3MapReader.h
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions radiant/mapdoom3/Doom3MapWriter.cpp → radiant/map/format/Doom3MapWriter.cpp
View file
Expand Up @@ -3,8 +3,8 @@
#include "igame.h"
#include "ientity.h"

#include "primitivewriters/BrushDef3Exporter.h"
#include "primitivewriters/PatchDefExporter.h"
#include "mapdoom3/primitivewriters/BrushDef3Exporter.h"
#include "mapdoom3/primitivewriters/PatchDefExporter.h"

#include "Doom3MapFormat.h"

Expand Down
0 radiant/mapdoom3/Doom3MapWriter.h → radiant/map/format/Doom3MapWriter.h
View file
File renamed without changes.
0 radiant/mapdoom3/Doom3PrefabFormat.cpp → radiant/map/format/Doom3PrefabFormat.cpp
View file
File renamed without changes.
0 radiant/mapdoom3/Doom3PrefabFormat.h → radiant/map/format/Doom3PrefabFormat.h
View file
File renamed without changes.
0 radiant/mapdoom3/Quake3MapFormat.cpp → radiant/map/format/Quake3MapFormat.cpp
View file
File renamed without changes.
0 radiant/mapdoom3/Quake3MapFormat.h → radiant/map/format/Quake3MapFormat.h
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions radiant/mapdoom3/Quake3MapReader.cpp → radiant/map/format/Quake3MapReader.cpp
View file
Expand Up @@ -9,10 +9,10 @@
#include "i18n.h"
#include <fmt/format.h>

#include "primitiveparsers/BrushDef.h"
#include "primitiveparsers/BrushDef3.h"
#include "primitiveparsers/PatchDef2.h"
#include "primitiveparsers/PatchDef3.h"
#include "mapdoom3/primitiveparsers/BrushDef.h"
#include "mapdoom3/primitiveparsers/BrushDef3.h"
#include "mapdoom3/primitiveparsers/PatchDef2.h"
#include "mapdoom3/primitiveparsers/PatchDef3.h"

namespace map {

Expand Down
0 radiant/mapdoom3/Quake3MapReader.h → radiant/map/format/Quake3MapReader.h
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions radiant/mapdoom3/Quake3MapWriter.h → radiant/map/format/Quake3MapWriter.h
View file
@@ -1,8 +1,8 @@
#pragma once

#include "Doom3MapWriter.h"
#include "primitivewriters/BrushDefExporter.h"
#include "primitivewriters/PatchDefExporter.h"
#include "mapdoom3/primitivewriters/BrushDefExporter.h"
#include "mapdoom3/primitivewriters/PatchDefExporter.h"
#include "Quake3MapFormat.h"

namespace map
Expand Down
0 radiant/mapdoom3/Quake4MapFormat.cpp → radiant/map/format/Quake4MapFormat.cpp
View file
File renamed without changes.
0 radiant/mapdoom3/Quake4MapFormat.h → radiant/map/format/Quake4MapFormat.h
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions radiant/mapdoom3/Quake4MapReader.cpp → radiant/map/format/Quake4MapReader.cpp
View file
Expand Up @@ -3,10 +3,10 @@
#include "i18n.h"
#include "itextstream.h"

#include "primitiveparsers/BrushDef.h"
#include "primitiveparsers/BrushDef3.h"
#include "primitiveparsers/PatchDef2.h"
#include "primitiveparsers/PatchDef3.h"
#include "mapdoom3/primitiveparsers/BrushDef.h"
#include "mapdoom3/primitiveparsers/BrushDef3.h"
#include "mapdoom3/primitiveparsers/PatchDef2.h"
#include "mapdoom3/primitiveparsers/PatchDef3.h"

#include <fmt/format.h>

Expand Down
0 radiant/mapdoom3/Quake4MapReader.h → radiant/map/format/Quake4MapReader.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion radiant/mapdoom3/Quake4MapWriter.h → radiant/map/format/Quake4MapWriter.h
View file
@@ -1,7 +1,7 @@
#pragma once

#include "Doom3MapWriter.h"
#include "primitivewriters/BrushDef3Exporter.h"
#include "mapdoom3/primitivewriters/BrushDef3Exporter.h"
#include "Quake4MapFormat.h"

namespace map
Expand Down
8 changes: 4 additions & 4 deletions radiant/mapdoom3/mapdoom3.cpp
View file
@@ -1,7 +1,7 @@
#include "Doom3MapFormat.h"
#include "Doom3PrefabFormat.h"
#include "Quake4MapFormat.h"
#include "Quake3MapFormat.h"
#include "map/format/Doom3MapFormat.h"
#include "map/format/Doom3PrefabFormat.h"
#include "map/format/Quake4MapFormat.h"
#include "map/format/Quake3MapFormat.h"
#include "aas/Doom3AasFileLoader.h"

#include "imapformat.h"
Expand Down
36 changes: 18 additions & 18 deletions tools/msvc/DarkRadiant.vcxproj
View file
Expand Up @@ -259,20 +259,12 @@
<ClCompile Include="..\..\radiant\mapdoom3\aas\Doom3AasFile.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\aas\Doom3AasFileLoader.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\aas\Doom3AasFileSettings.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\Doom3MapFormat.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\Doom3MapReader.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\Doom3MapWriter.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\Doom3PrefabFormat.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\mapdoom3.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\primitiveparsers\BrushDef.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\primitiveparsers\BrushDef3.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\primitiveparsers\Patch.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\primitiveparsers\PatchDef2.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\primitiveparsers\PatchDef3.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\Quake3MapFormat.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\Quake3MapReader.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\Quake4MapFormat.cpp" />
<ClCompile Include="..\..\radiant\mapdoom3\Quake4MapReader.cpp" />
<ClCompile Include="..\..\radiant\map\AasFileManager.cpp" />
<ClCompile Include="..\..\radiant\map\algorithm\ChildPrimitives.cpp" />
<ClCompile Include="..\..\radiant\map\algorithm\Export.cpp" />
Expand All @@ -282,6 +274,14 @@
<ClCompile Include="..\..\radiant\map\algorithm\Skins.cpp" />
<ClCompile Include="..\..\radiant\map\EditingStopwatch.cpp" />
<ClCompile Include="..\..\radiant\map\EditingStopwatchInfoFileModule.cpp" />
<ClCompile Include="..\..\radiant\map\format\Doom3MapFormat.cpp" />
<ClCompile Include="..\..\radiant\map\format\Doom3MapReader.cpp" />
<ClCompile Include="..\..\radiant\map\format\Doom3MapWriter.cpp" />
<ClCompile Include="..\..\radiant\map\format\Doom3PrefabFormat.cpp" />
<ClCompile Include="..\..\radiant\map\format\Quake3MapFormat.cpp" />
<ClCompile Include="..\..\radiant\map\format\Quake3MapReader.cpp" />
<ClCompile Include="..\..\radiant\map\format\Quake4MapFormat.cpp" />
<ClCompile Include="..\..\radiant\map\format\Quake4MapReader.cpp" />
<ClCompile Include="..\..\radiant\map\infofile\InfoFile.cpp" />
<ClCompile Include="..\..\radiant\map\infofile\InfoFileExporter.cpp" />
<ClCompile Include="..\..\radiant\map\infofile\InfoFileManager.cpp" />
Expand Down Expand Up @@ -1109,10 +1109,6 @@
<ClInclude Include="..\..\radiant\mapdoom3\aas\Doom3AasFileLoader.h" />
<ClInclude Include="..\..\radiant\mapdoom3\aas\Doom3AasFileSettings.h" />
<ClInclude Include="..\..\radiant\mapdoom3\aas\Util.h" />
<ClInclude Include="..\..\radiant\mapdoom3\Doom3MapFormat.h" />
<ClInclude Include="..\..\radiant\mapdoom3\Doom3MapReader.h" />
<ClInclude Include="..\..\radiant\mapdoom3\Doom3MapWriter.h" />
<ClInclude Include="..\..\radiant\mapdoom3\Doom3PrefabFormat.h" />
<ClInclude Include="..\..\radiant\mapdoom3\primitiveparsers\BrushDef.h" />
<ClInclude Include="..\..\radiant\mapdoom3\primitiveparsers\BrushDef3.h" />
<ClInclude Include="..\..\radiant\mapdoom3\primitiveparsers\Patch.h" />
Expand All @@ -1121,12 +1117,6 @@
<ClInclude Include="..\..\radiant\mapdoom3\primitivewriters\BrushDef3Exporter.h" />
<ClInclude Include="..\..\radiant\mapdoom3\primitivewriters\BrushDefExporter.h" />
<ClInclude Include="..\..\radiant\mapdoom3\primitivewriters\PatchDefExporter.h" />
<ClInclude Include="..\..\radiant\mapdoom3\Quake3MapFormat.h" />
<ClInclude Include="..\..\radiant\mapdoom3\Quake3MapReader.h" />
<ClInclude Include="..\..\radiant\mapdoom3\Quake3MapWriter.h" />
<ClInclude Include="..\..\radiant\mapdoom3\Quake4MapFormat.h" />
<ClInclude Include="..\..\radiant\mapdoom3\Quake4MapReader.h" />
<ClInclude Include="..\..\radiant\mapdoom3\Quake4MapWriter.h" />
<ClInclude Include="..\..\radiant\map\AasFileManager.h" />
<ClInclude Include="..\..\radiant\map\algorithm\ChildPrimitives.h" />
<ClInclude Include="..\..\radiant\map\algorithm\Export.h" />
Expand All @@ -1136,6 +1126,16 @@
<ClInclude Include="..\..\radiant\map\algorithm\Skins.h" />
<ClInclude Include="..\..\radiant\map\EditingStopwatch.h" />
<ClInclude Include="..\..\radiant\map\EditingStopwatchInfoFileModule.h" />
<ClInclude Include="..\..\radiant\map\format\Doom3MapFormat.h" />
<ClInclude Include="..\..\radiant\map\format\Doom3MapReader.h" />
<ClInclude Include="..\..\radiant\map\format\Doom3MapWriter.h" />
<ClInclude Include="..\..\radiant\map\format\Doom3PrefabFormat.h" />
<ClInclude Include="..\..\radiant\map\format\Quake3MapFormat.h" />
<ClInclude Include="..\..\radiant\map\format\Quake3MapReader.h" />
<ClInclude Include="..\..\radiant\map\format\Quake3MapWriter.h" />
<ClInclude Include="..\..\radiant\map\format\Quake4MapFormat.h" />
<ClInclude Include="..\..\radiant\map\format\Quake4MapReader.h" />
<ClInclude Include="..\..\radiant\map\format\Quake4MapWriter.h" />
<ClInclude Include="..\..\radiant\map\infofile\InfoFile.h" />
<ClInclude Include="..\..\radiant\map\infofile\InfoFileExporter.h" />
<ClInclude Include="..\..\radiant\map\infofile\InfoFileManager.h" />
Expand Down
111 changes: 57 additions & 54 deletions tools/msvc/DarkRadiant.vcxproj.filters
View file
Expand Up @@ -320,6 +320,9 @@
<Filter Include="src\ui\widgets">
<UniqueIdentifier>{6f4f3b4f-0cfb-40db-9826-1bbe750981a7}</UniqueIdentifier>
</Filter>
<Filter Include="src\map\format">
<UniqueIdentifier>{a33db67b-1632-47ad-9368-04d014d7d730}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\radiant\main.cpp">
Expand Down Expand Up @@ -1405,33 +1408,9 @@
<ClCompile Include="..\..\radiant\eventmanager\WidgetToggle.cpp">
<Filter>src\eventmanager</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\mapdoom3\Doom3MapFormat.cpp">
<Filter>src\mapdoom3</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\mapdoom3\Doom3MapReader.cpp">
<Filter>src\mapdoom3</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\mapdoom3\Doom3MapWriter.cpp">
<Filter>src\mapdoom3</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\mapdoom3\Doom3PrefabFormat.cpp">
<Filter>src\mapdoom3</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\mapdoom3\mapdoom3.cpp">
<Filter>src\mapdoom3</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\mapdoom3\Quake3MapFormat.cpp">
<Filter>src\mapdoom3</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\mapdoom3\Quake3MapReader.cpp">
<Filter>src\mapdoom3</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\mapdoom3\Quake4MapFormat.cpp">
<Filter>src\mapdoom3</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\mapdoom3\Quake4MapReader.cpp">
<Filter>src\mapdoom3</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\mapdoom3\aas\Doom3AasFile.cpp">
<Filter>src\mapdoom3\aas</Filter>
</ClCompile>
Expand Down Expand Up @@ -1573,6 +1552,30 @@
<ClCompile Include="..\..\radiant\ui\Documentation.cpp">
<Filter>src\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\map\format\Doom3MapFormat.cpp">
<Filter>src\map\format</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\map\format\Doom3MapReader.cpp">
<Filter>src\map\format</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\map\format\Doom3MapWriter.cpp">
<Filter>src\map\format</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\map\format\Doom3PrefabFormat.cpp">
<Filter>src\map\format</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\map\format\Quake3MapFormat.cpp">
<Filter>src\map\format</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\map\format\Quake3MapReader.cpp">
<Filter>src\map\format</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\map\format\Quake4MapFormat.cpp">
<Filter>src\map\format</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\map\format\Quake4MapReader.cpp">
<Filter>src\map\format</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\radiant\RadiantModule.h">
Expand Down Expand Up @@ -2970,36 +2973,6 @@
<ClInclude Include="..\..\radiant\eventmanager\WidgetToggle.h">
<Filter>src\eventmanager</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\mapdoom3\Doom3MapFormat.h">
<Filter>src\mapdoom3</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\mapdoom3\Doom3MapReader.h">
<Filter>src\mapdoom3</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\mapdoom3\Doom3MapWriter.h">
<Filter>src\mapdoom3</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\mapdoom3\Doom3PrefabFormat.h">
<Filter>src\mapdoom3</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\mapdoom3\Quake3MapFormat.h">
<Filter>src\mapdoom3</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\mapdoom3\Quake3MapReader.h">
<Filter>src\mapdoom3</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\mapdoom3\Quake3MapWriter.h">
<Filter>src\mapdoom3</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\mapdoom3\Quake4MapFormat.h">
<Filter>src\mapdoom3</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\mapdoom3\Quake4MapReader.h">
<Filter>src\mapdoom3</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\mapdoom3\Quake4MapWriter.h">
<Filter>src\mapdoom3</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\mapdoom3\aas\Doom3AasFile.h">
<Filter>src\mapdoom3\aas</Filter>
</ClInclude>
Expand Down Expand Up @@ -3186,6 +3159,36 @@
<ClInclude Include="..\..\radiant\ui\Documentation.h">
<Filter>src\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\map\format\Doom3MapFormat.h">
<Filter>src\map\format</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\map\format\Doom3MapReader.h">
<Filter>src\map\format</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\map\format\Doom3MapWriter.h">
<Filter>src\map\format</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\map\format\Doom3PrefabFormat.h">
<Filter>src\map\format</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\map\format\Quake3MapFormat.h">
<Filter>src\map\format</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\map\format\Quake3MapReader.h">
<Filter>src\map\format</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\map\format\Quake3MapWriter.h">
<Filter>src\map\format</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\map\format\Quake4MapFormat.h">
<Filter>src\map\format</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\map\format\Quake4MapReader.h">
<Filter>src\map\format</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\map\format\Quake4MapWriter.h">
<Filter>src\map\format</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\radiant\darkradiant.rc" />
Expand Down

0 comments on commit edec9e5

Please sign in to comment.