Merge branch 'voices'

bladecoder · bladecoder · commit 9e37fe950bc4 · 2017-05-05T10:40:26.000+02:00
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditOptionDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditOptionDialog.java
@@ -30,7 +30,9 @@
 public class EditOptionDialog extends EditModelDialog<Dialog, DialogOption> {
 
 	private InputPanel text;
+	private InputPanel voice;
 	private InputPanel responseText;
+	private InputPanel responseVoice;
 	private InputPanel verb;
 	private InputPanel next;
 	private InputPanel visible;
@@ -45,8 +47,12 @@ public EditOptionDialog(Skin skin, Dialog parent, DialogOption e, int pos) {
 
 		text = InputPanelFactory.createInputPanel(skin, "Text", "The sentence of the dialog to say by the player",
 				Type.SMALL_TEXT, true);
-		responseText = InputPanelFactory.createInputPanel(skin, "Response Text", "The response by the character",
+		voice = InputPanelFactory.createInputPanel(skin, "Voice", "The voice filename",
+				Type.VOICE, true);
+		responseText = InputPanelFactory.createInputPanel(skin, "Response Text", "The response said by the character",
 				Type.TEXT, false);
+		responseVoice = InputPanelFactory.createInputPanel(skin, "Response Voice", "The voice filename for the response",
+				Type.VOICE, false);
 		verb = InputPanelFactory.createInputPanel(skin, "Verb", "The verb to execute when choosing this option");
 		next = InputPanelFactory.createInputPanel(skin, "Next Dialog",
 				"The next dialog to show when this option is selected",
@@ -60,7 +66,7 @@ public EditOptionDialog(Skin skin, Dialog parent, DialogOption e, int pos) {
 		text.getCell(text.getField()).fillX();
 		responseText.getCell(responseText.getField()).fillX();
 
-		init(parent, e, new InputPanel[] { text, responseText, verb, next, visible, once });
+		init(parent, e, new InputPanel[] { text, voice, responseText, responseVoice, verb, next, visible, once });
 	}
 
 	@Override
@@ -101,6 +107,9 @@ protected void inputsToModel(boolean create) {
 		e.setNext(next.getText());
 		e.setVisible(Boolean.parseBoolean(visible.getText()));
 		e.setOnce(Boolean.parseBoolean(once.getText()));
+		e.setVoiceId(voice.getText());
+		e.setResponseVoiceId(responseVoice.getText());
+		
 
 		// TODO UNDO OP
 		// UndoOp undoOp = new UndoAddElement(doc, e);
@@ -121,6 +130,8 @@ protected void modelToInputs() {
 
 		visible.setText(Boolean.toString(e.isVisible()));
 		once.setText(Boolean.toString(e.isOnce()));
+		voice.setText(e.getVoiceId());
+		responseVoice.setText(e.getResponseVoiceId());
 	}
 
 	private String[] getActorDialogs(CharacterActor actor) {
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/InputPanelFactory.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/InputPanelFactory.java
@@ -96,6 +96,7 @@ private static InputPanel createInputPanel(Skin skin, String title, String desc,
 		case COLOR:
 			return new ColorInputPanel(skin, title, desc, mandatory, defaultValue);
 		case SOUND:
+		case VOICE:
 		case TEXT_STYLE:
 		case STRING:
 			if (options != null)
diff --git a/blade-engine/src/com/bladecoder/engine/actions/LookAtAction.java b/blade-engine/src/com/bladecoder/engine/actions/LookAtAction.java
@@ -51,6 +51,10 @@ public String getDirection() {
 	@ActionPropertyDescription("The 'text' to show")
 	@ActionProperty(type = Type.SMALL_TEXT)
 	private String text;
+	
+	@ActionPropertyDescription("The 'voice' file to play if selected.")
+	@ActionProperty(type = Type.VOICE)
+	private String voiceId;
 
 	@ActionProperty
 	@ActionPropertyDescription("The direction to lookat. If empty, the player lookat to the actor")
@@ -81,7 +85,7 @@ else if (a != null && player != null) {
 			String actorId = World.getInstance().getCurrentScene().getPlayer() != null? World.getInstance().getCurrentScene().getPlayer().getId():null;
 			
 			World.getInstance().getTextManager().addText(text, TextManager.POS_SUBTITLE, TextManager.POS_SUBTITLE,
-					false, Text.Type.SUBTITLE, null, null, actorId, wait ? cb : null);
+					false, Text.Type.SUBTITLE, null, null, actorId, voiceId, wait ? cb : null);
 			
 			return wait;
 		}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/Param.java b/blade-engine/src/com/bladecoder/engine/actions/Param.java
@@ -22,7 +22,7 @@
 
 public class Param {
 	public enum Type {
-		STRING, BOOLEAN, FLOAT, INTEGER, VECTOR2, VECTOR3, DIMENSION, ACTOR, CHARACTER_ACTOR, INTERACTIVE_ACTOR, SPRITE_ACTOR, SCENE, CHAPTER, FILE, OPTION, SCENE_ACTOR, ACTOR_ANIMATION, LAYER, EDITABLE_OPTION, SCENE_CHARACTER_ACTOR, SCENE_INTERACTIVE_ACTOR, SCENE_SPRITE_ACTOR, TEXT, SMALL_TEXT, BIG_TEXT, COLOR, SOUND, TEXT_STYLE, ATLAS_ASSET, MUSIC_ASSET, SOUND_ASSET, PARTICLE_ASSET, FONT_ASSET, NOT_SET
+		STRING, BOOLEAN, FLOAT, INTEGER, VECTOR2, VECTOR3, DIMENSION, ACTOR, CHARACTER_ACTOR, INTERACTIVE_ACTOR, SPRITE_ACTOR, SCENE, CHAPTER, FILE, OPTION, SCENE_ACTOR, ACTOR_ANIMATION, LAYER, EDITABLE_OPTION, SCENE_CHARACTER_ACTOR, SCENE_INTERACTIVE_ACTOR, SCENE_SPRITE_ACTOR, TEXT, SMALL_TEXT, BIG_TEXT, COLOR, SOUND, TEXT_STYLE, ATLAS_ASSET, MUSIC_ASSET, SOUND_ASSET, PARTICLE_ASSET, FONT_ASSET, NOT_SET, VOICE
 	}
 
 	public static final String NUMBER_PARAM_SEPARATOR = ",";
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SayAction.java b/blade-engine/src/com/bladecoder/engine/actions/SayAction.java
@@ -39,9 +39,9 @@ public class SayAction extends BaseCallbackAction {
 	@ActionProperty(type = Type.SMALL_TEXT)
 	private String text;
 
-	@ActionPropertyDescription("The 'soundId' to play if selected.")
-	@ActionProperty(type = Type.SOUND)
-	private String soundId;
+	@ActionPropertyDescription("The 'voice' file to play if selected.")
+	@ActionProperty(type = Type.VOICE)
+	private String voiceId;
 
 	@ActionProperty(required = true, defaultValue = "SUBTITLE")
 	@ActionPropertyDescription("The type of the text.")
@@ -65,8 +65,8 @@ public boolean run(VerbRunner cb) {
 		setVerbCb(cb);
 		InteractiveActor a = (InteractiveActor) World.getInstance().getCurrentScene().getActor(actor, false);
 
-		if (soundId != null)
-			a.playSound(soundId);
+		if (voiceId != null)
+			a.playSound(voiceId);
 
 		if (text != null) {
 			if (type == Text.Type.TALK && a != null) {
@@ -82,7 +82,7 @@ public boolean run(VerbRunner cb) {
 			}
 
 			World.getInstance().getTextManager().addText(text, x, y, queue, type, color, null, 
-					a != null? a.getId(): actor, this);
+					a != null? a.getId(): actor, voiceId, this);
 		}
 
 		return getWait();
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SayDialogAction.java b/blade-engine/src/com/bladecoder/engine/actions/SayDialogAction.java
@@ -36,6 +36,7 @@ public class SayDialogAction extends BaseCallbackAction {
 	private boolean characterTurn = false;
 	private String characterName;
 	private String responseText;
+	private String responseVoiceId;
 
 	private String previousAnim;
 
@@ -54,6 +55,7 @@ public boolean run(VerbRunner cb) {
 		String playerText = o.getText();
 		
 		responseText = o.getResponseText();
+		responseVoiceId = o.getResponseVoiceId();
 		characterName = w.getCurrentDialog().getActor();
 		
 		characterTurn = true;
@@ -73,7 +75,7 @@ public boolean run(VerbRunner cb) {
 			float y = boundingRectangle.getY() + boundingRectangle.getHeight();
 
 			w.getTextManager().addText(playerText, x, y, false,
-					Text.Type.TALK, player.getTextColor(), null, player.getId(), this);
+					Text.Type.TALK, player.getTextColor(), null, player.getId(), o.getVoiceId(), this);
  
 			startTalkAnim(player);
 
@@ -105,7 +107,7 @@ public void resume() {
 				
 				World.getInstance().getTextManager().addText(responseText, x,
 						y, false, Text.Type.TALK,
-						((CharacterActor) actor).getTextColor(), null, actor.getId(), this);
+						((CharacterActor) actor).getTextColor(), null, actor.getId(), responseVoiceId, this);
 
 
 				if(actor instanceof CharacterActor) {
@@ -144,6 +146,7 @@ private void startTalkAnim(CharacterActor a) {
 	public void write(Json json) {
 		json.writeValue("previousFA", previousAnim);
 		json.writeValue("responseText", responseText);
+		json.writeValue("responseSoundId", responseVoiceId);
 		json.writeValue("characterTurn", characterTurn);
 		json.writeValue("characterName", characterName);
 		super.write(json);
@@ -153,6 +156,7 @@ public void write(Json json) {
 	public void read (Json json, JsonValue jsonData) {
 		previousAnim = json.readValue("previousFA", String.class, jsonData);
 		responseText = json.readValue("responseText", String.class, jsonData);
+		responseVoiceId = json.readValue("responseSoundId", String.class, jsonData);
 		characterTurn = json.readValue("characterTurn", boolean.class, false, jsonData);
 		characterName = json.readValue("characterName", String.class, jsonData);
 		super.read(json, jsonData);
diff --git a/blade-engine/src/com/bladecoder/engine/actions/TextAction.java b/blade-engine/src/com/bladecoder/engine/actions/TextAction.java
@@ -32,6 +32,10 @@ public class TextAction implements Action {
 	@ActionPropertyDescription("The 'text' to show")
 	@ActionProperty(type = Type.SMALL_TEXT)
 	private String text;
+	
+	@ActionPropertyDescription("The 'voice' file to play if selected.")
+	@ActionProperty(type = Type.VOICE)
+	private String voiceId;
 
 	@ActionPropertyDescription("The style to use (an entry in your `ui.json` in the `com.bladecoder.engine.ui.TextManagerUI$TextManagerUIStyle` section)")
 	@ActionProperty(type = Type.TEXT_STYLE, required = true, defaultValue = "default")
@@ -104,7 +108,7 @@ public boolean run(VerbRunner cb) {
 			}
 
 			World.getInstance().getTextManager()
-						.addText(text, x, y, queue, type, color, style, null, wait?cb:null);
+						.addText(text, x, y, queue, type, color, style, null, voiceId, wait?cb:null);
 		}
 		
 		return wait;
diff --git a/blade-engine/src/com/bladecoder/engine/assets/EngineAssetManager.java b/blade-engine/src/com/bladecoder/engine/assets/EngineAssetManager.java
@@ -68,6 +68,7 @@ public class EngineAssetManager extends AssetManager {
 	public static final String SPINE_DIR = "spine/";
 	public static final String PARTICLE_DIR = "particles/";
 	public static final String FONT_DIR = "ui/fonts/";
+	public static final String VOICE_DIR = "voices/";
 
 	public static final String MODEL3D_EXT = ".g3db";
 	public static final String SPINE_EXT = ".skel";
diff --git a/blade-engine/src/com/bladecoder/engine/model/DialogOption.java b/blade-engine/src/com/bladecoder/engine/model/DialogOption.java
@@ -28,6 +28,8 @@ public class DialogOption implements Serializable {
 	private String next;
 	private boolean visible = true;
 	private boolean once = false;
+	private String voiceId;
+	private String responseVoiceId;
 
 	public boolean isVisible() {
 		return visible;
@@ -52,6 +54,22 @@ public String getText() {
 	public void setText(String text) {
 		this.text = text;
 	}
+	
+	public String getVoiceId() {
+		return voiceId;
+	}
+
+	public void setVoiceId(String voiceId) {
+		this.voiceId = voiceId;
+	}
+	
+	public String getResponseVoiceId() {
+		return responseVoiceId;
+	}
+
+	public void setResponseVoiceId(String soundId) {
+		this.responseVoiceId = soundId;
+	}
 
 	public void setResponseText(String responseText) {
 		this.responseText = responseText;
@@ -86,6 +104,8 @@ public void write(Json json) {
 			json.writeValue("verbId", verbId);
 			json.writeValue("next", next);
 			json.writeValue("once", once);
+			json.writeValue("soundId", voiceId);
+			json.writeValue("responseSoundId", responseVoiceId);
 		} else {
 			
 		}
@@ -102,6 +122,8 @@ public void read(Json json, JsonValue jsonData) {
 			verbId = json.readValue("verbId", String.class, jsonData);
 			next = json.readValue("next", String.class, jsonData);
 			once = json.readValue("once", Boolean.class, jsonData);
+			voiceId = json.readValue("soundId", String.class, jsonData);
+			responseVoiceId = json.readValue("responseSoundId", String.class, jsonData);
 		} else {
 			
 		}
diff --git a/blade-engine/src/com/bladecoder/engine/model/MusicEngine.java b/blade-engine/src/com/bladecoder/engine/model/MusicEngine.java
@@ -11,7 +11,7 @@
 /**
  * Simple music engine.
  * 
- * Plays a music file, if another music is playing, stop it before playing the
+ * Plays a music file, if another music is playing, stops it before playing the
  * new music.
  * 
  * @author rgarcia
diff --git a/blade-engine/src/com/bladecoder/engine/model/Text.java b/blade-engine/src/com/bladecoder/engine/model/Text.java
@@ -39,11 +39,12 @@ public enum Type {
 	public String style;
 	private ActionCallback cb;
 	public String actorId;
+	public String voiceId;
 
 	public Text() {
 	}
 
-	public Text(String str, float x, float y, float time, Type type, Color color, String style, String actorId, ActionCallback cb) {
+	public Text(String str, float x, float y, float time, Type type, Color color, String style, String actorId, String voiceId, ActionCallback cb) {
 		this.str = str;
 		this.x = x;
 		this.y = y;
@@ -53,6 +54,7 @@ public Text(String str, float x, float y, float time, Type type, Color color, St
 		this.style = style;
 		this.cb = cb;
 		this.actorId = actorId;
+		this.voiceId = voiceId;
 
 		// 0s -> Auto duration
 		// <0 -> Infinity
@@ -80,6 +82,7 @@ public void write(Json json) {
 		json.writeValue("color", color);
 		json.writeValue("style", style);
 		json.writeValue("actorId", actorId);
+		json.writeValue("voiceId", voiceId);
 		json.writeValue("cb", ActionCallbackSerialization.find(cb), cb == null ? null
 				: String.class);
 	}
@@ -94,6 +97,7 @@ public void read (Json json, JsonValue jsonData) {
 		color = json.readValue("color", Color.class, jsonData);
 		style = json.readValue("style", String.class, jsonData);
 		actorId = json.readValue("actorId", String.class, jsonData);
+		voiceId = json.readValue("voiceId", String.class, jsonData);
 		String cbSer = json.readValue("cb", String.class, jsonData);
 		if(cbSer != null)
 			cb = ActionCallbackSerialization.find(cbSer);
diff --git a/blade-engine/src/com/bladecoder/engine/model/TextManager.java b/blade-engine/src/com/bladecoder/engine/model/TextManager.java
@@ -48,6 +48,7 @@ public class TextManager implements Serializable {
 
 	private float inScreenTime;
 	private Text currentText = null;
+	private final VoiceManager voiceManager = new VoiceManager(this);
 
 	private Queue<Text> fifo;
 
@@ -56,7 +57,7 @@ public TextManager() {
 	}
 
 	public void addText(String str, float x, float y, boolean quee, Text.Type type,
-			Color color, String font, String actorId, ActionCallback cb) {
+			Color color, String font, String actorId, String voiceId, ActionCallback cb) {
 		
 		if(str.charAt(0) == I18N.PREFIX)
 			str = I18N.getString(str.substring(1));
@@ -84,9 +85,15 @@ public void addText(String str, float x, float y, boolean quee, Text.Type type,
 			Text sub;
 			
 			if (i != text.length - 1) {
-				sub = new Text(finalStr, x, y, duration, type, color, font, actorId, null);
+				sub = new Text(finalStr, x, y, duration, type, color, font, actorId, null, null);
 			} else {
-				sub = new Text(finalStr, x, y, duration, type, color, font, actorId, cb);
+				sub = new Text(finalStr, x, y, duration, type, color, font, actorId, null, cb);
+			}
+			
+			// sets the voice to the first line. Thought, when using voices, single lines should be used.
+			if(i == 0 && voiceId != null) {
+				sub.voiceId = voiceId;
+				sub.time = Float.MAX_VALUE;
 			}
 
 			fifo.add(sub);
@@ -102,13 +109,22 @@ public void addText(String str, float x, float y, boolean quee, Text.Type type,
 
 	}
 	
+	public VoiceManager getVoiceManager() {
+		return voiceManager;
+	}
+	
 	public Text getCurrentText() {
 		return currentText;
 	}
 
 	private void setCurrentText(Text t) {
 		inScreenTime = 0f;
 		currentText = t;
+		
+		if(t != null)
+			voiceManager.play(t.voiceId);
+		else
+			voiceManager.stop();
 	}
 
 	public void update(float delta) {
@@ -139,6 +155,7 @@ private void clear() {
 			next();
 		
 		inScreenTime = 0;
+		voiceManager.stop();
 	}
 
 	/**
@@ -159,6 +176,7 @@ public void write(Json json) {
 			json.writeValue("currentText", currentText);
 		
 		json.writeValue("fifo", new ArrayList<Text>(fifo), ArrayList.class, Text.class);
+		json.writeValue("voiceManager", voiceManager);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -167,5 +185,10 @@ public void read (Json json, JsonValue jsonData) {
 		inScreenTime = json.readValue("inScreenTime", Float.class, jsonData);
 		currentText = json.readValue("currentText", Text.class, jsonData);
 		fifo = new LinkedList<Text>(json.readValue("fifo", ArrayList.class, Text.class, jsonData));
+		
+		JsonValue jsonValue = jsonData.get("voiceManager");
+		
+		if(jsonValue != null)
+			voiceManager.read(json, jsonValue);
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/VoiceManager.java b/blade-engine/src/com/bladecoder/engine/model/VoiceManager.java
diff --git a/blade-engine/src/com/bladecoder/engine/model/World.java b/blade-engine/src/com/bladecoder/engine/model/World.java

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`public class Param {`
`24`	`24`	`public enum Type {`
`25`		`- STRING, BOOLEAN, FLOAT, INTEGER, VECTOR2, VECTOR3, DIMENSION, ACTOR, CHARACTER_ACTOR, INTERACTIVE_ACTOR, SPRITE_ACTOR, SCENE, CHAPTER, FILE, OPTION, SCENE_ACTOR, ACTOR_ANIMATION, LAYER, EDITABLE_OPTION, SCENE_CHARACTER_ACTOR, SCENE_INTERACTIVE_ACTOR, SCENE_SPRITE_ACTOR, TEXT, SMALL_TEXT, BIG_TEXT, COLOR, SOUND, TEXT_STYLE, ATLAS_ASSET, MUSIC_ASSET, SOUND_ASSET, PARTICLE_ASSET, FONT_ASSET, NOT_SET`
	`25`	`+ STRING, BOOLEAN, FLOAT, INTEGER, VECTOR2, VECTOR3, DIMENSION, ACTOR, CHARACTER_ACTOR, INTERACTIVE_ACTOR, SPRITE_ACTOR, SCENE, CHAPTER, FILE, OPTION, SCENE_ACTOR, ACTOR_ANIMATION, LAYER, EDITABLE_OPTION, SCENE_CHARACTER_ACTOR, SCENE_INTERACTIVE_ACTOR, SCENE_SPRITE_ACTOR, TEXT, SMALL_TEXT, BIG_TEXT, COLOR, SOUND, TEXT_STYLE, ATLAS_ASSET, MUSIC_ASSET, SOUND_ASSET, PARTICLE_ASSET, FONT_ASSET, NOT_SET, VOICE`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public static final String NUMBER_PARAM_SEPARATOR = ",";`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`/**`
`12`	`12`	`* Simple music engine.`
`13`	`13`	`*`
`14`		`- * Plays a music file, if another music is playing, stop it before playing the`
	`14`	`+ * Plays a music file, if another music is playing, stops it before playing the`
`15`	`15`	`* new music.`
`16`	`16`	`*`
`17`	`17`	`* @author rgarcia`