Merge branch 'release/1.4.1'

Bam4d · Jul 17, 2022 · da7b68c · da7b68c
2 parents 24c21c3 + a55c9d1
commit da7b68c
Show file tree

Hide file tree

Showing 17 changed files with 244 additions and 120 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,7 +24,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. mac/linux/windows]
- - Version [e.g. 1.4.0]
+ - Version [e.g. 1.4.1]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10.0)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
-project(Griddly VERSION 1.4.0)
+project(Griddly VERSION 1.4.1)
 
 set(BINARY ${CMAKE_PROJECT_NAME})
 

diff --git a/bindings/python.cpp b/bindings/python.cpp
@@ -12,7 +12,7 @@ namespace griddly {
 
 PYBIND11_MODULE(python_griddly, m) {
   m.doc() = "Griddly python bindings";
-  m.attr("version") = "1.4.0";
+  m.attr("version") = "1.4.1";
 
 #ifndef NDEBUG
   spdlog::set_level(spdlog::level::debug);

diff --git a/docs/conf.py b/docs/conf.py
@@ -22,7 +22,7 @@
 author = 'Chris Bamford'
 
 # The full version, including alpha/beta/rc tags
-release = '1.4.0'
+release = '1.4.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/js/bindings/GriddlyJS.cpp b/js/bindings/GriddlyJS.cpp
@@ -25,4 +25,8 @@ std::shared_ptr<GriddlyJSGDYWrapper> GriddlyJS::loadString(std::string levelStri
   std::istringstream s(levelString);
   gdyFactory->parseFromStream(s);
   return std::make_shared<GriddlyJSGDYWrapper>(GriddlyJSGDYWrapper(gdyFactory));
+}
+
+std::string GriddlyJS::getExceptionMessage(intptr_t exceptionPtr) {
+  return std::string(reinterpret_cast<std::exception *>(exceptionPtr)->what());
 }
diff --git a/js/bindings/GriddlyJS.hpp b/js/bindings/GriddlyJS.hpp
@@ -10,6 +10,7 @@ class GriddlyJS {
  public:
   GriddlyJS();
   std::shared_ptr<GriddlyJSGDYWrapper> loadString(std::string levelString);
+  std::string getExceptionMessage(intptr_t exceptionPtr);
 };
 
 template <typename K, typename V>
@@ -25,11 +26,14 @@ e::class_<std::unordered_map<K, V>> register_unordered_map(const char* name) {
       .function("keys", e::internal::MapAccess<MapType>::keys);
 }
 
+
 EMSCRIPTEN_BINDINGS(GriddlyJS) {
   // Classes
   e::class_<GriddlyJS>("GriddlyJS")
       .constructor()
-      .function("loadString", &GriddlyJS::loadString);
+      .function("loadString", &GriddlyJS::loadString)
+      .function("getExceptionMessage", &GriddlyJS::getExceptionMessage);
+
 
   e::class_<GriddlyJSGDYWrapper>("GriddlyJSGDYWrapper")
       .smart_ptr<std::shared_ptr<GriddlyJSGDYWrapper>>("GriddlyJSGDYWrapper")

diff --git a/js/griddlyjs-app/package-lock.json b/js/griddlyjs-app/package-lock.json
diff --git a/js/griddlyjs-app/package.json b/js/griddlyjs-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "griddlyjs-app",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.1.1",

diff --git a/js/griddlyjs-app/public/js/griddlyjs.wasm b/js/griddlyjs-app/public/js/griddlyjs.wasm
diff --git a/js/griddlyjs-app/src/App.js b/js/griddlyjs-app/src/App.js
@@ -1,5 +1,5 @@
 // import logo from './logo.svg';
-import yaml from "js-yaml";
+import yaml, { YAMLException } from "js-yaml";
 import React, { Component } from "react";
 import "./App.scss";
 import GriddlyJSCore from "./GriddlyJSCore";
@@ -107,6 +107,9 @@ class App extends Component {
 
   setCurrentLevel = (levelId) => {
     this.setState((state) => {
+      if (!state.gdy || !this.griddlyjs) {
+        return state;
+      }
       const levelString = state.gdy.Environment.Levels[levelId];
 
       try {
@@ -175,7 +178,10 @@ class App extends Component {
       levelString,
       this.state.selectedLevelId
     );
-    this.editorStateHandler.loadLevelString(levelString, this.state.selectedLevelId);
+    this.editorStateHandler.loadLevelString(
+      levelString,
+      this.state.selectedLevelId
+    );
     this.griddlyjs.reset(levelString);
     this.setState((state) => {
       return {
@@ -206,7 +212,10 @@ class App extends Component {
 
   saveNewLevel = () => {
     const savedLevelId = this.saveLevelString(this.state.levelString);
-    this.editorStateHandler.loadLevelString(this.state.levelString, this.state.selectedLevelId);
+    this.editorStateHandler.loadLevelString(
+      this.state.levelString,
+      this.state.selectedLevelId
+    );
     this.griddlyjs.reset(this.state.levelString);
     this.setState((state) => {
       return {
@@ -221,7 +230,10 @@ class App extends Component {
       this.state.levelString,
       this.state.selectedLevelId
     );
-    this.editorStateHandler.loadLevelString(this.state.levelString, this.state.selectedLevelId);
+    this.editorStateHandler.loadLevelString(
+      this.state.levelString,
+      this.state.selectedLevelId
+    );
     this.griddlyjs.reset(this.state.levelString);
 
     this.setState((state) => {
@@ -424,31 +436,27 @@ class App extends Component {
       this.setState((state) => {
         return {
           ...state,
-          loading: true
-        }
+          loading: true,
+        };
       });
 
-      setTimeout(() => {
-        try {
-          this.updateGDY(gdyString, projectName);
-          this.setCurrentLevel(lastLevelId);
-        } catch (e) {
-          this.displayMessage("Could not load GDY", "error", e);
-          this.setState((state) => {
-            return {
-              ...state,
-              projectName,
-              gdyHash: hashString(gdyString),
-              gdyString: gdyString,
-              gdy: gdy,
-              editorStateHandler: this.editorStateHandler,
-              selectedLevelId: lastLevelId,
-            };
-          });
-        }
-      }, 100);
-
-
+      try {
+        this.updateGDY(gdyString, projectName);
+        this.setCurrentLevel(lastLevelId);
+      } catch (e) {
+        this.displayMessage("Could not load GDY", "error", e);
+        this.setState((state) => {
+          return {
+            ...state,
+            projectName,
+            gdyHash: hashString(gdyString),
+            gdyString: gdyString,
+            gdy: gdy,
+            editorStateHandler: this.editorStateHandler,
+            selectedLevelId: lastLevelId,
+          };
+        });
+      }
     } catch (e) {
       this.displayMessage("Could not load GDY", "error", e);
       this.setState((state) => {
@@ -488,31 +496,82 @@ class App extends Component {
     });
   };
 
+  checkGriddlyJSCompatibility = (gdy) => {
+    // Check for avatar object
+    if (
+      !("Player" in gdy.Environment) ||
+      !("AvatarObject" in gdy.Environment.Player)
+    ) {
+      throw new Error(
+        "Currently only Single-Player environments where an avatar is controlled by the agent are compatible with GriddlyJS. \n\n Perhaps you forgot to set the AvatarObject?"
+      );
+    }
+
+    if (!("Levels" in gdy.Environment)) {
+      throw new Error("Please define at least one level.");
+    }
+  };
+
   updateGDY = (gdyString, projectName) => {
-    const gdy = yaml.load(gdyString);
-    this.editorHistory.updateState(projectName, { gdy });
+    this.closeAllMessages();
+
     try {
-      this.griddlyjs.unloadGDY();
-      this.griddlyjs.loadGDY(gdyString);
-    } catch (e) {
-      this.displayMessage("Unable to load GDY", "error", e);
-    }
-    this.editorStateHandler.loadGDY(gdy);
+      const gdy = yaml.load(gdyString);
+      this.checkGriddlyJSCompatibility(gdy);
+      this.editorHistory.updateState(projectName, { gdy });
+      try {
+        this.griddlyjs.unloadGDY();
+        this.griddlyjs.loadGDY(gdyString);
 
-    this.loadRenderers(gdy);
+        this.editorStateHandler.loadGDY(gdy);
 
-    this.setState((state) => {
-      return {
-        ...state,
-        projectName,
-        gdyHash: hashString(gdyString),
-        gdyString: gdyString,
-        gdy: gdy,
-        griddlyjs: this.griddlyjs,
-        editorStateHandler: this.editorStateHandler,
-        loading: false
-      };
-    });
+        this.loadRenderers(gdy);
+        this.setState((state) => {
+          return {
+            ...state,
+            projectName,
+            gdyHash: hashString(gdyString),
+            gdyString: gdyString,
+            gdy: gdy,
+            griddlyjs: this.griddlyjs,
+            editorStateHandler: this.editorStateHandler,
+            loading: false,
+          };
+        });
+      } catch (e) {
+        this.displayMessage("Unable to load GDY \n\n" + e.message, "error", e);
+        this.setState((state) => {
+          return {
+            ...state,
+            projectName,
+            // gdyHash: hashString(gdyString),
+            // gdy: gdy,
+            gdyString: gdyString,
+            editorStateHandler: this.editorStateHandler,
+            loading: false,
+          };
+        });
+      }
+    } catch (e) {
+      this.setState((state) => {
+        return {
+          ...state,
+          projectName,
+          gdyHash: hashString(gdyString),
+          gdyString: gdyString,
+          loading: false,
+        };
+      });
+      if (e instanceof YAMLException) {
+        this.displayMessage(
+          "There are syntax errors in your GDY: " + e.message,
+          "error",
+          e
+        );
+      } else {
+        this.displayMessage("Unable to load GDY \n\n" + e.message, "error", e);
+      }
+    }
   };
 
   updatePhaserCanvasSize = () => {
@@ -710,12 +769,18 @@ class App extends Component {
     });
   };
 
+  closeAllMessages = () => {
+    Object.entries(this.state.messages).map(([key, message]) => {
+      this.closeMessage(key);
+    });
+  };
+
   render() {
     return (
       <Container fluid className="griddlyjs-ide-container">
         <Intro onClose={this.closeIntroModal} show={this.state.showIntro} />
         <Modal show={this.state.loading} backdrop="static">
-        <Modal.Header>
+          <Modal.Header>
             <Modal.Title>Loading Project.....</Modal.Title>
           </Modal.Header>
         </Modal>
@@ -751,7 +816,7 @@ class App extends Component {
             </Button>
           </Modal.Footer>
         </Modal>
-        <ToastContainer className="p-3" position="top-left">
+        <ToastContainer className="p-5" position="top-start">
           {Object.entries(this.state.messages).map(([key, message]) => {
             let icon;
             switch (message.type) {
@@ -799,7 +864,16 @@ class App extends Component {
                 }}
               >
                 <Toast.Header closeButton={true}>{icon}</Toast.Header>
-                <Toast.Body>{message.content}</Toast.Body>
+                <Toast.Body className="message-text">
+                  {message.content.split("\n").map(function (item, idx) {
+                    return (
+                      <span key={idx}>
+                        {item}
+                        <br />
+                      </span>
+                    );
+                  })}
+                </Toast.Body>
               </Toast>
             );
           })}

diff --git a/js/griddlyjs-app/src/App.scss b/js/griddlyjs-app/src/App.scss
@@ -61,3 +61,9 @@
   text-align: center;
   margin: 20px;
 }
+
+.message-text {
+  white-space: pre-wrap;
+  text-align: left;
+  font-family: monospace;
+}