From f1860d259721c6f20d346dc6077074a08e1b4f72 Mon Sep 17 00:00:00 2001 From: "Sebastian @ HfG" Date: Tue, 22 Oct 2024 18:36:18 +0200 Subject: [PATCH] windows port experiments --- include/raygui/dark/style_dark.h | 46 ++++++++++++++++---------------- src/datatypes.h | 4 +++ src/main.cpp | 4 --- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/raygui/dark/style_dark.h b/include/raygui/dark/style_dark.h index c3010ee..4047da4 100644 --- a/include/raygui/dark/style_dark.h +++ b/include/raygui/dark/style_dark.h @@ -15,29 +15,29 @@ // Custom style name: Dark static const GuiStyleProp darkStyleProps[DARK_STYLE_PROPS_COUNT] = { - { 0, 0, 0x878787ff }, // DEFAULT_BORDER_COLOR_NORMAL - { 0, 1, 0x2c2c2cff }, // DEFAULT_BASE_COLOR_NORMAL - { 0, 2, 0xc3c3c3ff }, // DEFAULT_TEXT_COLOR_NORMAL - { 0, 3, 0xe1e1e1ff }, // DEFAULT_BORDER_COLOR_FOCUSED - { 0, 4, 0x848484ff }, // DEFAULT_BASE_COLOR_FOCUSED - { 0, 5, 0x181818ff }, // DEFAULT_TEXT_COLOR_FOCUSED - { 0, 6, 0x000000ff }, // DEFAULT_BORDER_COLOR_PRESSED - { 0, 7, 0xefefefff }, // DEFAULT_BASE_COLOR_PRESSED - { 0, 8, 0x202020ff }, // DEFAULT_TEXT_COLOR_PRESSED - { 0, 9, 0x6a6a6aff }, // DEFAULT_BORDER_COLOR_DISABLED - { 0, 10, 0x818181ff }, // DEFAULT_BASE_COLOR_DISABLED - { 0, 11, 0x606060ff }, // DEFAULT_TEXT_COLOR_DISABLED - { 0, 16, 0x00000010 }, // DEFAULT_TEXT_SIZE - { 0, 17, 0x00000000 }, // DEFAULT_TEXT_SPACING - { 0, 18, 0x9d9d9dff }, // DEFAULT_LINE_COLOR - { 0, 19, 0x3c3c3cff }, // DEFAULT_BACKGROUND_COLOR - { 0, 20, 0x00000018 }, // DEFAULT_TEXT_LINE_SPACING - { 1, 5, 0xf7f7f7ff }, // LABEL_TEXT_COLOR_FOCUSED - { 1, 8, 0x898989ff }, // LABEL_TEXT_COLOR_PRESSED - { 4, 5, 0xb0b0b0ff }, // SLIDER_TEXT_COLOR_FOCUSED - { 5, 5, 0x848484ff }, // PROGRESSBAR_TEXT_COLOR_FOCUSED - { 9, 5, 0xf5f5f5ff }, // TEXTBOX_TEXT_COLOR_FOCUSED - { 10, 5, 0xf6f6f6ff }, // VALUEBOX_TEXT_COLOR_FOCUSED + { 0, 0, (long)0x878787ff }, // DEFAULT_BORDER_COLOR_NORMAL + { 0, 1, (long)0x2c2c2cff }, // DEFAULT_BASE_COLOR_NORMAL + { 0, 2, (long)0xc3c3c3ff }, // DEFAULT_TEXT_COLOR_NORMAL + { 0, 3, (long)0xe1e1e1ff }, // DEFAULT_BORDER_COLOR_FOCUSED + { 0, 4, (long)0x848484ff }, // DEFAULT_BASE_COLOR_FOCUSED + { 0, 5, (long)0x181818ff }, // DEFAULT_TEXT_COLOR_FOCUSED + { 0, 6, (long)0x000000ff }, // DEFAULT_BORDER_COLOR_PRESSED + { 0, 7, (long)0xefefefff }, // DEFAULT_BASE_COLOR_PRESSED + { 0, 8, (long)0x202020ff }, // DEFAULT_TEXT_COLOR_PRESSED + { 0, 9, (long)0x6a6a6aff }, // DEFAULT_BORDER_COLOR_DISABLED + { 0, 10, (long)0x818181ff }, // DEFAULT_BASE_COLOR_DISABLED + { 0, 11, (long)0x606060ff }, // DEFAULT_TEXT_COLOR_DISABLED + { 0, 16, (long)0x00000010 }, // DEFAULT_TEXT_SIZE + { 0, 17, (long)0x00000000 }, // DEFAULT_TEXT_SPACING + { 0, 18, (long)0x9d9d9dff }, // DEFAULT_LINE_COLOR + { 0, 19, (long)0x3c3c3cff }, // DEFAULT_BACKGROUND_COLOR + { 0, 20, (long)0x00000018 }, // DEFAULT_TEXT_LINE_SPACING + { 1, 5, (long)0xf7f7f7ff }, // LABEL_TEXT_COLOR_FOCUSED + { 1, 8, (long)0x898989ff }, // LABEL_TEXT_COLOR_PRESSED + { 4, 5, (long)0xb0b0b0ff }, // SLIDER_TEXT_COLOR_FOCUSED + { 5, 5, (long)0x848484ff }, // PROGRESSBAR_TEXT_COLOR_FOCUSED + { 9, 5, (long)0xf5f5f5ff }, // TEXTBOX_TEXT_COLOR_FOCUSED + { 10, 5, (long)0xf6f6f6ff }, // VALUEBOX_TEXT_COLOR_FOCUSED }; // WARNING: This style uses a custom font: "PixelOperator.ttf" (size: 16, spacing: 0) diff --git a/src/datatypes.h b/src/datatypes.h index 455b440..5cf18bc 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -1,5 +1,9 @@ #pragma once +#ifdef _WIN32 +#define _USE_MATH_DEFINES +#endif + #include #include #include "libremidi/libremidi.hpp" diff --git a/src/main.cpp b/src/main.cpp index a25833c..12a093e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -95,14 +95,10 @@ int main(){ camera.rotation = 0.0f; camera.zoom = 1.0f; -// std::thread t1(sm.updateSignals); - - SetTargetFPS(app.fps); ToggleFullscreen(); - for(int i = 0; i < 8; i++){ nodes.emplace(nodes.end(), Node((float)i * app.grid, 0.0f, 15.0f)); }