Merge branch 'release/1.5.0'

.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.3]
+ - Version [e.g. 1.5.0]
 
 **Additional context**
 Add any other context about the problem here.

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.3)
+project(Griddly VERSION 1.5.0)
 
 set(BINARY ${CMAKE_PROJECT_NAME})
 
@@ -84,28 +84,28 @@ list(REMOVE_DUPLICATES GRIDDLY_INCLUDE_DIRS)
 
 if(WASM)
     list(
-        REMOVE_ITEM 
-        GRIDDLY_SOURCES 
+        REMOVE_ITEM
+        GRIDDLY_SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/src/Griddly/Core/Observers/SpriteObserver.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Griddly/Core/Observers/BlockObserver.cpp 
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/Griddly/Core/Observers/BlockObserver.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/Griddly/Core/Observers/IsometricSpriteObserver.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/Griddly/Core/Observers/VulkanGridObserver.cpp
     )
 
     list(
-        FILTER 
-        GRIDDLY_SOURCES 
+        FILTER
+        GRIDDLY_SOURCES
         EXCLUDE
         REGEX
-        "src/Griddly/Core/Observers/Vulkan/.*" 
+        "src/Griddly/Core/Observers/Vulkan/.*"
     )
 endif()
 
 
 # Compile shaders and copy them into resources directory in build output
 if(NOT WASM)
     message(STATUS "Compiling shaders...")
-    find_package(Vulkan REQUIRED FATAL_ERROR)
+    find_package(Vulkan REQUIRED)
 
     if(MSVC)
         execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/compile_shaders.bat RESULT_VARIABLE rv)
@@ -130,7 +130,7 @@ if(WASM)
 
     add_executable(griddlyjs ${JIDDLY_SOURCES} )
     target_link_libraries(griddlyjs PRIVATE ${BINARY} yaml-cpp glm)
-    
+
     # These properties specify what kind of Emscripten build to perform and are assigned to our 'a-simple-triangle' executable target.
     set_target_properties(
         griddlyjs

README.md

@@ -10,6 +10,16 @@
 
 A heavily optimized and flexible grid-world game engine for Game AI research.
 
+# ![WHOOSH!!](resources/images/gvgai/oryx/tree2.png) Some Environments
+
+<div>
+  <a href="https://griddly.readthedocs.io/en/latest/games/Spider_Nest/index.html"><img style="width: 30%" src="docs/games/Spider_Nest/img/Spider_Nest-level-Isometric-0.png"/></a>
+  <a href="https://griddly.readthedocs.io/en/latest/games/GriddlyRTS/index.html"><img style="width: 30%" src="docs/games/GriddlyRTS/img/GriddlyRTS-level-Block2D-3.png"/></a>
+  <a href="https://griddly.readthedocs.io/en/latest/games/Clusters/index.html"><img style="width: 30%" src="docs/games/Clusters/img/Clusters-level-Sprite2D-3.png"/></a>
+</div>
+
+[Check out the full list of pre-built environments here](https://griddly.readthedocs.io/en/latest/games/index.html)
+
 # ![BOOM](resources/images/gvgai/oryx/sparkle3.png) Some features
 * Design and build game mechanics using a simple YAML-based language: [GDY](https://griddly.readthedocs.io/en/latest/getting-started/gdy/index.html)
 * **Fast execution speed** environments can run up to 70k FPS on a single thread.
@@ -35,18 +45,6 @@ A heavily optimized and flexible grid-world game engine for Game AI research.
   * Integration with [Wandb](https://griddly.readthedocs.io/en/latest/rllib/intro/index.html#weights-and-biases-wandb)
 
 
-# ![WHOOSH!!](resources/images/gvgai/oryx/tree2.png) Some Environments
-
-<div>
-  <a href="https://griddly.readthedocs.io/en/latest/games/Spider_Nest/index.html"><img style="width: 30%" src="docs/games/Spider_Nest/img/Spider_Nest-level-Isometric-0.png"/></a>
-  <a href="https://griddly.readthedocs.io/en/latest/games/GriddlyRTS/index.html"><img style="width: 30%" src="docs/games/GriddlyRTS/img/GriddlyRTS-level-Block2D-3.png"/></a>
-  <a href="https://griddly.readthedocs.io/en/latest/games/Clusters/index.html"><img style="width: 30%" src="docs/games/Clusters/img/Clusters-level-Sprite2D-3.png"/></a>
-</div>
-
-[Check out the full list of pre-built environments here](https://griddly.readthedocs.io/en/latest/games/index.html)
-
-
-
 # ![Community](resources/images/oryx/oryx_fantasy/avatars/doggo1.png) Community
 Join the [Discord community](https://discord.gg/xuR8Dsv) for help and to talk about what you are doing with Griddly!
 
@@ -80,9 +78,18 @@ The most awesome part of Griddly is the ability to easily customize and build yo
 ## [Custom Shaders](https://griddly.readthedocs.io/en/latest/tutorials/Custom%20Shaders/index.html)
   * Customize rendering for environments using SPIR-V shaders.
 <div>
-  <img style="width: 30%" src="python/examples/Custom Shaders/Global%20Lighting/global_lighting.gif"/>
-  <img style="width: 30%" src="python/examples/Custom Shaders/Health%20Bars/health_bars.gif"/>
-  <img style="width: 30%" src="python/examples/Custom Shaders/Object%20Lighting/object_lighting.gif"/>
+  <div style="text-align: center">
+    <h3>Global Lighting</h3>
+    <img src="python/examples/Custom Shaders/Global%20Lighting/global_lighting.gif"/>
+  </div>
+  <div style="text-align: center">
+    <h3>Health Bars</h3>
+    <img src="python/examples/Custom Shaders/Health%20Bars/health_bars.gif"/>
+  </div>
+  <div style="text-align: center">
+    <h3>Per-Object Lighting</h3>
+    <img src="python/examples/Custom Shaders/Object%20Lighting/object_lighting.gif"/>
+  </h3>
 </div>
 
 # ![Installing](resources/images/gvgai/oryx/hammer1.png) Installing

bindings/python.cpp

@@ -12,7 +12,7 @@ namespace griddly {
 
 PYBIND11_MODULE(python_griddly, m) {
   m.doc() = "Griddly python bindings";
-  m.attr("version") = "1.4.3";
+  m.attr("version") = "1.5.0";
 
 #ifndef NDEBUG
   spdlog::set_level(spdlog::level::debug);

docs/conf.py

@@ -22,7 +22,7 @@
 author = 'Chris Bamford'
 
 # The full version, including alpha/beta/rc tags
-release = '1.4.3'
+release = '1.5.0'
 
 
 # -- General configuration ---------------------------------------------------

docs/index.rst

@@ -6,7 +6,7 @@
 Griddly Docs
 ============
 
-.. image:: img/griddly-header.png
+.. image:: img/logo.png
 
 Griddly documentation.
 

js/griddlyjs-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "griddlyjs-app",
-  "version": "1.4.3",
+  "version": "1.5.0",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.1.1",

js/griddlyjs-app/public/index.html

@@ -10,14 +10,14 @@
     <meta property="og:url" content="https://griddly.ai" />
     <meta property="og:title" content="Griddly JS" />
     <meta property="og:description" content="A Web-IDE for Reinforcement Learning" />
-    <meta property="og:image" content="https://griddly.ai/logo1200x630.png" />
+    <meta property="og:image" content="https://griddly.ai/Griddly_Social_2400x1080.png" />
 
     <meta name="twitter:card" content="summary_large_image">
     <meta name="twitter:creator" content="@Bam4d">
     <meta name="twitter:domain" value="griddly.ai" />
     <meta name="twitter:title" value="Griddly JS" />
     <meta name="twitter:description" value="A Web-IDE for Reinforcement Learning" />
-    <meta name="twitter:image" content="https://griddly.ai/logo800x418.png" />
+    <meta name="twitter:image" content="https://griddly.ai/Griddly_Social_1280x720.png" />
     <meta name="twitter:url" value="https://griddly.ai" />
     <meta
       name="description"
@@ -53,7 +53,7 @@
 
       gtag("config", "G-JZJBDD0RJK");
     </script>
-    <title>GriddlyJS</title>
+    <title>Griddly AI</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

js/griddlyjs-app/public/manifest.json

@@ -8,14 +8,9 @@
       "type": "image/x-icon"
     },
     {
-      "src": "griddlybear192x192.png",
+      "src": "griddlybear.png",
       "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "griddlybear512x512.png",
-      "type": "image/png",
-      "sizes": "512x512"
+      "sizes": "192x192 512x512"
     }
   ],
   "start_url": ".",

js/griddlyjs-app/src/App.js

@@ -22,6 +22,7 @@ import {
   NavItem,
   Modal,
   Form,
+  Spinner,
 } from "react-bootstrap";
 
 import {
@@ -55,15 +56,15 @@ class App extends Component {
     this.state = {
       levelPlayer: {
         phaserWidth: 500,
-        phaserHeight: 300,
+        phaserHeight: 250,
       },
       levelEditor: {
         phaserWidth: 500,
-        phaserHeight: 300,
+        phaserHeight: 250,
       },
       policyDebugger: {
         phaserWidth: 500,
-        phaserHeight: 300,
+        phaserHeight: 250,
       },
       levelSelector: {
         phaserWidth: 1000,
@@ -589,15 +590,15 @@ class App extends Component {
         ...state,
         levelPlayer: {
           phaserWidth: width,
-          phaserHeight: (6 * window.innerHeight) / 8,
+          phaserHeight: (6 * window.innerHeight) / 9,
         },
         levelEditor: {
           phaserWidth: width,
-          phaserHeight: (6 * window.innerHeight) / 8,
+          phaserHeight: (6 * window.innerHeight) / 9,
         },
         policyDebugger: {
           phaserWidth: width,
-          phaserHeight: (6 * window.innerHeight) / 8,
+          phaserHeight: (6 * window.innerHeight) / 9,
         },
         levelSelector: {
           phaserWidth: (2 * window.innerWidth) / 3,
@@ -783,8 +784,10 @@ class App extends Component {
         <Intro onClose={this.closeIntroModal} show={this.state.showIntro} />
         <Modal show={this.state.loading} backdrop="static">
           <Modal.Header>
-            <Modal.Title>Loading Project.....</Modal.Title>
+            <Modal.Title className="loading-logo"><img alt="loading" src="logo_ai_white.png" height={70} /></Modal.Title>
           </Modal.Header>
+          <Modal.Body className="loading-gif"><Spinner animation="border" variant="secondary" /></Modal.Body>
+          <Modal.Footer>Loading Project...</Modal.Footer>
         </Modal>
         <Modal
           show={this.state.newProject.showModal}
@@ -887,8 +890,8 @@ class App extends Component {
                 <a href="https://griddly.ai">
                   <img
                     alt="Griddly Bear"
-                    src="griddlybear192x192.png"
-                    height="30"
+                    src="logo_ai_white.png"
+                    height="40"
                   />
                 </a>
               </NavItem>

js/griddlyjs-app/src/App.scss

@@ -67,3 +67,11 @@
   text-align: left;
   font-family: monospace;
 }
+
+.loading-gif {
+  margin: auto;
+}
+
+.loading-logo {
+  margin: auto;
+}

js/griddlyjs-app/src/GDYEditor.js

@@ -120,7 +120,7 @@ class GDYEditor extends Component {
           path={file.name}
           value={file.value}
           language={file.language}
-          height="80vh"
+          height="70vh"
           // options={{fontSize: "20"}}
           theme="vs-dark"
           onMount={this.handleEditorDidMount}

js/griddlyjs-app/src/Intro.js

@@ -16,7 +16,7 @@ class Intro extends Component {
     this.slides = [
       {
         title: "Introduction",
-        image: "intro/intro.gif",
+        image: "intro/intro_updated.gif",
         content: (
           <div>
             <h5>Welcome to GriddlyJS</h5>
@@ -33,7 +33,7 @@ class Intro extends Component {
       },
       {
         title: "Managing projects",
-        image: "intro/newproject.gif",
+        image: "intro/newproject_updated.gif",
         content: (
           <div>
             <div>
@@ -80,7 +80,7 @@ class Intro extends Component {
       },
       {
         title: "Level Editor",
-        image: "intro/leveleditor.gif",
+        image: "intro/leveleditor_updated.gif",
         content: (
           <div>
             <div>
@@ -134,7 +134,7 @@ class Intro extends Component {
       },
       {
         title: "Debugging Mechanics",
-        image: "intro/debuggingmechanics.gif",
+        image: "intro/debuggingmechanics_updated.gif",
         content: (
           <div>
             <div>
@@ -171,7 +171,7 @@ class Intro extends Component {
       },
       {
         title: "Recording Trajectories",
-        image: "intro/recordingtrajectories.gif",
+        image: "intro/recordingtrajectories_updated.gif",
         content: (
           <div>
             <div>
@@ -207,7 +207,7 @@ class Intro extends Component {
       },
       {
         title: "Debugging Policies",
-        image: "intro/debugpolicies.gif",
+        image: "intro/debugpolicies_updated.gif",
         content: (
           <div>
             <div>