Index: compile.sh
===================================================================
--- compile.sh	(revision b8072d392d78f98f83ee7c10e3f50a901a29dff2)
+++ compile.sh	(revision 756162f65401bd12de652b25a35ce6e01efb144a)
@@ -1,11 +1,3 @@
 # TODO: Figure out why calling this from a makefile gives an error about shopt not being found
-
-# This section is left here in case there's no easy way to get glslangValidator in the path on a Mac
-
-OS=$(uname)
-
-if [ $OS = "Darwin" ]; then
-   VULKAN_SDK_PATH=/Users/dportnoy15/Development/vulkan-sdk-macos-1.1.108.0/macOS
-fi
 
 cd shaders
Index: docs/README.txt
===================================================================
--- docs/README.txt	(revision b8072d392d78f98f83ee7c10e3f50a901a29dff2)
+++ docs/README.txt	(revision 756162f65401bd12de652b25a35ce6e01efb144a)
@@ -1,2 +1,96 @@
+--------------------
+CONTROLS
+--------------------
+
+Use left and right arrow keys to move your ship
+Use Z and X to fire your left and right lasers at the cubes (asteroids)
+
+--------------------
+VULKAN INSTRUCTIOS
+--------------------
+
+These are the most up-to-date instructions. Use these rather than the ones
+listed further down, which are for the old OpenGL version of the game
+
+Windows
+--------
+
+Create an include directory inside the opengl-game folder
+
+Download GLM and copy the glm folder into your include directory
+
+Download the 64bit pre-compiledbinaries of GLFW3
+ - Copy lib-vc2019/glfw3.lib into your lib directory
+ - Copy the whole include/GLFW directory into your include directory
+
+Download the SDL2 pre-built Windows binaries
+ - Copy the SDL2 include folder into /include and rename it SDL2
+ - Copy the contents of lib/x64 to lib
+
+Download the SDL2_image Visual C++ development libraries from https://www.libsdl.org/projects/SDL_image/
+Download the SDL2_ttf Visual C++ development libraries from https://www.libsdl.org/projects/SDL_ttf/
+(Might use SDL2_gfx later as well)
+
+Copy the 64-bit static libraries to the lib directory you created above
+
+TODO: Figure out how to do static compilation with SDL2
+
+Since I'm currently using dynamic SDL2 libraries for Windows, some DLLs from sdl2-ttf and sdl2-image
+
+Download the vulkan sdk
+ - Add the location of the Include folder to the VS2019 project properties under C/C++ -> General -> Addition Include DIrectories
+ - Add the location of the Lib folder to the VS2019 project properties under Linker -> General -> Addition Library DIrectories
+
+Linux:
+--------
+
+Download the vulkan sdk (make sure VULKAN_SDK_PATH in the makefile points to it)
+
+sudo apt-get install libxcb1-dev xorg-dev libglm-dev libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev
+
+source setup-env.sh into your current shell
+
+mActually, I think now this should work, after following the online instructions for installing Vulkan:
+sudo apt-get install vulkan-sdk libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libglm-dev
+(Follow the instructions at https://vulkan.lunarg.com/sdk/home#linux to add the latest Vulkan SDK version to apt-get)
+(Verify that installing libvulkan-1 is not required)
+
+make vulkangame && ./vulkangame
+
+For the sfml version: (these directions need verification)
+
+sudo apt-get install libglm-dev libsfml-dev
+
+Currently, the apt-get sfml package doesn't have Vulkan support, so need to install from source as follows:
+
+Build the library yourself by following the instructions at https://www.sfml-dev.org/tutorials/2.5/compile-with-cmake.php
+
+sudo apt-get install libfreetype-dev libx11-dev libxrandr-dev libudev-dev libopengl-dev libflac-dev libogg-dev libvorbis-dev libopenal-dev libpthread-stubs0-dev
+
+sudo apt-get install cmake-qt-gui
+
+Clone the sfml repo
+
+OSX
+--------
+
+brew install cmake pkg-config glm sdl2 sdl2_image sdl2_ttf sdl2_gfx
+(cmake is needed for the python script mentioned below)
+
+Download the Vulkan SDK from https://vulkan.lunarg.com/sdk/home
+
+Install it by running this from inside the downloaded folder:
+sudo ./install_vulkan.py
+
+make shaders
+make vulkangame
+./vulkangame
+
+
+INSTRUCTIONS FOR THE SFML VERSION ()
+
+OLD INSTALL INSTRUCTIONS FOR THE OpenGL version (might no longer work)
+-----------------------------------------------------------------------
+
 Installation Instructions for Linux
 ---------------------------------------
@@ -47,75 +141,4 @@
 
 
---------------------
-VULKAN INSTRUCTIOS
---------------------
-
-Windows
---------
-
-Create an include directory inside the opengl-game folder
-
-Download GLM and copy the glm folder into your include directory
-
-Download the 64bit pre-compiledbinaries of GLFW3
- - Copy lib-vc2019/glfw3.lib into your lib directory
- - Copy the whole include/GLFW directory into your include directory
-
-Download the SDL2 pre-built Windows binaries
- - Copy the SDL2 include folder into /include and rename it SDL2
- - Copy the contents of lib/x64 to lib
-
-Download the SDL2_image Visual C++ development libraries from https://www.libsdl.org/projects/SDL_image/
-Download the SDL2_ttf Visual C++ development libraries from https://www.libsdl.org/projects/SDL_ttf/
-(Might use SDL2_gfx later as well)
-
-Copy the 64-bit static libraries to the lib directory you created above
-
-TODO: Figure out how to do static compilation with SDL2
-
-Since I'm currently using dynamic SDL2 libraries for Windows, some DLLs from sdl2-ttf and sdl2-image
-
-Download the vulkan sdk
- - Add the location of the Include folder to the VS2019 project properties under C/C++ -> General -> Addition Include DIrectories
- - Add the location of the Lib folder to the VS2019 project properties under Linker -> General -> Addition Library DIrectories
-
-Linux:
---------
-
-Download the vulkan sdk (make sure VULKAN_SDK_PATH in the makefile points to it)
-
-sudo apt-get install libxcb1-dev xorg-dev libglm-dev libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev
-
-source setup-env.sh into your current shell
-
-Actually, I think now this should work, after following the online instructions for installing Vulkan:
-sudo apt-get install vulkan-sdk libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libglm-dev
-(Follow the instructions at https://vulkan.lunarg.com/sdk/home#linux to add the latest Vulkan SDK version to apt-get)
-(Verify that installing libvulkan-1 is not required)
-
-make vulkangame && ./vulkangame
-
-For the sfml version: (these directions need verification)
-
-sudo apt-get install libglm-dev libsfml-dev
-
-Currently, the apt-get package doesn't have Vulkan support, so need to install from source as follows:
-
-Build the library yourself by following the instructions at https://www.sfml-dev.org/tutorials/2.5/compile-with-cmake.php
-
-sudo apt-get install libfreetype-dev libx11-dev libxrandr-dev libudev-dev libopengl-dev libflac-dev libogg-dev libvorbis-dev libopenal-dev libpthread-stubs0-dev
-
-sudo apt-get install cmake-qt-gui
-
-Clone the sfml repo
-
-OSX
---------
-
-Download the vulkan sdk (make sure VULKAN_SDK_PATH in the makefile points to it)
-
-brew install sdl2 sdl2_image sdl2_ttf sdl2_gfx
-
-make vulkangame && ./vulkangame
 
 REFERENCE
Index: game-gui-sdl.hpp
===================================================================
--- game-gui-sdl.hpp	(revision b8072d392d78f98f83ee7c10e3f50a901a29dff2)
+++ game-gui-sdl.hpp	(revision 756162f65401bd12de652b25a35ce6e01efb144a)
@@ -35,6 +35,8 @@
 #endif
 
+      SDL_Window* window;
+
    private:
-      SDL_Window* window;
+      // SDL_Window* window;
       int windowWidth, windowHeight;
       const Uint8* keyState;
Index: makefile
===================================================================
--- makefile	(revision b8072d392d78f98f83ee7c10e3f50a901a29dff2)
+++ makefile	(revision 756162f65401bd12de652b25a35ce6e01efb144a)
@@ -30,22 +30,7 @@
 	$(CC) $^ $(DEP) $(CXX_FLAGS) -o $@ -DGLEW_STATIC
 
-ifeq ($(OS),Darwin)
-	VULKAN_SDK_PATH = /Users/dportnoy15/Development/vulkan-sdk-macos-1.1.108.0/macOS
-endif
-ifeq ($(OS),Linux)
-	VULKAN_SDK_PATH = /home/dportnoy/Desktop/VulkanSDK/1.1.106.0/x86_64
-endif
-
-LIB_PATHS =  -I$(VULKAN_SDK_PATH)/include
-ifeq ($(OS),Darwin)
-	LIB_PATHS := -Wl,-rpath,$(VULKAN_SDK_PATH)/lib $(LIB_PATHS)
-endif
-ifeq ($(OS),Linux)
-	LIB_PATHS =
-endif
-
 LIBS = `pkg-config --static --libs sdl2 sdl2_image sdl2_ttf`
 ifeq ($(OS),Darwin)
-	LIBS := $(VULKAN_SDK_PATH)/lib/libvulkan.dylib $(LIBS)
+	LIBS := -lvulkan $(LIBS)
 endif
 ifeq ($(OS),Linux)
@@ -89,5 +74,5 @@
 .PHONY: shaders
 shaders:
-	cd shaders && ../compile.sh && cd ..
+	./compile.sh
 
 clean:
Index: vulkan-game.cpp
===================================================================
--- vulkan-game.cpp	(revision b8072d392d78f98f83ee7c10e3f50a901a29dff2)
+++ vulkan-game.cpp	(revision 756162f65401bd12de652b25a35ce6e01efb144a)
@@ -853,5 +853,15 @@
       ImGui::NewFrame();
 
-      (this->*currentRenderScreenFn)(gui->getWindowWidth(), gui->getWindowHeight());
+      int w, h;
+      SDL_GetWindowSize(((GameGui_SDL*)gui)->window, &w, &h);
+
+      // Probably a retina display
+      // TODO: Find a better fix for this. Maybe I should use SDL_Vulkan_GetWindowSize here instead
+      // of SDL_Vulkan_GetDrawableSize
+      if (w < gui->getWindowWidth() && h < gui->getWindowHeight()) {
+         (this->*currentRenderScreenFn)(w, h);
+      } else {
+         (this->*currentRenderScreenFn)(gui->getWindowWidth(), gui->getWindowHeight());
+      }
 
       ImGui::Render();