Browse Source

update imgui to v1.91.9

main
cinnaboot 1 year ago
parent
commit
7b04a8602f
  1. 6
      Makefile
  2. 2
      ext/imgui
  3. 4
      src/gooey.cpp

6
Makefile

@ -35,7 +35,7 @@ TEST_BIN := $(BINDIR)/test_orbit
IMGUI_DIR := ext/imgui IMGUI_DIR := ext/imgui
CXXFLAGS += -I$(IMGUI_DIR) CXXFLAGS += -I$(IMGUI_DIR)
IMGUI_IMPL_DIR := $(IMGUI_DIR)/backends IMGUI_IMPL_DIR := $(IMGUI_DIR)/backends
IMGUI_IMPL_SOURCES := $(IMGUI_IMPL_DIR)/imgui_impl_opengl3.cpp $(IMGUI_IMPL_DIR)/imgui_impl_sdl.cpp IMGUI_IMPL_SOURCES := $(IMGUI_IMPL_DIR)/imgui_impl_opengl3.cpp $(IMGUI_IMPL_DIR)/imgui_impl_sdl2.cpp
IMGUI_SOURCES := $(filter-out $(IMGUI_DIR)/imgui_demo.cpp, $(wildcard $(IMGUI_DIR)/*.cpp)) IMGUI_SOURCES := $(filter-out $(IMGUI_DIR)/imgui_demo.cpp, $(wildcard $(IMGUI_DIR)/*.cpp))
IMGUI_OBJECTS := $(patsubst $(IMGUI_DIR)/%.cpp, $(OBJDIR)/%.o, $(IMGUI_SOURCES)) IMGUI_OBJECTS := $(patsubst $(IMGUI_DIR)/%.cpp, $(OBJDIR)/%.o, $(IMGUI_SOURCES))
IMGUI_IMP_OBJECTS += $(patsubst $(IMGUI_IMPL_DIR)/%.cpp, $(OBJDIR)/%.o, $(IMGUI_IMPL_SOURCES)) IMGUI_IMP_OBJECTS += $(patsubst $(IMGUI_IMPL_DIR)/%.cpp, $(OBJDIR)/%.o, $(IMGUI_IMPL_SOURCES))
@ -45,9 +45,9 @@ OBJECTS := $(patsubst $(SRCDIR)/%.cpp, $(OBJDIR)/%.o, $(SOURCES))
BIN := $(BINDIR)/orbital_shipping BIN := $(BINDIR)/orbital_shipping
all: mkdirs $(BIN) tests tags all: mkdirs $(BIN) tags
@# automatically run tests when (re-)compiling @# automatically run tests when (re-)compiling
@${TEST_BIN} @#${TEST_BIN}
.PHONY: all .PHONY: all
tests: $(TEST_BIN) tests: $(TEST_BIN)

2
ext/imgui

@ -1 +1 @@
Subproject commit c71a50deb5ddf1ea386b91e60fa2e4a26d080074 Subproject commit 97428e8ac99e339ce05eee531cf55b77b29ea709

4
src/gooey.cpp

@ -3,7 +3,7 @@
#include <imgui.h> #include <imgui.h>
#include <backends/imgui_impl_opengl3.h> #include <backends/imgui_impl_opengl3.h>
#include <backends/imgui_impl_sdl.h> #include <backends/imgui_impl_sdl2.h>
using namespace ImGui; using namespace ImGui;
#include "gooey.h" #include "gooey.h"
@ -66,7 +66,7 @@ void
gooDraw(SDL_Window* window, GameState* gs, RenderState* rs) gooDraw(SDL_Window* window, GameState* gs, RenderState* rs)
{ {
ImGui_ImplOpenGL3_NewFrame(); ImGui_ImplOpenGL3_NewFrame();
ImGui_ImplSDL2_NewFrame(window); ImGui_ImplSDL2_NewFrame();
NewFrame(); NewFrame();
int x = 0, y = 0; int x = 0, y = 0;

Loading…
Cancel
Save