From 82dacd6ea695b5cb776398c91016e102156d0cd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20J=C3=A4mtner?= <hanja189@student.liu.se>
Date: Fri, 24 Jul 2020 15:02:50 +0200
Subject: [PATCH] Updated function name and docs
---
docs/helpers.rst | 1 +
python-api-src/lib_map_tools.cpp | 2 +-
src/BaseLocation.cpp | 6 +++---
src/BaseLocationManager.cpp | 2 +-
src/MapTools.cpp | 2 +-
src/MapTools.h | 2 +-
6 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/docs/helpers.rst b/docs/helpers.rst
index 7f57cd0..15cc665 100644
--- a/docs/helpers.rst
+++ b/docs/helpers.rst
@@ -135,6 +135,7 @@ MapTools
.. automethod:: draw_box
.. automethod:: draw_circle
+ .. automethod:: draw_resource_sphere
.. automethod:: draw_line
.. automethod:: draw_text
.. automethod:: draw_text_screen
diff --git a/python-api-src/lib_map_tools.cpp b/python-api-src/lib_map_tools.cpp
index 2f76c2b..b871070 100644
--- a/python-api-src/lib_map_tools.cpp
+++ b/python-api-src/lib_map_tools.cpp
@@ -20,7 +20,7 @@ void define_map_tools(py::module & m)
.def("draw_line", py::overload_cast<const CCPosition &, const CCPosition &, const CCColor &>(&MapTools::drawLine, py::const_), py::arg("start"), py::arg("stop"), py::arg("color") = sc2::Colors::White)
.def("draw_box", py::overload_cast<const CCPosition &, const CCPosition &, const CCColor &>(&MapTools::drawBox, py::const_), py::arg("top_left"), py::arg("bottom_right"), py::arg("color") = sc2::Colors::White)
.def("draw_circle", py::overload_cast<const CCPosition &, CCPositionType, const CCColor &>(&MapTools::drawCircle, py::const_), py::arg("center"), py::arg("radius"), py::arg("color") = sc2::Colors::White)
- .def("draw_resource_circle", &MapTools::drawResourceCircle, py::arg("center"), py::arg("radius"), py::arg("color") = sc2::Colors::White)
+ .def("draw_resource_sphere", &MapTools::drawResourceSphere, py::arg("center"), py::arg("radius"), py::arg("color") = sc2::Colors::White)
.def("draw_text", &MapTools::drawText, "position"_a, "text"_a, "color"_a = sc2::Colors::White)
.def("draw_text_screen", &MapTools::drawTextScreen, "percentage_x"_a, "percentage_y"_a, "text"_a, "color"_a = sc2::Colors::White)
.def("is_valid_tile", py::overload_cast<int, int>(&MapTools::isValidTile, py::const_), "x"_a, "y"_a)
diff --git a/src/BaseLocation.cpp b/src/BaseLocation.cpp
index f601e4e..b74c4b8 100644
--- a/src/BaseLocation.cpp
+++ b/src/BaseLocation.cpp
@@ -204,7 +204,7 @@ void BaseLocation::draw()
// Take first mineral for the Z-pos.
sc2::Point3D center_pos = sc2::Point3D(m_centerOfResources.x, m_centerOfResources.y, m_minerals[0].getUnitPtr()->pos.z);
- m_bot.Map().drawResourceCircle(center_pos, radius, CCColor(255, 255, 0));
+ m_bot.Map().drawResourceSphere(center_pos, radius, CCColor(255, 255, 0));
std::stringstream ss;
ss << "BaseLocation: " << m_baseID << "\n";
@@ -241,12 +241,12 @@ void BaseLocation::draw()
for (auto & mineral : m_minerals)
{
- m_bot.Map().drawResourceCircle(mineral.getUnitPtr()->pos, radius, CCColor(0, 128, 128));
+ m_bot.Map().drawResourceSphere(mineral.getUnitPtr()->pos, radius, CCColor(0, 128, 128));
}
for (auto & geyser : m_geysers)
{
- m_bot.Map().drawResourceCircle(geyser.getUnitPtr()->pos, radius, CCColor(0, 255, 0));
+ m_bot.Map().drawResourceSphere(geyser.getUnitPtr()->pos, radius, CCColor(0, 255, 0));
}
if (m_isStartLocation)
diff --git a/src/BaseLocationManager.cpp b/src/BaseLocationManager.cpp
index 512f233..848c23f 100644
--- a/src/BaseLocationManager.cpp
+++ b/src/BaseLocationManager.cpp
@@ -269,7 +269,7 @@ void BaseLocationManager::drawBaseLocations()
const BaseLocation * next_expansion = getNextExpansion(Players::Self);
CCTilePosition nextExpansionPosition = next_expansion->getDepotPosition();
- m_bot.Map().drawResourceCircle(sc2::Point3D(Util::GetPosition(nextExpansionPosition).x, Util::GetPosition(nextExpansionPosition).y, next_expansion->getMinerals()[0].getUnitPtr()->pos.z), 1, CCColor(255, 0, 255));
+ m_bot.Map().drawResourceSphere(sc2::Point3D(Util::GetPosition(nextExpansionPosition).x, Util::GetPosition(nextExpansionPosition).y, next_expansion->getMinerals()[0].getUnitPtr()->pos.z), 1, CCColor(255, 0, 255));
m_bot.Map().drawText(Util::GetPosition(nextExpansionPosition), "Next Expansion Location", CCColor(255, 0, 255));
}
diff --git a/src/MapTools.cpp b/src/MapTools.cpp
index 652968c..7436317 100644
--- a/src/MapTools.cpp
+++ b/src/MapTools.cpp
@@ -401,7 +401,7 @@ void MapTools::drawCircle(const CCPosition & pos, CCPositionType radius, const C
#endif
}
-void MapTools::drawResourceCircle(const sc2::Point3D & pos, CCPositionType radius, const CCColor & color) const
+void MapTools::drawResourceSphere(const sc2::Point3D & pos, CCPositionType radius, const CCColor & color) const
{
#ifdef SC2API
m_bot.Debug()->DebugSphereOut(pos, radius, color);
diff --git a/src/MapTools.h b/src/MapTools.h
index 025083a..870052a 100644
--- a/src/MapTools.h
+++ b/src/MapTools.h
@@ -54,7 +54,7 @@ public:
void drawBox(const CCPosition & tl, const CCPosition & br, const CCColor & color = CCColor(255, 255, 255)) const;
void drawCircle(CCPositionType x1, CCPositionType x2, CCPositionType radius, const CCColor & color = CCColor(255, 255, 255)) const;
void drawCircle(const CCPosition & pos, CCPositionType radius, const CCColor & color = CCColor(255, 255, 255)) const;
- void drawResourceCircle(const sc2::Point3D & pos, CCPositionType radius, const CCColor & color = CCColor(255, 255, 255)) const;
+ void drawResourceSphere(const sc2::Point3D & pos, CCPositionType radius, const CCColor & color = CCColor(255, 255, 255)) const;
void drawText(const CCPosition & pos, const std::string & str, const CCColor & color = CCColor(255, 255, 255)) const;
void drawTextScreen(float xPerc, float yPerc, const std::string & str, const CCColor & color = CCColor(255, 255, 255)) const;
--
GitLab