Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move MapCoordinate to libOPHD #1565

Merged
merged 7 commits into from
Feb 4, 2025
Merged

Move MapCoordinate to libOPHD #1565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a865fbd
Move `MapCoordinate` to `libOPHD`
DanRStevens Feb 3, 2025
f48ed17
Adjust blank lines for consistency
DanRStevens Feb 3, 2025
9ecae92
Remove dummy file `libOPHD.cpp`
DanRStevens Feb 3, 2025
8809e5f
Sort project entries for consistency
DanRStevens Feb 3, 2025
88ec069
Sort project file filters for consistency
DanRStevens Feb 3, 2025
38b8efd
Remove obsolete filter for `UI\Core`
DanRStevens Feb 3, 2025
d98c447
Add missing filter for source files in `Map\`
DanRStevens Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion appOPHD/GraphWalker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#include "GraphWalker.h"

#include "Map/MapCoordinate.h"
#include "Map/TileMap.h"
#include "MapObjects/Structure.h"

#include <libOPHD/DirectionOffset.h>
#include <libOPHD/EnumDirection.h>

#include <libOPHD/Map/MapCoordinate.h>


using namespace NAS2D;

Expand Down
3 changes: 1 addition & 2 deletions appOPHD/Map/MapView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include "../Map/MapCoordinate.h"

#include <libOPHD/Map/MapCoordinate.h>
#include <libOPHD/Map/MapOffset.h>

#include <NAS2D/Math/Rectangle.h>
Expand Down
3 changes: 1 addition & 2 deletions appOPHD/Map/Tile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#pragma once

#include "MapCoordinate.h"

#include <libOPHD/EnumTerrainType.h>
#include <libOPHD/Map/MapCoordinate.h>

#include <NAS2D/Math/Point.h>
#include <NAS2D/Math/Vector.h>
Expand Down
4 changes: 2 additions & 2 deletions appOPHD/States/MapViewState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

#include "../Constants/Numbers.h"

#include "../Map/MapCoordinate.h"

#include "../MapObjects/Robot.h"
#include "../MapObjects/Structure.h"

Expand All @@ -38,6 +36,8 @@
#include "../UI/MiniMap.h"
#include "../UI/CheatMenu.h"

#include <libOPHD/Map/MapCoordinate.h>

#include <libOPHD/Population/PopulationPool.h>
#include <libOPHD/Population/Population.h>
#include <libOPHD/Population/Morale.h>
Expand Down
4 changes: 2 additions & 2 deletions appOPHD/States/MapViewStateHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

#pragma once

#include "../Map/MapCoordinate.h"

#include <libOPHD/EnumConnectorDir.h>
#include <libOPHD/EnumProductType.h>
#include <libOPHD/EnumStructureID.h>

#include <libOPHD/Map/MapCoordinate.h>

#include <map>


Expand Down
3 changes: 2 additions & 1 deletion appOPHD/States/MapViewStateUi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "../PointerType.h"
#include "../StructureCatalogue.h"
#include "../StructureManager.h"
#include "../Map/MapCoordinate.h"
#include "../Map/TileMap.h"
#include "../Map/MapView.h"

Expand All @@ -26,6 +25,8 @@
#include <libOPHD/DirectionOffset.h>
#include <libOPHD/EnumDirection.h>

#include <libOPHD/Map/MapCoordinate.h>

#include <NAS2D/Utility.h>
#include <NAS2D/Renderer/Renderer.h>

Expand Down
4 changes: 2 additions & 2 deletions appOPHD/UI/NotificationArea.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

#include <libControls/Control.h>
#include <libOPHD/Map/MapCoordinate.h>

#include "../Map/MapCoordinate.h"
#include <libControls/Control.h>

#include <NAS2D/EventHandler.h>
#include <NAS2D/Math/Point.h>
Expand Down
2 changes: 0 additions & 2 deletions appOPHD/appOPHD.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@
<ClCompile Include="GraphWalker.cpp" />
<ClCompile Include="IOHelper.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="Map\MapCoordinate.cpp" />
<ClCompile Include="Map\MapView.cpp" />
<ClCompile Include="Map\Tile.cpp" />
<ClCompile Include="Map\TileMap.cpp" />
Expand Down Expand Up @@ -278,7 +277,6 @@
<ClInclude Include="Constants\UiConstants.h" />
<ClInclude Include="GraphWalker.h" />
<ClInclude Include="IOHelper.h" />
<ClInclude Include="Map\MapCoordinate.h" />
<ClInclude Include="Map\MapView.h" />
<ClInclude Include="Map\Tile.h" />
<ClInclude Include="Map\TileMap.h" />
Expand Down
74 changes: 31 additions & 43 deletions appOPHD/appOPHD.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,16 @@
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Source Files\States">
<UniqueIdentifier>{4c338eac-6a16-447d-9675-0fb6f6775bda}</UniqueIdentifier>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
<Filter Include="Source Files\Map">
<UniqueIdentifier>{8013e5ff-baf7-4499-bff7-a7e38570a994}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\MapObjects">
<UniqueIdentifier>{52eb17f3-c971-4ead-bf0c-5c4e384abc52}</UniqueIdentifier>
Expand All @@ -17,18 +25,26 @@
<Filter Include="Source Files\MapObjects\Structures">
<UniqueIdentifier>{4ed844e6-1ccb-4e6f-887c-381f36561c0e}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\MicroPather">
<UniqueIdentifier>{53d69791-75af-4014-99df-f2d2582597ca}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\States">
<UniqueIdentifier>{4c338eac-6a16-447d-9675-0fb6f6775bda}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\UI">
<UniqueIdentifier>{53be18b8-eaba-46f1-98d9-72eaaeb9c314}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\UI\Core">
<UniqueIdentifier>{a106ce63-62be-4ae0-956c-53b458bed822}</UniqueIdentifier>
<Filter Include="Source Files\UI\Reports">
<UniqueIdentifier>{463384e6-546b-4f3c-adda-f9c094bc326e}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
<Filter Include="Source Files\UI\SpecializedListBox">
<UniqueIdentifier>{cd5e28df-9593-4566-86b8-d6e3a5c24335}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\States">
<UniqueIdentifier>{402a383d-3f20-4883-b636-09f71bc952da}</UniqueIdentifier>
<Filter Include="Header Files\Constants">
<UniqueIdentifier>{df1a7586-89dd-467f-b703-58d0b820cd47}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Map">
<UniqueIdentifier>{ef0f2f7d-e0aa-47f6-a564-6a2de9a2cef2}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\MapObjects">
<UniqueIdentifier>{f1567006-6b53-4e9f-a038-9e5e9d444cb3}</UniqueIdentifier>
Expand All @@ -39,43 +55,21 @@
<Filter Include="Header Files\MapObjects\Structures">
<UniqueIdentifier>{1d0c1304-94ea-4f94-b1e6-439408414946}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\UI">
<UniqueIdentifier>{7554b729-89ba-4834-bcb5-d29c59f0d91a}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\UI\Core">
<UniqueIdentifier>{50739b22-ad40-4252-9c5d-4fd92dfa3be7}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
<Filter Include="Header Files\Constants">
<UniqueIdentifier>{df1a7586-89dd-467f-b703-58d0b820cd47}</UniqueIdentifier>
<Filter Include="Header Files\MicroPather">
<UniqueIdentifier>{2edfd0b6-d405-4d57-954e-054f9de7cf34}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Map">
<UniqueIdentifier>{ef0f2f7d-e0aa-47f6-a564-6a2de9a2cef2}</UniqueIdentifier>
<Filter Include="Header Files\States">
<UniqueIdentifier>{402a383d-3f20-4883-b636-09f71bc952da}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Map">
<UniqueIdentifier>{8013e5ff-baf7-4499-bff7-a7e38570a994}</UniqueIdentifier>
<Filter Include="Header Files\UI">
<UniqueIdentifier>{7554b729-89ba-4834-bcb5-d29c59f0d91a}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\UI\Reports">
<UniqueIdentifier>{a44c6715-e1af-4914-a179-42b503304355}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\UI\Reports">
<UniqueIdentifier>{463384e6-546b-4f3c-adda-f9c094bc326e}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\UI\SpecializedListBox">
<UniqueIdentifier>{cd5e28df-9593-4566-86b8-d6e3a5c24335}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\UI\SpecializedListBox">
<UniqueIdentifier>{cb143db0-8f9f-4ca0-b688-47c9e12cce98}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\MicroPather">
<UniqueIdentifier>{2edfd0b6-d405-4d57-954e-054f9de7cf34}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\MicroPather">
<UniqueIdentifier>{53d69791-75af-4014-99df-f2d2582597ca}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="GraphWalker.cpp">
Expand All @@ -87,9 +81,6 @@
<ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Map\MapCoordinate.cpp">
<Filter>Source Files\Map</Filter>
</ClCompile>
<ClCompile Include="Map\MapView.cpp">
<Filter>Source Files\Map</Filter>
</ClCompile>
Expand Down Expand Up @@ -359,9 +350,6 @@
<ClInclude Include="IOHelper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Map\MapCoordinate.h">
<Filter>Header Files\Map</Filter>
</ClInclude>
<ClInclude Include="Map\MapView.h">
<Filter>Header Files\Map</Filter>
</ClInclude>
Expand Down
2 changes: 1 addition & 1 deletion libOPHD/DirectionOffset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

#include "DirectionOffset.h"

#include "EnumDirection.h"

#include <map>


namespace
{
const std::map<Direction, NAS2D::Vector<int>> DirectionOffsetTable =
Expand Down
2 changes: 1 addition & 1 deletion appOPHD/Map/MapCoordinate.cpp → libOPHD/Map/MapCoordinate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#include "MapCoordinate.h"

#include <libOPHD/DirectionOffset.h>
#include "../DirectionOffset.h"


MapCoordinate MapCoordinate::translate(MapOffset mapOffset) const
Expand Down
2 changes: 1 addition & 1 deletion appOPHD/Map/MapCoordinate.h → libOPHD/Map/MapCoordinate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <libOPHD/Map/MapOffset.h>
#include "MapOffset.h"

#include <NAS2D/Math/Point.h>

Expand Down
Empty file removed libOPHD/libOPHD.cpp
View file
Open in desktop
Empty file.
15 changes: 8 additions & 7 deletions libOPHD/libOPHD.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="DirectionOffset.cpp" />
<ClCompile Include="libOPHD.cpp" />
<ClCompile Include="XmlSerializer.cpp" />
<ClCompile Include="Map\MapCoordinate.cpp" />
<ClCompile Include="Population\Morale.cpp" />
<ClCompile Include="Population\PopulationPool.cpp" />
<ClCompile Include="Population\Population.cpp" />
<ClCompile Include="Population\PopulationPool.cpp" />
<ClCompile Include="Population\PopulationTable.cpp" />
<ClCompile Include="Technology\ResearchTracker.cpp" />
<ClCompile Include="Technology\TechnologyCatalog.cpp" />
<ClCompile Include="XmlSerializer.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="DirectionOffset.h" />
Expand All @@ -184,16 +184,17 @@
<ClInclude Include="EnumProductType.h" />
<ClInclude Include="EnumStructureID.h" />
<ClInclude Include="EnumTerrainType.h" />
<ClInclude Include="Map\MapOffset.h" />
<ClInclude Include="RandomNumberGenerator.h" />
<ClInclude Include="Population\Population.h" />
<ClInclude Include="Population\PopulationTable.h" />
<ClInclude Include="XmlSerializer.h" />
<ClInclude Include="Map\MapCoordinate.h" />
<ClInclude Include="Map\MapOffset.h" />
<ClInclude Include="Population\Morale.h" />
<ClInclude Include="Population\Population.h" />
<ClInclude Include="Population\PopulationPool.h" />
<ClInclude Include="Population\PopulationTable.h" />
<ClInclude Include="Technology\ResearchTracker.h" />
<ClInclude Include="Technology\Technology.h" />
<ClInclude Include="Technology\TechnologyCatalog.h" />
<ClInclude Include="XmlSerializer.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\nas2d-core\NAS2D\NAS2D.vcxproj">
Expand Down
Loading