diff --git a/assets/plugins/plugin-9patch-0.0.8.jar b/assets/plugins/plugin-9patch-0.1.0.jar similarity index 91% rename from assets/plugins/plugin-9patch-0.0.8.jar rename to assets/plugins/plugin-9patch-0.1.0.jar index 8044429d..42476fe6 100644 Binary files a/assets/plugins/plugin-9patch-0.0.8.jar and b/assets/plugins/plugin-9patch-0.1.0.jar differ diff --git a/assets/plugins/plugin-performance-0.0.8.jar b/assets/plugins/plugin-performance-0.1.0.jar similarity index 84% rename from assets/plugins/plugin-performance-0.0.8.jar rename to assets/plugins/plugin-performance-0.1.0.jar index 90e30b05..c680db07 100644 Binary files a/assets/plugins/plugin-performance-0.0.8.jar and b/assets/plugins/plugin-performance-0.1.0.jar differ diff --git a/assets/plugins/plugin-skin-composer-0.0.8.jar b/assets/plugins/plugin-skin-composer-0.1.0.jar similarity index 88% rename from assets/plugins/plugin-skin-composer-0.0.8.jar rename to assets/plugins/plugin-skin-composer-0.1.0.jar index ae8f5303..9568b108 100644 Binary files a/assets/plugins/plugin-skin-composer-0.0.8.jar and b/assets/plugins/plugin-skin-composer-0.1.0.jar differ diff --git a/assets/plugins/plugin-tiled-0.0.8.jar b/assets/plugins/plugin-tiled-0.1.0.jar similarity index 68% rename from assets/plugins/plugin-tiled-0.0.8.jar rename to assets/plugins/plugin-tiled-0.1.0.jar index 9930452c..034c75ab 100644 Binary files a/assets/plugins/plugin-tiled-0.0.8.jar and b/assets/plugins/plugin-tiled-0.1.0.jar differ diff --git a/h2d-libgdx-spine-extension b/h2d-libgdx-spine-extension index b6ecaca3..dc01b4d6 160000 --- a/h2d-libgdx-spine-extension +++ b/h2d-libgdx-spine-extension @@ -1 +1 @@ -Subproject commit b6ecaca39d3ef8d9e8b78ac2943a97d9258bed15 +Subproject commit dc01b4d6f53b1a80258592eab11cbd904c7e89c0 diff --git a/h2d-libgdx-talos-extension b/h2d-libgdx-talos-extension index 35f0a1ed..0cc2a1e4 160000 --- a/h2d-libgdx-talos-extension +++ b/h2d-libgdx-talos-extension @@ -1 +1 @@ -Subproject commit 35f0a1ed8c739150078c12df6a2cb9954300402f +Subproject commit 0cc2a1e49168c857816c7326601fc3748ff7671f diff --git a/h2d-libgdx-typinglabel-extension b/h2d-libgdx-typinglabel-extension index 40d2d963..867d7703 160000 --- a/h2d-libgdx-typinglabel-extension +++ b/h2d-libgdx-typinglabel-extension @@ -1 +1 @@ -Subproject commit 40d2d9637ae8b4c7f4c7c3119b1e1454eb471a4d +Subproject commit 867d770366aa901651842d2244026cf1959f45e1 diff --git a/hyperlap2d-runtime-libgdx b/hyperlap2d-runtime-libgdx index d15fc11c..91b18cc5 160000 --- a/hyperlap2d-runtime-libgdx +++ b/hyperlap2d-runtime-libgdx @@ -1 +1 @@ -Subproject commit d15fc11cc2bcd9e2e57ca3e18297ebef9aaa6830 +Subproject commit 91b18cc5cf8bb79bf81ac61294016594c3bddedd diff --git a/plugin-9patch/build.gradle b/plugin-9patch/build.gradle index 579dce9e..9eb6accb 100644 --- a/plugin-9patch/build.gradle +++ b/plugin-9patch/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'games.rednblack' -version '0.0.8' +version '0.1.0' repositories { mavenCentral() diff --git a/plugin-performance/build.gradle b/plugin-performance/build.gradle index 579dce9e..9eb6accb 100644 --- a/plugin-performance/build.gradle +++ b/plugin-performance/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'games.rednblack' -version '0.0.8' +version '0.1.0' repositories { mavenCentral() diff --git a/plugin-skin-composer/build.gradle b/plugin-skin-composer/build.gradle index 784a0c26..6a26ecaa 100644 --- a/plugin-skin-composer/build.gradle +++ b/plugin-skin-composer/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'games.rednblack' -version '0.0.8' +version '0.1.0' repositories { mavenCentral() diff --git a/plugin-tiled/build.gradle b/plugin-tiled/build.gradle index bf2b3e9c..594abeaf 100644 --- a/plugin-tiled/build.gradle +++ b/plugin-tiled/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'games.rednblack' -version '0.0.8' +version '0.1.0' ext { pack = ["assets/textures", "assets/pack/", "tiled"] diff --git a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/TiledPanelMediator.java b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/TiledPanelMediator.java index b3dd8b81..51478435 100644 --- a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/TiledPanelMediator.java +++ b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/TiledPanelMediator.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.Iterator; import games.rednblack.editor.renderer.data.TexturePackVO; +import games.rednblack.h2d.extension.spine.SpineItemType; import org.puremvc.java.interfaces.INotification; import org.puremvc.java.patterns.mediator.Mediator; @@ -197,7 +198,7 @@ public class TiledPanelMediator extends Mediator { height = r.getRegionHeight() / TiledPlugin.AUTO_TILE_ROWS; } else { TileVO t = tiledPlugin.dataToSave.getTile(notification.getBody()); - if (t.entityType == EntityFactory.SPINE_TYPE) { + if (t.entityType == SpineItemType.SPINE_TYPE) { SpineDrawable spineDrawable = tiledPlugin.pluginRM.getSpineDrawable(t.regionName); width = spineDrawable.width; height = spineDrawable.height; @@ -404,7 +405,7 @@ public class TiledPanelMediator extends Mediator { else if (className.endsWith(".SpriteResource")) return EntityFactory.SPRITE_TYPE; else if (className.endsWith(".SpineResource")) - return EntityFactory.SPINE_TYPE; + return SpineItemType.SPINE_TYPE; return EntityFactory.UNKNOWN_TYPE; } diff --git a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/TilesResourceFilter.java b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/TilesResourceFilter.java index db747bc5..2071fc1d 100644 --- a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/TilesResourceFilter.java +++ b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/TilesResourceFilter.java @@ -2,6 +2,7 @@ package games.rednblack.editor.plugin.tiled; import games.rednblack.editor.renderer.factory.EntityFactory; import games.rednblack.h2d.common.filters.IAbstractResourceFilter; +import games.rednblack.h2d.extension.spine.SpineItemType; public class TilesResourceFilter extends IAbstractResourceFilter { @@ -16,7 +17,7 @@ public class TilesResourceFilter extends IAbstractResourceFilter { public boolean filterResource(String resName, int entityType) { if (entityType == EntityFactory.IMAGE_TYPE || entityType == EntityFactory.SPRITE_TYPE - || entityType == EntityFactory.SPINE_TYPE) { + || entityType == SpineItemType.SPINE_TYPE) { return tiledPlugin.dataToSave.containsAutoTile(resName) || tiledPlugin.dataToSave.containsTile(resName); } return false; diff --git a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/manager/ResourcesManager.java b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/manager/ResourcesManager.java index 7731319f..43d8efed 100644 --- a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/manager/ResourcesManager.java +++ b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/manager/ResourcesManager.java @@ -15,6 +15,7 @@ import games.rednblack.editor.plugin.tiled.TiledPlugin; import games.rednblack.editor.plugin.tiled.view.SpineDrawable; import games.rednblack.editor.renderer.factory.EntityFactory; import games.rednblack.h2d.extension.spine.ResourceRetrieverAttachmentLoader; +import games.rednblack.h2d.extension.spine.SpineItemType; import java.io.File; import java.io.FileOutputStream; @@ -98,7 +99,7 @@ public class ResourcesManager { if (spineDrawableCache.get(name) == null) { ResourceRetrieverAttachmentLoader atlasAttachmentLoader = new ResourceRetrieverAttachmentLoader(name, tiledPlugin.getAPI().getSceneLoader().getRm()); SkeletonJson skeletonJson = new SkeletonJson(atlasAttachmentLoader); - SkeletonData skeletonData = skeletonJson.readSkeletonData(tiledPlugin.getAPI().getSceneLoader().getRm().getSkeletonJSON(name)); + SkeletonData skeletonData = skeletonJson.readSkeletonData(tiledPlugin.getAPI().getSceneLoader().getRm().getExternalItemType(SpineItemType.SPINE_TYPE, name)); Skeleton skeleton = new Skeleton(skeletonData); spineDrawableCache.put(name, new SpineDrawable(skeleton, skeletonRenderer)); diff --git a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DrawTileTool.java b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DrawTileTool.java index 3623c243..1ce144e9 100644 --- a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DrawTileTool.java +++ b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DrawTileTool.java @@ -1,5 +1,6 @@ package games.rednblack.editor.plugin.tiled.tools; +import games.rednblack.h2d.extension.spine.SpineItemType; import org.puremvc.java.interfaces.INotification; import com.badlogic.gdx.Input; @@ -169,7 +170,7 @@ public class DrawTileTool implements Tool { case EntityFactory.SPRITE_TYPE: currentDrawStrategy = spriteDrawStrategy; break; - case EntityFactory.SPINE_TYPE: + case SpineItemType.SPINE_TYPE: currentDrawStrategy = spineDrawStrategy; break; default: diff --git a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/drawStrategy/SpineDrawStrategy.java b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/drawStrategy/SpineDrawStrategy.java index cfac5566..c6ae2e85 100644 --- a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/drawStrategy/SpineDrawStrategy.java +++ b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/drawStrategy/SpineDrawStrategy.java @@ -4,11 +4,12 @@ import com.esotericsoftware.spine.Skeleton; import com.esotericsoftware.spine.SkeletonData; import com.esotericsoftware.spine.SkeletonJson; import games.rednblack.editor.plugin.tiled.TiledPlugin; -import games.rednblack.editor.renderer.components.SpineDataComponent; import games.rednblack.editor.renderer.utils.ComponentRetriever; import games.rednblack.h2d.common.command.ReplaceSpineCommandBuilder; import games.rednblack.h2d.common.factory.IFactory; import games.rednblack.h2d.extension.spine.ResourceRetrieverAttachmentLoader; +import games.rednblack.h2d.extension.spine.SpineComponent; +import games.rednblack.h2d.extension.spine.SpineItemType; public class SpineDrawStrategy extends BasicDrawStrategy { @@ -39,15 +40,15 @@ public class SpineDrawStrategy extends BasicDrawStrategy { public void updateTile(int entity) { if (!checkValidTile(entity)) return; - SpineDataComponent spineDataComponent = ComponentRetriever.get(entity, SpineDataComponent.class, tiledPlugin.getAPI().getEngine()); - if (!spineDataComponent.animationName.equals(tiledPlugin.getSelectedTileName())) { + SpineComponent spineComponent = ComponentRetriever.get(entity, SpineComponent.class, tiledPlugin.getAPI().getEngine()); + if (!spineComponent.animationName.equals(tiledPlugin.getSelectedTileName())) { replaceSpineCommandBuilder.begin(entity); String animName = tiledPlugin.getSelectedTileName(); replaceSpineCommandBuilder.setAnimationName(animName); ResourceRetrieverAttachmentLoader atlasAttachmentLoader = new ResourceRetrieverAttachmentLoader(animName, tiledPlugin.getAPI().getSceneLoader().getRm()); SkeletonJson skeletonJson = new SkeletonJson(atlasAttachmentLoader); replaceSpineCommandBuilder.setSkeletonJson(skeletonJson); - SkeletonData skeletonData = skeletonJson.readSkeletonData((tiledPlugin.getAPI().getSceneLoader().getRm().getSkeletonJSON(animName))); + SkeletonData skeletonData = skeletonJson.readSkeletonData((tiledPlugin.getAPI().getSceneLoader().getRm().getExternalItemType(SpineItemType.SPINE_TYPE, animName))); replaceSpineCommandBuilder.setSkeleton(new Skeleton(skeletonData)); replaceSpineCommandBuilder.execute(tiledPlugin.facade); } diff --git a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/view/tabs/AbstractGridTilesTab.java b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/view/tabs/AbstractGridTilesTab.java index f299fece..ffe22378 100644 --- a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/view/tabs/AbstractGridTilesTab.java +++ b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/view/tabs/AbstractGridTilesTab.java @@ -19,6 +19,7 @@ import games.rednblack.editor.plugin.tiled.view.SpineDrawable; import games.rednblack.editor.plugin.tiled.view.tabs.listener.GridTabInputListener; import games.rednblack.editor.renderer.factory.EntityFactory; import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; +import games.rednblack.h2d.extension.spine.SpineItemType; public abstract class AbstractGridTilesTab extends DefaultTab { @@ -115,7 +116,7 @@ public abstract class AbstractGridTilesTab extends De protected void setGridSizeToFirstTileSize(String tileName, int type) { float width = 0; float height = 0; - if (type == EntityFactory.SPINE_TYPE) { + if (type == SpineItemType.SPINE_TYPE) { SpineDrawable spineDrawable = tiledPlugin.pluginRM.getSpineDrawable(tileName); width = spineDrawable.width; height = spineDrawable.height; @@ -157,14 +158,14 @@ public abstract class AbstractGridTilesTab extends De Drawable tileDrawable = null; if (i < savedTiles.size) { int t = savedTiles.get(i).getEntityType(); - if (t == EntityFactory.SPINE_TYPE) { + if (t == SpineItemType.SPINE_TYPE) { tileDrawable = resourcesManager.getSpineDrawable(savedTiles.get(i).getRegionName()); } else { tileDrawable = new TextureRegionDrawable(resourcesManager.getTextureRegion(savedTiles.get(i).getRegionName(), t)); } } else if (!tileName.equals("")) { if (i == tileIndex) { - if (type == EntityFactory.SPINE_TYPE) { + if (type == SpineItemType.SPINE_TYPE) { tileDrawable = resourcesManager.getSpineDrawable(tileName); } else { tileDrawable = new TextureRegionDrawable(resourcesManager.getTextureRegion(tileName, type)); diff --git a/src/main/java/games/rednblack/editor/controller/commands/component/ReplaceSpineCommand.java b/src/main/java/games/rednblack/editor/controller/commands/component/ReplaceSpineCommand.java index d1e22769..102ed299 100644 --- a/src/main/java/games/rednblack/editor/controller/commands/component/ReplaceSpineCommand.java +++ b/src/main/java/games/rednblack/editor/controller/commands/component/ReplaceSpineCommand.java @@ -4,12 +4,11 @@ import com.esotericsoftware.spine.*; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.controller.commands.EntityModifyRevertibleCommand; import games.rednblack.editor.renderer.components.DimensionsComponent; -import games.rednblack.editor.renderer.components.SpineDataComponent; import games.rednblack.editor.renderer.components.TransformComponent; import games.rednblack.editor.utils.runtime.EntityUtils; import games.rednblack.editor.utils.runtime.SandboxComponentRetriever; import games.rednblack.h2d.common.MsgAPI; -import games.rednblack.h2d.extension.spine.SpineObjectComponent; +import games.rednblack.h2d.extension.spine.SpineComponent; public class ReplaceSpineCommand extends EntityModifyRevertibleCommand { @@ -29,33 +28,32 @@ public class ReplaceSpineCommand extends EntityModifyRevertibleCommand { entityId = EntityUtils.getEntityId(entity); - SpineDataComponent spineDataComponent = SandboxComponentRetriever.get(entity, SpineDataComponent.class); - SpineObjectComponent spineObjectComponent = SandboxComponentRetriever.get(entity, SpineObjectComponent.class); + SpineComponent spineComponent = SandboxComponentRetriever.get(entity, SpineComponent.class); DimensionsComponent dimensionsComponent = SandboxComponentRetriever.get(entity, DimensionsComponent.class); TransformComponent transformComponent = SandboxComponentRetriever.get(entity, TransformComponent.class); - backupAnimName = spineDataComponent.animationName; - backupSkeletonJson = spineObjectComponent.skeletonJson; - backupSkeleton = spineObjectComponent.skeleton; + backupAnimName = spineComponent.animationName; + backupSkeletonJson = spineComponent.skeletonJson; + backupSkeleton = spineComponent.skeleton; - spineDataComponent.animationName = animName; - spineObjectComponent.skeletonJson = skeletonJson; - spineObjectComponent.skeletonData = skeletonData; - spineObjectComponent.skeleton = skeleton; + spineComponent.animationName = animName; + spineComponent.skeletonJson = skeletonJson; + spineComponent.skeletonData = skeletonData; + spineComponent.skeleton = skeleton; AnimationStateData stateData = new AnimationStateData(skeletonData); - spineObjectComponent.state = new AnimationState(stateData); + spineComponent.state = new AnimationState(stateData); - spineObjectComponent.computeBoundBox(dimensionsComponent); - dimensionsComponent.width *= spineObjectComponent.worldMultiplier; - dimensionsComponent.height *= spineObjectComponent.worldMultiplier; + spineComponent.computeBoundBox(dimensionsComponent); + dimensionsComponent.width *= spineComponent.worldMultiplier; + dimensionsComponent.height *= spineComponent.worldMultiplier; transformComponent.originX = dimensionsComponent.width / 2f; transformComponent.originY = dimensionsComponent.height / 2f; String currentAnimName = skeletonData.getAnimations().get(0).getName(); - spineDataComponent.currentAnimationName = currentAnimName; - spineObjectComponent.setAnimation(currentAnimName); + spineComponent.currentAnimationName = currentAnimName; + spineComponent.setAnimation(currentAnimName); HyperLap2DFacade.getInstance().sendNotification(MsgAPI.ITEM_DATA_UPDATED, entity); } @@ -64,29 +62,28 @@ public class ReplaceSpineCommand extends EntityModifyRevertibleCommand { public void undoAction() { int entity = EntityUtils.getByUniqueId(entityId); - SpineDataComponent spineDataComponent = SandboxComponentRetriever.get(entity, SpineDataComponent.class); - SpineObjectComponent spineObjectComponent = SandboxComponentRetriever.get(entity, SpineObjectComponent.class); + SpineComponent spineComponent = SandboxComponentRetriever.get(entity, SpineComponent.class); DimensionsComponent dimensionsComponent = SandboxComponentRetriever.get(entity, DimensionsComponent.class); TransformComponent transformComponent = SandboxComponentRetriever.get(entity, TransformComponent.class); - spineDataComponent.animationName = backupAnimName; - spineObjectComponent.skeletonJson = backupSkeletonJson; - spineObjectComponent.skeletonData = backupSkeleton.getData(); - spineObjectComponent.skeleton = backupSkeleton; + spineComponent.animationName = backupAnimName; + spineComponent.skeletonJson = backupSkeletonJson; + spineComponent.skeletonData = backupSkeleton.getData(); + spineComponent.skeleton = backupSkeleton; - AnimationStateData stateData = new AnimationStateData(spineObjectComponent.skeletonData); - spineObjectComponent.state = new AnimationState(stateData); + AnimationStateData stateData = new AnimationStateData(spineComponent.skeletonData); + spineComponent.state = new AnimationState(stateData); - spineObjectComponent.computeBoundBox(dimensionsComponent); - dimensionsComponent.width *= spineObjectComponent.worldMultiplier; - dimensionsComponent.height *= spineObjectComponent.worldMultiplier; + spineComponent.computeBoundBox(dimensionsComponent); + dimensionsComponent.width *= spineComponent.worldMultiplier; + dimensionsComponent.height *= spineComponent.worldMultiplier; transformComponent.originX = dimensionsComponent.width / 2f; transformComponent.originY = dimensionsComponent.height / 2f; - String currentAnimName = spineObjectComponent.skeletonData.getAnimations().get(0).getName(); - spineDataComponent.currentAnimationName = currentAnimName; - spineObjectComponent.setAnimation(currentAnimName); + String currentAnimName = spineComponent.skeletonData.getAnimations().get(0).getName(); + spineComponent.currentAnimationName = currentAnimName; + spineComponent.setAnimation(currentAnimName); HyperLap2DFacade.getInstance().sendNotification(MsgAPI.ITEM_DATA_UPDATED, entity); } diff --git a/src/main/java/games/rednblack/editor/controller/commands/component/UpdateSpineDataCommand.java b/src/main/java/games/rednblack/editor/controller/commands/component/UpdateSpineDataCommand.java index 076a1d32..4df51feb 100644 --- a/src/main/java/games/rednblack/editor/controller/commands/component/UpdateSpineDataCommand.java +++ b/src/main/java/games/rednblack/editor/controller/commands/component/UpdateSpineDataCommand.java @@ -2,12 +2,11 @@ package games.rednblack.editor.controller.commands.component; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.controller.commands.EntityModifyRevertibleCommand; -import games.rednblack.editor.renderer.components.SpineDataComponent; -import games.rednblack.editor.renderer.data.SpineVO; +import games.rednblack.h2d.extension.spine.SpineVO; import games.rednblack.editor.utils.runtime.EntityUtils; import games.rednblack.editor.utils.runtime.SandboxComponentRetriever; import games.rednblack.h2d.common.MsgAPI; -import games.rednblack.h2d.extension.spine.SpineObjectComponent; +import games.rednblack.h2d.extension.spine.SpineComponent; public class UpdateSpineDataCommand extends EntityModifyRevertibleCommand { @@ -24,11 +23,10 @@ public class UpdateSpineDataCommand extends EntityModifyRevertibleCommand { backup = new SpineVO(); backup.loadFromEntity(entity, sandbox.getEngine(), sandbox.sceneControl.sceneLoader.getEntityFactory()); - SpineDataComponent spineDataComponent = SandboxComponentRetriever.get(entity, SpineDataComponent.class); - SpineObjectComponent spineObjectComponent = SandboxComponentRetriever.get(entity, SpineObjectComponent.class); + SpineComponent spineComponent = SandboxComponentRetriever.get(entity, SpineComponent.class); - spineDataComponent.currentAnimationName = vo.currentAnimationName; - spineObjectComponent.setAnimation(vo.currentAnimationName); + spineComponent.currentAnimationName = vo.currentAnimationName; + spineComponent.setAnimation(vo.currentAnimationName); HyperLap2DFacade.getInstance().sendNotification(MsgAPI.ITEM_DATA_UPDATED, entity); } @@ -36,11 +34,10 @@ public class UpdateSpineDataCommand extends EntityModifyRevertibleCommand { @Override public void undoAction() { int entity = EntityUtils.getByUniqueId(entityId); - SpineDataComponent spineDataComponent = SandboxComponentRetriever.get(entity, SpineDataComponent.class); - SpineObjectComponent spineObjectComponent = SandboxComponentRetriever.get(entity, SpineObjectComponent.class); + SpineComponent spineComponent = SandboxComponentRetriever.get(entity, SpineComponent.class); - spineDataComponent.currentAnimationName = backup.currentAnimationName; - spineObjectComponent.setAnimation(backup.currentAnimationName); + spineComponent.currentAnimationName = backup.currentAnimationName; + spineComponent.setAnimation(backup.currentAnimationName); HyperLap2DFacade.getInstance().sendNotification(MsgAPI.ITEM_DATA_UPDATED, entity); } 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 98bb02a4..4160f845 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 @@ -2,8 +2,7 @@ package games.rednblack.editor.controller.commands.component; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.controller.commands.EntityModifyRevertibleCommand; -import games.rednblack.editor.renderer.components.particle.TalosDataComponent; -import games.rednblack.editor.renderer.data.TalosVO; +import games.rednblack.h2d.extension.talos.TalosVO; import games.rednblack.editor.utils.runtime.EntityUtils; import games.rednblack.editor.utils.runtime.SandboxComponentRetriever; import games.rednblack.h2d.common.MsgAPI; @@ -24,10 +23,8 @@ public class UpdateTalosDataCommand extends EntityModifyRevertibleCommand { backup = new TalosVO(); backup.loadFromEntity(entity, sandbox.getEngine(), sandbox.sceneControl.sceneLoader.getEntityFactory()); - TalosDataComponent dataComponent = SandboxComponentRetriever.get(entity, TalosDataComponent.class); - dataComponent.transform = vo.transform; - TalosComponent talosComponent = SandboxComponentRetriever.get(entity, TalosComponent.class); + talosComponent.transform = vo.transform; talosComponent.effect.setPosition(0, 0); HyperLap2DFacade.getInstance().sendNotification(MsgAPI.ITEM_DATA_UPDATED, entity); @@ -37,11 +34,9 @@ public class UpdateTalosDataCommand extends EntityModifyRevertibleCommand { public void undoAction() { int entity = EntityUtils.getByUniqueId(entityId); - TalosDataComponent particleComponent = SandboxComponentRetriever.get(entity, TalosDataComponent.class); - particleComponent.transform = backup.transform; - TalosComponent talosComponent = SandboxComponentRetriever.get(entity, TalosComponent.class); talosComponent.effect.setPosition(0, 0); + talosComponent.transform = backup.transform; HyperLap2DFacade.getInstance().sendNotification(MsgAPI.ITEM_DATA_UPDATED, entity); } diff --git a/src/main/java/games/rednblack/editor/controller/commands/resource/ExportLibraryItemCommand.java b/src/main/java/games/rednblack/editor/controller/commands/resource/ExportLibraryItemCommand.java index f693b0e7..047e794e 100644 --- a/src/main/java/games/rednblack/editor/controller/commands/resource/ExportLibraryItemCommand.java +++ b/src/main/java/games/rednblack/editor/controller/commands/resource/ExportLibraryItemCommand.java @@ -19,6 +19,8 @@ import games.rednblack.editor.utils.ZipUtils; import games.rednblack.h2d.common.MsgAPI; import games.rednblack.h2d.common.vo.ExportMapperVO; import games.rednblack.h2d.common.vo.ExportMapperVO.ExportedAsset; +import games.rednblack.h2d.extension.spine.SpineVO; +import games.rednblack.h2d.extension.talos.TalosVO; import org.apache.commons.io.FileUtils; import org.lwjgl.PointerBuffer; import org.lwjgl.system.MemoryStack; diff --git a/src/main/java/games/rednblack/editor/data/migrations/data020/CompositeVO.java b/src/main/java/games/rednblack/editor/data/migrations/data020/CompositeVO.java index 852ebe20..b8ce8ab4 100644 --- a/src/main/java/games/rednblack/editor/data/migrations/data020/CompositeVO.java +++ b/src/main/java/games/rednblack/editor/data/migrations/data020/CompositeVO.java @@ -1,6 +1,8 @@ package games.rednblack.editor.data.migrations.data020; import games.rednblack.editor.renderer.data.*; +import games.rednblack.h2d.extension.spine.SpineVO; +import games.rednblack.h2d.extension.talos.TalosVO; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/games/rednblack/editor/factory/ItemFactory.java b/src/main/java/games/rednblack/editor/factory/ItemFactory.java index 598b5382..ac612a88 100644 --- a/src/main/java/games/rednblack/editor/factory/ItemFactory.java +++ b/src/main/java/games/rednblack/editor/factory/ItemFactory.java @@ -18,6 +18,8 @@ import games.rednblack.editor.view.stage.tools.TextTool; import games.rednblack.editor.view.ui.box.UILayerBoxMediator; import games.rednblack.h2d.common.MsgAPI; import games.rednblack.h2d.common.factory.IFactory; +import games.rednblack.h2d.extension.spine.SpineItemType; +import games.rednblack.h2d.extension.talos.TalosItemType; import java.util.HashMap; @@ -142,7 +144,7 @@ public class ItemFactory implements IFactory { } data.data = animationName; - createdEntity = entityFactory.createEntity(sandbox.getCurrentViewingEntity(), EntityFactory.SPINE_TYPE, data); + createdEntity = entityFactory.createEntity(sandbox.getCurrentViewingEntity(), SpineItemType.SPINE_TYPE, data); HyperLap2DFacade.getInstance().sendNotification(MsgAPI.ACTION_CREATE_ITEM, createdEntity); Pools.free(data); @@ -244,7 +246,7 @@ public class ItemFactory implements IFactory { return -1; } data.data = particleName; - int entity = entityFactory.createEntity(sandbox.getCurrentViewingEntity(), EntityFactory.TALOS_TYPE, data); + int entity = entityFactory.createEntity(sandbox.getCurrentViewingEntity(), TalosItemType.TALOS_TYPE, data); HyperLap2DFacade.getInstance().sendNotification(MsgAPI.ACTION_CREATE_ITEM, entity); diff --git a/src/main/java/games/rednblack/editor/proxy/ResourceManager.java b/src/main/java/games/rednblack/editor/proxy/ResourceManager.java index 4e925683..1c814491 100644 --- a/src/main/java/games/rednblack/editor/proxy/ResourceManager.java +++ b/src/main/java/games/rednblack/editor/proxy/ResourceManager.java @@ -25,7 +25,9 @@ import games.rednblack.editor.renderer.utils.H2DSkinLoader; import games.rednblack.editor.renderer.utils.HyperJson; import games.rednblack.editor.renderer.utils.ShadedDistanceFieldFont; import games.rednblack.editor.view.ui.widget.actors.basic.WhitePixel; +import games.rednblack.h2d.extension.spine.SpineItemType; import games.rednblack.h2d.extension.talos.ResourceRetrieverAssetProvider; +import games.rednblack.h2d.extension.talos.TalosItemType; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.puremvc.java.patterns.proxy.Proxy; @@ -150,11 +152,6 @@ public class ResourceManager extends Proxy implements IResourceRetriever { return new ParticleEffect(particleEffects.get(name)); } - @Override - public FileHandle getTalosVFX(String name) { - return talosVFXsFiles.get(name); - } - /** * Sets working resolution, please set before doing any loading * @param resolution String resolution name, default is "orig" later use resolution names created in editor @@ -166,11 +163,17 @@ public class ResourceManager extends Proxy implements IResourceRetriever { } } - @Override - public FileHandle getSkeletonJSON(String animationName) { - SpineAnimData animData = spineAnimAtlases.get(animationName); - return animData.jsonFile; + public FileHandle getExternalItemType(int itemType, String name) { + switch (itemType) { + case SpineItemType.SPINE_TYPE: + SpineAnimData animData = spineAnimAtlases.get(name); + return animData.jsonFile; + case TalosItemType.TALOS_TYPE: + return talosVFXsFiles.get(name); + default: + return null; + } } @Override diff --git a/src/main/java/games/rednblack/editor/system/TalosContinuousSystem.java b/src/main/java/games/rednblack/editor/system/TalosContinuousSystem.java index d262d528..4b50c567 100644 --- a/src/main/java/games/rednblack/editor/system/TalosContinuousSystem.java +++ b/src/main/java/games/rednblack/editor/system/TalosContinuousSystem.java @@ -2,7 +2,6 @@ package games.rednblack.editor.system; import com.artemis.annotations.All; import com.talosvfx.talos.runtime.ParticleEffectInstance; -import games.rednblack.editor.renderer.components.particle.TalosDataComponent; import games.rednblack.h2d.extension.talos.TalosComponent; import games.rednblack.h2d.extension.talos.TalosSystem; @@ -11,7 +10,7 @@ import games.rednblack.h2d.extension.talos.TalosSystem; * This system will make sure they look continuous while in editor, so user will find and see them easily. * */ -@All({TalosComponent.class, TalosDataComponent.class}) +@All({TalosComponent.class}) public class TalosContinuousSystem extends TalosSystem { @Override diff --git a/src/main/java/games/rednblack/editor/utils/asset/impl/SpineAsset.java b/src/main/java/games/rednblack/editor/utils/asset/impl/SpineAsset.java index 0dbee2d0..8fae2e44 100644 --- a/src/main/java/games/rednblack/editor/utils/asset/impl/SpineAsset.java +++ b/src/main/java/games/rednblack/editor/utils/asset/impl/SpineAsset.java @@ -8,7 +8,6 @@ import com.badlogic.gdx.utils.JsonValue; import com.kotcrab.vis.ui.util.dialog.Dialogs; import games.rednblack.editor.proxy.ProjectManager; import games.rednblack.editor.proxy.SceneDataManager; -import games.rednblack.editor.renderer.components.SpineDataComponent; import games.rednblack.editor.renderer.data.*; import games.rednblack.editor.renderer.utils.Version; import games.rednblack.editor.utils.HyperLap2DUtils; @@ -18,7 +17,9 @@ import games.rednblack.editor.utils.runtime.EntityUtils; import games.rednblack.editor.utils.runtime.SandboxComponentRetriever; import games.rednblack.editor.view.stage.Sandbox; import games.rednblack.h2d.common.ProgressHandler; +import games.rednblack.h2d.extension.spine.SpineComponent; import games.rednblack.h2d.extension.spine.SpineItemType; +import games.rednblack.h2d.extension.spine.SpineVO; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; @@ -242,7 +243,7 @@ public class SpineAsset extends Asset { private void deleteEntitiesWithSpineAnimation(int rootEntity, String spineName) { tmpEntityList.clear(); Consumer action = (root) -> { - SpineDataComponent spineDataComponent = SandboxComponentRetriever.get(root, SpineDataComponent.class); + SpineComponent spineDataComponent = SandboxComponentRetriever.get(root, SpineComponent.class); if (spineDataComponent != null && spineDataComponent.animationName.equals(spineName)) { tmpEntityList.add(root); } diff --git a/src/main/java/games/rednblack/editor/utils/asset/impl/TalosVFXAsset.java b/src/main/java/games/rednblack/editor/utils/asset/impl/TalosVFXAsset.java index f8eb83ad..86c39966 100644 --- a/src/main/java/games/rednblack/editor/utils/asset/impl/TalosVFXAsset.java +++ b/src/main/java/games/rednblack/editor/utils/asset/impl/TalosVFXAsset.java @@ -8,11 +8,10 @@ import com.talosvfx.talos.runtime.ParticleEmitterDescriptor; import games.rednblack.editor.proxy.ProjectManager; import games.rednblack.editor.proxy.ResolutionManager; import games.rednblack.editor.proxy.SceneDataManager; -import games.rednblack.editor.renderer.components.particle.TalosDataComponent; import games.rednblack.editor.renderer.data.CompositeItemVO; import games.rednblack.editor.renderer.data.SceneVO; -import games.rednblack.editor.renderer.data.SpriteAnimationVO; -import games.rednblack.editor.renderer.data.TalosVO; +import games.rednblack.h2d.extension.talos.TalosComponent; +import games.rednblack.h2d.extension.talos.TalosVO; import games.rednblack.editor.utils.ImportUtils; import games.rednblack.editor.utils.asset.Asset; import games.rednblack.editor.utils.runtime.EntityUtils; @@ -25,7 +24,6 @@ import org.apache.commons.io.FilenameUtils; import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.function.Consumer; public class TalosVFXAsset extends Asset { @@ -231,7 +229,7 @@ public class TalosVFXAsset extends Asset { private void deleteEntitiesWithParticleEffects(int rootEntity, String particleName) { tmpEntityList.clear(); Consumer action = (root) -> { - TalosDataComponent particleComponent = SandboxComponentRetriever.get(root, TalosDataComponent.class); + TalosComponent particleComponent = SandboxComponentRetriever.get(root, TalosComponent.class); if (particleComponent != null && particleComponent.particleName.equals(particleName)) { tmpEntityList.add(root); } diff --git a/src/main/java/games/rednblack/editor/utils/runtime/EntityUtils.java b/src/main/java/games/rednblack/editor/utils/runtime/EntityUtils.java index cf115cd7..9c97b2ed 100644 --- a/src/main/java/games/rednblack/editor/utils/runtime/EntityUtils.java +++ b/src/main/java/games/rednblack/editor/utils/runtime/EntityUtils.java @@ -34,6 +34,8 @@ import games.rednblack.editor.renderer.data.*; import games.rednblack.editor.renderer.factory.EntityFactory; import games.rednblack.editor.renderer.utils.HyperJson; import games.rednblack.editor.view.stage.Sandbox; +import games.rednblack.h2d.extension.spine.SpineItemType; +import games.rednblack.h2d.extension.talos.TalosItemType; import java.util.*; import java.util.function.Consumer; @@ -55,10 +57,10 @@ public class EntityUtils { itemTypeNameMap.put(IMAGE_TYPE, "Image"); itemTypeNameMap.put(NINE_PATCH, "9-Patch Image"); itemTypeNameMap.put(LIGHT_TYPE, "Light"); - itemTypeNameMap.put(SPINE_TYPE, "Spine Animation"); + itemTypeNameMap.put(SpineItemType.SPINE_TYPE, "Spine Animation"); itemTypeNameMap.put(SPRITE_TYPE, "Sprite Animation"); itemTypeNameMap.put(COLOR_PRIMITIVE, "Primitive"); - itemTypeNameMap.put(TALOS_TYPE, "Talos VFX"); + itemTypeNameMap.put(TalosItemType.TALOS_TYPE, "Talos VFX"); itemTypeIconMap.put(UNKNOWN_TYPE, "icon-unknown"); itemTypeIconMap.put(COMPOSITE_TYPE, "icon-root"); @@ -67,10 +69,10 @@ public class EntityUtils { itemTypeIconMap.put(IMAGE_TYPE, "icon-image"); itemTypeIconMap.put(NINE_PATCH, "icon-image"); itemTypeIconMap.put(LIGHT_TYPE, "icon-particle-white"); - itemTypeIconMap.put(SPINE_TYPE, "icon-spine"); + itemTypeIconMap.put(SpineItemType.SPINE_TYPE, "icon-spine"); itemTypeIconMap.put(SPRITE_TYPE, "icon-animation"); itemTypeIconMap.put(COLOR_PRIMITIVE, "icon-image"); - itemTypeIconMap.put(TALOS_TYPE, "icon-particle-white"); + itemTypeIconMap.put(TalosItemType.TALOS_TYPE, "icon-particle-white"); } public static String getItemName(int entity) { diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIMultiPropertyBoxMediator.java b/src/main/java/games/rednblack/editor/view/ui/box/UIMultiPropertyBoxMediator.java index 8904fb93..88f6022b 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UIMultiPropertyBoxMediator.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UIMultiPropertyBoxMediator.java @@ -40,6 +40,8 @@ import games.rednblack.editor.view.ui.properties.UIAbstractProperties; import games.rednblack.editor.view.ui.properties.UIAbstractPropertiesMediator; import games.rednblack.editor.view.ui.properties.panels.*; import games.rednblack.h2d.common.MsgAPI; +import games.rednblack.h2d.extension.spine.SpineItemType; +import games.rednblack.h2d.extension.talos.TalosItemType; import games.rednblack.h2d.extension.typinglabel.TypingLabelComponent; import org.puremvc.java.interfaces.IMediator; import org.puremvc.java.interfaces.INotification; @@ -173,7 +175,7 @@ public class UIMultiPropertyBoxMediator extends PanelMediator strings, Class resourceClass, BiFunction factoryFunction, String searchText) { for (String animationName : strings) { if (!animationName.toLowerCase().contains(searchText) - || filterResource(animationName, resourceClass == SpineResource.class ? EntityFactory.SPINE_TYPE : EntityFactory.SPRITE_TYPE)) + || filterResource(animationName, resourceClass == SpineResource.class ? SpineItemType.SPINE_TYPE : EntityFactory.SPRITE_TYPE)) continue; try { diff --git a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIParticleEffectsTabMediator.java b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIParticleEffectsTabMediator.java index a01a9130..b6e6103b 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIParticleEffectsTabMediator.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIParticleEffectsTabMediator.java @@ -79,7 +79,7 @@ public class UIParticleEffectsTabMediator extends UIResourcesTabMediator strings, Class resourceClass, BiFunction factoryFunction, String searchText) { for (String particleName : strings) { if (!particleName.toLowerCase().contains(searchText) - || filterResource(particleName, resourceClass == TalosResource.class ? EntityFactory.TALOS_TYPE : EntityFactory.PARTICLE_TYPE)) continue; + || filterResource(particleName, resourceClass == TalosResource.class ? TalosItemType.TALOS_TYPE : EntityFactory.PARTICLE_TYPE)) continue; try { Constructor constructor = resourceClass.getConstructor(String.class); DraggableResource draggableResource = new DraggableResource((DraggableResourceView) constructor.newInstance(particleName)); diff --git a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/draggable/box/SpineResource.java b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/draggable/box/SpineResource.java index bca1b76d..f942eb05 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/draggable/box/SpineResource.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/draggable/box/SpineResource.java @@ -22,7 +22,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; -import games.rednblack.editor.renderer.data.SpineVO; +import games.rednblack.h2d.extension.spine.SpineVO; import games.rednblack.editor.view.ui.box.UIResourcesBoxMediator; import games.rednblack.editor.view.ui.widget.actors.SpineActor; import games.rednblack.h2d.common.ResourcePayloadObject; diff --git a/src/main/java/games/rednblack/editor/view/ui/followers/FollowerFactory.java b/src/main/java/games/rednblack/editor/view/ui/followers/FollowerFactory.java index 2e21508a..75b67d4b 100644 --- a/src/main/java/games/rednblack/editor/view/ui/followers/FollowerFactory.java +++ b/src/main/java/games/rednblack/editor/view/ui/followers/FollowerFactory.java @@ -20,6 +20,8 @@ package games.rednblack.editor.view.ui.followers; import games.rednblack.editor.renderer.factory.EntityFactory; import games.rednblack.editor.utils.runtime.EntityUtils; +import games.rednblack.h2d.extension.spine.SpineItemType; +import games.rednblack.h2d.extension.talos.TalosItemType; /** * Created by azakhary on 5/21/2015. @@ -32,10 +34,10 @@ public class FollowerFactory { return new ImageFollower(entity); case EntityFactory.LIGHT_TYPE: return new LightFollower(entity); - case EntityFactory.TALOS_TYPE: + case TalosItemType.TALOS_TYPE: case EntityFactory.PARTICLE_TYPE: return new ParticleFollower(entity); - case EntityFactory.SPINE_TYPE: + case SpineItemType.SPINE_TYPE: return new SpineFollower(entity); } diff --git a/src/main/java/games/rednblack/editor/view/ui/followers/SpineFollower.java b/src/main/java/games/rednblack/editor/view/ui/followers/SpineFollower.java index 0eece3b5..43d0dcc0 100644 --- a/src/main/java/games/rednblack/editor/view/ui/followers/SpineFollower.java +++ b/src/main/java/games/rednblack/editor/view/ui/followers/SpineFollower.java @@ -7,17 +7,17 @@ import com.badlogic.gdx.math.Matrix4; import com.esotericsoftware.spine.SkeletonRendererDebug; import games.rednblack.editor.utils.runtime.SandboxComponentRetriever; import games.rednblack.editor.view.stage.Sandbox; -import games.rednblack.h2d.extension.spine.SpineObjectComponent; +import games.rednblack.h2d.extension.spine.SpineComponent; public class SpineFollower extends NormalSelectionFollower { - private final SpineObjectComponent spineObjectComponent; + private final SpineComponent spineObjectComponent; private final SkeletonRendererDebug skeletonRendererDebug; private final Matrix4 matrix = new Matrix4(); public SpineFollower(int entity) { super(entity); - spineObjectComponent = SandboxComponentRetriever.get(entity, SpineObjectComponent.class); + spineObjectComponent = SandboxComponentRetriever.get(entity, SpineComponent.class); skeletonRendererDebug = new SkeletonRendererDebug(); skeletonRendererDebug.setScale(2f); skeletonRendererDebug.setBoundingBoxes(false); diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpineAnimationItemPropertiesMediator.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpineAnimationItemPropertiesMediator.java index b1b40eff..d4a4847c 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpineAnimationItemPropertiesMediator.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpineAnimationItemPropertiesMediator.java @@ -21,19 +21,17 @@ package games.rednblack.editor.view.ui.properties.panels; import com.badlogic.gdx.utils.Array; import com.esotericsoftware.spine.Animation; import games.rednblack.editor.controller.commands.component.UpdateSpineDataCommand; -import games.rednblack.editor.renderer.components.SpineDataComponent; -import games.rednblack.editor.renderer.data.SpineVO; +import games.rednblack.h2d.extension.spine.SpineVO; import games.rednblack.editor.utils.runtime.SandboxComponentRetriever; import games.rednblack.editor.view.ui.properties.UIItemPropertiesMediator; import games.rednblack.h2d.common.MsgAPI; -import games.rednblack.h2d.extension.spine.SpineObjectComponent; +import games.rednblack.h2d.extension.spine.SpineComponent; public class UISpineAnimationItemPropertiesMediator extends UIItemPropertiesMediator { private static final String TAG = UISpineAnimationItemPropertiesMediator.class.getCanonicalName(); public static final String NAME = TAG; - private SpineDataComponent spineDataComponent; - private SpineObjectComponent spineObjectComponent; + private SpineComponent spineComponent; public UISpineAnimationItemPropertiesMediator() { super(NAME, new UISpineAnimationItemProperties()); @@ -41,16 +39,15 @@ public class UISpineAnimationItemPropertiesMediator extends UIItemPropertiesMedi @Override protected void translateObservableDataToView(int entity) { - spineObjectComponent = SandboxComponentRetriever.get(entity, SpineObjectComponent.class); - spineDataComponent = SandboxComponentRetriever.get(entity, SpineDataComponent.class); + spineComponent = SandboxComponentRetriever.get(entity, SpineComponent.class); Array animations = new Array<>(); - for (Animation animation : spineObjectComponent.getAnimations()) { + for (Animation animation : spineComponent.getAnimations()) { animations.add(animation.getName()); } viewComponent.setAnimations(animations); - viewComponent.setSelectedAnimation(spineDataComponent.currentAnimationName); + viewComponent.setSelectedAnimation(spineComponent.currentAnimationName); } @Override 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 bb82dabc..94d685a0 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 @@ -1,8 +1,8 @@ package games.rednblack.editor.view.ui.properties.panels; import games.rednblack.editor.controller.commands.component.UpdateTalosDataCommand; -import games.rednblack.editor.renderer.components.particle.TalosDataComponent; -import games.rednblack.editor.renderer.data.TalosVO; +import games.rednblack.h2d.extension.talos.TalosComponent; +import games.rednblack.h2d.extension.talos.TalosVO; import games.rednblack.editor.utils.runtime.SandboxComponentRetriever; import games.rednblack.editor.view.ui.properties.UIItemPropertiesMediator; import games.rednblack.h2d.common.MsgAPI; @@ -18,7 +18,7 @@ public class UITalosPropertiesMediator extends UIItemPropertiesMediator