mirror of https://github.com/bkaradzic/bgfx
Updated ImGui.
This commit is contained in:
parent
22e1faca69
commit
3eb6c41769
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.72 WIP
|
||||
// dear imgui, v1.72
|
||||
// (main code and documentation)
|
||||
|
||||
// Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code.
|
||||
|
@ -4435,15 +4435,23 @@ bool ImGui::IsMouseDoubleClicked(int button)
|
|||
return g.IO.MouseDoubleClicked[button];
|
||||
}
|
||||
|
||||
// [Internal] This doesn't test if the button is presed
|
||||
bool ImGui::IsMouseDragPastThreshold(int button, float lock_threshold)
|
||||
{
|
||||
ImGuiContext& g = *GImGui;
|
||||
IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
|
||||
if (lock_threshold < 0.0f)
|
||||
lock_threshold = g.IO.MouseDragThreshold;
|
||||
return g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold;
|
||||
}
|
||||
|
||||
bool ImGui::IsMouseDragging(int button, float lock_threshold)
|
||||
{
|
||||
ImGuiContext& g = *GImGui;
|
||||
IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
|
||||
if (!g.IO.MouseDown[button])
|
||||
return false;
|
||||
if (lock_threshold < 0.0f)
|
||||
lock_threshold = g.IO.MouseDragThreshold;
|
||||
return g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold;
|
||||
return IsMouseDragPastThreshold(button, lock_threshold);
|
||||
}
|
||||
|
||||
ImVec2 ImGui::GetMousePos()
|
||||
|
@ -9721,6 +9729,9 @@ void ImGui::ShowMetricsWindow(bool* p_open)
|
|||
if (!node_open)
|
||||
return;
|
||||
|
||||
if (window && !window->WasActive)
|
||||
ImGui::Text("(Note: owning Window is inactive: DrawList is not being rendered!)");
|
||||
|
||||
int elem_offset = 0;
|
||||
for (const ImDrawCmd* pcmd = draw_list->CmdBuffer.begin(); pcmd < draw_list->CmdBuffer.end(); elem_offset += pcmd->ElemCount, pcmd++)
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.72 WIP
|
||||
// dear imgui, v1.72
|
||||
// (headers)
|
||||
|
||||
// See imgui.cpp file for documentation.
|
||||
|
@ -46,8 +46,8 @@ Index of this file:
|
|||
|
||||
// Version
|
||||
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
|
||||
#define IMGUI_VERSION "1.72 WIP"
|
||||
#define IMGUI_VERSION_NUM 17102
|
||||
#define IMGUI_VERSION "1.72"
|
||||
#define IMGUI_VERSION_NUM 17200
|
||||
#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
|
||||
|
||||
// Define attributes of all API symbols declarations (e.g. for DLL under Windows)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.72 WIP
|
||||
// dear imgui, v1.72
|
||||
// (demo code)
|
||||
|
||||
// Message to the person tempted to delete this file when integrating Dear ImGui into their code base:
|
||||
|
@ -539,8 +539,19 @@ static void ShowDemoWindowWidgets()
|
|||
static float f1=0.123f, f2=0.0f;
|
||||
ImGui::SliderFloat("slider float", &f1, 0.0f, 1.0f, "ratio = %.3f");
|
||||
ImGui::SliderFloat("slider float (curve)", &f2, -10.0f, 10.0f, "%.4f", 2.0f);
|
||||
|
||||
static float angle = 0.0f;
|
||||
ImGui::SliderAngle("slider angle", &angle);
|
||||
|
||||
// Using the format string to display a name instead of an integer.
|
||||
// Here we completely omit '%d' from the format string, so it'll only display a name.
|
||||
// This technique can also be used with DragInt().
|
||||
enum Element { Element_Fire, Element_Earth, Element_Air, Element_Water, Element_COUNT };
|
||||
const char* element_names[Element_COUNT] = { "Fire", "Earth", "Air", "Water" };
|
||||
static int current_element = Element_Fire;
|
||||
const char* current_element_name = (current_element >= 0 && current_element < Element_COUNT) ? element_names[current_element] : "Unknown";
|
||||
ImGui::SliderInt("slider enum", ¤t_element, 0, Element_COUNT - 1, current_element_name);
|
||||
ImGui::SameLine(); HelpMarker("Using the format string parameter to display a name instead of the underlying integer.");
|
||||
}
|
||||
|
||||
{
|
||||
|
@ -1782,9 +1793,9 @@ static void ShowDemoWindowLayout()
|
|||
ImGui::Text("SetNextItemWidth/PushItemWidth(-1)");
|
||||
ImGui::SameLine(); HelpMarker("Align to right edge");
|
||||
ImGui::PushItemWidth(-1);
|
||||
ImGui::DragFloat("float##5a", &f);
|
||||
ImGui::DragFloat("float##5b", &f);
|
||||
ImGui::DragFloat("float##5c", &f);
|
||||
ImGui::DragFloat("##float5a", &f);
|
||||
ImGui::DragFloat("##float5b", &f);
|
||||
ImGui::DragFloat("##float5c", &f);
|
||||
ImGui::PopItemWidth();
|
||||
|
||||
ImGui::TreePop();
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.72 WIP
|
||||
// dear imgui, v1.72
|
||||
// (drawing and font code)
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.72 WIP
|
||||
// dear imgui, v1.72
|
||||
// (internal structures/api)
|
||||
|
||||
// You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility!
|
||||
|
@ -1556,6 +1556,7 @@ namespace ImGui
|
|||
IMGUI_API void SetNavIDWithRectRel(ImGuiID id, int nav_layer, const ImRect& rect_rel);
|
||||
|
||||
// Inputs
|
||||
inline bool IsMouseDragPastThreshold(int button, float lock_threshold = -1.0f);
|
||||
inline bool IsKeyPressedMap(ImGuiKey key, bool repeat = true) { const int key_index = GImGui->IO.KeyMap[key]; return (key_index >= 0) ? IsKeyPressed(key_index, repeat) : false; }
|
||||
inline bool IsNavInputDown(ImGuiNavInput n) { return GImGui->IO.NavInputs[n] > 0.0f; }
|
||||
inline bool IsNavInputPressed(ImGuiNavInput n, ImGuiInputReadMode mode) { return GetNavInputAmount(n, mode) > 0.0f; }
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.72 WIP
|
||||
// dear imgui, v1.72
|
||||
// (widgets code)
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue