diff --git a/standalone/src/main.cpp b/standalone/src/main.cpp index c697a95b..5cee83c0 100755 --- a/standalone/src/main.cpp +++ b/standalone/src/main.cpp @@ -1,12 +1,11 @@ -// ImGui - standalone example application for Glfw + OpenGL 3, using programmable pipeline -// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp. - - #include #include "imgui_impl_glfw_gl3.h" #include -#include // This example is using gl3w to access OpenGL functions (because it is small). You may use glew/glad/glLoadGen/etc. whatever already works for you. +#include #include +#include + +#include "../../server/TracyView.hpp" static void error_callback(int error, const char* description) { @@ -25,7 +24,7 @@ int main(int, char**) #if __APPLE__ glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); #endif - GLFWwindow* window = glfwCreateWindow(1280, 720, "ImGui OpenGL3 example", NULL, NULL); + GLFWwindow* window = glfwCreateWindow(1650, 960, "Tracy server", NULL, NULL); glfwMakeContextCurrent(window); glfwSwapInterval(1); // Enable vsync gl3wInit(); @@ -43,42 +42,30 @@ int main(int, char**) //io.Fonts->AddFontFromFileTTF("../../extra_fonts/ProggyTiny.ttf", 10.0f); //io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\ArialUni.ttf", 18.0f, NULL, io.Fonts->GetGlyphRangesJapanese()); - bool show_test_window = true; - bool show_another_window = false; ImVec4 clear_color = ImColor(114, 144, 154); + char addr[1024] = { "127.0.0.1" }; + std::unique_ptr view; + // Main loop while (!glfwWindowShouldClose(window)) { glfwPollEvents(); ImGui_ImplGlfwGL3_NewFrame(); - // 1. Show a simple window - // Tip: if we don't call ImGui::Begin()/ImGui::End() the widgets appears in a window automatically called "Debug" + if( !view ) { - static float f = 0.0f; - ImGui::Text("Hello, world!"); - ImGui::SliderFloat("float", &f, 0.0f, 1.0f); - ImGui::ColorEdit3("clear color", (float*)&clear_color); - if (ImGui::Button("Test Window")) show_test_window ^= 1; - if (ImGui::Button("Another Window")) show_another_window ^= 1; - ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate); - } - - // 2. Show another simple window, this time using an explicit Begin/End pair - if (show_another_window) - { - ImGui::SetNextWindowSize(ImVec2(200,100), ImGuiCond_FirstUseEver); - ImGui::Begin("Another Window", &show_another_window); - ImGui::Text("Hello"); + ImGui::Begin( "Connect to..." ); + ImGui::InputText( "Address", addr, 1024 ); + if( ImGui::Button( "Connect" ) && *addr ) + { + view = std::make_unique( addr ); + } ImGui::End(); } - - // 3. Show the ImGui test window. Most of the sample code is in ImGui::ShowTestWindow() - if (show_test_window) + else { - ImGui::SetNextWindowPos(ImVec2(650, 20), ImGuiCond_FirstUseEver); - ImGui::ShowTestWindow(&show_test_window); + view->Draw(); } // Rendering