Added textStyle attribute to character actors.

Author: bladecoder

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

@@ -97,11 +97,13 @@ public class EditActorDialog extends EditModelDialog<Scene, BaseActor> {
 
 	private InputPanel orgAlign;
 
+	private InputPanel textColor;
+	private InputPanel textStyle;
+	
 	// 3d Renderer
 	private InputPanel spriteSize;
 	private InputPanel cameraName;
 	private InputPanel fov;
-	private InputPanel textColor;
 
 	// Particle Renderer
 	private InputPanel particleName;
@@ -178,6 +180,9 @@ public EditActorDialog(Skin skin, Scene parent, BaseActor e) {
 
 		textColor = InputPanelFactory.createInputPanel(skin, "Text Color",
 				"The text color (RRGGBBAA) when the actor talks.", Param.Type.COLOR, false);
+		
+		textStyle = InputPanelFactory.createInputPanel(skin, "Text Style",
+				"The style to use (an entry in your `ui.json` in the `com.bladecoder.engine.ui.TextManagerUI$TextManagerUIStyle` section).", Param.Type.STRING, false);
 
 		particleName = InputPanelFactory.createInputPanel(skin, "Particle Name", "The name of the particle system.",
 				Type.PARTICLE_ASSET, true);
@@ -229,7 +234,7 @@ public void changed(ChangeEvent event, Actor actor) {
 		init(parent, e,
 				new InputPanel[] { typePanel, id, renderer, particleName, particleAtlas, layer, visible, interaction, desc, state, fakeDepth, pos, refPoint, scale, rot,
 						tint, text, font, size, textAlign, borderWidth, borderColor, borderStraight, shadowOffsetX, shadowOffsetY,
-						shadowColor, bboxFromRenderer, zIndex, orgAlign, walkingSpeed, spriteSize, cameraName, fov, textColor });
+						shadowColor, bboxFromRenderer, zIndex, orgAlign, walkingSpeed, spriteSize, cameraName, fov, textColor, textStyle });
 
 		typeChanged();
 
@@ -280,6 +285,7 @@ private void typeChanged() {
 		if (ACTOR_TYPES[i].equals(CHARACTER_TYPE_STR)) {
 			setVisible(walkingSpeed, true);
 			setVisible(textColor, true);
+			setVisible(textStyle, true);
 		}
 
 		rendererChanged();
@@ -538,6 +544,7 @@ protected void inputsToModel(boolean create) {
 
 					ca.setWalkingSpeed(Float.parseFloat(walkingSpeed.getText()));
 					ca.setTextColor(Param.parseColor(textColor.getText()));
+					ca.setTextStyle(textStyle.getText());
 				}
 			}
 		}
@@ -631,6 +638,7 @@ protected void modelToInputs() {
 
 					walkingSpeed.setText(Float.toString(ca.getWalkingSpeed()));
 					textColor.setText(ca.getTextColor() == null ? null : ca.getTextColor().toString());
+					textStyle.setText(ca.getTextStyle());
 					typePanel.setText(CHARACTER_TYPE_STR);
 				} else {
 					typePanel.setText(SPRITE_TYPE_STR);

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

@@ -42,6 +42,7 @@ public class CharacterActor extends SpriteActor {
 
 	private float walkingSpeed = DEFAULT_WALKING_SPEED;
 	private Color textColor;
+	private String textStyle;
 
 	private String standAnim = DEFAULT_STAND_ANIM;
 	private String walkAnim = DEFAULT_WALK_ANIM;
@@ -57,6 +58,14 @@ public void setTextColor(Color textColor) {
 		this.textColor = textColor;
 	}
 
+	public String getTextStyle() {
+		return textStyle;
+	}
+
+	public void setTextStyle(String textStyle) {
+		this.textStyle = textStyle;
+	}
+
 	public String getStandAnim() {
 		return standAnim;
 	}
@@ -241,6 +250,7 @@ public void write(Json json) {
 		json.writeValue("dialogs", dialogs, HashMap.class, Dialog.class);
 
 		if (SerializationHelper.getInstance().getMode() == Mode.MODEL) {
+			json.writeValue("textStyle", textStyle);
 		} else {
 			json.writeValue("standAnim", standAnim);
 			json.writeValue("walkAnim", walkAnim);
@@ -263,6 +273,8 @@ public void read(Json json, JsonValue jsonData) {
 				for (Dialog d : dialogs.values())
 					d.setActor(id);
 			}
+			
+			textStyle = json.readValue("textStyle", String.class, jsonData);
 
 		} else {
 			if (dialogs != null) {

blade-engine/src/com/bladecoder/engine/ui/TextManagerUI.java

@@ -28,6 +28,7 @@
 import com.badlogic.gdx.utils.Align;
 import com.badlogic.gdx.utils.ObjectMap;
 import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.CharacterActor;
 import com.bladecoder.engine.model.Text;
 import com.bladecoder.engine.model.TextManager;
 import com.bladecoder.engine.model.World;
@@ -54,6 +55,8 @@ public class TextManagerUI extends Actor {
 	private float fontX = 0;
 
 	private AtlasRegion charIcon = null;
+	
+	private TextManagerUIStyle style;
 
 	public TextManagerUI(Skin skin) {
 		setTouchable(Touchable.disabled);
@@ -88,7 +91,7 @@ public void act(float delta) {
 				unprojectTmp.set(posx, posy, 0);
 				World.getInstance().getSceneCamera().scene2screen(getStage().getViewport(), unprojectTmp);
 
-				final TextManagerUIStyle style = getStyle(currentSubtitle);
+				style = getStyle(currentSubtitle);
 
 				float maxWidth = Math.min(getStage().getViewport().getScreenWidth() - DPIUtils.getMarginSize() * 2,
 						style.font.getXHeight() * (currentSubtitle.type == Text.Type.TALK ? style.maxTalkCharWidth : style.maxCharWidth));
@@ -143,7 +146,8 @@ public void act(float delta) {
 
 				if (currentSubtitle.type == Text.Type.TALK) {
 					if (style.talkBubble != null) {
-						setY(getY() + DPIUtils.getTouchMinSize() / 3 + PADDING);
+						float bubbleHeight = DPIUtils.getTouchMinSize()  * style.bubbleSize / 4;
+						setY(getY() + bubbleHeight + PADDING);
 					} else {
 						setY(getY() + PADDING);
 					}
@@ -175,8 +179,6 @@ && getX() + getWidth() < getStage().getViewport().getScreenWidth() + getWidth())
 	public void draw(Batch batch, float alpha) {
 		batch.setColor(Color.WHITE);
 
-		final TextManagerUIStyle style = getStyle(subtitle);
-
 		if (subtitle.type == Text.Type.TALK) {
 			if (getX() < 0 || getX() > getStage().getViewport().getScreenWidth())
 				return;
@@ -215,12 +217,16 @@ public void draw(Batch batch, float alpha) {
 
 	private TextManagerUIStyle getStyle(Text text) {
 		String key = "default";
-		if (text != null) {
+		
+		if (text != null &&  text.style != null && !text.style.isEmpty()) {
 			key = text.style;
+		} else if (text.actorId != null) {
+			CharacterActor a = (CharacterActor) World.getInstance().getCurrentScene().getActor(text.actorId, false);
+			
+			if(a.getTextStyle() != null)
+				key = a.getTextStyle();
 		}
-		if (key == null || key.isEmpty()) {
-			key = "default";
-		}
+		
 		return styles.get(key);
 	}