From 43f33aca3fb3cb524473458180101e4cdc7a1b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Bergstr=C3=B6m?= <davbe125@student.liu.se>
Date: Tue, 26 Jun 2018 11:57:48 +0200
Subject: [PATCH] Enable inheritance of the IDABot class in Python
---
python-api-src/library.cpp | 8 ++++++--
python-api-src/library.h | 31 ++++++++++++++++++++++++++++++-
src/IDABot.h | 2 +-
3 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/python-api-src/library.cpp b/python-api-src/library.cpp
index 3ea3049..1185755 100644
--- a/python-api-src/library.cpp
+++ b/python-api-src/library.cpp
@@ -23,8 +23,12 @@ PYBIND11_MODULE(library, m)
.def(py::init());
// IDABot is a specialization of Agent
- py::class_<IDABot, sc2::Agent>(m, "IDABot")
- .def(py::init());
+ py::class_<IDABot, PyIDABot, sc2::Agent>(m, "IDABot")
+ .def(py::init())
+ .def("OnGameStart", &IDABot::OnGameStart)
+ .def("OnStep", &IDABot::OnStep)
+ .def("OnStep_UpdateIDABot", &IDABot::OnStep_UpdateIDABot)
+ .def("GetMyUnits", &IDABot::GetMyUnits);
py::class_<sc2::PlayerSetup>(m, "PlayerSetup");
diff --git a/python-api-src/library.h b/python-api-src/library.h
index 3720542..c8bdb79 100644
--- a/python-api-src/library.h
+++ b/python-api-src/library.h
@@ -19,5 +19,34 @@ public:
}
};
-// Defined
+class PyIDABot : public IDABot
+{
+public:
+ using IDABot::IDABot;
+ void OnGameStart() override
+ {
+ PYBIND11_OVERLOAD(
+ void,
+ IDABot,
+ OnGameStart
+ );
+ }
+ void OnStep() override
+ {
+ PYBIND11_OVERLOAD(
+ void,
+ IDABot,
+ OnStep
+ );
+ }
+ void OnStep_UpdateIDABot() override
+ {
+ PYBIND11_OVERLOAD(
+ void,
+ IDABot,
+ OnStep_UpdateIDABot
+ );
+ }
+};
+
void define_typeenums(pybind11::module & m);
\ No newline at end of file
diff --git a/src/IDABot.h b/src/IDABot.h
index 090c96b..902134d 100644
--- a/src/IDABot.h
+++ b/src/IDABot.h
@@ -36,7 +36,7 @@ public:
void OnGameStart() override;
void OnStep() override;
- void OnStep_UpdateIDABot();
+ virtual void OnStep_UpdateIDABot();
/*
My stuff
--
GitLab