diff --git a/h2d-libgdx-talos-extension b/h2d-libgdx-talos-extension index 946b6beb..af8045e3 160000 --- a/h2d-libgdx-talos-extension +++ b/h2d-libgdx-talos-extension @@ -1 +1 @@ -Subproject commit 946b6beb7e624044fdab1ee7c6bba4e02d9554d3 +Subproject commit af8045e3c778cddc5129c26a8dcd921308e1dbcd diff --git a/src/main/java/games/rednblack/editor/controller/commands/component/UpdateTalosDataCommand.java b/src/main/java/games/rednblack/editor/controller/commands/component/UpdateTalosDataCommand.java index 6675160a..5df98e11 100644 --- a/src/main/java/games/rednblack/editor/controller/commands/component/UpdateTalosDataCommand.java +++ b/src/main/java/games/rednblack/editor/controller/commands/component/UpdateTalosDataCommand.java @@ -25,6 +25,7 @@ public class UpdateTalosDataCommand extends EntityModifyRevertibleCommand { TalosComponent talosComponent = SandboxComponentRetriever.get(entity, TalosComponent.class); talosComponent.transform = vo.transform; + talosComponent.autoStart = vo.autoStart; talosComponent.effect.setPosition(0, 0); Facade.getInstance().sendNotification(MsgAPI.ITEM_DATA_UPDATED, entity); @@ -37,6 +38,7 @@ public class UpdateTalosDataCommand extends EntityModifyRevertibleCommand { TalosComponent talosComponent = SandboxComponentRetriever.get(entity, TalosComponent.class); talosComponent.effect.setPosition(0, 0); talosComponent.transform = backup.transform; + talosComponent.autoStart = backup.autoStart; Facade.getInstance().sendNotification(MsgAPI.ITEM_DATA_UPDATED, entity); } diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UITalosProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UITalosProperties.java index 4ca99e75..b096fe34 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UITalosProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UITalosProperties.java @@ -1,21 +1,21 @@ package games.rednblack.editor.view.ui.properties.panels; -import com.badlogic.gdx.utils.Align; import com.kotcrab.vis.ui.widget.VisCheckBox; import games.rednblack.editor.event.CheckBoxChangeListener; import games.rednblack.editor.view.ui.properties.UIItemCollapsibleProperties; import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; public class UITalosProperties extends UIItemCollapsibleProperties { - private VisCheckBox matrixTransformCheckBox; + private final VisCheckBox matrixTransformCheckBox, autoStartCheckBox; public UITalosProperties() { super("Talos VFX"); - matrixTransformCheckBox = StandardWidgetsFactory.createCheckBox(); + matrixTransformCheckBox = StandardWidgetsFactory.createCheckBox("Matrix Transform"); + autoStartCheckBox = StandardWidgetsFactory.createCheckBox("Auto Start"); - mainTable.add(StandardWidgetsFactory.createLabel("Matrix Transform", Align.right)).padRight(5).width(120).right(); mainTable.add(matrixTransformCheckBox).left().row(); + mainTable.add(autoStartCheckBox).left().row(); setListeners(); } @@ -29,11 +29,20 @@ public class UITalosProperties extends UIItemCollapsibleProperties { return matrixTransformCheckBox.isChecked(); } + public boolean isAutoStartEnabled() { + return autoStartCheckBox.isChecked(); + } + public void setMatrixTransformEnabled(boolean scissorsEnabled) { matrixTransformCheckBox.setChecked(scissorsEnabled); } + public void setAutoStartEnabled(boolean autoStart) { + autoStartCheckBox.setChecked(autoStart); + } + private void setListeners() { matrixTransformCheckBox.addListener(new CheckBoxChangeListener(getUpdateEventName())); + autoStartCheckBox.addListener(new CheckBoxChangeListener(getUpdateEventName())); } } diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UITalosPropertiesMediator.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UITalosPropertiesMediator.java index 94d685a0..c7eeab7a 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UITalosPropertiesMediator.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UITalosPropertiesMediator.java @@ -18,13 +18,16 @@ public class UITalosPropertiesMediator extends UIItemPropertiesMediator