Added initial scale to sprite actors

Author: bladecoder

adventure-composer/src/main/java/com/bladecoder/engineeditor/model/ChapterDocument.java

@@ -397,9 +397,10 @@ public BaseActor getEngineActor(Element e) {
 				((SpriteActor) a).getRenderer().setInitAnimation(e.getAttribute("init_animation"));
 
 			}
-
-			if (e.getAttribute("obstacle").equals("true"))
-				a.setWalkObstacle(true);
+			
+			if (!e.getAttribute("scale").isEmpty()) {
+				((SpriteActor) a).setScale(Float.parseFloat(e.getAttribute("scale")));
+			}
 
 			// PARSE DEPTH TYPE
 			String depthType = e.getAttribute("depth_type");
@@ -410,6 +411,9 @@ public BaseActor getEngineActor(Element e) {
 					((SpriteActor) a).setDepthType(DepthType.VECTOR);
 			}
 		}
+		
+		if (e.getAttribute("obstacle").equals("true"))
+			a.setWalkObstacle(true);
 
 		return a;
 	}

adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditActorDialog.java

@@ -38,11 +38,11 @@ public class EditActorDialog extends EditElementDialog {
 			"Image actors show image files"
 			};
 
-	private InputPanel[] inputs = new InputPanel[12];
+	private InputPanel[] inputs = new InputPanel[13];
 	InputPanel typePanel;
 
 	String attrs[] = { "type", "id", "layer", "desc", "state", "interaction", "visible",
-			"walking_speed", "depth_type", "sprite_size", "camera", "fov" };
+			"walking_speed", "depth_type", "sprite_size", "camera", "fov", "scale" };
 
 	@SuppressWarnings("unchecked")
 	public EditActorDialog(Skin skin, BaseDocument doc, Element parent,
@@ -85,6 +85,10 @@ public EditActorDialog(Skin skin, BaseDocument doc, Element parent,
 		inputs[11] = new InputPanel(skin, "Camera FOV",
 				"The camera field of view", Param.Type.FLOAT, true, "49.3",
 				null);
+		
+		inputs[12] = new InputPanel(skin, "Scale",
+				"The sprite scale", Param.Type.FLOAT, true, "1",
+				null);
 
 		setInfo(TYPES_INFO[0]);
 
@@ -113,13 +117,19 @@ private void typeChanged() {
 		setVisible(inputs[9],false);
 		setVisible(inputs[10],false);
 		setVisible(inputs[11],false);
+		setVisible(inputs[12],false);
 
 		if (ChapterDocument.ACTOR_TYPES[i]
 				.equals(ChapterDocument.SPRITE3D_ACTOR_TYPE)) {
 			setVisible(inputs[9],true);
 			setVisible(inputs[10],true);
 			setVisible(inputs[11],true);
 		}
+		
+		if (!ChapterDocument.ACTOR_TYPES[i]
+				.equals(ChapterDocument.NO_RENDERER_ACTOR_TYPE)) {
+			setVisible(inputs[12],true);
+		}
 	}
 
 	@Override

blade-engine/src/com/bladecoder/engine/loader/ChapterXMLLoader.java

@@ -301,6 +301,13 @@ public void startElement(String namespaceURI, String localName,
 						.getValue("obstacle"));
 				actor.setWalkObstacle(obstacle);
 			}
+			
+			
+			if (atts.getValue("scale") != null && actor instanceof SpriteActor) {
+				float s = Float
+						.parseFloat(atts.getValue("scale"));
+				((SpriteActor)actor).setScale(s);
+			}
 
 			String layerStr = atts.getValue("layer");
 

blade-engine/src/com/bladecoder/engine/model/BaseActor.java

@@ -94,7 +94,7 @@ public boolean hit(float x, float y) {
 	}
 
 	public boolean hasInteraction() {
-		return interaction;
+		return interaction && visible;
 	}
 
 	public void setInteraction(boolean interaction) {