Skip to content

Make ImVec2/ImVec4 math operations immutable #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 29, 2025
Merged

Make ImVec2/ImVec4 math operations immutable #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions imgui-binding/src/generated/java/imgui/ImVec2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,37 @@ public ImVec2 set(final ImVec2 value) {
}

public ImVec2 plus(final float x, final float y) {
this.x += x;
this.y += y;
return this;
return new ImVec2(this.x + x, this.y + y);
}

public ImVec2 plus(final ImVec2 value) {
return plus(value.x, value.y);
}

public ImVec2 minus(final float x, final float y) {
this.x -= x;
this.y -= y;
return this;
return new ImVec2(this.x - x, this.y -y);
}

public ImVec2 minus(final ImVec2 value) {
return minus(value.x, value.y);
}

public ImVec2 times(final float x, final float y) {
this.x *= x;
this.y *= y;
return this;
return new ImVec2(this.x * x, this.y * y);
}

public ImVec2 times(final ImVec2 value) {
return times(value.x, value.y);
}

public ImVec2 div(final float x, final float y) {
return new ImVec2(this.x / x, this.y / y);
}

public ImVec2 div(final ImVec2 value) {
return div(value.x, value.y);
}

@Override
public String toString() {
return "ImVec2{"
Expand Down
26 changes: 11 additions & 15 deletions imgui-binding/src/generated/java/imgui/ImVec4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,41 +35,37 @@ public ImVec4 set(final ImVec4 value) {
}

public ImVec4 plus(final float x, final float y, final float z, final float w) {
this.x += x;
this.y += y;
this.z += z;
this.w += w;
return this;
return new ImVec4(this.x + x, this.y + y, this.z + z, this.w + w);
}

public ImVec4 plus(final ImVec4 value) {
return plus(value.x, value.y, value.z, value.w);
}

public ImVec4 minus(final float x, final float y, final float z, final float w) {
this.x -= x;
this.y -= y;
this.z -= z;
this.w -= w;
return this;
return new ImVec4(this.x - x, this.y - y, this.z - z, this.w - w);
}

public ImVec4 minus(final ImVec4 value) {
return minus(value.x, value.y, value.z, value.w);
}

public ImVec4 times(final float x, final float y, final float z, final float w) {
this.x *= x;
this.y *= y;
this.z *= z;
this.w *= w;
return this;
return new ImVec4(this.x * x, this.y * y, this.z * z, this.w * w);
}

public ImVec4 times(final ImVec4 value) {
return times(value.x, value.y, value.z, value.w);
}

public ImVec4 div(final float x, final float y, final float z, final float w) {
return new ImVec4(this.x / x, this.y / y, this.z / z, this.w / w);
}

public ImVec4 div(final ImVec4 value) {
return div(value.x, value.y, value.z, value.w);
}

@Override
public String toString() {
return "ImVec4{"
Expand Down
20 changes: 11 additions & 9 deletions imgui-binding/src/main/java/imgui/ImVec2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,37 @@ public ImVec2 set(final ImVec2 value) {
}

public ImVec2 plus(final float x, final float y) {
this.x += x;
this.y += y;
return this;
return new ImVec2(this.x + x, this.y + y);
}

public ImVec2 plus(final ImVec2 value) {
return plus(value.x, value.y);
}

public ImVec2 minus(final float x, final float y) {
this.x -= x;
this.y -= y;
return this;
return new ImVec2(this.x - x, this.y -y);
}

public ImVec2 minus(final ImVec2 value) {
return minus(value.x, value.y);
}

public ImVec2 times(final float x, final float y) {
this.x *= x;
this.y *= y;
return this;
return new ImVec2(this.x * x, this.y * y);
}

public ImVec2 times(final ImVec2 value) {
return times(value.x, value.y);
}

public ImVec2 div(final float x, final float y) {
return new ImVec2(this.x / x, this.y / y);
}

public ImVec2 div(final ImVec2 value) {
return div(value.x, value.y);
}

@Override
public String toString() {
return "ImVec2{"
Expand Down
26 changes: 11 additions & 15 deletions imgui-binding/src/main/java/imgui/ImVec4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,41 +35,37 @@ public ImVec4 set(final ImVec4 value) {
}

public ImVec4 plus(final float x, final float y, final float z, final float w) {
this.x += x;
this.y += y;
this.z += z;
this.w += w;
return this;
return new ImVec4(this.x + x, this.y + y, this.z + z, this.w + w);
}

public ImVec4 plus(final ImVec4 value) {
return plus(value.x, value.y, value.z, value.w);
}

public ImVec4 minus(final float x, final float y, final float z, final float w) {
this.x -= x;
this.y -= y;
this.z -= z;
this.w -= w;
return this;
return new ImVec4(this.x - x, this.y - y, this.z - z, this.w - w);
}

public ImVec4 minus(final ImVec4 value) {
return minus(value.x, value.y, value.z, value.w);
}

public ImVec4 times(final float x, final float y, final float z, final float w) {
this.x *= x;
this.y *= y;
this.z *= z;
this.w *= w;
return this;
return new ImVec4(this.x * x, this.y * y, this.z * z, this.w * w);
}

public ImVec4 times(final ImVec4 value) {
return times(value.x, value.y, value.z, value.w);
}

public ImVec4 div(final float x, final float y, final float z, final float w) {
return new ImVec4(this.x / x, this.y / y, this.z / z, this.w / w);
}

public ImVec4 div(final ImVec4 value) {
return div(value.x, value.y, value.z, value.w);
}

@Override
public String toString() {
return "ImVec4{"
Expand Down
55 changes: 47 additions & 8 deletions imgui-binding/src/test/java/imgui/ImVec2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertSame;

class ImVec2Test {
@Nested
Expand Down Expand Up @@ -34,67 +36,104 @@ void fromImVec2() {
class set {
@Test
void withFloats() {
final ImVec2 value = new ImVec2().set(1, 2);
final ImVec2 original = new ImVec2();
final ImVec2 value = original.set(1, 2);
assertEquals(1, value.x);
assertEquals(2, value.y);
assertSame(original, value);
}

@Test
void withImVec2() {
final ImVec2 value = new ImVec2().set(new ImVec2(1, 2));
final ImVec2 original = new ImVec2();
final ImVec2 value = original.set(new ImVec2(1, 2));
assertEquals(1, value.x);
assertEquals(2, value.y);
assertSame(original, value);
}
}

@Nested
class plus {
@Test
void withFloats() {
final ImVec2 value = new ImVec2(5, 5).plus(1, 2);
final ImVec2 original = new ImVec2(5, 5);
final ImVec2 value = original.plus(1, 2);
assertEquals(6, value.x);
assertEquals(7, value.y);
assertNotSame(original, value);
}

@Test
void withImVec2() {
final ImVec2 value = new ImVec2(5, 5).plus(new ImVec2(1, 2));
final ImVec2 original = new ImVec2(5, 5);
final ImVec2 value = original.plus(new ImVec2(1, 2));
assertEquals(6, value.x);
assertEquals(7, value.y);
assertNotSame(original, value);
}
}

@Nested
class minus {
@Test
void withFloats() {
final ImVec2 value = new ImVec2(5, 5).minus(1, 2);
final ImVec2 original = new ImVec2(5, 5);
final ImVec2 value = original.minus(1, 2);
assertEquals(4, value.x);
assertEquals(3, value.y);
assertNotSame(original, value);
}

@Test
void withImVec2() {
final ImVec2 value = new ImVec2(5, 5).minus(new ImVec2(1, 2));
final ImVec2 original = new ImVec2(5, 5);
final ImVec2 value = original.minus(new ImVec2(1, 2));
assertEquals(4, value.x);
assertEquals(3, value.y);
assertNotSame(original, value);
}
}

@Nested
class times {
@Test
void withFloats() {
final ImVec2 value = new ImVec2(5, 5).times(1, 2);
final ImVec2 original = new ImVec2(5, 5);
final ImVec2 value = original.times(1, 2);
assertEquals(5, value.x);
assertEquals(10, value.y);
assertNotSame(original, value);
}

@Test
void withImVec2() {
final ImVec2 value = new ImVec2(5, 5).times(new ImVec2(1, 2));
final ImVec2 original = new ImVec2(5, 5);
final ImVec2 value = original.times(new ImVec2(1, 2));
assertEquals(5, value.x);
assertEquals(10, value.y);
assertNotSame(original, value);
}
}

@Nested
class div {
@Test
void withFloats() {
final ImVec2 original = new ImVec2(10, 10);
final ImVec2 value = original.div(5, 2);
assertEquals(2, value.x);
assertEquals(5, value.y);
assertNotSame(original, value);
}

@Test
void withImVec2() {
final ImVec2 original = new ImVec2(10, 10);
final ImVec2 value = original.div(new ImVec2(5, 2));
assertEquals(2, value.x);
assertEquals(5, value.y);
assertNotSame(original, value);
}
}
}
Loading