Add fix for origin not being set correctly. Added shipBuilderOrigin as a new parameter to hullConfig to store the original origin value that was loaded from the file, whereas origin is the value that is used after it has been processed.

Author: SimonC4

main/src/com/miloshpetrov/sol2/files/HullConfigManager.java

@@ -123,7 +123,7 @@ private HullConfig read(FileHandle hullConfigDirectory) {
     }
 
     private void parseGunSlotList(JsonValue containerNode, HullConfig.Data configData) {
-        Vector2 builderOrigin = shipBuilder.getOrigin(configData.internalName);
+        Vector2 builderOrigin = new Vector2(configData.shipBuilderOrigin);
 
         for(JsonValue gunSlotNode: containerNode) {
             Vector2 position = readVector2(gunSlotNode, "position", null);
@@ -161,6 +161,10 @@ private void readProperties(FileHandle propertiesFile, HullConfig.Data configDat
         configData.price = jsonNode.getInt("price", 0);
         configData.hirePrice = jsonNode.getFloat("hirePrice", 0);
 
+        Vector2 tmpV = new Vector2(jsonNode.get("rigidBody").get("origin").getFloat("x"),
+                1 - jsonNode.get("rigidBody").get("origin").getFloat("y"));
+        configData.shipBuilderOrigin.set(tmpV);
+
         process(configData);
 
         parseGunSlotList(jsonNode.get("gunSlots"), configData);
@@ -185,7 +189,7 @@ private AbilityConfig loadAbility(
     // Seems to offsets all positions by the shipbuilder origin
     // Todo: Find out what this function does and provide a better name.
     private void process(HullConfig.Data configData) {
-        Vector2 builderOrigin = shipBuilder.getOrigin(configData.internalName);
+        Vector2 builderOrigin = new Vector2(configData.shipBuilderOrigin);
 
         configData.origin.set(builderOrigin)
                          .scl(configData.size);

main/src/com/miloshpetrov/sol2/game/PathLoader.java

@@ -403,7 +403,7 @@ public Body getBodyAndSprite(SolGame game, HullConfig hullConfig, float scale, B
             fd.shape.dispose();
         }
 
-        orig = getOrigin(pathName, 1);
+        orig = hullConfig.getShipBuilderOrigin();
         if (tex == null) {
             String imgName = pathName;
             tex = hullConfig.getTexture();

main/src/com/miloshpetrov/sol2/game/ship/hulls/HullConfig.java

@@ -104,6 +104,10 @@ public Vector2 getOrigin() {
         return new Vector2(data.origin);
     }
 
+    public Vector2 getShipBuilderOrigin() {
+        return new Vector2(data.shipBuilderOrigin);
+    }
+
     private static List<Vector2> deepCopyOf(List<Vector2> src) {
         List<Vector2> returnList = new ArrayList<Vector2>(src.size());
 
@@ -143,7 +147,10 @@ public final static class Data {
         public String displayName;
         public float price;
         public float hirePrice;
+        // origin is the value after it has been processed
         public Vector2 origin = new Vector2();
+        // shipBuilderOrigin is the vector loaded from the file
+        public Vector2 shipBuilderOrigin = new Vector2();
 
         public Data() {
 
@@ -170,6 +177,7 @@ public Data(Data src) {
             this.price = src.price;
             this.hirePrice = src.hirePrice;
             this.origin = new Vector2(src.origin);
+            this.shipBuilderOrigin = new Vector2(src.shipBuilderOrigin);
             this.gunSlots.addAll(src.gunSlots);
         }