From b561d2eac6518c3d197c74060496444753621d27 Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Mon, 11 Apr 2022 20:17:32 +0200 Subject: [PATCH] Made types clone copieble --- .../love/distributedrebirth/numberxd/base2t/BaseNumber.java | 6 +++++- .../distributedrebirth/numberxd/base2t/type/V006Tixte.java | 4 ++-- .../distributedrebirth/numberxd/base2t/type/V009Tyte.java | 4 ++-- .../distributedrebirth/numberxd/base2t/type/V018Tord.java | 4 ++-- .../distributedrebirth/numberxd/base2t/type/V027Temvig.java | 4 ++-- .../distributedrebirth/numberxd/base2t/type/V036Teger.java | 4 ++-- .../distributedrebirth/numberxd/base2t/type/V042Traw.java | 4 ++-- .../distributedrebirth/numberxd/base2t/type/V072Tong.java | 4 ++-- .../distributedrebirth/numberxd/base2t/type/V144Tocta.java | 4 ++-- .../numberxd/base2t/typexl/V0x000348ˣᴸ.java | 4 ++-- .../numberxd/base2t/typexl/V0x000654ˣᴸ.java | 4 ++-- .../numberxd/base2t/typexl/V0x000CA8ˣᴸ.java | 4 ++-- .../numberxd/base2t/typexl/V0x0013B0ˣᴸ.java | 4 ++-- .../love/distributedrebirth/unicode4d/draw/ImCharacter.java | 2 +- 14 files changed, 30 insertions(+), 26 deletions(-) diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/BaseNumber.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/BaseNumber.java index 6ff372ae..658f1d8b 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/BaseNumber.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/BaseNumber.java @@ -16,7 +16,11 @@ public interface BaseNumber> { int BãßBitCount(); - V toClone(); + default V toClone() { + return toClone(iteratorOctalsByClone()); + } + + V toClone(BaseIteratorOctal values); void fillOctalsByClone(BaseAppenderOctal appender); diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V006Tixte.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V006Tixte.java index 55f38e9a..d5784bb8 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V006Tixte.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V006Tixte.java @@ -43,8 +43,8 @@ public final class V006Tixte implements BaseNumber { } @Override - public V006Tixte toClone() { - return new V006Tixte(iteratorOctalsByClone()); + public V006Tixte toClone(BaseIteratorOctal values) { + return new V006Tixte(values); } @Override diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V009Tyte.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V009Tyte.java index 0089bb2a..ec5ba3b4 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V009Tyte.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V009Tyte.java @@ -59,8 +59,8 @@ public final class V009Tyte implements BaseNumberTyte { } @Override - public V009Tyte toClone() { - return new V009Tyte(iteratorOctalsByClone()); + public V009Tyte toClone(BaseIteratorOctal values) { + return new V009Tyte(values); } @Override diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V018Tord.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V018Tord.java index 502b135c..1ed3999f 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V018Tord.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V018Tord.java @@ -70,8 +70,8 @@ public final class V018Tord implements BaseNumberTyte { } @Override - public V018Tord toClone() { - return new V018Tord(iteratorOctalsByClone()); + public V018Tord toClone(BaseIteratorOctal values) { + return new V018Tord(values); } @Override diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V027Temvig.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V027Temvig.java index 5a1a1fd6..3441b9ab 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V027Temvig.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V027Temvig.java @@ -49,8 +49,8 @@ public final class V027Temvig implements BaseNumberTyte { } @Override - public V027Temvig toClone() { - return new V027Temvig(iteratorOctalsByClone()); + public V027Temvig toClone(BaseIteratorOctal values) { + return new V027Temvig(values); } @Override diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V036Teger.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V036Teger.java index 5d1cd144..460feb45 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V036Teger.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V036Teger.java @@ -71,8 +71,8 @@ public final class V036Teger implements BaseNumberTyte { } @Override - public V036Teger toClone() { - return new V036Teger(iteratorOctalsByClone()); + public V036Teger toClone(BaseIteratorOctal values) { + return new V036Teger(values); } @Override diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V042Traw.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V042Traw.java index 64b9e1e3..1e94337e 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V042Traw.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V042Traw.java @@ -41,8 +41,8 @@ public final class V042Traw implements BaseNumber { } @Override - public V042Traw toClone() { - return new V042Traw(iteratorOctalsByClone()); + public V042Traw toClone(BaseIteratorOctal values) { + return new V042Traw(values); } @Override diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V072Tong.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V072Tong.java index 6a055249..4878621c 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V072Tong.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V072Tong.java @@ -62,8 +62,8 @@ public final class V072Tong implements BaseNumberTyte { } @Override - public V072Tong toClone() { - return new V072Tong(iteratorOctalsByClone()); + public V072Tong toClone(BaseIteratorOctal values) { + return new V072Tong(values); } @Override diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V144Tocta.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V144Tocta.java index f717718b..21c4cc1f 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V144Tocta.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/type/V144Tocta.java @@ -78,8 +78,8 @@ public final class V144Tocta implements BaseNumberTyte { } @Override - public V144Tocta toClone() { - return new V144Tocta(iteratorOctalsByClone()); + public V144Tocta toClone(BaseIteratorOctal values) { + return new V144Tocta(values); } @Override diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x000348ˣᴸ.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x000348ˣᴸ.java index 0165eb5e..9836b99e 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x000348ˣᴸ.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x000348ˣᴸ.java @@ -42,8 +42,8 @@ public class V0x000348ˣᴸ implements BaseNumberˣᴸ { } @Override - public V0x000348ˣᴸ toClone() { - return new V0x000348ˣᴸ(iteratorOctalsByClone()); + public V0x000348ˣᴸ toClone(BaseIteratorOctal values) { + return new V0x000348ˣᴸ(values); } @Override diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x000654ˣᴸ.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x000654ˣᴸ.java index 1c21c4a6..a9755c26 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x000654ˣᴸ.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x000654ˣᴸ.java @@ -43,8 +43,8 @@ public class V0x000654ˣᴸ implements BaseNumberTyteˣᴸ { } @Override - public V0x000654ˣᴸ toClone() { - return new V0x000654ˣᴸ(iteratorOctalsByClone()); + public V0x000654ˣᴸ toClone(BaseIteratorOctal values) { + return new V0x000654ˣᴸ(values); } @Override diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x000CA8ˣᴸ.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x000CA8ˣᴸ.java index e0ff8bb1..3c91ae9f 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x000CA8ˣᴸ.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x000CA8ˣᴸ.java @@ -43,8 +43,8 @@ public class V0x000CA8ˣᴸ implements BaseNumberTyteˣᴸ { } @Override - public V0x000CA8ˣᴸ toClone() { - return new V0x000CA8ˣᴸ(iteratorOctalsByClone()); + public V0x000CA8ˣᴸ toClone(BaseIteratorOctal values) { + return new V0x000CA8ˣᴸ(values); } @Override diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x0013B0ˣᴸ.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x0013B0ˣᴸ.java index 10dd3c80..d866ed8b 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x0013B0ˣᴸ.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/typexl/V0x0013B0ˣᴸ.java @@ -41,8 +41,8 @@ public class V0x0013B0ˣᴸ implements BaseNumberˣᴸ { } @Override - public V0x0013B0ˣᴸ toClone() { - return new V0x0013B0ˣᴸ(iteratorOctalsByClone()); + public V0x0013B0ˣᴸ toClone(BaseIteratorOctal values) { + return new V0x0013B0ˣᴸ(values); } @Override diff --git a/gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/draw/ImCharacter.java b/gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/draw/ImCharacter.java index 7efdefd4..f99daf4c 100644 --- a/gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/draw/ImCharacter.java +++ b/gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/draw/ImCharacter.java @@ -27,7 +27,7 @@ public class ImCharacter { float yOff = p0.y + 19f; float yFlip = -1f; float scale = 0.0199f; - if (drawChar.getyMax() > 800) { + if (drawChar.getyMax() > 900) { scale = 0.0100f; } ImGlyphPathCommand first = null;