minor compilation fix

This commit is contained in:
Bruno
2021-08-07 20:26:59 +02:00
parent 38a2aa90e0
commit ddd9bb4e99
2 changed files with 3 additions and 2 deletions

View File

@@ -1272,13 +1272,14 @@ void ImGuiToolkit::ImageGlyph(font_style type, char c, float h)
{ {
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
const ImTextureID my_tex_id = io.Fonts->TexID; const ImTextureID my_tex_id = io.Fonts->TexID;
const ImFontGlyph*glyph = fontmap[type]->FindGlyph(c); const ImFontGlyph* glyph = fontmap[type]->FindGlyph(c);
const ImVec2 size( h * (glyph->X1 - glyph->X0) / (glyph->Y1 - glyph->Y0) , h); const ImVec2 size( h * (glyph->X1 - glyph->X0) / (glyph->Y1 - glyph->Y0) , h);
const ImVec2 uv0( glyph->U0, glyph->V0); const ImVec2 uv0( glyph->U0, glyph->V0);
const ImVec2 uv1( glyph->U1, glyph->V1); const ImVec2 uv1( glyph->U1, glyph->V1);
ImGui::Image((void*)(intptr_t)my_tex_id, size, uv0, uv1); ImGui::Image((void*)(intptr_t)my_tex_id, size, uv0, uv1);
} }
void ImGuiToolkit::WindowText(const char* window_name, ImVec2 window_pos, const char* text) void ImGuiToolkit::WindowText(const char* window_name, ImVec2 window_pos, const char* text)
{ {
ImGui::SetNextWindowPos(window_pos, ImGuiCond_Always); ImGui::SetNextWindowPos(window_pos, ImGuiCond_Always);

View File

@@ -625,7 +625,7 @@ void MixingView::updateSelectionOverlay()
} }
#define CIRCLE_PIXELS 64 #define CIRCLE_PIXELS 64
#define CIRCLE_PIXEL_RADIUS 1024.0 #define CIRCLE_PIXEL_RADIUS 1024.f
//#define CIRCLE_PIXELS 256 //#define CIRCLE_PIXELS 256
//#define CIRCLE_PIXEL_RADIUS 16384.0 //#define CIRCLE_PIXEL_RADIUS 16384.0
//#define CIRCLE_PIXELS 1024 //#define CIRCLE_PIXELS 1024