Small bug fixes.

Author: bladecoder

adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditSceneDialog.java

@@ -37,7 +37,6 @@
 import com.bladecoder.engineeditor.Ctx;
 import com.bladecoder.engineeditor.common.EditorLogger;
 import com.bladecoder.engineeditor.common.ElementUtils;
-import com.bladecoder.engineeditor.common.Message;
 import com.bladecoder.engineeditor.model.Project;
 import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
 import com.bladecoder.engineeditor.ui.panels.FilteredSelectBox;
@@ -74,25 +73,25 @@ public EditSceneDialog(Skin skin, World parent, Scene e) {
 
 		super(skin);
 
-		id = InputPanelFactory.createInputPanel(skin, "Scene ID",
-				"The ID is mandatory for scenes.", true);
+		id = InputPanelFactory.createInputPanel(skin, "Scene ID", "The ID is mandatory for scenes.", true);
 		backgroundAtlas = InputPanelFactory.createInputPanel(skin, "Background Atlas",
 				"The atlas where the background for the scene is located", Type.ATLAS_ASSET, false);
 		backgroundRegion = InputPanelFactory.createInputPanel(skin, "Background Region Id",
 				"The region id for the background.", new String[0], false);
 //		depthVector = InputPanelFactory.createInputPanel(skin, "Depth Vector",
 //				"X: the actor 'y' position for a 0.0 scale, Y: the actor 'y' position for a 1.0 scale.",
 //				Param.Type.VECTOR2, false);
-		
-		depthVector = InputPanelFactory.createInputPanel(skin, "Fake depth", "Change actor scale based in the 'y' axis position.", Param.Type.BOOLEAN, true,
-				"false");
-		
+
+		depthVector = InputPanelFactory.createInputPanel(skin, "Fake depth",
+				"Change actor scale based in the 'y' axis position.", Param.Type.BOOLEAN, true, "false");
+
 		state = InputPanelFactory.createInputPanel(skin, "State", "The initial state for the scene.", false);
-		music = InputPanelFactory.createInputPanel(skin, "Music Filename", "The music for the scene", Type.MUSIC_ASSET, false);
+		music = InputPanelFactory.createInputPanel(skin, "Music Filename", "The music for the scene", Type.MUSIC_ASSET,
+				false);
 		loopMusic = InputPanelFactory.createInputPanel(skin, "Loop Music", "If the music is playing in looping",
 				Param.Type.BOOLEAN, true, "true");
-		volumeMusic = InputPanelFactory.createInputPanel(skin, "Music Volume", "The volume of the music. Value is between 0 and 1.",
-				Param.Type.FLOAT, true, "1");
+		volumeMusic = InputPanelFactory.createInputPanel(skin, "Music Volume",
+				"The volume of the music. Value is between 0 and 1.", Param.Type.FLOAT, true, "1");
 		initialMusicDelay = InputPanelFactory.createInputPanel(skin, "Initial music delay",
 				"The time to wait before playing", Param.Type.FLOAT, true, "0");
 		repeatMusicDelay = InputPanelFactory.createInputPanel(skin, "Repeat music delay",
@@ -103,8 +102,9 @@ public EditSceneDialog(Skin skin, World parent, Scene e) {
 		sceneSize = InputPanelFactory.createInputPanel(skin, "Scene Dimension",
 				"Sets the size of the scene. If empty, the background image size is used as the scene dimension.",
 				Param.Type.DIMENSION, false);
-		
-		walkzone = InputPanelFactory.createInputPanel(skin, "Walkzone", "The initial walkzone.", Type.WALKZONE_ACTOR, false);
+
+		walkzone = InputPanelFactory.createInputPanel(skin, "Walkzone", "The initial walkzone.", Type.WALKZONE_ACTOR,
+				false);
 
 		bgImage = new Image();
 		bgImage.setScaling(Scaling.fit);
@@ -118,7 +118,8 @@ public void changed(ChangeEvent event, Actor actor) {
 				try {
 					fillBGRegions(backgroundAtlas, backgroundRegion);
 				} catch (Exception e) {
-					Message.showMsg(getStage(), "Error loading regions from selected atlas", 4);
+					EditorLogger.error("Error loading regions from selected atlas: " + backgroundAtlas.getText() + "."
+							+ backgroundRegion.getText());
 				}
 			}
 		});
@@ -133,7 +134,8 @@ public void changed(ChangeEvent event, Actor actor) {
 		try {
 			fillBGRegions(backgroundAtlas, backgroundRegion);
 		} catch (Exception e2) {
-			EditorLogger.error("Error loading regions from selected atlas");
+			EditorLogger.error("Error loading regions from selected atlas: " + backgroundAtlas.getText() + "."
+					+ backgroundRegion.getText());
 		}
 
 		init(parent, e, new InputPanel[] { id, backgroundAtlas, backgroundRegion, depthVector, state, sceneSize, music,
@@ -214,19 +216,20 @@ protected void inputsToModel(boolean create) {
 			parent.getScenes().remove(e.getId());
 		}
 
-		e.setId(ElementUtils.getCheckedId(id.getText(), Ctx.project.getWorld().getScenes().keySet().toArray(new String[0])));
+		e.setId(ElementUtils.getCheckedId(id.getText(),
+				Ctx.project.getWorld().getScenes().keySet().toArray(new String[0])));
 
 		e.setBackgroundAtlas(backgroundAtlas.getText());
 		e.setBackgroundRegionId(backgroundRegion.getText());
-		
+
 		boolean dv = Boolean.parseBoolean(depthVector.getText());
-		
-		if(dv == true && e.getDepthVector() == null) { // create depth vector
+
+		if (dv == true && e.getDepthVector() == null) { // create depth vector
 			e.setDepthVector(new Vector2(Ctx.project.getWorld().getHeight(), 0));
-		} else if(dv == false && e.getDepthVector() != null) { // Remove depth vector
+		} else if (dv == false && e.getDepthVector() != null) { // Remove depth vector
 			e.setDepthVector(null);
 		}
-		
+
 		e.setState(state.getText());
 
 		MusicDesc md = null;
@@ -245,7 +248,7 @@ protected void inputsToModel(boolean create) {
 		e.setMusicDesc(md);
 
 		e.setSceneSize(Param.parseVector2(sceneSize.getText()));
-		
+
 		e.setWalkZone(walkzone.getText());
 
 		parent.addScene(e);
@@ -269,12 +272,12 @@ protected void modelToInputs() {
 		id.setText(e.getId());
 		backgroundAtlas.setText(e.getBackgroundAtlas());
 		backgroundRegion.setText(e.getBackgroundRegionId());
-		
+
 		if (e.getDepthVector() != null)
 			depthVector.setText("true");
 		else
 			depthVector.setText("false");
-		
+
 		state.setText(e.getState());
 
 		MusicDesc md = e.getMusicDesc();
@@ -290,7 +293,7 @@ protected void modelToInputs() {
 
 		if (e.getSceneSize() != null)
 			sceneSize.setText(Param.toStringParam(e.getSceneSize()));
-		
+
 		walkzone.setText(e.getWalkZone());
 	}
 

blade-engine/src/com/bladecoder/engine/actions/ScaleAction.java

@@ -23,7 +23,7 @@
 import com.bladecoder.engine.model.World;
 import com.bladecoder.engine.util.InterpolationMode;
 
-@ActionDescription(name = "ScaleAnim", value= "Proportional Scale animation for sprite actors")
+@ActionDescription(name = "ScaleAnim", value = "Proportional Scale animation for sprite actors")
 public class ScaleAction implements Action {
 	@ActionPropertyDescription("The target actor")
 	@ActionProperty(type = Type.SPRITE_ACTOR)
@@ -39,37 +39,36 @@ public class ScaleAction implements Action {
 
 	@ActionProperty
 	@ActionPropertyDescription("The The times to repeat")
-	private int count = 1;
+	private int count = -1;
 
 	@ActionProperty(required = true)
 	@ActionPropertyDescription("If this param is 'false' the transition is showed and the action continues inmediatly")
 	private boolean wait = true;
 
-	@ActionProperty(required = true, defaultValue = "REPEAT")
+	@ActionProperty(required = true, defaultValue = "NO_REPEAT")
 	@ActionPropertyDescription("The repeat mode")
-	private Tween.Type repeat = Tween.Type.REPEAT;
+	private Tween.Type repeat = Tween.Type.NO_REPEAT;
 
 	@ActionProperty
 	@ActionPropertyDescription("The interpolation mode")
 	private InterpolationMode interpolation;
-	
+
 	private World w;
-	
+
 	@Override
 	public void init(World w) {
 		this.w = w;
 	}
 
 	@Override
-	public boolean run(VerbRunner cb) {				
+	public boolean run(VerbRunner cb) {
 		SpriteActor a = (SpriteActor) w.getCurrentScene().getActor(actor, false);
-		
+
 		SpriteScaleTween t = new SpriteScaleTween();
-		t.start(a, repeat, count, scale, scale, speed, interpolation,
-				wait ? cb : null);
-		
+		t.start(a, repeat, count, scale, scale, speed, interpolation, wait ? cb : null);
+
 		a.addTween(t);
-		
+
 		return wait;
 	}
 

blade-engine/src/com/bladecoder/engine/actions/SetActorAttrAction.java

@@ -60,7 +60,7 @@ public class SetActorAttrAction implements Action {
 	@ActionProperty
 	@ActionPropertyDescription("Sets the actor scale proportionally")
 	private Float scale;
-	
+
 	@ActionProperty
 	@ActionPropertyDescription("Sets the actor scale non proportionally")
 	private Vector2 scaleXY;
@@ -91,13 +91,13 @@ public class SetActorAttrAction implements Action {
 	@ActionProperty
 	@ActionPropertyDescription("Sets the actor speed for walking. Only supported for character actors.")
 	private Float walkingSpeed;
-	
+
 	@ActionProperty
 	@ActionPropertyDescription("Sets the position of the text when talking. Relative to the character position.")
 	private Vector2 talkingTextPos;
-	
+
 	private World w;
-	
+
 	@Override
 	public void init(World w) {
 		this.w = w;
@@ -163,7 +163,7 @@ public boolean run(VerbRunner cb) {
 			else
 				EngineLogger.error("'scale' property not supported for actor:" + a.getId());
 		}
-		
+
 		if (scaleXY != null) {
 			if (a instanceof SpriteActor)
 				((SpriteActor) a).setScale(scaleXY.x, scaleXY.y);
@@ -180,7 +180,7 @@ public boolean run(VerbRunner cb) {
 
 		if (tint != null) {
 			if (a instanceof SpriteActor)
-				((SpriteActor) a).setTint(tint);
+				((SpriteActor) a).setTint(tint.cpy());
 			else
 				EngineLogger.error("'tint' property not supported for actor:" + a.getId());
 		}
@@ -229,7 +229,7 @@ public boolean run(VerbRunner cb) {
 			} else
 				EngineLogger.error("'uiActor' property not supported for actor:" + a.getId());
 		}
-		
+
 		if (talkingTextPos != null) {
 			if (a instanceof CharacterActor)
 				((CharacterActor) a).setTalkingTextPos(talkingTextPos);
@@ -244,8 +244,7 @@ private void setUIActor(Scene scn, InteractiveActor actor) {
 
 		scn.removeActor(actor);
 
-		if (scn != w.getCurrentScene() && w.getCachedScene(scn.getId()) == null
-				&& actor instanceof AssetConsumer) {
+		if (scn != w.getCurrentScene() && w.getCachedScene(scn.getId()) == null && actor instanceof AssetConsumer) {
 			((AssetConsumer) actor).loadAssets();
 			EngineAssetManager.getInstance().finishLoading();
 			((AssetConsumer) actor).retrieveAssets();

blade-engine/src/com/bladecoder/engine/anim/SpriteAlphaTween.java

@@ -26,23 +26,28 @@
  * Tween for SpriteActor alpha animation
  */
 public class SpriteAlphaTween extends Tween<SpriteActor> {
-	
+
 	private float startAlpha;
 	private float targetAlpha;
-	
+
 	public SpriteAlphaTween() {
 	}
 
-	public void start(SpriteActor target, Type repeatType, int count, float tAlpha, float duration, InterpolationMode interpolation, ActionCallback cb) {
-		
+	public void start(SpriteActor target, Type repeatType, int count, float tAlpha, float duration,
+			InterpolationMode interpolation, ActionCallback cb) {
+
 		setTarget(target);
-		
-		if(target.getTint() == null)
+
+		if (target.getTint() == null) {
 			target.setTint(Color.WHITE.cpy());
-		
+		} else {
+			// to set the flag dirty
+			target.setTint(target.getTint());
+		}
+
 		startAlpha = target.getTint().a;
 		targetAlpha = tAlpha;
-		
+
 		setDuration(duration);
 		setType(repeatType);
 		setCount(count);
@@ -51,15 +56,15 @@ public void start(SpriteActor target, Type repeatType, int count, float tAlpha,
 		if (cb != null) {
 			setCb(cb);
 		}
-		
+
 		restart();
 	}
 
 	@Override
 	public void updateTarget() {
 		target.getTint().a = startAlpha + getPercent() * (targetAlpha - startAlpha);
 	}
-	
+
 	@Override
 	public void write(Json json) {
 		super.write(json);
@@ -70,8 +75,8 @@ public void write(Json json) {
 
 	@Override
 	public void read(Json json, JsonValue jsonData) {
-		super.read(json, jsonData);	
-		
+		super.read(json, jsonData);
+
 		startAlpha = json.readValue("startAlpha", float.class, 1.0f, jsonData);
 		targetAlpha = json.readValue("targetAlpha", float.class, 1.0f, jsonData);
 	}

blade-engine/src/com/bladecoder/engine/anim/SpriteTintTween.java

@@ -26,23 +26,28 @@
  * Tween for SpriteActor tint animation
  */
 public class SpriteTintTween extends Tween<SpriteActor> {
-	
+
 	private Color startColor;
 	private Color targetColor;
-	
+
 	public SpriteTintTween() {
 	}
 
-	public void start(SpriteActor target, Type repeatType, int count, Color tColor, float duration, InterpolationMode interpolation, ActionCallback cb) {
-		
+	public void start(SpriteActor target, Type repeatType, int count, Color tColor, float duration,
+			InterpolationMode interpolation, ActionCallback cb) {
+
 		setTarget(target);
-		
-		if(target.getTint() == null)
+
+		if (target.getTint() == null) {
 			target.setTint(Color.WHITE.cpy());
-		
+		} else {
+			// to set the flag dirty
+			target.setTint(target.getTint());
+		}
+
 		startColor = target.getTint().cpy();
 		targetColor = tColor.cpy();
-		
+
 		setDuration(duration);
 		setType(repeatType);
 		setCount(count);
@@ -51,19 +56,19 @@ public void start(SpriteActor target, Type repeatType, int count, Color tColor,
 		if (cb != null) {
 			setCb(cb);
 		}
-		
+
 		restart();
 	}
 
 	@Override
 	public void updateTarget() {
-		
+
 		target.getTint().a = startColor.a + getPercent() * (targetColor.a - startColor.a);
 		target.getTint().r = startColor.r + getPercent() * (targetColor.r - startColor.r);
 		target.getTint().g = startColor.g + getPercent() * (targetColor.g - startColor.g);
 		target.getTint().b = startColor.b + getPercent() * (targetColor.b - startColor.b);
 	}
-	
+
 	@Override
 	public void write(Json json) {
 		super.write(json);
@@ -74,8 +79,8 @@ public void write(Json json) {
 
 	@Override
 	public void read(Json json, JsonValue jsonData) {
-		super.read(json, jsonData);	
-		
+		super.read(json, jsonData);
+
 		startColor = json.readValue("startColor", Color.class, Color.WHITE, jsonData);
 		targetColor = json.readValue("targetColor", Color.class, Color.WHITE, jsonData);
 	}