shlepa/imgui-java
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant "textEnd" argument from text methods

Browse Source
This commit is contained in:
SpaiR committed 2020-07-08 04:52:34 +03:00
1 parent dd94f21207
commit f555f84d2e
2 files changed
+20 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

imgui-binding/src/main/java/imgui/ImDrawList.java
+14 -26
View File
@@ -191,45 +191,33 @@ public final class ImDrawList {
IM_DRAW_LIST->AddNgonFilled(ImVec2(centreX, centreY), radius, col, numSegments);
*/
public native void addText(float posX, float posY, int col, String textBegin); /*
IM_DRAW_LIST->AddText(ImVec2(posX, posY), col, textBegin);
public native void addText(float posX, float posY, int col, String text); /*
IM_DRAW_LIST->AddText(ImVec2(posX, posY), col, text);
*/
public native void addText(float posX, float posY, int col, String textBegin, String textEnd); /*
IM_DRAW_LIST->AddText(ImVec2(posX, posY), col, textBegin, textEnd);
*/
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String textBegin) {
nAddText(imFont.ptr, fontSize, posX, posY, col, textBegin);
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String text) {
nAddText(imFont.ptr, fontSize, posX, posY, col, text);
}
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String textBegin); /*
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, textBegin);
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String text); /*
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, text);
*/
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String textBegin, final String textEnd) {
nAddText(imFont.ptr, fontSize, posX, posY, col, textBegin, textEnd);
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String text, final float wrapWidth) {
nAddText(imFont.ptr, fontSize, posX, posY, col, text, wrapWidth);
}
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String textBegin, String textEnd); /*
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, textBegin, textEnd);
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String text, float wrapWidth); /*
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, text, NULL, wrapWidth);
*/
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String textBegin, final String textEnd, final float wrapWidth) {
nAddText(imFont.ptr, fontSize, posX, posY, col, textBegin, textEnd, wrapWidth);
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String text, final float wrapWidth, final float cpuFineClipRectX, final float cpuFineClipRectY, final float cpuFineClipRectZ, final float cpuFineClipRectV) {
nAddText(imFont.ptr, fontSize, posX, posY, col, text, wrapWidth, cpuFineClipRectX, cpuFineClipRectY, cpuFineClipRectZ, cpuFineClipRectV);
}
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String textBegin, String textEnd, float wrapWidth); /*
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, textBegin, textEnd, wrapWidth);
*/
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String textBegin, final String textEnd, final float wrapWidth, final float cpuFineClipRectX, final float cpuFineClipRectY, final float cpuFineClipRectZ, final float cpuFineClipRectV) {
nAddText(imFont.ptr, fontSize, posX, posY, col, textBegin, textEnd, wrapWidth, cpuFineClipRectX, cpuFineClipRectY, cpuFineClipRectZ, cpuFineClipRectV);
}
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String textBegin, String textEnd, float wrapWidth, float cpuFineClipRectX, float cpuFineClipRectY, float cpuFineClipRectZ, float cpuFineClipRectV); /*
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String text, float wrapWidth, float cpuFineClipRectX, float cpuFineClipRectY, float cpuFineClipRectZ, float cpuFineClipRectV); /*
ImVec4 cpuFineClipRect = ImVec4(cpuFineClipRectX, cpuFineClipRectY, cpuFineClipRectZ, cpuFineClipRectV);
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, textBegin, textEnd, wrapWidth, &cpuFineClipRect);
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, text, NULL, wrapWidth, &cpuFineClipRect);
*/
public native void addPolyline(ImVec2[] points, int numPoints, int col, boolean closed, float thickness); /*
imgui-binding/src/main/java/imgui/ImGui.java
+6 -15
View File
@@ -1326,15 +1326,6 @@ public final class ImGui {
ImGui::TextUnformatted(text);
*/
/**
* Raw text without formatting. Roughly equivalent to Text("%s", text) but:
* A) doesn't require null terminated string if 'textEnd' is specified,
* B) it's faster, no memory copy is done, no buffer size limits, recommended for long chunks of text.
*/
public static native void textUnformatted(String text, String textEnd); /*
ImGui::TextUnformatted(text, textEnd);
*/
/**
* Formatted text
* <p>
@@ -4851,18 +4842,18 @@ public final class ImGui {
Jni::ImVec2Cpy(env, src, dstImVec2);
*/
public static native void calcTextSize(ImVec2 dstImVec2, String text, String textEnd); /*
ImVec2 src = ImGui::CalcTextSize(text, textEnd);
public static native void calcTextSize(ImVec2 dstImVec2, String text, boolean hideTextAfterDoubleHash); /*
ImVec2 src = ImGui::CalcTextSize(text, NULL, hideTextAfterDoubleHash);
Jni::ImVec2Cpy(env, src, dstImVec2);
*/
public static native void calcTextSize(ImVec2 dstImVec2, String text, String textEnd, boolean hideTextAfterDoubleHas); /*
ImVec2 src = ImGui::CalcTextSize(text, textEnd, hideTextAfterDoubleHas);
public static native void calcTextSize(ImVec2 dstImVec2, String text, float wrapWidth); /*
ImVec2 src = ImGui::CalcTextSize(text, NULL, false, wrapWidth);
Jni::ImVec2Cpy(env, src, dstImVec2);
*/
public static native void calcTextSize(ImVec2 dstImVec2, String text, String textEnd, boolean hideTextAfterDoubleHas, float wrapWidth); /*
ImVec2 src = ImGui::CalcTextSize(text, textEnd, hideTextAfterDoubleHas, wrapWidth);
public static native void calcTextSize(ImVec2 dstImVec2, String text, boolean hideTextAfterDoubleHash, float wrapWidth); /*
ImVec2 src = ImGui::CalcTextSize(text, NULL, hideTextAfterDoubleHash, wrapWidth);
Jni::ImVec2Cpy(env, src, dstImVec2);
*/