restructured project to match a more standard cmake setup

CMakeLists.txt

@@ -7,115 +7,65 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_library(blah
 
-	public/blah.h
-	public/blah/app.cpp
-	public/blah/app.h
-	public/blah/filesystem.cpp
-	public/blah/filesystem.h
-	public/blah/log.cpp
-	public/blah/log.h
-	public/blah/time.cpp
-	public/blah/time.h
+	src/core/app.cpp
+	src/core/filesystem.cpp
+	src/core/log.cpp
+	src/core/time.cpp
 
-	public/blah/graphics/blend.h
-	public/blah/graphics/blend.cpp
-	public/blah/graphics/framebuffer.h
-	public/blah/graphics/framebuffer.cpp
-	public/blah/graphics/material.h
-	public/blah/graphics/material.cpp
-	public/blah/graphics/mesh.h
-	public/blah/graphics/mesh.cpp
-	public/blah/graphics/renderpass.h
-	public/blah/graphics/renderpass.cpp
-	public/blah/graphics/sampler.h
-	public/blah/graphics/shader.h
-	public/blah/graphics/shader.cpp
-	public/blah/graphics/texture.h
-	public/blah/graphics/texture.cpp
+	src/graphics/blend.cpp
+	src/graphics/framebuffer.cpp
+	src/graphics/material.cpp
+	src/graphics/mesh.cpp
+	src/graphics/renderpass.cpp
+	src/graphics/shader.cpp
+	src/graphics/texture.cpp
 
-	public/blah/input/input.cpp
-	public/blah/input/virtual_stick.cpp
-	public/blah/input/virtual_stick.h
-	public/blah/input/virtual_button.cpp
-	public/blah/input/virtual_button.h
-	public/blah/input/virtual_axis.cpp
-	public/blah/input/virtual_axis.h
+	src/input/input.cpp
+	src/input/virtual_stick.cpp
+	src/input/virtual_button.cpp
+	src/input/virtual_axis.cpp
 	
-	public/blah/containers/vector.h
-	public/blah/containers/stackvector.h
-	public/blah/containers/str.cpp
-	public/blah/containers/str.h
+	src/containers/str.cpp
 	
-	public/blah/drawing/batch.cpp
-	public/blah/drawing/batch.h
-	public/blah/drawing/spritefont.cpp
-	public/blah/drawing/spritefont.h
-	public/blah/drawing/subtexture.cpp
-	public/blah/drawing/subtexture.h
+	src/drawing/batch.cpp
+	src/drawing/spritefont.cpp
+	src/drawing/subtexture.cpp
 
-	public/blah/images/aseprite.cpp
-	public/blah/images/aseprite.h
-	public/blah/images/font.cpp
-	public/blah/images/font.h
-	public/blah/images/image.cpp
-	public/blah/images/image.h
-	public/blah/images/packer.cpp
-	public/blah/images/packer.h
+	src/images/aseprite.cpp
+	src/images/font.cpp
+	src/images/image.cpp
+	src/images/packer.cpp
 
-	public/blah/math/calc.cpp
-	public/blah/math/calc.h
-	public/blah/math/circle.cpp
-	public/blah/math/circle.h
-	public/blah/math/color.cpp
-	public/blah/math/color.h
-	public/blah/math/ease.h
-	public/blah/math/line.cpp
-	public/blah/math/line.h
-	public/blah/math/mat3x2.cpp
-	public/blah/math/mat3x2.h
-	public/blah/math/mat4x4.cpp
-	public/blah/math/mat4x4.h
-	public/blah/math/point.cpp
-	public/blah/math/point.h
-	public/blah/math/quad.h
-	public/blah/math/quad.cpp
-	public/blah/math/rect.cpp
-	public/blah/math/rect.h
-	public/blah/math/rectI.cpp
-	public/blah/math/rectI.h
-	public/blah/math/stopwatch.cpp
-	public/blah/math/stopwatch.h
-	public/blah/math/vec2.cpp
-	public/blah/math/vec2.h
-	public/blah/math/vec4.h
+	src/math/calc.cpp
+	src/math/circle.cpp
+	src/math/color.cpp
+	src/math/line.cpp
+	src/math/mat3x2.cpp
+	src/math/mat4x4.cpp
+	src/math/point.cpp
+	src/math/quad.cpp
+	src/math/rect.cpp
+	src/math/rectI.cpp
+	src/math/stopwatch.cpp
+	src/math/vec2.cpp
 	
-	public/blah/streams/endian.h
-	public/blah/streams/bufferstream.cpp
-	public/blah/streams/bufferstream.h	
-	public/blah/streams/filestream.cpp
-	public/blah/streams/filestream.h
-	public/blah/streams/memorystream.cpp
-	public/blah/streams/memorystream.h
-	public/blah/streams/stream.cpp
-	public/blah/streams/stream.h
+	src/streams/bufferstream.cpp	
+	src/streams/filestream.cpp
+	src/streams/memorystream.cpp
+	src/streams/stream.cpp
 
-	private/blah/third_party/stb_image.h
-	private/blah/third_party/stb_image_write.h
-	private/blah/third_party/stb_truetype.h
-	private/blah/internal/graphics_backend.h
-	private/blah/internal/graphics_backend_gl.cpp
-	private/blah/internal/graphics_backend_d3d11.cpp
-	private/blah/internal/graphics_backend_dummy.cpp
-	private/blah/internal/input_backend.h
-	private/blah/internal/platform_backend.h
-	private/blah/internal/platform_backend_sdl2.cpp
+
+	src/internal/graphics_backend_gl.cpp
+	src/internal/graphics_backend_d3d11.cpp
+	src/internal/graphics_backend_dummy.cpp
+	src/internal/platform_backend_sdl2.cpp
 )
 
 target_include_directories(blah 
 	PUBLIC
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/public>
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 	PRIVATE
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/private>
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
 )
 
 # Platform Variables
@@ -127,12 +77,12 @@ set(D3D11_ENABLED false CACHE BOOL "Use D3D11 graphics implementation")
 
 set(LIBS "")
 
-# add OpenGL definition if we're using OpenGL
+# add OpenGL definition if we're using it
 if (OPENGL_ENABLED)
 	add_compile_definitions(BLAH_USE_OPENGL)
 endif()
 
-# add D3D11 definition if we're using D3D11
+# add D3D11 definition if we're using it
 if (D3D11_ENABLED)
 	add_compile_definitions(BLAH_USE_D3D11)
 	set(LIBS ${LIBS} d3d11.lib dxguid.lib D3Dcompiler.lib)

include/blah.h

@@ -0,0 +1,54 @@
+#pragma once
+
+#include "blah/core/app.h"
+#include "blah/core/filesystem.h"
+#include "blah/core/log.h"
+#include "blah/core/time.h"
+	
+#include "blah/containers/vector.h"
+#include "blah/containers/stackvector.h"
+#include "blah/containers/str.h"
+	
+#include "blah/drawing/batch.h"
+#include "blah/drawing/spritefont.h"
+#include "blah/drawing/subtexture.h"
+
+#include "blah/graphics/blend.h"
+#include "blah/graphics/framebuffer.h"
+#include "blah/graphics/material.h"
+#include "blah/graphics/mesh.h"
+#include "blah/graphics/renderpass.h"
+#include "blah/graphics/sampler.h"
+#include "blah/graphics/shader.h"
+#include "blah/graphics/texture.h"
+
+#include "blah/images/aseprite.h"
+#include "blah/images/font.h"
+#include "blah/images/image.h"
+#include "blah/images/packer.h"
+
+#include "blah/input/input.h"
+#include "blah/input/virtual_stick.h"
+#include "blah/input/virtual_button.h"
+#include "blah/input/virtual_axis.h"
+
+#include "blah/math/calc.h"
+#include "blah/math/circle.h"
+#include "blah/math/color.h"
+#include "blah/math/ease.h"
+#include "blah/math/line.h"
+#include "blah/math/mat3x2.h"
+#include "blah/math/mat4x4.h"
+#include "blah/math/point.h"
+#include "blah/math/quad.h"
+#include "blah/math/rect.h"
+#include "blah/math/rectI.h"
+#include "blah/math/stopwatch.h"
+#include "blah/math/vec2.h"
+#include "blah/math/vec4.h"
+	
+#include "blah/streams/bufferstream.h"
+#include "blah/streams/filestream.h"
+#include "blah/streams/memorystream.h"
+#include "blah/streams/stream.h"
+#include "blah/streams/endian.h"

include/blah/containers/stackvector.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <blah/log.h>
+#include <blah/core/log.h>
 #include <new>
 
 namespace Blah

include/blah/containers/vector.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <blah/log.h>
+#include <blah/core/log.h>
 #include <type_traits>
 #include <new>
 

include/blah/core/app.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <blah/graphics/framebuffer.h>
+#include <memory>
 
 namespace Blah
 {
@@ -40,6 +40,9 @@ namespace Blah
 		int max_texture_size = 0;
 	};
 
+	class FrameBuffer;
+	using FrameBufferRef = std::shared_ptr<FrameBuffer>;
+
 	namespace App
 	{
 		// Runs the application

include/blah/drawing/batch.h

@@ -11,7 +11,7 @@
 #include <blah/graphics/blend.h>
 #include <blah/graphics/sampler.h>
 #include <blah/graphics/renderpass.h>
-#include <blah/app.h>
+#include <blah/core/app.h>
 
 namespace Blah
 {

include/blah/drawing/subtexture.h

@@ -4,6 +4,8 @@
 
 namespace Blah
 {
+	// Subtexture is a view into a texture, and can be used to 
+	// easily represent sprites in a larger texture atlas.
 	struct Subtexture
 	{
 		// Reference to our Texture

include/blah/graphics/blend.h

@@ -65,29 +65,28 @@ namespace Blah
 
 		BlendMode() = default;
 
-		BlendMode(BlendOp op, BlendFactor src, BlendFactor dst)
-		{
-			color_op = op;
-			color_src = src;
-			color_dst = dst;
-			alpha_op = op;
-			alpha_src = src;
-			alpha_dst = dst;
-			mask = BlendMask::RGBA;
-			rgba = 0xffffffff;
-		}
+		BlendMode(BlendOp op, BlendFactor src, BlendFactor dst) :
+			color_op(op),
+			color_src(src),
+			color_dst(dst),
+			alpha_op(op),
+			alpha_src(src),
+			alpha_dst(dst),
+			mask(BlendMask::RGBA),
+			rgba(0xffffffff) {}
 
-		BlendMode(BlendOp rgbOp, BlendFactor rgbSrc, BlendFactor rgbDst, BlendOp aOp, BlendFactor aSrc, BlendFactor aDst, BlendMask blendMask, uint32_t blendColor)
-		{
-			color_op = rgbOp;
-			color_src = rgbSrc;
-			color_dst = rgbDst;
-			alpha_op = aOp;
-			alpha_src = aSrc;
-			alpha_dst = aDst;
-			mask = blendMask;
-			rgba = blendColor;
-		}
+		BlendMode(
+			BlendOp color_op, BlendFactor color_src, BlendFactor color_dst,
+			BlendOp alpha_op, BlendFactor alpha_src, BlendFactor alpha_dst,
+			BlendMask blend_mask, uint32_t blend_rgba) :
+			color_op(color_op),
+			color_src(color_src),
+			color_dst(color_dst),
+			alpha_op(alpha_op),
+			alpha_src(alpha_src),
+			alpha_dst(alpha_dst),
+			mask(blend_mask),
+			rgba(blend_rgba) {}
 
 		bool operator==(const BlendMode& rhs) const
 		{

include/blah/graphics/material.h

@@ -57,6 +57,8 @@ namespace Blah
 		TextureSampler get_sampler(int slot, int array_index = 0) const;
 
 		// Sets the value. `length` is the total number of floats to set
+		// For example if the uniform is a float2[4], a total of 8 float values
+		// can be set.
 		void set_value(const char* name, const float* value, int64_t length);
 
 		// Gets a pointer to the values of the given Uniform, or nullptr if it doesn't exist.

include/blah/graphics/texture.h

@@ -3,7 +3,6 @@
 
 namespace Blah
 {
-
 	enum class TextureFormat
 	{
 		None,

include/blah/images/aseprite.h

@@ -6,6 +6,9 @@
 
 namespace Blah
 {
+	// A simple Aseprite file parser.
+	// This implementation does not support Aseprite blendmodes,
+	// besides the default blend mode.
 	class Aseprite
 	{
 	public:

include/blah/images/packer.h

@@ -9,7 +9,8 @@
 
 namespace Blah
 {
-
+	// Texture Packer, which takes source images and combines
+	// them into a single large texture.
 	class Packer
 	{
 	public:

include/blah/input/input.h

@@ -412,13 +412,13 @@ namespace Blah
 		// Gets the Mouse Wheel
 		Point mouse_wheel();
 
-		// Returns 1 if the keyboard key was pressed this frame, and 0 otherwise.
+		// Checks if the keyboard key was pressed this frame
 		bool pressed(Key key);
 
-		// Returns 1 if the keyboard key was held this frame, and 0 otherwise.
+		// Checks if the keyboard key was held this frame
 		bool down(Key key);
 
-		// Returns 1 if the keyboard key was released this frame, and 0 otherwise.
+		// Checks if the keyboard key was released this frame
 		bool released(Key key);
 
 		// Checks if the Left or Right Ctrl Key is down
@@ -435,23 +435,28 @@ namespace Blah
 
 		// Gets the controller info for the current controller index.
 		// If the controller is not connected or the index it out of range, this will set an unconnected controller.
-		const ControllerState* controller(int controllerIndex);
+		const ControllerState* controller(int controller_index);
 
-		// Returns 1 if the button on the controller was pressed this frame, and 0 otherwise.
-		// If the controller is not connected, or the index is out of range, this will return 0.
-		bool pressed(int controllerIndex, Button button);
+		// Checks if the button on the controller was pressed this frame.
+		// If the controller is not connected, or the index is out of range, this will return false.
+		bool pressed(int controller_index, Button button);
 
-		// Returns 1 if the button on the controller was held this frame, and 0 otherwise.
-		// If the controller is not connected, or the index is out of range, this will return 0.
-		bool down(int controllerIndex, Button button);
+		// Checks if the button on the controller was held this frame.
+		// If the controller is not connected, or the index is out of range, this will return false.
+		bool down(int controller_index, Button button);
 
-		// Returns 1 if the button on the controller was released this frame, and 0 otherwise.
-		// If the controller is not connected, or the index is out of range, this will return 0.
-		bool released(int controllerIndex, Button button);
+		// Checks if the button on the controller was released this frame.
+		// If the controller is not connected, or the index is out of range, this will return false.
+		bool released(int controller_index, Button button);
 		
-		float axis_check(int controllerIndex, Axis axis);
-		int axis_check(int prev, Key negative, Key positive);
-		int axis_check(int prev, int controllerIndex, Button negative, Button positive);
+		// returns the value of the given axis
+		float axis_check(int controller_index, Axis axis);
+
+		// checks the given virtual axis, described by 2 keys. `fallback` is returned if both keys are held
+		int axis_check(int fallback, Key negative, Key positive);
+
+		// checks the given virtual axis, described by 2 buttons. `fallback` is returned if both buttons are held
+		int axis_check(int fallback, int controller_index, Button negative, Button positive);
 
 		// returns a string name of the given key
 		const char* name_of(Key key);

include/blah/input/virtual_axis.h

@@ -3,6 +3,8 @@
 
 namespace Blah
 {
+	// A virtual controller axis, which can be used to map multiple
+	// inputs to an axis. Note that you must call `update` every frame!
 	class VirtualAxis
 	{
 	private:

include/blah/input/virtual_stick.h

@@ -5,6 +5,8 @@
 
 namespace Blah
 {
+	// A virtual controller stick, which can be used to map multiple
+	// inputs to a stick. Note that you must call `update` every frame!
 	class VirtualStick
 	{
 	private:

include/blah/math/ease.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <blah/math/calc.h>
-#include <blah/log.h>
+#include <blah/core/log.h>
 
 namespace Blah
 {

include/blah/streams/filestream.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <blah/streams/stream.h>
-#include <blah/filesystem.h>
+#include <blah/core/filesystem.h>
 
 namespace Blah
 {

public/blah.h

@@ -1,55 +0,0 @@
-#pragma once
-
-#include <blah.h>
-#include <blah/app.h>
-#include <blah/filesystem.h>
-#include <blah/log.h>
-#include <blah/time.h>
-	
-#include <blah/containers/vector.h>
-#include <blah/containers/stackvector.h>
-#include <blah/containers/str.h>
-	
-#include <blah/drawing/batch.h>
-#include <blah/drawing/spritefont.h>
-#include <blah/drawing/subtexture.h>
-
-#include <blah/graphics/blend.h>
-#include <blah/graphics/framebuffer.h>
-#include <blah/graphics/material.h>
-#include <blah/graphics/mesh.h>
-#include <blah/graphics/renderpass.h>
-#include <blah/graphics/sampler.h>
-#include <blah/graphics/shader.h>
-#include <blah/graphics/texture.h>
-
-#include <blah/images/aseprite.h>
-#include <blah/images/font.h>
-#include <blah/images/image.h>
-#include <blah/images/packer.h>
-
-#include <blah/input/input.h>
-#include <blah/input/virtual_stick.h>
-#include <blah/input/virtual_button.h>
-#include <blah/input/virtual_axis.h>
-
-#include <blah/math/calc.h>
-#include <blah/math/circle.h>
-#include <blah/math/color.h>
-#include <blah/math/ease.h>
-#include <blah/math/line.h>
-#include <blah/math/mat3x2.h>
-#include <blah/math/mat4x4.h>
-#include <blah/math/point.h>
-#include <blah/math/quad.h>
-#include <blah/math/rect.h>
-#include <blah/math/rectI.h>
-#include <blah/math/stopwatch.h>
-#include <blah/math/vec2.h>
-#include <blah/math/vec4.h>
-	
-#include <blah/streams/bufferstream.h>
-#include <blah/streams/filestream.h>
-#include <blah/streams/memorystream.h>
-#include <blah/streams/stream.h>
-#include <blah/streams/endian.h>

src/core/app.cpp

@@ -1,11 +1,11 @@
-#include <blah/app.h>
-#include <blah/log.h>
-#include <blah/time.h>
+#include <blah/core/app.h>
+#include <blah/core/log.h>
+#include <blah/core/time.h>
 #include <blah/math/point.h>
-
-#include <blah/internal/platform_backend.h>
-#include <blah/internal/graphics_backend.h>
-#include <blah/internal/input_backend.h>
+#include <blah/graphics/framebuffer.h>
+#include "../internal/platform_backend.h"
+#include "../internal/graphics_backend.h"
+#include "../internal/input_backend.h"
 
 using namespace Blah;
 

src/core/filesystem.cpp

@@ -1,5 +1,5 @@
-#include <blah/filesystem.h>
-#include <blah/internal/platform_backend.h>
+#include <blah/core/filesystem.h>
+#include "../internal/platform_backend.h"
 
 using namespace Blah;
 

src/core/log.cpp

@@ -1,5 +1,5 @@
-#include <blah/log.h>
-#include <blah/app.h>
+#include <blah/core/log.h>
+#include <blah/core/app.h>
 #include <stdarg.h> // for logging methods
 #include <stdio.h>  // for sprintf
 

src/core/time.cpp

@@ -1,4 +1,4 @@
-#include <blah/time.h>
+#include <blah/core/time.h>
 #include <math.h>
 
 using namespace Blah;

src/drawing/batch.cpp

@@ -5,7 +5,7 @@
 #include <blah/graphics/shader.h>
 #include <blah/graphics/material.h>
 #include <blah/math/calc.h>
-#include <blah/app.h>
+#include <blah/core/app.h>
 
 using namespace Blah;
 namespace

src/drawing/spritefont.cpp

@@ -1,7 +1,7 @@
 #include <blah/drawing/spritefont.h>
 #include <blah/images/font.h>
 #include <blah/images/packer.h>
-#include <blah/log.h>
+#include <blah/core/log.h>
 
 using namespace Blah;
 

src/graphics/framebuffer.cpp

@@ -1,5 +1,5 @@
 #include <blah/graphics/framebuffer.h>
-#include <blah/internal/graphics_backend.h>
+#include "../internal/graphics_backend.h"
 
 using namespace Blah;
 

src/graphics/material.cpp

@@ -1,5 +1,5 @@
 #include <blah/graphics/material.h>
-#include <blah/log.h>
+#include <blah/core/log.h>
 
 using namespace Blah;
 

src/graphics/mesh.cpp

@@ -1,5 +1,5 @@
-#include "mesh.h"
-#include <blah/internal/graphics_backend.h>
+#include <blah/graphics/mesh.h>
+#include "../internal/graphics_backend.h"
 
 using namespace Blah;
 

src/graphics/renderpass.cpp

@@ -1,6 +1,6 @@
 #include <blah/graphics/renderpass.h>
-#include <blah/internal/graphics_backend.h>
-#include <blah/log.h>
+#include <blah/core/log.h>
+#include "../internal/graphics_backend.h"
 
 using namespace Blah;
 

src/graphics/shader.cpp

@@ -1,5 +1,6 @@
 #include <blah/graphics/shader.h>
-#include <blah/internal/graphics_backend.h>
+#include <blah/core/app.h>
+#include "../internal/graphics_backend.h"
 
 using namespace Blah;
 

src/graphics/texture.cpp

@@ -1,8 +1,8 @@
 #include <blah/graphics/texture.h>
 #include <blah/images/image.h>
 #include <blah/streams/stream.h>
-#include <blah/internal/graphics_backend.h>
-#include <blah/log.h>
+#include <blah/core/log.h>
+#include "../internal/graphics_backend.h"
 
 using namespace Blah;
 

src/images/aseprite.cpp

@@ -1,10 +1,11 @@
 #include <blah/images/aseprite.h>
 #include <blah/streams/filestream.h>
-#include <blah/log.h>
+#include <blah/core/filesystem.h>
+#include <blah/core/log.h>
 
 #define STBI_NO_STDIO
 #define STBI_ONLY_ZLIB
-#include <blah/third_party/stb_image.h>
+#include "../third_party/stb_image.h"
 
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 #define MIN(a, b) ((a) < (b) ? (a) : (b))

src/images/font.cpp

@@ -1,13 +1,13 @@
 #include <blah/images/font.h>
 #include <blah/streams/filestream.h>
 #include <blah/math/calc.h>
-#include <blah/log.h>
+#include <blah/core/log.h>
 
 using namespace Blah;
 
 #define STBTT_STATIC
 #define STB_TRUETYPE_IMPLEMENTATION
-#include <blah/third_party/stb_truetype.h>
+#include "../third_party/stb_truetype.h"
 
 String GetName(stbtt_fontinfo* font, int nameId)
 {

src/images/image.cpp

@@ -1,7 +1,7 @@
 #include <blah/images/image.h>
 #include <blah/streams/stream.h>
 #include <blah/streams/filestream.h>
-#include <blah/log.h>
+#include <blah/core/log.h>
 
 using namespace Blah;
 
@@ -9,10 +9,10 @@ using namespace Blah;
 #define STBI_ONLY_JPEG
 #define STBI_ONLY_PNG
 #define STBI_ONLY_BMP
-#include <blah/third_party/stb_image.h>
+#include "../third_party/stb_image.h"
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include <blah/third_party/stb_image_write.h>
+#include "../third_party/stb_image_write.h"
 
 namespace
 {

src/images/packer.cpp

@@ -1,5 +1,5 @@
 #include <blah/images/packer.h>
-#include <blah/log.h>
+#include <blah/core/log.h>
 #include <algorithm>
 #include <cstring>
 

src/input/input.cpp

@@ -1,9 +1,9 @@
 #include <blah/input/input.h>
-#include <blah/app.h>
-#include <blah/time.h>
-#include <blah/log.h>
+#include <blah/core/app.h>
+#include <blah/core/time.h>
+#include <blah/core/log.h>
 #include <blah/math/point.h>
-#include <blah/internal/input_backend.h>
+#include "../internal/input_backend.h"
 #include <string.h>
 
 using namespace Blah;
@@ -334,7 +334,7 @@ float Input::axis_check(int controllerIndex, Axis axis)
 	return 0;
 }
 
-int Input::axis_check(int prev, Key negative, Key positive)
+int Input::axis_check(int fallback, Key negative, Key positive)
 {
 	if (Input::pressed(positive))
 		return 1;
@@ -346,7 +346,7 @@ int Input::axis_check(int prev, Key negative, Key positive)
 		bool neg = Input::down(negative);
 
 		if (pos && neg)
-			return prev;
+			return fallback;
 		else if (pos)
 			return 1;
 		else if (neg)
@@ -356,7 +356,7 @@ int Input::axis_check(int prev, Key negative, Key positive)
 	}
 }
 
-int Input::axis_check(int prev, int controllerIndex, Button negative, Button positive)
+int Input::axis_check(int fallback, int controllerIndex, Button negative, Button positive)
 {
 	if (Input::pressed(controllerIndex, positive))
 		return 1;
@@ -368,7 +368,7 @@ int Input::axis_check(int prev, int controllerIndex, Button negative, Button pos
 		bool neg = Input::down(controllerIndex, negative);
 
 		if (pos && neg)
-			return prev;
+			return fallback;
 		else if (pos)
 			return 1;
 		else if (neg)

src/input/virtual_axis.cpp

@@ -1,6 +1,6 @@
 #include <blah/input/virtual_axis.h>
-#include <blah/time.h>
-#include <blah/log.h>
+#include <blah/core/time.h>
+#include <blah/core/log.h>
 
 using namespace Blah;
 

src/input/virtual_button.cpp

@@ -1,6 +1,6 @@
 #include <blah/input/virtual_button.h>
-#include <blah/time.h>
-#include <blah/log.h>
+#include <blah/core/time.h>
+#include <blah/core/log.h>
 
 using namespace Blah;
 

src/input/virtual_stick.cpp

@@ -1,6 +1,6 @@
 #include <blah/input/virtual_stick.h>
-#include <blah/time.h>
-#include <blah/log.h>
+#include <blah/core/time.h>
+#include <blah/core/log.h>
 
 using namespace Blah;
 

src/internal/graphics_backend.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <blah/app.h>
+#include <blah/core/app.h>
 #include <blah/graphics/renderpass.h>
 #include <blah/graphics/texture.h>
 #include <blah/graphics/framebuffer.h>

src/internal/graphics_backend_d3d11.cpp

@@ -3,10 +3,9 @@
 // TODO:
 // Note the D3D11 Implementation is still a work-in-progress
 
-#include <blah/internal/graphics_backend.h>
-#include <blah/internal/platform_backend.h>
-#include <blah/log.h>
-#include <blah/app.h>
+#include "../internal/graphics_backend.h"
+#include "../internal/platform_backend.h"
+#include <blah/core/log.h>
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>

src/internal/graphics_backend_dummy.cpp

@@ -1,6 +1,8 @@
 #if !(defined(BLAH_USE_OPENGL) || defined(BLAH_USE_D3D11))
 
-#include <blah/internal/graphics_backend.h>
+#include "../internal/graphics_backend.h"
+#include "../internal/platform_backend.h"
+#include <blah/core/log.h>
 
 namespace Blah
 {

src/internal/graphics_backend_gl.cpp

@@ -1,9 +1,8 @@
 #ifdef BLAH_USE_OPENGL
 
-#include <blah/internal/graphics_backend.h>
-#include <blah/internal/platform_backend.h>
-#include <blah/log.h>
-#include <blah/app.h>
+#include "../internal/graphics_backend.h"
+#include "../internal/platform_backend.h"
+#include <blah/core/log.h>
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>

src/internal/platform_backend.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <inttypes.h>
-#include <blah/filesystem.h>
+#include <blah/core/filesystem.h>
 #include <blah/containers/vector.h>
 
 namespace Blah

src/internal/platform_backend_sdl2.cpp

@@ -1,12 +1,12 @@
 #ifdef BLAH_USE_SDL2
 
-#include <blah/internal/platform_backend.h>
-#include <blah/internal/input_backend.h>
-#include <blah/internal/graphics_backend.h>
+#include "../internal/platform_backend.h"
+#include "../internal/input_backend.h"
+#include "../internal/graphics_backend.h"
 #include <blah/input/input.h>
-#include <blah/app.h>
-#include <blah/filesystem.h>
-#include <blah/log.h>
+#include <blah/core/app.h>
+#include <blah/core/filesystem.h>
+#include <blah/core/log.h>
 
 #include <SDL.h>
 #include <SDL_vulkan.h>

src/streams/filestream.cpp

@@ -1,6 +1,6 @@
 #include <blah/streams/filestream.h>
-#include <blah/internal/platform_backend.h>
-#include <blah/log.h>
+#include <blah/core/log.h>
+#include "../internal/platform_backend.h"
 #include <string.h>
 
 using namespace Blah;