- fix camera loading state

- fix bad casting when read saved game
- fix walking speed double scale multiply

Author: bladecoder

CHANGELOG.md

@@ -4,8 +4,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.8.4]
+
+### Fixed
+
+- fix camera loading state
+- fix bad casting when read saved game
+- fix walking speed double scale multiply
+
 ## [0.8.3]
 
+### Added
+
 - UI Fixes
   - Inventory ui over inventory icon
   - Edit verbs dialog improvement
@@ -24,7 +34,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
-composer: fix world width and height was not recalculated when loading
+-composer: fix world width and height was not recalculated when loading
 
 ## [0.8.1]
 

blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/spine/SpineRenderer.java

@@ -17,10 +17,6 @@
 
 import java.util.HashMap;
 
-import com.bladecoder.engine.model.ActorRenderer;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.model.World;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
@@ -31,19 +27,20 @@
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
 import com.bladecoder.engine.actions.ActionCallbackQueue;
-import com.bladecoder.engine.anim.AtlasAnimationDesc;
 import com.bladecoder.engine.anim.AnimationDesc;
 import com.bladecoder.engine.anim.SpineAnimationDesc;
 import com.bladecoder.engine.anim.Tween;
 import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.ActorRenderer;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.World;
 import com.bladecoder.engine.util.ActionCallbackSerialization;
 import com.bladecoder.engine.util.EngineLogger;
 import com.bladecoder.engine.util.RectangleRenderer;
 import com.esotericsoftware.spine.Animation;
 import com.esotericsoftware.spine.AnimationState;
 import com.esotericsoftware.spine.AnimationState.AnimationStateListener;
-import com.esotericsoftware.spine.attachments.Attachment;
-import com.esotericsoftware.spine.attachments.RegionAttachment;
 import com.esotericsoftware.spine.AnimationStateData;
 import com.esotericsoftware.spine.Event;
 import com.esotericsoftware.spine.Skeleton;
@@ -52,6 +49,8 @@
 import com.esotericsoftware.spine.SkeletonData;
 import com.esotericsoftware.spine.SkeletonRenderer;
 import com.esotericsoftware.spine.Slot;
+import com.esotericsoftware.spine.attachments.Attachment;
+import com.esotericsoftware.spine.attachments.RegionAttachment;
 
 public class SpineRenderer implements ActorRenderer {
 

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

@@ -295,7 +295,7 @@ private void parseActor(Attributes atts) throws SAXException {
 
 			if (atts.getValue(XMLConstants.WALKING_SPEED_ATTR) != null
 					&& !atts.getValue(XMLConstants.WALKING_SPEED_ATTR).isEmpty()) {
-				float s = Float.parseFloat(atts.getValue(XMLConstants.WALKING_SPEED_ATTR)) * scale;
+				float s = Float.parseFloat(atts.getValue(XMLConstants.WALKING_SPEED_ATTR));
 				((SpriteActor) actor).setWalkingSpeed(s);
 			}
 

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

@@ -237,6 +237,10 @@ public void update(float delta) {
 		}
 
 		camera.update(delta);
+		
+		if(followActor != null) {
+			camera.updatePos(followActor);
+		}
 	}
 
 	public void draw(SpriteBatch spriteBatch) {
@@ -572,28 +576,16 @@ public void write(Json json) {
 		json.writeValue("verbs", verbs);
 
 		json.writeValue("actors", actors);
-		json.writeValue("player", player,
-				player == null ? null : player.getClass());
-
-		json.writeValue(
-				"backgroundAtlas",
-				backgroundAtlas,
-				backgroundAtlas == null ? null : backgroundAtlas
-						.getClass());
-		json.writeValue(
-				"backgroundRegionId",
-				backgroundRegionId,
-				backgroundRegionId == null ? null : backgroundRegionId
-						.getClass());
-
-		json.writeValue("lightMapAtlas", lightMapAtlas,
-				lightMapAtlas == null ? null : lightMapAtlas.getClass());
+		json.writeValue("player", player);
+
+		json.writeValue("backgroundAtlas", backgroundAtlas);
+		json.writeValue("backgroundRegionId",backgroundRegionId);
+
+		json.writeValue("lightMapAtlas", lightMapAtlas);
 
-		json.writeValue("lightMapRegionId", lightMapRegionId,
-				lightMapRegionId == null ? null : lightMapRegionId.getClass());
+		json.writeValue("lightMapRegionId", lightMapRegionId);
 
-		json.writeValue("musicFilename", musicFilename,
-				musicFilename == null ? null : musicFilename.getClass());
+		json.writeValue("musicFilename", musicFilename);
 		json.writeValue("loopMusic", loopMusic);
 		json.writeValue("initialMusicDelay", initialMusicDelay);
 		json.writeValue("repeatMusicDelay", repeatMusicDelay);

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

@@ -16,7 +16,6 @@
 package com.bladecoder.engine.model;
 
 import com.bladecoder.engine.model.SpriteActor;
-
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.math.Vector2;
@@ -28,6 +27,7 @@
 import com.bladecoder.engine.actions.ActionCallback;
 import com.bladecoder.engine.anim.CameraTween;
 import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.assets.EngineAssetManager;
 
 public class SceneCamera extends OrthographicCamera implements Serializable  {
 
@@ -111,6 +111,7 @@ else if (y >= maxtop)
 			y = maxtop;
 
 		position.set(x, y, 0);
+		
 		update();
 	}
 
@@ -190,32 +191,38 @@ public void scene2screen(Viewport viewport, Vector3 out) {
 
 	@Override
 	public void write(Json json) {
-		json.writeValue("startScrollDistanceX", startScrollDistanceX);
-		json.writeValue("startScrollDistanceY", startScrollDistanceY);
-		json.writeValue("width", viewportWidth);
-		json.writeValue("height", viewportHeight);
-		json.writeValue("scrollingWidth", scrollingWidth);
-		json.writeValue("scrollingHeight", scrollingHeight);
-		json.writeValue("pos", getPosition());
+		float worldScale = EngineAssetManager.getInstance().getScale();
+		
+		json.writeValue("width", viewportWidth / worldScale);
+		json.writeValue("height", viewportHeight / worldScale);
+		json.writeValue("scrollingWidth", scrollingWidth / worldScale);
+		json.writeValue("scrollingHeight", scrollingHeight / worldScale);
+		
+		Vector2 p = getPosition();
+		p.x = p.x/worldScale;
+		p.y = p.y/worldScale;
+		json.writeValue("pos", p);
 		json.writeValue("zoom", getZoom());
 		json.writeValue("cameraTween", cameraTween);
 	}
 
 	@Override
 	public void read(Json json, JsonValue jsonData) {
-		startScrollDistanceX = json.readValue("startScrollDistanceX", Float.class, jsonData);
-		startScrollDistanceY = json.readValue("startScrollDistanceY", Float.class, jsonData);
+		float worldScale = EngineAssetManager.getInstance().getScale();
 
-		viewportWidth = json.readValue("width", Float.class, jsonData);
-		viewportHeight = json.readValue("height", Float.class, jsonData);
-		scrollingWidth = json.readValue("scrollingWidth", Float.class, jsonData);
-		scrollingHeight = json.readValue("scrollingHeight", Float.class, jsonData);
+		viewportWidth = json.readValue("width", Float.class, jsonData) * worldScale;
+		viewportHeight = json.readValue("height", Float.class, jsonData) * worldScale;
+		scrollingWidth = json.readValue("scrollingWidth", Float.class, jsonData) * worldScale;
+		scrollingHeight = json.readValue("scrollingHeight", Float.class, jsonData) * worldScale;
 		Vector2 pos = json.readValue("pos", Vector2.class, jsonData);
+		pos.x *=  worldScale;
+		pos.y *=  worldScale;
 		float z = json.readValue("zoom", Float.class, jsonData);
 
 		create(viewportWidth, viewportHeight);
-		setPosition(pos.x, pos.y);
-		setZoom(z);
+		this.zoom = z;
+		position.set(pos.x, pos.y, 0);
+		update();
 
 		cameraTween = json.readValue("cameraTween", CameraTween.class, jsonData);
 	}	

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

@@ -83,10 +83,6 @@ public void setPosition(float x, float y) {
 
 				setScale(s);
 			}
-
-			if (scene.getCameraFollowActor() == this)
-				scene.getCamera().updatePos(this);
-
 		}
 
 	}