Merge pull request #14 from FreakingChicken/master

Crazydiamonde · web-flow · commit 375b83c68c76 · 2024-08-25T06:17:29.000-04:00
Added Terrain previews in the type selector
diff --git a/src/main/java/com/woogleFX/editorObjects/attributes/dataTypes/Color.java b/src/main/java/com/woogleFX/editorObjects/attributes/dataTypes/Color.java
@@ -38,6 +38,13 @@ public Color(int a, int r, int g, int b){
         this.b = b;
     }
 
+    public Color(double a, double r, double g, double b){
+        this.a = (int) Math.round(255 * a);
+        this.r = (int) Math.round(255 * r);
+        this.g = (int) Math.round(255 * g);
+        this.b = (int) Math.round(255 * b);
+    }
+
     public static Color parse(String input){
 
         if (input.equals("1")) return new Color(255, 255, 255, 255);
diff --git a/src/main/java/com/woogleFX/engine/fx/FXPropertiesView.java b/src/main/java/com/woogleFX/engine/fx/FXPropertiesView.java
@@ -16,6 +16,7 @@
 import com.woogleFX.engine.undoHandling.userActions.AttributeChangeAction;
 import com.worldOfGoo.resrc.ResrcImage;
 import com.worldOfGoo2.util.ItemHelper;
+import com.worldOfGoo2.util.TerrainHelper;
 import javafx.application.Platform;
 import javafx.geometry.Bounds;
 import javafx.geometry.Insets;
@@ -29,7 +30,10 @@
 import javafx.util.StringConverter;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 public class FXPropertiesView {
 
@@ -38,6 +42,8 @@ public static TreeTableView<EditorAttribute> getPropertiesView() {
         return propertiesView;
     }
 
+    public static Map<String, Button> terrainTypeElements = new HashMap<>();
+
 
     public static void init() {
 
@@ -502,19 +508,38 @@ private static ContextMenu possibleAttributeValues(TextFieldTreeTableCell<Editor
 
                 for (String itemType : ItemHelper.terrainTypeNameMap.values()) {
                     if (!itemType.toLowerCase().contains(currentText.toLowerCase())) continue;
-                    Button setImageItem = new Button(itemType);
+                    Button setImageItem;
+                    if (terrainTypeElements.containsKey(itemType)) {
+                        setImageItem = terrainTypeElements.get(itemType);
 
-                    configureButton(setImageItem);
+                        setImageItem.setOnAction(event -> {
+                            UndoManager.registerChange(new AttributeChangeAction(attribute,
+                                    attribute.stringValue(), itemType));
+                            attribute.setValue(itemType);
+                            if (contextMenu.isFocused()) {
+                                cell.commitEdit(attribute.stringValue());
+                                TerrainHelper.terrainColorCache.clear();
+                            }
+                        });
 
-                    setImageItem.setOnAction(event -> {
-                        UndoManager.registerChange(new AttributeChangeAction(attribute,
-                                attribute.stringValue(), itemType));
-                        attribute.setValue(itemType);
-                        if (contextMenu.isFocused()) {
-                            cell.commitEdit(attribute.stringValue());
-                        }
-                    });
+                    } else {
+                        setImageItem = new Button(itemType);
 
+                        configureButton(setImageItem);
+
+                        setImageItem.setOnAction(event -> {
+                            UndoManager.registerChange(new AttributeChangeAction(attribute,
+                                    attribute.stringValue(), itemType));
+                            attribute.setValue(itemType);
+                            if (contextMenu.isFocused()) {
+                                cell.commitEdit(attribute.stringValue());
+                                TerrainHelper.terrainColorCache.clear();
+                            }
+                        });
+                        setImageItem.setGraphic(TerrainHelper.terrainPreviewImage(itemType));
+
+                        terrainTypeElements.put(itemType, setImageItem);
+                    }
                     vBox.getChildren().add(setImageItem);
                 }
 
diff --git a/src/main/java/com/woogleFX/file/FileManager.java b/src/main/java/com/woogleFX/file/FileManager.java
@@ -318,6 +318,8 @@ public static ArrayList<EditorObject> openResources(GameVersion version) throws
             saxParser.parse(ballFile, defaultHandler);
             ballFile = new File(dir + "/res/environments/images/_resources.xml");
             saxParser.parse(ballFile, defaultHandler);
+            ballFile = new File(dir + "/res/terrain/images/_resources.xml");
+            saxParser.parse(ballFile, defaultHandler);
         }
         return resources;
     }
diff --git a/src/main/java/com/woogleFX/file/resourceManagers/GlobalResourceManager.java b/src/main/java/com/woogleFX/file/resourceManagers/GlobalResourceManager.java
@@ -19,6 +19,7 @@
 import com.worldOfGoo.text.TextString;
 import com.worldOfGoo2.items._2_Item;
 import com.worldOfGoo2.util.ItemHelper;
+import com.worldOfGoo2.util.TerrainHelper;
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -85,6 +86,7 @@ public static void init() {
             new Thread(() -> {
                 try {
                     ResourceManager.findTerrainTypes(null, GameVersion.VERSION_WOG2);
+                    TerrainHelper.buildImageMap();
                 } catch (FileNotFoundException e) {
                     e.printStackTrace();
                 }
diff --git a/src/main/java/com/woogleFX/file/resourceManagers/ResourceManager.java b/src/main/java/com/woogleFX/file/resourceManagers/ResourceManager.java
@@ -16,9 +16,11 @@
 import com.worldOfGoo2.environments._2_Environment;
 import com.worldOfGoo2.items._2_Item;
 import com.worldOfGoo2.items._2_Item_Collection;
+import com.worldOfGoo2.misc._2_ImageID;
+import com.worldOfGoo2.terrain.BaseSettings;
 import com.worldOfGoo2.terrain._2_Terrain_Collection;
-import com.worldOfGoo2.terrain._2_Terrain_TerrainType;
 import com.worldOfGoo2.util.ItemHelper;
+import com.worldOfGoo2.util.TerrainHelper;
 import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.image.Image;
 
diff --git a/src/main/java/com/worldOfGoo2/environments/_2_Environment_Layer.java b/src/main/java/com/worldOfGoo2/environments/_2_Environment_Layer.java
@@ -26,7 +26,7 @@ public _2_Environment_Layer(EditorObject parent) {
         addAttribute("anchorsTakeDepthIntoAccount", InputField._2_STRING);
         addAttribute("bloom", InputField._2_STRING);
         addAttribute("color", InputField._2_STRING);
-        addAttribute("blendingType", InputField._2_STRING);
+        addAttribute("blendingType", InputField._2_NUMBER);
         addAttribute("flashAnimationName", InputField._2_STRING);
         addAttribute("isFlashAnimation", InputField._2_STRING);
         addAttribute("animScroll", InputField._2_STRING).setChildAlias(_2_Point.class);
diff --git a/src/main/java/com/worldOfGoo2/level/_2_Level_Strand.java b/src/main/java/com/worldOfGoo2/level/_2_Level_Strand.java
@@ -20,6 +20,7 @@
 import com.worldOfGoo.ball.BallStrand;
 import com.worldOfGoo.level.BallInstance;
 import com.worldOfGoo2.misc._2_ImageID;
+import com.worldOfGoo2.util.TerrainHelper;
 import javafx.embed.swing.SwingFXUtils;
 import javafx.geometry.Point2D;
 import javafx.scene.image.Image;
@@ -283,6 +284,9 @@ public Paint getColor() {
                     } else {
                         return new Color(0.0 ,0.0, 1.0, 1);
                     }
+                }
+                if (goo1 != null && goo1.getAttribute("type").stringValue().equals("Terrain") && goo1.getAttribute("terrainGroup").intValue() > -1) {
+                    return TerrainHelper.averageColor(goo1.getAttribute("terrainGroup").intValue());
                 } else {
                     return new Color(0.5, 0.5, 0.5, 1);
                 }
diff --git a/src/main/java/com/worldOfGoo2/level/_2_Level_TerrainGroup.java b/src/main/java/com/worldOfGoo2/level/_2_Level_TerrainGroup.java
@@ -9,6 +9,7 @@
 import com.woogleFX.engine.fx.FXPropertiesView;
 import com.woogleFX.file.resourceManagers.GlobalResourceManager;
 import com.woogleFX.gameData.level.GameVersion;
+import com.woogleFX.gameData.level.WOG2Level;
 import com.worldOfGoo2.misc._2_Point;
 import com.worldOfGoo2.terrain._2_Terrain_TerrainType;
 import com.worldOfGoo2.util.ItemHelper;
@@ -57,6 +58,17 @@ public void setValue(String value) {
 
     }
 
+    @Override
+    public String getName() {
+        if (LevelManager.getLevel() != null && LevelManager.getLevel() instanceof WOG2Level level) {
+            for (int i = 0; i < level.getLevel().getChildren("terrainGroups").size(); i++) {
+                if (level.getLevel().getChildren("terrainGroups").get(i) == this) {
+                    return i + ", " + this.getAttribute("type").stringValue();
+                }
+            }
+        }
+        return "";
+    }
 
     @Override
     public void onLoaded() {
diff --git a/src/main/java/com/worldOfGoo2/terrain/BaseSettings.java b/src/main/java/com/worldOfGoo2/terrain/BaseSettings.java
@@ -1,12 +1,20 @@
 package com.worldOfGoo2.terrain;
 
 import com.woogleFX.editorObjects.EditorObject;
+import com.woogleFX.editorObjects.attributes.InputField;
 import com.woogleFX.gameData.level.GameVersion;
+import com.worldOfGoo2.ball._2_Ball_Image;
+import com.worldOfGoo2.misc._2_ImageID;
 
 public class BaseSettings extends EditorObject {
 
     public BaseSettings(EditorObject parent) {
         super(parent, "BaseSettings", GameVersion.VERSION_WOG2);
+
+        addAttribute("canBeStained", InputField._2_BOOLEAN);
+        addAttribute("metersToUv", InputField._2_NUMBER);
+        addAttribute("cliffDecorationValue", InputField._2_NUMBER);
+        addAttribute("images", InputField._2_LIST_CHILD).setChildAlias(_2_ImageID.class);
     }
 
 }
diff --git a/src/main/java/com/worldOfGoo2/terrain/_2_Terrain_TerrainType.java b/src/main/java/com/worldOfGoo2/terrain/_2_Terrain_TerrainType.java
@@ -1,12 +1,16 @@
 package com.worldOfGoo2.terrain;
 
 import com.woogleFX.editorObjects.EditorObject;
+import com.woogleFX.editorObjects.attributes.InputField;
 import com.woogleFX.gameData.level.GameVersion;
+import com.worldOfGoo2.misc._2_ImageID;
 
 public class _2_Terrain_TerrainType extends EditorObject {
 
     public _2_Terrain_TerrainType(EditorObject parent) {
         super(parent, "TerrainType", GameVersion.VERSION_WOG2);
+
+        addAttribute("baseSettings", InputField._2_CHILD).setChildAlias(BaseSettings.class);
     }
 
 }
diff --git a/src/main/java/com/worldOfGoo2/util/EnvironmentHelper.java b/src/main/java/com/worldOfGoo2/util/EnvironmentHelper.java
@@ -1,6 +1,7 @@
 package com.worldOfGoo2.util;
 
 import com.woogleFX.editorObjects.EditorObject;
+import com.woogleFX.editorObjects.ImageUtility;
 import com.woogleFX.gameData.level.GameVersion;
 import com.worldOfGoo2.environments._2_Environment;
 import com.worldOfGoo2.environments._2_Environment_ForegroundFX;
@@ -13,8 +14,6 @@
 import javafx.scene.image.WritableImage;
 import javafx.scene.paint.Color;
 
-import java.awt.*;
-import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
 
@@ -56,20 +55,30 @@ public static Image singleFromEnvironment(_2_Environment environment) {
             try {
                 var color = new BigInteger(layer.getAttribute("color").stringValue()).toString(16);
                 Image image = layer.getAttribute("imageName").imageValue(null, GameVersion.VERSION_WOG2);
+
+                var jfxColor = hex2ARGB(color);
+
+                image = ImageUtility.colorize(image,
+                        new com.woogleFX.editorObjects.attributes.dataTypes.Color(jfxColor.getOpacity(), jfxColor.getRed(), jfxColor.getGreen(), jfxColor.getBlue()));
+
                 ImageView view = getEffectsView(image, monochrome, color);
 
                 int blendMode = 2;
                 try {
-                    Integer.parseInt(layer.getAttribute("blendingType").stringValue()); // very very sorry to whoever finds this
-                } catch (Exception ignore) {}
+                    blendMode = layer.getAttribute("blendingType").intValue();
+                } catch (Exception e) { e.printStackTrace();}
 
                 gc.save();
 
-                gc.setGlobalAlpha(hex2ARGB(color).getOpacity());
+                gc.setGlobalAlpha(jfxColor.getOpacity());
+                var blend = new Blend();
 
                 switch(blendMode) {
                     case 3: { // ADD
                         gc.setGlobalBlendMode(BlendMode.ADD);
+
+                        blend.setMode(BlendMode.ADD);
+                        gc.setEffect(blend);
                     }
                     default: {
                         gc.setGlobalBlendMode(BlendMode.SRC_OVER);
@@ -90,19 +99,6 @@ public static Image singleFromEnvironment(_2_Environment environment) {
             }
         }
 
-        for (EditorObject part : environment.getChildren()) if (part instanceof _2_Environment_ForegroundFX fx) {
-            //if (fx.getName().equalsIgnoreCase("finalFx")) {
-
-                var blend = new Blend(BlendMode.MULTIPLY, monochrome,
-                        new ColorInput(0, 0, canvas.getWidth(), canvas.getHeight(),
-                                new javafx.scene.paint.Color(
-                                        part.getAttribute("layerRed").doubleValue(),
-                                        part.getAttribute("layerGreen").doubleValue(),
-                                        part.getAttribute("layerBlue").doubleValue(), 0f)));
-                gc.setEffect(blend);
-            //}
-        }
-
         WritableImage writableImage = new WritableImage((int)canvas.getWidth(), (int)canvas.getHeight());
         canvas.snapshot(null, writableImage);
 
@@ -114,48 +110,23 @@ private static ImageView getEffectsView(Image image, ColorAdjust monochrome, Str
         view.setFitWidth(image.getWidth());
         view.setFitHeight(image.getHeight());
         view.setImage(image);
-        /*
-        var blend = new Blend(BlendMode.MULTIPLY, monochrome,
-                new ColorInput(0, 0, view.getImage().getWidth(), view.getImage().getHeight(),
-                        new javafx.scene.paint.Color(color.getRed() / 255d, color.getGreen() / 255d, color.getBlue() / 255d, color.getAlpha() / 255d)));
-        view.setEffect(blend);
-        */
-        /*
-        Lighting lighting = new Lighting(new Light.Distant(45, 90, hex2ARGB(color)));
-        ColorAdjust bright = new ColorAdjust(0, 1, 1, 1);
-        lighting.setContentInput(bright);
-        lighting.setSurfaceScale(0.0);
-
-        view.setEffect(lighting);
-
-         */
-
-        var c = hex2ARGB(color);
-
-        ColorAdjust bright = new ColorAdjust();
-
-        bright.setSaturation(c.getSaturation());
-        bright.setHue(c.getHue());
-
-        view.setEffect(bright);
 
         return view;
     }
 
     public static javafx.scene.paint.Color hex2ARGB(String h) {
         try {
-            if (h.length() == 8) { // AARRGGBB
-                var a = Integer.valueOf(h.substring(0, 2), 16);
-                var r = Integer.valueOf(h.substring(2, 4), 16);
-                var g = Integer.valueOf(h.substring(4, 6), 16);
-                var b = Integer.valueOf(h.substring(6, 8), 16);
-                return new Color(r / 255d, g / 255d, b / 255d, a / 255d);
-            } else { // RRGGBB
+            if (h.length() < 8) {
                 var r = Integer.valueOf(h.substring(0, 2), 16);
                 var g = Integer.valueOf(h.substring(2, 4), 16);
                 var b = Integer.valueOf(h.substring(4, 6), 16);
-                return new Color(r / 255d, g / 255d, b / 255d, 1.0);
+                return new Color(r / 255d, g / 255d, b / 255d, 1);
             }
+            var a = Integer.valueOf(h.substring(0, 2), 16);
+            var r = Integer.valueOf(h.substring(2, 4), 16);
+            var g = Integer.valueOf(h.substring(4, 6), 16);
+            var b = Integer.valueOf(h.substring(6, 8), 16);
+            return new Color(r / 255d, g / 255d, b / 255d, a / 255d);
         } catch(Exception e) { // If a color is invalid we'll just use white
             System.out.println("Error while loading color " + h);
             e.printStackTrace();
diff --git a/src/main/java/com/worldOfGoo2/util/TerrainHelper.java b/src/main/java/com/worldOfGoo2/util/TerrainHelper.java

Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,8 @@ public static ArrayList<EditorObject> openResources(GameVersion version) throws`
`318`	`318`	`saxParser.parse(ballFile, defaultHandler);`
`319`	`319`	`ballFile = new File(dir + "/res/environments/images/_resources.xml");`
`320`	`320`	`saxParser.parse(ballFile, defaultHandler);`
	`321`	`+ ballFile = new File(dir + "/res/terrain/images/_resources.xml");`
	`322`	`+ saxParser.parse(ballFile, defaultHandler);`
`321`	`323`	`}`
`322`	`324`	`return resources;`
`323`	`325`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,16 @@`
`1`	`1`	`package com.worldOfGoo2.terrain;`
`2`	`2`
`3`	`3`	`import com.woogleFX.editorObjects.EditorObject;`
	`4`	`+import com.woogleFX.editorObjects.attributes.InputField;`
`4`	`5`	`import com.woogleFX.gameData.level.GameVersion;`
	`6`	`+import com.worldOfGoo2.misc._2_ImageID;`
`5`	`7`
`6`	`8`	`public class _2_Terrain_TerrainType extends EditorObject {`
`7`	`9`
`8`	`10`	`public _2_Terrain_TerrainType(EditorObject parent) {`
`9`	`11`	`super(parent, "TerrainType", GameVersion.VERSION_WOG2);`
	`12`	`+`
	`13`	`+ addAttribute("baseSettings", InputField._2_CHILD).setChildAlias(BaseSettings.class);`
`10`	`14`	`}`
`11`	`15`
`12`	`16`	`}`