feat(api): bump Dear ImGui from 1.89.0 to 1.90.9
This commit is contained in:
1 parent
718633e61e
commit
634e28b76a
61 files changed
+11728
-7827
No files matched your search
@@ -172,6 +172,7 @@ public class ImGuiImplGl3 {
|
||||
protected int elementsHandle = 0;
|
||||
// protected int vertexBufferSize;
|
||||
// protected int indexBufferSize;
|
||||
// protected boolean hasPolygonMode;
|
||||
protected boolean hasClipOrigin;
|
||||
}
|
||||
|
||||
@@ -262,11 +263,11 @@ public class ImGuiImplGl3 {
|
||||
io.setBackendRendererName("imgui-java_impl_opengl3");
|
||||
|
||||
{ // Desktop or GLES 3
|
||||
final String glVersion = glGetString(GL_VERSION);
|
||||
int major = glGetInteger(GL_MAJOR_VERSION);
|
||||
int minor = glGetInteger(GL_MINOR_VERSION);
|
||||
if (major == 0 && minor == 0) {
|
||||
// Query GL_VERSION in desktop GL 2.x, the string will start with "<major>.<minor>"
|
||||
final String glVersion = glGetString(GL_VERSION);
|
||||
if (glVersion != null) {
|
||||
final String[] glVersions = glVersion.split("\\.");
|
||||
major = Integer.parseInt(glVersions[0]);
|
||||
@@ -337,6 +338,9 @@ public class ImGuiImplGl3 {
|
||||
if (data.shaderHandle == 0) {
|
||||
createDeviceObjects();
|
||||
}
|
||||
if (data.fontTexture == 0) {
|
||||
createFontsTexture();
|
||||
}
|
||||
}
|
||||
|
||||
protected void setupRenderState(final ImDrawData drawData, final int fbWidth, final int fbHeight, final int gVertexArrayObject) {
|
||||
|
||||
@@ -108,7 +108,19 @@ import static org.lwjgl.glfw.GLFW.GLFW_KEY_F1;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F10;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F11;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F12;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F13;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F14;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F15;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F16;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F17;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F18;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F19;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F2;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F20;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F21;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F22;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F23;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F24;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F3;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F4;
|
||||
import static org.lwjgl.glfw.GLFW.GLFW_KEY_F5;
|
||||
@@ -288,7 +300,7 @@ public class ImGuiImplGlfw {
|
||||
|
||||
// This field is required to use GLFW with touch screens on Windows.
|
||||
// For compatibility reasons it was added here as a comment. But we don't use somewhere in the binding implementation.
|
||||
// protected long glfwWndProc;
|
||||
// protected long prevWndProc;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -579,6 +591,30 @@ public class ImGuiImplGlfw {
|
||||
return ImGuiKey.F11;
|
||||
case GLFW_KEY_F12:
|
||||
return ImGuiKey.F12;
|
||||
case GLFW_KEY_F13:
|
||||
return ImGuiKey.F13;
|
||||
case GLFW_KEY_F14:
|
||||
return ImGuiKey.F14;
|
||||
case GLFW_KEY_F15:
|
||||
return ImGuiKey.F15;
|
||||
case GLFW_KEY_F16:
|
||||
return ImGuiKey.F16;
|
||||
case GLFW_KEY_F17:
|
||||
return ImGuiKey.F17;
|
||||
case GLFW_KEY_F18:
|
||||
return ImGuiKey.F18;
|
||||
case GLFW_KEY_F19:
|
||||
return ImGuiKey.F19;
|
||||
case GLFW_KEY_F20:
|
||||
return ImGuiKey.F20;
|
||||
case GLFW_KEY_F21:
|
||||
return ImGuiKey.F21;
|
||||
case GLFW_KEY_F22:
|
||||
return ImGuiKey.F22;
|
||||
case GLFW_KEY_F23:
|
||||
return ImGuiKey.F23;
|
||||
case GLFW_KEY_F24:
|
||||
return ImGuiKey.F24;
|
||||
default:
|
||||
return ImGuiKey.None;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user