2.11.24 - Fix defautl variant uv transform being overriden by animation ones when not different.

Author: Waterpicker

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "gg.generations"
-version = "2.11.23"
+version = "2.11.24"
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 

src/library/java/gg/generations/rarecandy/pokeutils/PixelAsset.java

@@ -40,28 +40,31 @@ public class PixelAsset {
                     if (json.getAsJsonArray().size() == 2) {
                         vec.set(json.getAsJsonArray().get(0).getAsFloat(), json.getAsJsonArray().get(1).getAsFloat());
                     }
+                } else if(json.isJsonObject()) {
+                    var obj = json.getAsJsonObject();
+
+                    if(obj.has("x")) vec.x = obj.getAsJsonPrimitive("x").getAsFloat();
+                    if(obj.has("y")) vec.y = obj.getAsJsonPrimitive("y").getAsFloat();
                 }
 
                 return vec;
             })
-            .registerTypeAdapter(VariantDetails.class, new GenericJsonThing<VariantDetails>(new BiFunction<VariantDetails, JsonSerializationContext, JsonElement>() {
-                @Override
-                public JsonElement apply(VariantDetails variantDetails, JsonSerializationContext ctx) {
-                    var obj = new JsonObject();
-                    if (variantDetails.material() != null) obj.addProperty("material", variantDetails.material());
-                    if (variantDetails.hide() != null) obj.addProperty("hide", variantDetails.hide());
-                    if (variantDetails.offset() != null && variantDetails.offset() != AnimationController.NO_OFFSET)
-                        obj.add("offset", ctx.serialize(variantDetails.offset()));
+            .registerTypeAdapter(VariantDetails.class, new GenericJsonThing<VariantDetails>((variantDetails, ctx) -> {
+                var obj = new JsonObject();
+                if (variantDetails.material() != null) obj.addProperty("material", variantDetails.material());
+                if (variantDetails.hide() != null) obj.addProperty("hide", variantDetails.hide());
+                if (variantDetails.offset() != null && variantDetails.offset() != AnimationController.NO_OFFSET)
+                    obj.add("transform", ctx.serialize(variantDetails.offset()));
 
-                    return obj;
-                }
+                return obj;
             }, new BiFunction<JsonElement, JsonDeserializationContext, VariantDetails>() {
                 @Override
                 public VariantDetails apply(JsonElement jsonElement, JsonDeserializationContext ctx) {
                     var obj = jsonElement.getAsJsonObject();
                     var material = obj.has("material") ? obj.getAsJsonPrimitive("material").getAsString() : null;
                     var hide = obj.has("hide") ? obj.getAsJsonPrimitive("hide").getAsBoolean() : null;
                     Transform offset = obj.has("offset") ? ctx.deserialize(obj.get("offset"), Transform.class) : null;
+                    offset = offset == null && obj.has("transform") ? ctx.deserialize(obj.get("transform"), Transform.class) : null;
                     return new VariantDetails(material, hide, offset);
                 }
             }))
@@ -95,8 +98,15 @@ public VariantDetails apply(JsonElement jsonElement, JsonDeserializationContext
                     if (json.getAsJsonArray().size() == 3) {
                         vec.set(json.getAsJsonArray().get(0).getAsFloat(), json.getAsJsonArray().get(1).getAsFloat(), json.getAsJsonArray().get(2).getAsFloat());
                     }
+                } else if(json.isJsonObject()) {
+                    var obj = json.getAsJsonObject();
+
+                    if(obj.has("x")) vec.x = obj.getAsJsonPrimitive("x").getAsFloat();
+                    if(obj.has("y")) vec.y = obj.getAsJsonPrimitive("y").getAsFloat();
+                    if(obj.has("z")) vec.y = obj.getAsJsonPrimitive("z").getAsFloat();
                 }
 
+
                 return vec;
             }))
             .registerTypeAdapter(Quaternionf.class, new GenericJsonThing<Quaternionf>((json, ctx) -> {

src/library/java/gg/generations/rarecandy/renderer/animation/Transform.java

@@ -3,13 +3,20 @@
 import org.joml.Vector2f;
 
 public record Transform(Vector2f scale, Vector2f offset) {
+    public static final Vector2f DEFAULT_SCALE = new Vector2f(1f, 1f);
+    public static final Vector2f DEFAULT_OFFSET = new Vector2f(0f, 0f);
+
     public Transform() {
         this(new Vector2f());
     }
 
     public Transform(Vector2f offset) {
         this(new Vector2f(1f, 1f), offset);
     }
+
+    public boolean isUnit() {
+        return offset.x == 0f && offset.y == 0f && scale.x == 1f && scale.y == 1f;
+    }
 }
 
 

src/main/java/gg/generations/rarecandy/tools/gui/GuiPipelines.java

@@ -34,25 +34,33 @@ public class GuiPipelines {
                 if (ctx.instance() instanceof AnimatedObjectInstance instance) {
                     var t = instance.getTransform(ctx.getMaterial().getMaterialName());
 
-                    if (t != null) {
+                    if (t != null && !t.isUnit()) {
                         transform = t;
                     }
                 }
 
-                ctx.uniform().uploadVec2f(transform.offset());
+                var offset = transform.offset();
+
+                if(offset == null) offset = Transform.DEFAULT_OFFSET;
+
+                ctx.uniform().uploadVec2f(offset);
             })
             .supplyUniform("scale", ctx -> {
                 Transform transform = ctx.object().getTransform(ctx.instance().variant());
 
                 if (ctx.instance() instanceof AnimatedObjectInstance instance) {
                     var t = instance.getTransform(ctx.getMaterial().getMaterialName());
 
-                    if (t != null) {
+                    if (t != null && !t.isUnit()) {
                         transform = t;
                     }
                 }
 
-                ctx.uniform().uploadVec2f(transform.scale());
+                var scale = transform.scale();
+
+                if(scale == null) scale = Transform.DEFAULT_SCALE;
+
+                ctx.uniform().uploadVec2f(scale);
             })
             .prePostDraw(material -> {
                 if(material.getBoolean("disableDepth")) {