Basic ImGui implementation

.gitignore

@@ -1,6 +1,7 @@
 .vscode/
 *.so
 *.o
+*.d
 obj/
 src/Features/Experimental/
 docs/images/drawings/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "external/imgui"]
+	path = lib/imgui
+	url = https://github.com/ocornut/imgui

Makefile

@@ -5,16 +5,24 @@ CXX=g++-10
 SDIR=src
 ODIR=obj
 
-SRCS=$(shell find $(SDIR) -name '*.cpp')
-OBJS=$(patsubst $(SDIR)/%.cpp, $(ODIR)/%.o, $(SRCS))
+IMGUI_SRCS=\
+	lib/imgui/imgui.cpp \
+	lib/imgui/imgui_draw.cpp \
+	lib/imgui/imgui_tables.cpp \
+	lib/imgui/imgui_widgets.cpp
+
+SRCS=$(shell find $(SDIR) -name '*.cpp') $(IMGUI_SRCS)
+OBJS=$(SRCS:.cpp=.o)
+# OBJS=$(patsubst $(SDIR)/%.cpp, $(ODIR)/%.o, $(SRCS))
 
 VERSION=$(shell git describe --tags)
 
 # Header dependency target files; generated by g++ with -MMD
-DEPS=$(OBJS:%.o=%.d)
+# DEPS=$(OBJS:%.o=%.d)
+DEPS=$(OBJS:.o=.d)
 
 WARNINGS=-Wall -Wno-parentheses -Wno-unknown-pragmas -Wno-delete-non-virtual-dtor -Wno-overloaded-virtual
-CXXFLAGS=-std=c++17 -m32 $(WARNINGS) -I$(SDIR) -fPIC -D_GNU_SOURCE -Ilib/ffmpeg/include -Ilib/SFML/include -Ilib/curl/include -Ilib/discord-rpc/include -DSFML_STATIC -DCURL_STATICLIB
+CXXFLAGS=-std=c++17 -m32 $(WARNINGS) -I$(SDIR) -Ilib/imgui -fPIC -D_GNU_SOURCE -Ilib/ffmpeg/include -Ilib/SFML/include -Ilib/curl/include -Ilib/discord-rpc/include -DSFML_STATIC -DCURL_STATICLIB
 LDFLAGS=-m32 -shared -lstdc++fs -Llib/ffmpeg/lib/linux -lavformat -lavcodec -lavutil -lswscale -lswresample -lx264 -lx265 -lvorbis -lvorbisenc -lvorbisfile -logg -lopus -lvpx -Llib/SFML/lib/linux -lsfml -Llib/curl/lib/linux -lcurl -lssl -lcrypto -lnghttp2 -Llib/discord-rpc/lib/linux -ldiscord-rpc
 
 # Import config.mk, which can be used for optional config
@@ -29,7 +37,7 @@ clean:
 sar.so: src/Version.hpp $(OBJS)
 	$(CXX) $^ $(LDFLAGS) -o $@
 
-$(ODIR)/%.o: $(SDIR)/%.cpp
+%.o: %.cpp
 	@mkdir -p $(dir $@)
 	$(CXX) $(CXXFLAGS) -MMD -c $< -o $@
 

src/Features/Camera.cpp

@@ -95,7 +95,8 @@ float Camera::GetCurrentPathTime() {
 //if in drive mode, checks if player wants to control the camera
 //for now it requires LMB input (as in demo drive mode)
 bool Camera::IsDriving() {
-	if (!engine->IsGameFocused() || vgui->IsUIVisible()) {
+  // console->Print("IsGameFocused %d, IsUIVisible %d\n", engine->IsGameFocused(), vgui->IsUIVisible());
+	if (!engine->IsGameFocused() ) {// || vgui->IsUIVisible()) {
 		return false;
 	}
 
@@ -104,6 +105,7 @@ bool Camera::IsDriving() {
 	}
 
 	bool userWantsToDrive = sar_cam_drive.GetInt() == 2 || inputSystem->IsKeyDown(ButtonCode_t::MOUSE_LEFT);
+  // console->Print("sar_cam_drive %d, isMouseLeftDown %d\n", sar_cam_drive.GetInt(), inputSystem->IsKeyDown(MOUSE_LEFT));
 	if (!userWantsToDrive) {
 		return false;
 	}

src/Features/Hud/Hud.cpp

@@ -16,6 +16,8 @@
 #include "InputHud.hpp"
 #include "VphysHud.hpp"
 
+#include "Imgui/Hud/ImguiHuds.hpp"
+
 #include <algorithm>
 #include <cstdio>
 #include <map>
@@ -110,6 +112,14 @@ bool BaseHud::ShouldDraw() {
 		return false;
 	}
 
+	for (auto& h : g_imguiHuds) {
+		if (strcmp(h->GetHandle(), "showpos") == 0) {
+			if (h->Enabled() && h->ShouldDraw()) {
+				return false;
+			}
+		}
+	}
+
 	if (engine->demoplayer->IsPlaying() || engine->IsOrange()) {
 		return this->type & HudType_InGame;
 	}
@@ -222,7 +232,11 @@ void HudContext::Reset(int slot) {
 	this->elements = 0;
 	this->group.fill(0);
 	this->xPadding = sar_hud_x.GetInt();
-	this->yPadding = sar_hud_y.GetInt();
+  if (sar_hud_y.GetInt() < 28) {
+    this->yPadding = (g_drawImgui ? 28 : sar_hud_y.GetInt());
+  } else {
+    this->yPadding = sar_hud_y.GetInt();
+  }
 	this->spacing = sar_hud_spacing.GetInt();
 	this->maxWidth = 0;
 

src/Features/Hud/Hud.hpp

@@ -176,6 +176,13 @@ extern bool g_hudPrecisionWarn;
 
 DECL_DECLARE_AUTOCOMPLETION_FUNCTION(HudSetPos);
 
+extern Variable sar_hud_precision;
+extern Variable sar_hud_velocity_precision;
+
+extern Variable sar_hud_position;
+extern Variable sar_hud_angles;
+extern Variable sar_hud_velocity;
+
 #define CON_COMMAND_HUD_SETPOS(name, helpname) \
     CON_COMMAND_F_COMPLETION( \
         name##_setpos,                                                                                                            \