Skip to content

Commit e60f56b

Browse files
committed
Move primitive wrappers into its own package "imgui.type"
1 parent 52f0343 commit e60f56b

File tree

13 files changed

+247
-208
lines changed

13 files changed

+247
-208
lines changed

imgui-binding/src/main/java/imgui/ImFontAtlas.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package imgui;
22

3+
import imgui.type.ImInt;
4+
35
import java.nio.ByteBuffer;
46
import java.nio.ByteOrder;
57

@@ -311,7 +313,7 @@ public ByteBuffer getTexDataAsAlpha8(final ImInt outWidth, final ImInt outHeight
311313
* 1 byte-per-pixel
312314
*/
313315
public ByteBuffer getTexDataAsAlpha8(final ImInt outWidth, final ImInt outHeight, final ImInt outBytesPerPixel) {
314-
final byte[] tmpBuff = getTexDataAsAlpha8(outWidth.data, outHeight.data, outBytesPerPixel.data);
316+
final byte[] tmpBuff = getTexDataAsAlpha8(outWidth.getData(), outHeight.getData(), outBytesPerPixel.getData());
315317
final ByteBuffer buffer = ByteBuffer.allocateDirect(tmpBuff.length).order(ByteOrder.nativeOrder());
316318
buffer.put(tmpBuff);
317319
buffer.flip();
@@ -338,7 +340,7 @@ public ByteBuffer getTexDataAsRGBA32(final ImInt outWidth, final ImInt outHeight
338340
* 4 bytes-per-pixel
339341
*/
340342
public ByteBuffer getTexDataAsRGBA32(final ImInt outWidth, final ImInt outHeight, final ImInt outBytesPerPixel) {
341-
final byte[] tmpBuff = nGetTexDataAsRGBA32(outWidth.data, outHeight.data, outBytesPerPixel.data);
343+
final byte[] tmpBuff = nGetTexDataAsRGBA32(outWidth.getData(), outHeight.getData(), outBytesPerPixel.getData());
342344
final ByteBuffer buffer = ByteBuffer.allocateDirect(tmpBuff.length).order(ByteOrder.nativeOrder());
343345
buffer.put(tmpBuff);
344346
buffer.flip();

imgui-binding/src/main/java/imgui/ImGui.java

Lines changed: 193 additions & 185 deletions
Large diffs are not rendered by default.

imgui-binding/src/main/java/imgui/ImBool.java renamed to imgui-binding/src/main/java/imgui/type/ImBool.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package imgui;
1+
package imgui.type;
22

33
import java.util.Objects;
44

55
public final class ImBool implements Cloneable {
6-
final boolean[] data = new boolean[]{false};
6+
private final boolean[] data = new boolean[]{false};
77

88
public ImBool() {
99
}
@@ -20,6 +20,10 @@ public boolean get() {
2020
return data[0];
2121
}
2222

23+
public boolean[] getData() {
24+
return data;
25+
}
26+
2327
public void set(final boolean value) {
2428
data[0] = value;
2529
}

imgui-binding/src/main/java/imgui/ImDouble.java renamed to imgui-binding/src/main/java/imgui/type/ImDouble.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package imgui;
1+
package imgui.type;
22

33
import java.util.Objects;
44

55
public final class ImDouble implements Cloneable {
6-
final double[] data = new double[]{0.0d};
6+
private final double[] data = new double[]{0.0d};
77

88
public ImDouble() {
99
}
@@ -20,6 +20,10 @@ public double get() {
2020
return this.data[0];
2121
}
2222

23+
public double[] getData() {
24+
return data;
25+
}
26+
2327
public void set(final double value) {
2428
this.data[0] = value;
2529
}

imgui-binding/src/main/java/imgui/ImFloat.java renamed to imgui-binding/src/main/java/imgui/type/ImFloat.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package imgui;
1+
package imgui.type;
22

33
import java.util.Objects;
44

55
public final class ImFloat implements Cloneable {
6-
final float[] data = new float[]{0};
6+
private final float[] data = new float[]{0};
77

88
public ImFloat() {
99
}
@@ -20,6 +20,10 @@ public float get() {
2020
return this.data[0];
2121
}
2222

23+
public float[] getData() {
24+
return data;
25+
}
26+
2327
public void set(final float value) {
2428
this.data[0] = value;
2529
}

imgui-binding/src/main/java/imgui/ImGuiInputTextData.java renamed to imgui-binding/src/main/java/imgui/type/ImGuiInputTextData.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package imgui;
1+
package imgui.type;
22

33
/**
44
* Use this class to customize your ImGui input.
@@ -7,13 +7,13 @@ public final class ImGuiInputTextData {
77
private static final short DEFAULT_RESIZE_FACTOR = 10;
88

99
/**
10-
* If not empty, then other chars which are different from provided will be filtered during the {@link ImGui#inputText}
11-
* and {@link ImGui#inputTextMultiline} methods.
10+
* If not empty, then other chars which are different from provided will be filtered during the {@link imgui.ImGui#inputText}
11+
* and {@link imgui.ImGui#inputTextMultiline} methods.
1212
*/
1313
public String allowedChars = "";
1414

1515
/**
16-
* If true, then string will be resized during the the {@link ImGui#inputText} and {@link ImGui#inputTextMultiline} methods.
16+
* If true, then string will be resized during the the {@link imgui.ImGui#inputText} and {@link imgui.ImGui#inputTextMultiline} methods.
1717
* Alternatively you can provide {@link imgui.flag.ImGuiInputTextFlags#CallbackResize} flag to the input text widgets to enable string resizing.
1818
* Resize factor of the string could be modified by changing {@link #resizeFactor} field.
1919
*/

imgui-binding/src/main/java/imgui/ImInt.java renamed to imgui-binding/src/main/java/imgui/type/ImInt.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package imgui;
1+
package imgui.type;
22

33
import java.util.Objects;
44

55
public final class ImInt implements Cloneable {
6-
final int[] data = new int[]{0};
6+
private final int[] data = new int[]{0};
77

88
public ImInt() {
99
}
@@ -20,6 +20,10 @@ public int get() {
2020
return this.data[0];
2121
}
2222

23+
public int[] getData() {
24+
return data;
25+
}
26+
2327
public void set(final int value) {
2428
this.data[0] = value;
2529
}

imgui-binding/src/main/java/imgui/ImLong.java renamed to imgui-binding/src/main/java/imgui/type/ImLong.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package imgui;
1+
package imgui.type;
22

33
import java.util.Objects;
44

55
public final class ImLong implements Cloneable {
6-
final long[] data = new long[]{0};
6+
private final long[] data = new long[]{0};
77

88
public ImLong() {
99
}
@@ -20,6 +20,10 @@ public long get() {
2020
return this.data[0];
2121
}
2222

23+
public long[] getData() {
24+
return data;
25+
}
26+
2327
public void set(final long value) {
2428
this.data[0] = value;
2529
}

imgui-binding/src/main/java/imgui/ImShort.java renamed to imgui-binding/src/main/java/imgui/type/ImShort.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package imgui;
1+
package imgui.type;
22

33
import java.util.Objects;
44

55
public final class ImShort implements Cloneable {
6-
final short[] data = new short[]{0};
6+
private final short[] data = new short[]{0};
77

88
public ImShort() {
99
}
@@ -20,6 +20,10 @@ public short get() {
2020
return this.data[0];
2121
}
2222

23+
public short[] getData() {
24+
return data;
25+
}
26+
2327
public void set(final short value) {
2428
this.data[0] = value;
2529
}

imgui-binding/src/main/java/imgui/ImString.java renamed to imgui-binding/src/main/java/imgui/type/ImString.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package imgui;
1+
package imgui.type;
22

33
import java.nio.charset.StandardCharsets;
44
import java.util.Objects;
@@ -22,7 +22,7 @@ public final class ImString implements Cloneable {
2222
*/
2323
public final ImGuiInputTextData inputData = new ImGuiInputTextData();
2424

25-
byte[] data;
25+
private byte[] data;
2626
private String text = "";
2727

2828
/**
@@ -77,6 +77,10 @@ public String get() {
7777
return text;
7878
}
7979

80+
public byte[] getData() {
81+
return data;
82+
}
83+
8084
public void set(final String value) {
8185
set(value, inputData.isResizable, inputData.resizeFactor);
8286
}

0 commit comments

Comments
 (0)