Changeset 756162f in opengl-game for game-gui-sdl.hpp

Timestamp:

May 1, 2021, 6:26:44 PM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

9d21aac

Parents:

b8072d3 (diff), cb6fabb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Dmitry Portnoy <dportnoy@…> (05/01/21 18:26:23)

git-committer:

Dmitry Portnoy <dportnoy@…> (05/01/21 18:26:44)

Message:

Merge branch 'feature/imgui-sdl' of medievaltech.com:opengl-game into feature/imgui-sdl

File:

• game-gui-sdl.hpp (modified) (1 diff)

game-gui-sdl.hpp

@@ -35 +35 @@
 #endif
 
+      SDL_Window* window;
+
    private:
-      SDL_Window* window;
+      // SDL_Window* window;
       int windowWidth, windowHeight;
       const Uint8* keyState;