Migrate MapInterface

install/scripts/test.py

@@ -90,6 +90,8 @@ def visit(self, node):
 visitor = Walker()
 GlobalSelectionSystem.foreachSelected(visitor)
 
+print('Map name is ' + GlobalMap.getMapName())
+
 # Try to find the map's worldspawn
 worldspawn = GlobalMap.getWorldSpawn()
 

plugins/script/interfaces/MapInterface.cpp

@@ -1,8 +1,11 @@
 #include "MapInterface.h"
 
+#include <pybind11/pybind11.h>
+
 #include "imap.h"
 
-namespace script {
+namespace script 
+{
 
 ScriptSceneNode MapInterface::getWorldSpawn()
 {
@@ -15,15 +18,16 @@ std::string MapInterface::getMapName()
 }
 
 // IScriptInterface implementation
-void MapInterface::registerInterface(boost::python::object& nspace) {
+void MapInterface::registerInterface(py::module& scope, py::dict& globals)
+{
 	// Add the module declaration to the given python namespace
-	nspace["GlobalMap"] = boost::python::class_<MapInterface>("GlobalMap")
-		.def("getWorldSpawn", &MapInterface::getWorldSpawn)
-		.def("getMapName", &MapInterface::getMapName)
-	;
+	py::class_<MapInterface> map(scope, "Map");
+
+	map.def("getWorldSpawn", &MapInterface::getWorldSpawn);
+	map.def("getMapName", &MapInterface::getMapName);
 
 	// Now point the Python variable "GlobalMap" to this instance
-	nspace["GlobalMap"] = boost::python::ptr(this);
+	globals["GlobalMap"] = this;
 }
 
 } // namespace script

plugins/script/interfaces/MapInterface.h

@@ -1,16 +1,14 @@
-#ifndef _MAP_INTERFACE_H_
-#define _MAP_INTERFACE_H_
-
-#include <boost/python.hpp>
+#pragma once
 
 #include "iscript.h"
 
 #include "SceneGraphInterface.h"
 
-namespace script {
+namespace script
+{
 
 /**
- * greebo: This class provides the script interface for the GlobalEntityClassManager module.
+ * greebo: This class provides the script interface for the GlobalMap module.
  */
 class MapInterface :
 	public IScriptInterface
@@ -20,10 +18,7 @@ class MapInterface :
 	std::string getMapName();
 
 	// IScriptInterface implementation
-	void registerInterface(boost::python::object& nspace);
+	void registerInterface(py::module& scope, py::dict& globals) override;
 };
-typedef std::shared_ptr<MapInterface> MapInterfacePtr;
 
 } // namespace script
-
-#endif /* _MAP_INTERFACE_H_ */