cleanup

diff --git a/Makefile b/Makefile
index 156d5cb20d9dd64b0b64548b98b810e556cf23d6..dd67f8ff6fc9e2bed18b145743a32f0274a7b256 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,9 @@ test: blank.test
        ./blank.test
 
 clean:
-       rm -df $(OBJ) $(DEP) $(DIR)
+       rm -f $(OBJ)
+       rm -f $(DEP)
+       find build -type d -empty -delete
 
 distclean: clean
        rm -f $(BIN) cachegrind.out.* callgrind.out.*

diff --git a/src/app/init.cpp b/src/app/init.cpp
index fea5653cf1cf6499bb378b22286169cf2c15fff8..78a83e1df190d741c170c2823d7a07f578daa8e6 100644 (file)
--- a/src/app/init.cpp
+++ b/src/app/init.cpp
@@ -139,7 +139,7 @@ InitAL::InitAL() {
        }
 }
 
-InitAL::~InitAL() {
+InitAL::~InitAL() throw(AlutError) {
        if (!alutExit()) {
                throw AlutError(alutGetError(), "alutExit");
        }

diff --git a/src/app/init.hpp b/src/app/init.hpp
index 66c3345fa170a108ee71189648a0384ddc54c2b5..9385d44979b815078f609e332cf9617b08607e3c 100644 (file)
--- a/src/app/init.hpp
+++ b/src/app/init.hpp
@@ -101,7 +101,7 @@ class InitAL {
 
 public:
        InitAL();
-       ~InitAL();
+       ~InitAL() throw(AlutError);
 
        InitAL(const InitAL &) = delete;
        InitAL &operator =(const InitAL &) = delete;

diff --git a/src/blank.cpp b/src/blank.cpp
index 2c3c40d860d9189f8264386026748272e579b126..395125c4b24fbbf351668dc53f1c09f0193b2ef4 100644 (file)
--- a/src/blank.cpp
+++ b/src/blank.cpp
@@ -1,9 +1,28 @@
 #include "app/Runtime.hpp"
 
+#include <exception>
+#include <iostream>
+
 using namespace blank;
 
 int main(int argc, char *argv[]) {
        Runtime rt;
-       rt.Initialize(argc, argv);
-       return rt.Execute();
+       try {
+               rt.Initialize(argc, argv);
+       } catch (std::exception &e) {
+               std::cerr << "error in initialization: " << e.what() << std::endl;
+               return 1;
+       } catch (...) {
+               std::cerr << "unknown error in initialization" << std::endl;
+               return 1;
+       }
+       try {
+               return rt.Execute();
+       } catch (std::exception &e) {
+               std::cerr << "error in execution: " << e.what() << std::endl;
+               return 2;
+       } catch (...) {
+               std::cerr << "unknown error in execution" << std::endl;
+               return 2;
+       }
 }

diff --git a/src/graphics/Viewport.hpp b/src/graphics/Viewport.hpp
index 47302733d1f01c71e34de70ffceddff870f2d624..de62c4847c9cc67309030c6886ee66b394c19502 100644 (file)
--- a/src/graphics/Viewport.hpp
+++ b/src/graphics/Viewport.hpp
@@ -23,7 +23,7 @@ public:
        Viewport(const Viewport &) = delete;
        Viewport &operator =(const Viewport &) = delete;
 
-       void VSync(bool b) noexcept;
+       void VSync(bool b);
 
        void EnableDepthTest() noexcept;
        void EqualDepthTest() noexcept;

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 9468b68b794b8640558c986870f885c5e171c26d..d1913ad3e77b18d3a20aa51c4d6af7326982827b 100644 (file)
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -10,6 +10,7 @@
 
 #include <algorithm>
 #include <cstring>
+#include <iostream>
 #include <memory>
 #include <stdexcept>
 
@@ -261,8 +262,11 @@ void Texture::Data(const SDL_Surface &srf, bool pad2) noexcept {
 
                UnpackRowLength(0);
        } else if (srf.w > (1 << 30) || srf.h > (1 << 30)) {
+               // That's at least one gigapixel in either or both dimensions.
+               // If this is not an error, that's an insanely large or high
+               // resolution texture.
 #ifndef NDEBUG
-               throw std::runtime_error("texture too large");
+               std::cerr << "texture size exceeds 2^30, aborting data import" << std::endl;
 #endif
        } else {
                GLsizei width = 1, height = 1;

diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp
index 30b1c3c9d04c422dc8753a696790a4a00578819c..cb446191ab8b0458769c21e0bd21916528af3fe4 100644 (file)
--- a/src/graphics/viewport.cpp
+++ b/src/graphics/viewport.cpp
@@ -103,7 +103,7 @@ Viewport::Viewport()
        glClearColor(0.0, 0.0, 0.0, 1.0);
 }
 
-void Viewport::VSync(bool b) noexcept {
+void Viewport::VSync(bool b) {
        if (SDL_GL_SetSwapInterval(b) != 0) {
                throw SDLError("SDL_GL_SetSwapInterval");
        }

diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp
index 97ec3e353600d0efa79cb49c67aca250da142786..7f7b185dc91eaff3d9c71c0126ddcd414b3d02d2 100644 (file)
--- a/src/world/chunk.cpp
+++ b/src/world/chunk.cpp
@@ -33,7 +33,6 @@ Chunk::Chunk(const BlockTypeRegistry &types) noexcept
 : types(&types)
 , neighbor{0}
 , gravity()
-, blocks{}
 , light{0}
 , generated(false)
 , lighted(false)