diff --git a/docs/helpers.rst b/docs/helpers.rst index 7f57cd07c373eae8dd1d0fcfa4b6b3ee92101b5b..15cc665061d3ba8606024b55399998a459dd264b 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 2f76c2b6091c536f60f70653de1d6af21862c8a9..b871070a089ad951c63e60e28e59d61a3fee3701 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 f601e4ee42d8a43eb6357522fbba026191266981..b74c4b8e6199e32452bcbec83e793b684316f888 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 512f233c6af0b0e4e5a7227d86bd18b0486c37ad..848c23fcb7d25a7e86ab1ffdb0108206eff39d3d 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 652968cbfd98ba2181444b87e2657eb54f4367ff..74363174179090016da9be8037b70bf90f09b0fd 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 025083a3cde21f213f2e10d7c76eb389dd428e25..870052aaa453330c54037fd70ba4f2027022743e 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;