From 94b1e168b2b97b48b81f7a8f64406b0a6f64184e Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Wed, 4 Jan 2023 23:29:18 -0500 Subject: Revert "Update BGFX, BX and BIMG (#10750)" (#10787) This reverts commit 5581eaa50a42256242f32569f59ce10d70ddd8c2 due to link failure on macOS. --- 3rdparty/bgfx/examples/common/example-glue.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to '3rdparty/bgfx/examples/common/example-glue.cpp') diff --git a/3rdparty/bgfx/examples/common/example-glue.cpp b/3rdparty/bgfx/examples/common/example-glue.cpp index 74ff3719f18..c4b309c3607 100644 --- a/3rdparty/bgfx/examples/common/example-glue.cpp +++ b/3rdparty/bgfx/examples/common/example-glue.cpp @@ -1,6 +1,6 @@ /* - * Copyright 2011-2022 Branimir Karadzic. All rights reserved. - * License: https://github.com/bkaradzic/bgfx/blob/master/LICENSE + * Copyright 2011-2021 Branimir Karadzic. All rights reserved. + * License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause */ #include "imgui/imgui.h" @@ -35,9 +35,9 @@ struct SampleData m_values[m_offset] = value; m_offset = (m_offset+1) % kNumSamples; - float min = bx::max(); - float max = bx::min(); - float avg = 0.0f; + float min = bx::kFloatMax; + float max = -bx::kFloatMax; + float avg = 0.0f; for (uint32_t ii = 0; ii < kNumSamples; ++ii) { @@ -81,11 +81,11 @@ static bool bar(float _width, float _maxWidth, float _height, const ImVec4& _col bool itemHovered = false; - ImGui::Button("##", ImVec2(_width, _height) ); + ImGui::Button("", ImVec2(_width, _height) ); itemHovered |= ImGui::IsItemHovered(); ImGui::SameLine(); - ImGui::InvisibleButton("##", ImVec2(bx::max(1.0f, _maxWidth-_width), _height) ); + ImGui::InvisibleButton("", ImVec2(bx::max(1.0f, _maxWidth-_width), _height) ); itemHovered |= ImGui::IsItemHovered(); ImGui::PopStyleVar(2); -- cgit v1.2.3-70-g09d2