mirror of
https://github.com/Relintai/sfw.git
synced 2024-12-20 21:06:49 +01:00
Removed imgui demos.
This commit is contained in:
parent
90bea9ffa1
commit
f8f2e6668e
@ -102,7 +102,6 @@ ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_impl_glfw.cpp -o
|
|||||||
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_impl_opengl3.cpp -o sfw/render_gui/imgui_impl_opengl3.o
|
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_impl_opengl3.cpp -o sfw/render_gui/imgui_impl_opengl3.o
|
||||||
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_tables.cpp -o sfw/render_gui/imgui_tables.o
|
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_tables.cpp -o sfw/render_gui/imgui_tables.o
|
||||||
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_widgets.cpp -o sfw/render_gui/imgui_widgets.o
|
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_widgets.cpp -o sfw/render_gui/imgui_widgets.o
|
||||||
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_demo.cpp -o sfw/render_gui/imgui_demo.o
|
|
||||||
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/gui.cpp -o sfw/render_gui/gui.o
|
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/gui.cpp -o sfw/render_gui/gui.o
|
||||||
|
|
||||||
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/game_scene.cpp -o sfw/game_scene.o
|
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/game_scene.cpp -o sfw/game_scene.o
|
||||||
@ -151,7 +150,6 @@ ccache g++ -Wall -D_REENTRANT -g sfw/core/aabb.o sfw/core/basis.o sfw/core/color
|
|||||||
sfw/render_gui/imgui_impl_opengl3.o \
|
sfw/render_gui/imgui_impl_opengl3.o \
|
||||||
sfw/render_gui/imgui_tables.o \
|
sfw/render_gui/imgui_tables.o \
|
||||||
sfw/render_gui/imgui_widgets.o \
|
sfw/render_gui/imgui_widgets.o \
|
||||||
sfw/render_gui/imgui_demo.o \
|
|
||||||
sfw/render_gui/gui.o \
|
sfw/render_gui/gui.o \
|
||||||
sfw/game_scene.o sfw/main.o \
|
sfw/game_scene.o sfw/main.o \
|
||||||
-lX11 \
|
-lX11 \
|
||||||
|
@ -115,7 +115,6 @@ clang++ $args -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_impl_glfw.cpp -o sfw
|
|||||||
clang++ $args -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_impl_opengl3.cpp -o sfw/render_gui/imgui_impl_opengl3.o
|
clang++ $args -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_impl_opengl3.cpp -o sfw/render_gui/imgui_impl_opengl3.o
|
||||||
clang++ $args -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_tables.cpp -o sfw/render_gui/imgui_tables.o
|
clang++ $args -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_tables.cpp -o sfw/render_gui/imgui_tables.o
|
||||||
clang++ $args -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_widgets.cpp -o sfw/render_gui/imgui_widgets.o
|
clang++ $args -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_widgets.cpp -o sfw/render_gui/imgui_widgets.o
|
||||||
clang++ $args -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_demo.cpp -o sfw/render_gui/imgui_demo.o
|
|
||||||
clang++ $args -D_REENTRANT -g -Isfw -c sfw/render_gui/gui.cpp -o sfw/render_gui/gui.o
|
clang++ $args -D_REENTRANT -g -Isfw -c sfw/render_gui/gui.cpp -o sfw/render_gui/gui.o
|
||||||
|
|
||||||
clang++ $args -D_REENTRANT -g -Isfw -c sfw/game_scene.cpp -o sfw/game_scene.o
|
clang++ $args -D_REENTRANT -g -Isfw -c sfw/game_scene.cpp -o sfw/game_scene.o
|
||||||
@ -165,7 +164,6 @@ clang++ $args -D_REENTRANT -g sfw/core/aabb.o sfw/core/basis.o sfw/core/color.o
|
|||||||
sfw/render_gui/imgui_impl_opengl3.o \
|
sfw/render_gui/imgui_impl_opengl3.o \
|
||||||
sfw/render_gui/imgui_tables.o \
|
sfw/render_gui/imgui_tables.o \
|
||||||
sfw/render_gui/imgui_widgets.o \
|
sfw/render_gui/imgui_widgets.o \
|
||||||
sfw/render_gui/imgui_demo.o \
|
|
||||||
sfw/render_gui/gui.o \
|
sfw/render_gui/gui.o \
|
||||||
sfw/game_scene.o sfw/main.o \
|
sfw/game_scene.o sfw/main.o \
|
||||||
-o game
|
-o game
|
||||||
|
@ -111,7 +111,6 @@ cl /D_REENTRANT /EHsc /Zi /Isfw /c sfw/render_gui/imgui_impl_glfw.cpp /Fo:sfw/re
|
|||||||
cl /D_REENTRANT /EHsc /Zi /Isfw /c sfw/render_gui/imgui_impl_opengl3.cpp /Fo:sfw/render_gui/imgui_impl_opengl3.obj
|
cl /D_REENTRANT /EHsc /Zi /Isfw /c sfw/render_gui/imgui_impl_opengl3.cpp /Fo:sfw/render_gui/imgui_impl_opengl3.obj
|
||||||
cl /D_REENTRANT /EHsc /Zi /Isfw /c sfw/render_gui/imgui_tables.cpp /Fo:sfw/render_gui/imgui_tables.obj
|
cl /D_REENTRANT /EHsc /Zi /Isfw /c sfw/render_gui/imgui_tables.cpp /Fo:sfw/render_gui/imgui_tables.obj
|
||||||
cl /D_REENTRANT /EHsc /Zi /Isfw /c sfw/render_gui/imgui_widgets.cpp /Fo:sfw/render_gui/imgui_widgets.obj
|
cl /D_REENTRANT /EHsc /Zi /Isfw /c sfw/render_gui/imgui_widgets.cpp /Fo:sfw/render_gui/imgui_widgets.obj
|
||||||
cl /D_REENTRANT /EHsc /Zi /Isfw /c sfw/render_gui/imgui_demo.cpp /Fo:sfw/render_gui/imgui_demo.obj
|
|
||||||
cl /D_REENTRANT /EHsc /Zi /Isfw /c sfw/render_gui/gui.cpp /Fo:sfw/render_gui/gui.obj
|
cl /D_REENTRANT /EHsc /Zi /Isfw /c sfw/render_gui/gui.cpp /Fo:sfw/render_gui/gui.obj
|
||||||
|
|
||||||
cl /D_REENTRANT /EHsc /Zi /Isfw /c sfw/game_scene.cpp /Fo:sfw/game_scene.obj
|
cl /D_REENTRANT /EHsc /Zi /Isfw /c sfw/game_scene.cpp /Fo:sfw/game_scene.obj
|
||||||
@ -162,7 +161,6 @@ cl /D_REENTRANT /Zi ^
|
|||||||
sfw/render_gui/imgui_impl_opengl3.obj ^
|
sfw/render_gui/imgui_impl_opengl3.obj ^
|
||||||
sfw/render_gui/imgui_tables.obj ^
|
sfw/render_gui/imgui_tables.obj ^
|
||||||
sfw/render_gui/imgui_widgets.obj ^
|
sfw/render_gui/imgui_widgets.obj ^
|
||||||
sfw/render_gui/imgui_demo.obj ^
|
|
||||||
sfw/render_gui/gui.obj ^
|
sfw/render_gui/gui.obj ^
|
||||||
sfw/game_scene.obj sfw/main.obj ^
|
sfw/game_scene.obj sfw/main.obj ^
|
||||||
/SUBSYSTEM:CONSOLE
|
/SUBSYSTEM:CONSOLE
|
||||||
|
@ -102,7 +102,6 @@ ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_impl_glfw.cpp -o
|
|||||||
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_impl_opengl3.cpp -o sfw/render_gui/imgui_impl_opengl3.o
|
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_impl_opengl3.cpp -o sfw/render_gui/imgui_impl_opengl3.o
|
||||||
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_tables.cpp -o sfw/render_gui/imgui_tables.o
|
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_tables.cpp -o sfw/render_gui/imgui_tables.o
|
||||||
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_widgets.cpp -o sfw/render_gui/imgui_widgets.o
|
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_widgets.cpp -o sfw/render_gui/imgui_widgets.o
|
||||||
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/imgui_demo.cpp -o sfw/render_gui/imgui_demo.o
|
|
||||||
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/gui.cpp -o sfw/render_gui/gui.o
|
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_gui/gui.cpp -o sfw/render_gui/gui.o
|
||||||
|
|
||||||
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/game_scene.cpp -o sfw/game_scene.o
|
ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/game_scene.cpp -o sfw/game_scene.o
|
||||||
@ -152,7 +151,6 @@ ccache g++ -Wall \
|
|||||||
sfw/render_gui/imgui_impl_opengl3.o \
|
sfw/render_gui/imgui_impl_opengl3.o \
|
||||||
sfw/render_gui/imgui_tables.o \
|
sfw/render_gui/imgui_tables.o \
|
||||||
sfw/render_gui/imgui_widgets.o \
|
sfw/render_gui/imgui_widgets.o \
|
||||||
sfw/render_gui/imgui_demo.o \
|
|
||||||
sfw/render_gui/gui.o \
|
sfw/render_gui/gui.o \
|
||||||
sfw/game_scene.o sfw/main.o \
|
sfw/game_scene.o sfw/main.o \
|
||||||
-lgdi32 -lShlwapi -lws2_32 \
|
-lgdi32 -lShlwapi -lws2_32 \
|
||||||
|
@ -431,15 +431,9 @@ void GameScene::render_gui_manual(bool clear_screen) {
|
|||||||
(void)io;
|
(void)io;
|
||||||
|
|
||||||
// Our state
|
// Our state
|
||||||
static bool show_demo_window = true;
|
|
||||||
static bool show_another_window = false;
|
static bool show_another_window = false;
|
||||||
static ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
|
static ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
|
||||||
|
|
||||||
// 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
|
|
||||||
if (show_demo_window) {
|
|
||||||
ImGui::ShowDemoWindow(&show_demo_window);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. Show a simple window that we create ourselves. We use a Begin/End pair to create a named window.
|
// 2. Show a simple window that we create ourselves. We use a Begin/End pair to create a named window.
|
||||||
{
|
{
|
||||||
static float f = 0.0f;
|
static float f = 0.0f;
|
||||||
@ -448,7 +442,6 @@ void GameScene::render_gui_manual(bool clear_screen) {
|
|||||||
ImGui::Begin("Hello, world! This is an another demo!"); // Create a window called "Hello, world!" and append into it.
|
ImGui::Begin("Hello, world! This is an another demo!"); // Create a window called "Hello, world!" and append into it.
|
||||||
|
|
||||||
ImGui::Text("This is some useful text."); // Display some text (you can use a format strings too)
|
ImGui::Text("This is some useful text."); // Display some text (you can use a format strings too)
|
||||||
ImGui::Checkbox("Demo Window", &show_demo_window); // Edit bools storing our window open/close state
|
|
||||||
ImGui::Checkbox("Another Window", &show_another_window);
|
ImGui::Checkbox("Another Window", &show_another_window);
|
||||||
|
|
||||||
ImGui::SliderFloat("float", &f, 0.0f, 1.0f); // Edit 1 float using a slider from 0.0f to 1.0f
|
ImGui::SliderFloat("float", &f, 0.0f, 1.0f); // Edit 1 float using a slider from 0.0f to 1.0f
|
||||||
|
@ -445,15 +445,9 @@ void GameScene::render_gui_manual(bool clear_screen) {
|
|||||||
(void)io;
|
(void)io;
|
||||||
|
|
||||||
// Our state
|
// Our state
|
||||||
static bool show_demo_window = true;
|
|
||||||
static bool show_another_window = false;
|
static bool show_another_window = false;
|
||||||
static ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
|
static ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
|
||||||
|
|
||||||
// 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
|
|
||||||
if (show_demo_window) {
|
|
||||||
ImGui::ShowDemoWindow(&show_demo_window);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. Show a simple window that we create ourselves. We use a Begin/End pair to create a named window.
|
// 2. Show a simple window that we create ourselves. We use a Begin/End pair to create a named window.
|
||||||
{
|
{
|
||||||
static float f = 0.0f;
|
static float f = 0.0f;
|
||||||
@ -462,7 +456,6 @@ void GameScene::render_gui_manual(bool clear_screen) {
|
|||||||
ImGui::Begin("Hello, world! This is an another demo!"); // Create a window called "Hello, world!" and append into it.
|
ImGui::Begin("Hello, world! This is an another demo!"); // Create a window called "Hello, world!" and append into it.
|
||||||
|
|
||||||
ImGui::Text("This is some useful text."); // Display some text (you can use a format strings too)
|
ImGui::Text("This is some useful text."); // Display some text (you can use a format strings too)
|
||||||
ImGui::Checkbox("Demo Window", &show_demo_window); // Edit bools storing our window open/close state
|
|
||||||
ImGui::Checkbox("Another Window", &show_another_window);
|
ImGui::Checkbox("Another Window", &show_another_window);
|
||||||
|
|
||||||
ImGui::SliderFloat("float", &f, 0.0f, 1.0f); // Edit 1 float using a slider from 0.0f to 1.0f
|
ImGui::SliderFloat("float", &f, 0.0f, 1.0f); // Edit 1 float using a slider from 0.0f to 1.0f
|
||||||
|
@ -20,15 +20,9 @@ void GUI::test() {
|
|||||||
(void)io;
|
(void)io;
|
||||||
|
|
||||||
// Our state
|
// Our state
|
||||||
static bool show_demo_window = true;
|
|
||||||
static bool show_another_window = false;
|
static bool show_another_window = false;
|
||||||
static ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
|
static ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
|
||||||
|
|
||||||
// 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
|
|
||||||
if (show_demo_window) {
|
|
||||||
ImGui::ShowDemoWindow(&show_demo_window);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. Show a simple window that we create ourselves. We use a Begin/End pair to create a named window.
|
// 2. Show a simple window that we create ourselves. We use a Begin/End pair to create a named window.
|
||||||
{
|
{
|
||||||
static float f = 0.0f;
|
static float f = 0.0f;
|
||||||
@ -37,7 +31,6 @@ void GUI::test() {
|
|||||||
ImGui::Begin("Hello, world!"); // Create a window called "Hello, world!" and append into it.
|
ImGui::Begin("Hello, world!"); // Create a window called "Hello, world!" and append into it.
|
||||||
|
|
||||||
ImGui::Text("This is some useful text."); // Display some text (you can use a format strings too)
|
ImGui::Text("This is some useful text."); // Display some text (you can use a format strings too)
|
||||||
ImGui::Checkbox("Demo Window", &show_demo_window); // Edit bools storing our window open/close state
|
|
||||||
ImGui::Checkbox("Another Window", &show_another_window);
|
ImGui::Checkbox("Another Window", &show_another_window);
|
||||||
|
|
||||||
ImGui::SliderFloat("float", &f, 0.0f, 1.0f); // Edit 1 float using a slider from 0.0f to 1.0f
|
ImGui::SliderFloat("float", &f, 0.0f, 1.0f); // Edit 1 float using a slider from 0.0f to 1.0f
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1043,21 +1043,6 @@ static void stb_textedit_replace(ImGuiInputTextState* str, STB_TexteditState* st
|
|||||||
//--STRIP
|
//--STRIP
|
||||||
{{FILE:sfw/render_gui/imgui_impl_opengl3.h}}
|
{{FILE:sfw/render_gui/imgui_impl_opengl3.h}}
|
||||||
|
|
||||||
|
|
||||||
//--STRIP
|
|
||||||
//#include "imgui.h"
|
|
||||||
// System includes
|
|
||||||
//#include <ctype.h> // toupper
|
|
||||||
//#include <limits.h> // INT_MIN, INT_MAX
|
|
||||||
//#include <math.h> // sqrtf, powf, cosf, sinf, floorf, ceilf
|
|
||||||
//#include <stdio.h> // vsnprintf, sscanf, printf
|
|
||||||
//#include <stdlib.h> // NULL, malloc, free, atoi
|
|
||||||
//#include <stdint.h> // intptr_t
|
|
||||||
//#include <inttypes.h> // PRId64/PRIu64, not avail in some MinGW headers.
|
|
||||||
//#include <emscripten/version.h> // __EMSCRIPTEN_major__ etc.
|
|
||||||
//--STRIP
|
|
||||||
{{FILE:sfw/render_gui/imgui_demo.cpp}}
|
|
||||||
|
|
||||||
//--STRIP
|
//--STRIP
|
||||||
//#include "imgui.h"
|
//#include "imgui.h"
|
||||||
//#ifndef IMGUI_DISABLE
|
//#ifndef IMGUI_DISABLE
|
||||||
|
@ -971,21 +971,6 @@ static void stb_textedit_replace(ImGuiInputTextState* str, STB_TexteditState* st
|
|||||||
//--STRIP
|
//--STRIP
|
||||||
{{FILE:sfw/render_gui/imgui_impl_opengl3.h}}
|
{{FILE:sfw/render_gui/imgui_impl_opengl3.h}}
|
||||||
|
|
||||||
|
|
||||||
//--STRIP
|
|
||||||
//#include "imgui.h"
|
|
||||||
// System includes
|
|
||||||
//#include <ctype.h> // toupper
|
|
||||||
//#include <limits.h> // INT_MIN, INT_MAX
|
|
||||||
//#include <math.h> // sqrtf, powf, cosf, sinf, floorf, ceilf
|
|
||||||
//#include <stdio.h> // vsnprintf, sscanf, printf
|
|
||||||
//#include <stdlib.h> // NULL, malloc, free, atoi
|
|
||||||
//#include <stdint.h> // intptr_t
|
|
||||||
//#include <inttypes.h> // PRId64/PRIu64, not avail in some MinGW headers.
|
|
||||||
//#include <emscripten/version.h> // __EMSCRIPTEN_major__ etc.
|
|
||||||
//--STRIP
|
|
||||||
{{FILE:sfw/render_gui/imgui_demo.cpp}}
|
|
||||||
|
|
||||||
//--STRIP
|
//--STRIP
|
||||||
//#include "imgui.h"
|
//#include "imgui.h"
|
||||||
//#ifndef IMGUI_DISABLE
|
//#ifndef IMGUI_DISABLE
|
||||||
|
Loading…
Reference in New Issue
Block a user