Merge branch 'release/1.6.6'

Bam4d · Jan 4, 2023 · 94b04b5 · 94b04b5
2 parents 0f75a59 + 1c978f3
commit 94b04b5
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 16 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.6.5]
+ - Version [e.g. 1.6.6]
 
 **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.18.0)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
-project(Griddly VERSION 1.6.5)
+project(Griddly VERSION 1.6.6)
 
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)
 
@@ -128,6 +128,9 @@ find_package(yaml-cpp REQUIRED)
 find_package(spdlog REQUIRED)
 
 if(NOT WASM)
+
+  include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
+
   # find the dependencies from conan
   set(PYBIND11_FINDPYTHON FALSE)
 
@@ -149,6 +152,7 @@ if(NOT WASM)
 
   # ShaderC for compiling shaders
   find_package(shaderc REQUIRED)
+
 endif()
 
 include(${CMAKE_CONFIG_FOLDER}/targets/griddly.cmake)
@@ -163,9 +167,15 @@ else()
     set(ENV{GLSLC_BIN} ${CONAN_SHADERC_ROOT}/bin/glslc)
 
     if(MSVC)
-      execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/compile_shaders.bat RESULT_VARIABLE rv)
+      execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/compile_shaders.bat RESULT_VARIABLE STATUS)
+      if(STATUS AND NOT STATUS EQUAL 0)
+        message( FATAL_ERROR "Cannot compile shaders: ${STATUS}")
+      endif()
     else()
-      execute_process(COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/compile_shaders.sh RESULT_VARIABLE rv)
+      execute_process(COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/compile_shaders.sh RESULT_VARIABLE STATUS)
+      if(STATUS AND NOT STATUS EQUAL 0)
+        message( FATAL_ERROR "Cannot compile shaders: ${STATUS}")
+      endif()
     endif()
 
     if(ENABLE_PYTHON_BINDINGS)

diff --git a/CMakeUserPresets.json b/CMakeUserPresets.json
@@ -15,8 +15,8 @@
               "CMAKE_POLICY_DEFAULT_CMP0091": "NEW",
               "CMAKE_BUILD_TYPE": "Debug"
           },
-          "toolchainFile": "/home/bam4d/qmul/Griddly/build/conan_toolchain.cmake",
-          "binaryDir": "/home/bam4d/qmul/Griddly/build"
+          "toolchainFile": "build/conan_toolchain.cmake",
+          "binaryDir": "build"
       },
       {
         "name": "Debug WASM",
@@ -28,18 +28,20 @@
             "CMAKE_BUILD_TYPE": "Debug",
             "WASM": "ON"
         },
-        "toolchainFile": "/home/bam4d/qmul/Griddly/build_wasm/conan_toolchain.cmake",
-        "binaryDir": "/home/bam4d/qmul/Griddly/build_wasm"
+        "toolchainFile": "build_wasm/conan_toolchain.cmake",
+        "binaryDir": "build_wasm"
     }
   ],
   "buildPresets": [
     {
       "name": "Debug WASM",
-      "configurePreset": "Debug WASM"
+      "configurePreset": "Debug WASM",
+      "configuration": "Debug"
     },
     {
       "name": "Debug Native",
-      "configurePreset": "Debug Native"
+      "configurePreset": "Debug Native",
+      "configuration": "Debug"
     }
   ]
 }
diff --git a/README.md b/README.md
@@ -235,6 +235,15 @@ You will need to set up a python environment of your choice and then install con
 pip install conan
 ```
 
+### Debug Layers for Vulkan
+
+When compiling using Debug, you will need the install vulkan validation layers which are part of the [vulkan sdk](https://vulkan.lunarg.com/).
+Otherwise you will run into errors like:
+```
+[2023-01-04 15:21:54.412] [warning] Required vulkan layer unavailable: VK_LAYER_KHRONOS_validation
+[2023-01-04 15:21:54.412] [error] Missing vulkan extensions in driver. Please upgrade your vulkan drivers.
+```
+
 ### Ubuntu
 
 ```

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.6.5";
+  m.attr("version") = "1.6.6";
 
 #ifndef NDEBUG
   spdlog::set_level(spdlog::level::debug);

diff --git a/compile_shaders.sh b/compile_shaders.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+set -e
 cd "$(dirname "$0")"
 
 compile_shaders_in_dir () {

diff --git a/deps/conanfile.txt b/deps/conanfile.txt
@@ -14,5 +14,6 @@ tools.cmake.cmaketoolchain:generator=Ninja
 [generators]
 CMakeToolchain
 CMakeDeps
+cmake_paths
 
 
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.6.5'
+release = '1.6.6'
 
 
 # -- General configuration ---------------------------------------------------

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.6.5",
+  "version": "1.6.6",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.1.1",

diff --git a/python/setup.py b/python/setup.py
@@ -71,7 +71,7 @@ def griddly_package_data(config='Debug'):
 
 setup(
     name='griddly',
-    version="1.6.5",
+    version="1.6.6",
     author_email="[email protected]",
     description="Griddly Python Libraries",
     long_description=long_description,