fixes: atlas drawing with spripspaces + parallax

Author: bladecoder

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

@@ -155,7 +155,7 @@ public void changed(ChangeEvent event, Actor actor) {
 			}
 		});
 
-		init(parent, e, new InputPanel[] { typePanel, id, layer, visible, interaction, desc, state, renderer, depthType,
+		init(parent, e, new InputPanel[] { typePanel, id, renderer, layer, visible, interaction, desc, state, depthType,
 				scale, zIndex, walkingSpeed, spriteSize, cameraName, fov, textColor });
 
 		typeChanged();

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

@@ -68,6 +68,7 @@ public class EditSceneDialog extends EditModelDialog<World, Scene> {
 	private InputPanel loopMusic;
 	private InputPanel initialMusicDelay;
 	private InputPanel repeatMusicDelay;
+	private InputPanel sceneSize;
 
 	@SuppressWarnings("unchecked")
 	public EditSceneDialog(Skin skin, World parent, Scene e) {
@@ -91,6 +92,9 @@ public EditSceneDialog(Skin skin, World parent, Scene e) {
 				"The time to wait before playing", Param.Type.FLOAT, true, "0");
 		repeatMusicDelay = InputPanelFactory.createInputPanel(skin, "Repeat music delay",
 				"The time to wait before repetitions", Param.Type.FLOAT, true, "0");
+		
+		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);
 
 		bgImage = new Image();
 		bgImage.setScaling(Scaling.fit);
@@ -123,7 +127,7 @@ public void changed(ChangeEvent event, Actor actor) {
 		}
 
 		init(parent, e, new InputPanel[] { id, backgroundAtlas, backgroundRegion,
-				depthVector, state, music, loopMusic, initialMusicDelay, repeatMusicDelay });
+				depthVector, state, sceneSize, music, loopMusic, initialMusicDelay, repeatMusicDelay });
 	}
 
 	private void showBgImage(String r) {
@@ -209,6 +213,8 @@ protected void inputsToModel(boolean create) {
 
 		e.setMusic(music.getText(), Boolean.parseBoolean(loopMusic.getText()),
 				Float.parseFloat(initialMusicDelay.getText()), Float.parseFloat(repeatMusicDelay.getText()));
+		
+		e.setSceneSize(Param.parseVector2(sceneSize.getText()));
 
 		parent.addScene(e);
 
@@ -238,6 +244,9 @@ protected void modelToInputs() {
 		loopMusic.setText(Boolean.toString(e.isLoopMusic()));
 		initialMusicDelay.setText(Float.toString(e.getInitialMusicDelay()));
 		repeatMusicDelay.setText(Float.toString(e.getRepeatMusicDelay()));
+		
+		if (e.getSceneSize() != null)
+			sceneSize.setText(Param.toStringParam(e.getSceneSize()));
 	}
 
 	private String[] getAtlasList() {

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

@@ -18,7 +18,6 @@
 import java.util.HashMap;
 
 import com.badlogic.gdx.math.Vector2;
-import com.bladecoder.engine.util.EngineLogger;
 
 public class AnimationDesc {
 	public final static String BACK = "back";
@@ -96,7 +95,7 @@ public static String getDirectionString(Vector2 p0, Vector2 pf, int numDirs) {
 		if (ratio2 < 1.0)
 			ratio2 = 1.0f / ratio;
 
-		EngineLogger.debug("P0: " + p0 + " PF: " + pf + " dx: " + dx + " dy: " + dy + " RATIO: " + ratio);
+//		EngineLogger.debug("P0: " + p0 + " PF: " + pf + " dx: " + dx + " dy: " + dy + " RATIO: " + ratio);
 
 		if (ratio2 < DIRECTION_ASPECT_TOLERANCE && numDirs > 4) { // DIAGONAL
 																	// MOVEMENT

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

@@ -127,8 +127,8 @@ public void draw(SpriteBatch batch, float x, float y, float scale) {
 			batch.draw(tex, x, y, tex.originalWidth / 2 - tex.offsetX, tex.originalHeight / 2  - tex.offsetY, tex.packedWidth, tex.packedHeight, scale,
 					scale, 0);
 		} else {
-			batch.draw(tex, x + tex.packedWidth * scale, y, tex.originalWidth / 2 - tex.offsetX, tex.originalHeight / 2  - tex.offsetY, -tex.packedWidth,
-					tex.packedHeight, scale, scale, 0);
+			batch.draw(tex, x, y, tex.originalWidth / 2 - tex.offsetX, tex.originalHeight / 2  - tex.offsetY, tex.packedWidth, tex.packedHeight, -scale,
+					scale, 0);
 		}
 	}
 

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

@@ -88,6 +88,7 @@ public class Scene implements Serializable, AssetConsumer {
 	private String musicFilename;
 	private boolean isPlayingSer = false;
 	private float musicPosSer = 0;
+	private Vector2 sceneSize;
 
 	transient private boolean isMusicPaused = false;
 
@@ -620,12 +621,16 @@ public void retrieveAssets() {
 			int height = background.get(0).getRegionHeight();
 
 			// Sets the scrolling dimensions. It must be done here because
-			// the background must be loaded to calculate the bbox
-			camera.setScrollingDimensions(width, height);
+			// the background must be loaded to calculate the bbox	
+			if(sceneSize == null)
+				camera.setScrollingDimensions(width, height);
 
 			// if(followActor != null)
 			// camera.updatePos(followActor);
 		}
+		
+		if(sceneSize != null)
+			camera.setScrollingDimensions(sceneSize.x, sceneSize.y);
 
 		// RETRIEVE ACTORS
 		for (BaseActor a : actors.values()) {
@@ -667,6 +672,14 @@ public void dispose() {
 		}
 	}
 
+	public Vector2 getSceneSize() {
+		return sceneSize;
+	}
+
+	public void setSceneSize(Vector2 sceneSize) {
+		this.sceneSize = sceneSize;
+	}
+
 	public void orderLayersByZIndex() {
 		for (SceneLayer l : layers) {
 			l.orderByZIndex();
@@ -707,6 +720,9 @@ public void write(Json json) {
 
 			if (polygonalNavGraph != null)
 				json.writeValue("polygonalNavGraph", polygonalNavGraph);
+			
+			if (sceneSize != null)
+				json.writeValue("sceneSize", sceneSize);
 
 		} else {
 			SceneActorRef actorRef;
@@ -775,6 +791,8 @@ public void read(Json json, JsonValue jsonData) {
 			depthVector = json.readValue("depthVector", Vector2.class, jsonData);
 
 			polygonalNavGraph = json.readValue("polygonalNavGraph", PolygonalNavGraph.class, jsonData);
+			
+			sceneSize = json.readValue("sceneSize", Vector2.class, jsonData);
 
 		} else {
 			JsonValue jsonValueActors = jsonData.get("actors");