[API] Up OpenGL impl
This commit is contained in:
1 parent
cbf8ecc47f
commit
384e24a6c5
2 files changed
+71
-23
No files matched your search
@@ -97,7 +97,7 @@ public final class ImDrawData extends ImGuiStruct {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
public ByteBuffer getCmdListIdxBufferData(final int cmdListIdx) {
|
public ByteBuffer getCmdListIdxBufferData(final int cmdListIdx) {
|
||||||
final int idxBufferCapacity = getCmdListIdxBufferSize(cmdListIdx) * SIZEOF_IM_DRAW_IDX;
|
final int idxBufferCapacity = getCmdListIdxBufferSize(cmdListIdx) * sizeOfImDrawIdx();
|
||||||
if (dataBuffer.capacity() < idxBufferCapacity) {
|
if (dataBuffer.capacity() < idxBufferCapacity) {
|
||||||
dataBuffer.clear();
|
dataBuffer.clear();
|
||||||
dataBuffer = ByteBuffer.allocateDirect(idxBufferCapacity + RESIZE_FACTOR).order(ByteOrder.nativeOrder());
|
dataBuffer = ByteBuffer.allocateDirect(idxBufferCapacity + RESIZE_FACTOR).order(ByteOrder.nativeOrder());
|
||||||
@@ -123,7 +123,7 @@ public final class ImDrawData extends ImGuiStruct {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
public ByteBuffer getCmdListVtxBufferData(final int cmdListIdx) {
|
public ByteBuffer getCmdListVtxBufferData(final int cmdListIdx) {
|
||||||
final int vtxBufferCapacity = getCmdListVtxBufferSize(cmdListIdx) * SIZEOF_IM_DRAW_VERT;
|
final int vtxBufferCapacity = getCmdListVtxBufferSize(cmdListIdx) * sizeOfImDrawVert();
|
||||||
if (dataBuffer.capacity() < vtxBufferCapacity) {
|
if (dataBuffer.capacity() < vtxBufferCapacity) {
|
||||||
dataBuffer.clear();
|
dataBuffer.clear();
|
||||||
dataBuffer = ByteBuffer.allocateDirect(vtxBufferCapacity + RESIZE_FACTOR).order(ByteOrder.nativeOrder());
|
dataBuffer = ByteBuffer.allocateDirect(vtxBufferCapacity + RESIZE_FACTOR).order(ByteOrder.nativeOrder());
|
||||||
@@ -141,6 +141,14 @@ public final class ImDrawData extends ImGuiStruct {
|
|||||||
memcpy(vtxBuffer, IM_DRAW_DATA->CmdLists[cmdListIdx]->VtxBuffer.Data, vtxBufferCapacity);
|
memcpy(vtxBuffer, IM_DRAW_DATA->CmdLists[cmdListIdx]->VtxBuffer.Data, vtxBufferCapacity);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
public static native int sizeOfImDrawVert(); /*
|
||||||
|
return (int)sizeof(ImDrawVert);
|
||||||
|
*/
|
||||||
|
|
||||||
|
public static native int sizeOfImDrawIdx(); /*
|
||||||
|
return (int)sizeof(ImDrawIdx);
|
||||||
|
*/
|
||||||
|
|
||||||
///////// End of Render Methods
|
///////// End of Render Methods
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -106,6 +106,7 @@ public final class ImGuiImplGl3 {
|
|||||||
* 4.1 410 "#version 410 core"
|
* 4.1 410 "#version 410 core"
|
||||||
* 4.2 420 "#version 410 core"
|
* 4.2 420 "#version 410 core"
|
||||||
* 4.3 430 "#version 430 core"
|
* 4.3 430 "#version 430 core"
|
||||||
|
* ES 3.0 300 "#version 300 es" = WebGL 2.0
|
||||||
* ---------------------------------------
|
* ---------------------------------------
|
||||||
* </pre>
|
* </pre>
|
||||||
* <p>
|
* <p>
|
||||||
@@ -138,8 +139,14 @@ public final class ImGuiImplGl3 {
|
|||||||
|
|
||||||
// Will project scissor/clipping rectangles into framebuffer space
|
// Will project scissor/clipping rectangles into framebuffer space
|
||||||
drawData.getDisplaySize(displaySize); // (0,0) unless using multi-viewports
|
drawData.getDisplaySize(displaySize); // (0,0) unless using multi-viewports
|
||||||
|
drawData.getDisplayPos(displayPos);
|
||||||
drawData.getFramebufferScale(framebufferScale); // (1,1) unless using retina display which are often (2,2)
|
drawData.getFramebufferScale(framebufferScale); // (1,1) unless using retina display which are often (2,2)
|
||||||
|
|
||||||
|
final float clipOffX = displayPos.x;
|
||||||
|
final float clipOffY = displayPos.y;
|
||||||
|
final float clipScaleX = framebufferScale.x;
|
||||||
|
final float clipScaleY = framebufferScale.y;
|
||||||
|
|
||||||
// Avoid rendering when minimized, scale coordinates for retina displays (screen coordinates != framebuffer coordinates)
|
// Avoid rendering when minimized, scale coordinates for retina displays (screen coordinates != framebuffer coordinates)
|
||||||
final int fbWidth = (int) (displaySize.x * framebufferScale.x);
|
final int fbWidth = (int) (displaySize.x * framebufferScale.x);
|
||||||
final int fbHeight = (int) (displaySize.y * framebufferScale.y);
|
final int fbHeight = (int) (displaySize.y * framebufferScale.y);
|
||||||
@@ -148,8 +155,6 @@ public final class ImGuiImplGl3 {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
drawData.getDisplayPos(displayPos);
|
|
||||||
|
|
||||||
backupGlState();
|
backupGlState();
|
||||||
bind(fbWidth, fbHeight);
|
bind(fbWidth, fbHeight);
|
||||||
|
|
||||||
@@ -162,29 +167,31 @@ public final class ImGuiImplGl3 {
|
|||||||
for (int cmdBufferIdx = 0; cmdBufferIdx < drawData.getCmdListCmdBufferSize(cmdListIdx); cmdBufferIdx++) {
|
for (int cmdBufferIdx = 0; cmdBufferIdx < drawData.getCmdListCmdBufferSize(cmdListIdx); cmdBufferIdx++) {
|
||||||
drawData.getCmdListCmdBufferClipRect(cmdListIdx, cmdBufferIdx, clipRect);
|
drawData.getCmdListCmdBufferClipRect(cmdListIdx, cmdBufferIdx, clipRect);
|
||||||
|
|
||||||
final float clipRectX = (clipRect.x - displayPos.x) * framebufferScale.x;
|
final float clipMinX = (clipRect.x - clipOffX) * clipScaleX;
|
||||||
final float clipRectY = (clipRect.y - displayPos.y) * framebufferScale.y;
|
final float clipMinY = (clipRect.y - clipOffY) * clipScaleY;
|
||||||
final float clipRectZ = (clipRect.z - displayPos.x) * framebufferScale.x;
|
final float clipMaxX = (clipRect.z - clipOffX) * clipScaleX;
|
||||||
final float clipRectW = (clipRect.w - displayPos.y) * framebufferScale.y;
|
final float clipMaxY = (clipRect.w - clipOffY) * clipScaleY;
|
||||||
|
|
||||||
if (clipRectX < fbWidth && clipRectY < fbHeight && clipRectZ >= 0.0f && clipRectW >= 0.0f) {
|
if (clipMaxX <= clipMinX || clipMaxY <= clipMinY) {
|
||||||
// Apply scissor/clipping rectangle
|
continue;
|
||||||
glScissor((int) clipRectX, (int) (fbHeight - clipRectW), (int) (clipRectZ - clipRectX), (int) (clipRectW - clipRectY));
|
}
|
||||||
|
|
||||||
// Bind texture, Draw
|
// Apply scissor/clipping rectangle (Y is inverted in OpenGL)
|
||||||
final int textureId = drawData.getCmdListCmdBufferTextureId(cmdListIdx, cmdBufferIdx);
|
glScissor((int) clipMinX, (int) (fbHeight - clipMaxY), (int) (clipMaxX - clipMinX), (int) (clipMaxY - clipMinY));
|
||||||
final int elemCount = drawData.getCmdListCmdBufferElemCount(cmdListIdx, cmdBufferIdx);
|
|
||||||
final int idxBufferOffset = drawData.getCmdListCmdBufferIdxOffset(cmdListIdx, cmdBufferIdx);
|
|
||||||
final int vtxBufferOffset = drawData.getCmdListCmdBufferVtxOffset(cmdListIdx, cmdBufferIdx);
|
|
||||||
final int indices = idxBufferOffset * ImDrawData.SIZEOF_IM_DRAW_IDX;
|
|
||||||
|
|
||||||
glBindTexture(GL_TEXTURE_2D, textureId);
|
// Bind texture, Draw
|
||||||
|
final int textureId = drawData.getCmdListCmdBufferTextureId(cmdListIdx, cmdBufferIdx);
|
||||||
|
final int elemCount = drawData.getCmdListCmdBufferElemCount(cmdListIdx, cmdBufferIdx);
|
||||||
|
final int idxBufferOffset = drawData.getCmdListCmdBufferIdxOffset(cmdListIdx, cmdBufferIdx);
|
||||||
|
final int vtxBufferOffset = drawData.getCmdListCmdBufferVtxOffset(cmdListIdx, cmdBufferIdx);
|
||||||
|
final int indices = idxBufferOffset * ImDrawData.SIZEOF_IM_DRAW_IDX;
|
||||||
|
|
||||||
if (glVersion >= 320) {
|
glBindTexture(GL_TEXTURE_2D, textureId);
|
||||||
glDrawElementsBaseVertex(GL_TRIANGLES, elemCount, GL_UNSIGNED_SHORT, indices, vtxBufferOffset);
|
|
||||||
} else {
|
if (glVersion >= 320) {
|
||||||
glDrawElements(GL_TRIANGLES, elemCount, GL_UNSIGNED_SHORT, indices);
|
glDrawElementsBaseVertex(GL_TRIANGLES, elemCount, GL_UNSIGNED_SHORT, indices, vtxBufferOffset);
|
||||||
}
|
} else {
|
||||||
|
glDrawElements(GL_TRIANGLES, elemCount, GL_UNSIGNED_SHORT, indices);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -288,6 +295,9 @@ public final class ImGuiImplGl3 {
|
|||||||
if (glslVersionValue < 130) {
|
if (glslVersionValue < 130) {
|
||||||
vertShaderSource = getVertexShaderGlsl120();
|
vertShaderSource = getVertexShaderGlsl120();
|
||||||
fragShaderSource = getFragmentShaderGlsl120();
|
fragShaderSource = getFragmentShaderGlsl120();
|
||||||
|
} else if (glslVersionValue == 300) {
|
||||||
|
vertShaderSource = getVertexShaderGlsl300es();
|
||||||
|
fragShaderSource = getFragmentShaderGlsl300es();
|
||||||
} else if (glslVersionValue >= 410) {
|
} else if (glslVersionValue >= 410) {
|
||||||
vertShaderSource = getVertexShaderGlsl410Core();
|
vertShaderSource = getVertexShaderGlsl410Core();
|
||||||
fragShaderSource = getFragmentShaderGlsl410Core();
|
fragShaderSource = getFragmentShaderGlsl410Core();
|
||||||
@@ -484,6 +494,23 @@ public final class ImGuiImplGl3 {
|
|||||||
+ "}\n";
|
+ "}\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String getVertexShaderGlsl300es() {
|
||||||
|
return glslVersion + "\n"
|
||||||
|
+ "precision highp float;\n"
|
||||||
|
+ "layout (location = 0) in vec2 Position;\n"
|
||||||
|
+ "layout (location = 1) in vec2 UV;\n"
|
||||||
|
+ "layout (location = 2) in vec4 Color;\n"
|
||||||
|
+ "uniform mat4 ProjMtx;\n"
|
||||||
|
+ "out vec2 Frag_UV;\n"
|
||||||
|
+ "out vec4 Frag_Color;\n"
|
||||||
|
+ "void main()\n"
|
||||||
|
+ "{\n"
|
||||||
|
+ " Frag_UV = UV;\n"
|
||||||
|
+ " Frag_Color = Color;\n"
|
||||||
|
+ " gl_Position = ProjMtx * vec4(Position.xy,0,1);\n"
|
||||||
|
+ "}\n";
|
||||||
|
}
|
||||||
|
|
||||||
private String getVertexShaderGlsl410Core() {
|
private String getVertexShaderGlsl410Core() {
|
||||||
return glslVersion + "\n"
|
return glslVersion + "\n"
|
||||||
+ "layout (location = 0) in vec2 Position;\n"
|
+ "layout (location = 0) in vec2 Position;\n"
|
||||||
@@ -526,6 +553,19 @@ public final class ImGuiImplGl3 {
|
|||||||
+ "}\n";
|
+ "}\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String getFragmentShaderGlsl300es() {
|
||||||
|
return glslVersion + "\n"
|
||||||
|
+ "precision mediump float;\n"
|
||||||
|
+ "uniform sampler2D Texture;\n"
|
||||||
|
+ "in vec2 Frag_UV;\n"
|
||||||
|
+ "in vec4 Frag_Color;\n"
|
||||||
|
+ "layout (location = 0) out vec4 Out_Color;\n"
|
||||||
|
+ "void main()\n"
|
||||||
|
+ "{\n"
|
||||||
|
+ " Out_Color = Frag_Color * texture(Texture, Frag_UV.st);\n"
|
||||||
|
+ "}\n";
|
||||||
|
}
|
||||||
|
|
||||||
private String getFragmentShaderGlsl410Core() {
|
private String getFragmentShaderGlsl410Core() {
|
||||||
return glslVersion + "\n"
|
return glslVersion + "\n"
|
||||||
+ "in vec2 Frag_UV;\n"
|
+ "in vec2 Frag_UV;\n"
|
||||||
|
|||||||
Reference in new issue
Block a user