Changeset aa7707d in opengl-game for gui

Timestamp:

Jul 25, 2020, 8:05:57 PM (4 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master

Children:

681dbe8

Parents:

6bfd91c

Message:

Update the Vulkan SDK version and get the latest code compiling on Windows

Location:

gui

Files:

• button.cpp (modified) (2 diffs)
• panel.cpp (modified) (3 diffs)

gui/button.cpp

@@ -2 +2 @@
 
 #include <SDL2/SDL_ttf.h>
-#include <SDL2/SDL2_gfxPrimitives.h>
+// #include <SDL2/SDL2_gfxPrimitives.h>
 
 #include "../vulkan-game.hpp"
@@ -72 +72 @@
    uint8_t colorA = cur_color & 0xFF;
 
+   /*
    boxRGBA(&this->renderer, this->x + x, this->y + y, this->x + this->width, this->y + this->height,
       colorR, colorG, colorB, colorA);
+   */
 
    SDL_Rect rect = {

gui/panel.cpp

@@ -3 +3 @@
 #include <iostream>
 
-#include <SDL2/SDL2_gfxPrimitives.h>
+// #include <SDL2/SDL2_gfxPrimitives.h>
 
 using namespace std;
@@ -42 +42 @@
    SDL_RenderClear(&this->renderer);
 
+   /*
    roundedBoxRGBA(&this->renderer, 0, 0, this->width, this->height,
       8, 0x33, 0x33, 0x33, 0xFF);
+   */
 
    int borderThickness = 1;
@@ -52 +54 @@
    uint8_t colorA = this->color & 0xFF;
 
+   /*
    roundedBoxRGBA(&this->renderer, borderThickness, borderThickness,
       this->width - borderThickness, this->height - borderThickness,
       8, colorR, colorG, colorB, colorA);
+   */
 
    for (UIElement*& uiElement : this->uiElements) {