From e520d02f4faef9984e652cb396344ab8fea3e8e8 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Wed, 21 Apr 2021 11:08:45 +0100 Subject: [PATCH 1/2] bumping version numbers --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- CMakeLists.txt | 2 +- bindings/python.cpp | 2 +- docs/conf.py | 2 +- python/setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 1cfb6bf66..67a9183de 100644 --- 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.0.1] + - Version [e.g. 1.0.2] **Additional context** Add any other context about the problem here. diff --git a/CMakeLists.txt b/CMakeLists.txt index 140f1ca16..fe71fc69f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10.0) -project(Griddly VERSION 1.0.1) +project(Griddly VERSION 1.0.2) set(BINARY ${CMAKE_PROJECT_NAME}) diff --git a/bindings/python.cpp b/bindings/python.cpp index a6677cd8f..d2b1d1c22 100644 --- 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.0.1"; + m.attr("version") = "1.0.2"; #ifndef NDEBUG spdlog::set_level(spdlog::level::debug); diff --git a/docs/conf.py b/docs/conf.py index 074e63f9a..791cda6d3 100644 --- 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.0.1' +release = '1.0.2' # -- General configuration --------------------------------------------------- diff --git a/python/setup.py b/python/setup.py index 4f2178df1..f30016c60 100644 --- a/python/setup.py +++ b/python/setup.py @@ -71,7 +71,7 @@ def griddly_package_data(config='Debug'): setup( name='griddly', - version="1.0.1", + version="1.0.2", author_email="chrisbam4d@gmail.com", description="Griddly Python Libraries", long_description=long_description, From 02544fe3b35a887588d00e633d936285bbfdcd0f Mon Sep 17 00:00:00 2001 From: Bam4d Date: Wed, 21 Apr 2021 11:13:38 +0100 Subject: [PATCH 2/2] improve error message for loading images --- src/Griddly/Core/Observers/SpriteObserver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Griddly/Core/Observers/SpriteObserver.cpp b/src/Griddly/Core/Observers/SpriteObserver.cpp index d6ffdde12..12c684192 100644 --- a/src/Griddly/Core/Observers/SpriteObserver.cpp +++ b/src/Griddly/Core/Observers/SpriteObserver.cpp @@ -36,7 +36,7 @@ vk::SpriteData SpriteObserver::loadImage(std::string imageFilename) { stbi_uc* pixels = stbi_load(absoluteFilePath.c_str(), &width, &height, &channels, STBI_rgb_alpha); if (!pixels) { - throw std::runtime_error("Failed to load texture image."); + throw std::runtime_error(fmt::format("Failed to load texture image {0}.",imageFilename)); } int outputWidth = observerConfig_.tileSize.x;