Changeset 40995d3 in opengl-game for game-gui.hpp


Ignore:
Timestamp:
Oct 1, 2019, 3:14:06 AM (5 years ago)
Author:
Dmitry Portnoy <dmp1488@…>
Branches:
feature/imgui-sdl, master, points-test
Children:
4d84c72
Parents:
7563b8a (diff), a0da009 (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.
Message:

Merge branch 'master' of medievaltech.com:opengl-game

File:
1 edited

Legend:

Unmodified
Added
Removed

  • game-gui.hpp

    r7563b8a r40995d3  
    44#include <string>
    55#include <vector>
    6 
    7 // TODO: Remove the line below once the couts in the game-gui-* files are moved
    8 #include <iostream>
    96
    107#ifdef GAMEGUI_INCLUDE_VULKAN
    … …  
    2118   UI_EVENT_MOUSEBUTTONDOWN,
    2219   UI_EVENT_MOUSEBUTTONUP,
    23    UI_EVENT_MOUSEMOTION
     20   UI_EVENT_MOUSEMOTION,
     21   UI_EVENT_UNKNOWN
    2422};
    2523
    … …  
    3533struct MouseEvent {
    3634   EventType type;
     35   /*
     36      int button;
     37      int action;
     38      int x;
     39      int y;
     40   */
     41};
     42
     43struct UnknownEvent {
     44   EventType type;
     45   unsigned int eventType;
    3746};
    3847
    … …  
    4251   KeyEvent key;
    4352   MouseEvent mouse;
     53   UnknownEvent unknown;
    4454};
    45 
    46 /*
    47 struct MouseEvent {
    48    int button;
    49    int action;
    50    int x;
    51    int y;
    52 };
    53 */
    5455
    5556class GameGui {
Note: See TracChangeset for help on using the changeset viewer.