Changeset b8d4456 in opengl-game

Timestamp:

Jun 8, 2020, 6:49:39 PM (4 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master

Children:

4e705d6

Parents:

4a9416a

Message:

Add x and y coordinates to mouse events

Files:

• consts.hpp (modified) (1 diff)
• docs/README.txt (modified) (1 diff)
• docs/TODO.txt (modified) (1 diff)
• game-gui-sdl.cpp (modified) (2 diffs)
• game-gui-sdl.hpp (modified) (1 diff)
• game-gui.hpp (modified) (1 diff)
• vulkan-utils.hpp (modified) (1 diff)

consts.hpp

@@ -4 +4 @@
 #define GAME_VERSION "0.01.000"
 
+// TODO: Rename these using some other prefix
 #define RTWO_SUCCESS true
 #define RTWO_ERROR false

docs/README.txt

@@ -96 +96 @@
 Download the vulkan sdk (make sure VULKAN_SDK_PATH in the makefile points to it)
 
-brew install sdl2 sdl2_image sdl2_ttf
+brew install sdl2 sdl2_image sdl2_ttf sdl2_gfx
 
 make vulkangame && ./vulkangame

docs/TODO.txt

@@ -2 +2 @@
 ==========
 - Switch the game to use SDL and Vulkan (based on the test program I already made)
-  - Will require switching the UI from IMGUI to Vulkan
+  - Will require switching the UI from IMGUI to SDL
 - Make window resizing and fullscreen mode work correctly
 

game-gui-sdl.cpp

@@ -27 +27 @@
 
    if (SDL_Init(SDL_INIT_EVERYTHING) < 0) {
-      return RTWO_ERROR;
-   }
-
-   int imgFlags = IMG_INIT_PNG;
-   if (!(IMG_Init(imgFlags) & imgFlags)) {
       return RTWO_ERROR;
    }
@@ -123 +118 @@
             break;
          case SDL_MOUSEMOTION:
+            event->mouse.x = e.motion.x;
+            event->mouse.y = e.motion.y;
          case SDL_FINGERMOTION:
             event->type = UI_EVENT_MOUSEMOTION;

game-gui-sdl.hpp

@@ -5 +5 @@
 
 #include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
 #include <SDL2/SDL_ttf.h>
 

game-gui.hpp

@@ -35 +35 @@
 struct MouseEvent {
    EventType type;
+   int x;
+   int y;
    /*
       int button;
       int action;
-      int x;
-      int y;
    */
 };

vulkan-utils.hpp

@@ -9 +9 @@
 
 #include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
 #include <SDL2/SDL_vulkan.h>