Add 'id' attribute to SoundFX.

Author: bladecoder

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

@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.FilenameFilter;
 import java.util.Arrays;
+import java.util.HashMap;
 
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.bladecoder.engine.actions.Param;
@@ -29,59 +30,64 @@
 import com.bladecoder.engineeditor.ui.components.InputPanel;
 import com.bladecoder.engineeditor.ui.components.InputPanelFactory;
 import com.bladecoder.engineeditor.undo.UndoCreateSound;
+import com.bladecoder.engineeditor.utils.ElementUtils;
 
 public class EditSoundDialog extends EditModelDialog<InteractiveActor, SoundFX> {
 
+	private InputPanel id;
 	private InputPanel filename;
 	private InputPanel loop;
 	private InputPanel volume;
+	private InputPanel pan;
 
 	public EditSoundDialog(Skin skin, InteractiveActor parent, SoundFX e) {
 		super(skin);
 
-//		id = InputPanelFactory.createInputPanel(skin, "Sound ID", "The id of the sound", true);
+		id = InputPanelFactory.createInputPanel(skin, "Sound ID", "The id of the sound", true);
 		filename = InputPanelFactory.createInputPanel(skin, "Filename", "Filename of the sound", getSoundList(), true);
 		loop = InputPanelFactory.createInputPanel(skin, "Loop", "True if the sound is looping", Param.Type.BOOLEAN,
 				true, "false");
 		volume = InputPanelFactory.createInputPanel(skin, "Volume", "Select the volume between 0 and 1", Param.Type.FLOAT, true, "1.0");
+		pan = InputPanelFactory.createInputPanel(skin, "Pan", "panning in the range -1 (full left) to 1 (full right). 0 is center position", Param.Type.FLOAT, true, "0.0");
 
 		setInfo("Actors can have a list of sounds that can be associated to Sprites or played with the 'sound' action");
 
-		init(parent, e, new InputPanel[] { filename, loop, volume });
+		init(parent, e, new InputPanel[] { id, filename, loop, volume, pan });
 	}
 
 	@Override
 	protected void inputsToModel(boolean create) {
 
 		if(create) {
 			e = new SoundFX();
+			
+			// UNDO OP
+			Ctx.project.getUndoStack().add(new UndoCreateSound(parent, e));
+		} else {
+			HashMap<String, SoundFX> sounds = parent.getSounds();
+			sounds.remove(e.getId());
 		}
 
+		String checkedId = parent.getSounds() == null? id.getText():ElementUtils.getCheckedId(id.getText(), parent.getSounds().keySet().toArray(new String[parent.getSounds().size()])); 
+		
+		e.setId(checkedId);
 		e.setFilename(filename.getText());
 		e.setLoop(Boolean.parseBoolean(loop.getText()));
 		e.setVolume(Float.parseFloat(volume.getText()));
+		e.setPan(Float.parseFloat(pan.getText()));
 
-		if(create) {
-			parent.addSound(e);
-			
-			// UNDO OP
-			Ctx.project.getUndoStack().add(new UndoCreateSound(parent, e));
-		} else {
-			
-		}
+		parent.addSound(e);
 
 		Ctx.project.setModified();
 	}
 
 	@Override
 	protected void modelToInputs() {
-		
-		// TODO SEARCH FOR ID
-//		parent.getSounds().containsValue(arg0)		
-//		id.setText("");
+		id.setText(e.getId());
 		filename.setText(e.getFilename());
 		loop.setText(Boolean.toString(e.getLoop()));
 		volume.setText(Float.toString(e.getVolume()));
+		pan.setText(Float.toString(e.getPan()));
 	}
 
 	private String[] getSoundList() {

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

@@ -56,7 +56,7 @@ protected void delete() {
 
 		SoundFX s = removeSelected();
 
-		parent.getSounds().remove(s.getFilename());
+		parent.getSounds().remove(s.getId());
 
 		// UNDO
 		Ctx.project.getUndoStack().add(new UndoDeleteSound(parent, s));
@@ -82,6 +82,8 @@ protected void paste() {
 
 		list.getItems().insert(pos, newElement);
 
+		newElement.setId(ElementUtils.getCheckedId(newElement.getId(), parent.getSounds().keySet().toArray(new String[parent.getSounds().size()])));
+		
 		parent.addSound(newElement);
 
 		list.setSelectedIndex(pos);
@@ -97,7 +99,7 @@ protected void paste() {
 
 		@Override
 		protected String getCellTitle(SoundFX e) {
-			return e.getFilename();
+			return e.getId();
 		}
 
 		StringBuilder sb = new StringBuilder();

adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteSound.java

@@ -4,6 +4,7 @@
 import com.bladecoder.engine.model.SoundFX;
 import com.bladecoder.engineeditor.Ctx;
 import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.utils.ElementUtils;
 
 
 public class UndoDeleteSound implements UndoOp {
@@ -17,6 +18,7 @@ public UndoDeleteSound(InteractiveActor a, SoundFX s) {
 
 	@Override
 	public void undo() {
+		s.setId(ElementUtils.getCheckedId(s.getFilename(), a.getSounds().keySet().toArray(new String[a.getSounds().size()]))); 
 		a.addSound(s);
 		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_CREATED, null, s);
 	}

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

@@ -128,18 +128,18 @@ public void runVerb(String id, String target) {
 		verbs.runVerb(id, state, target);
 	}
 
-	public void addSound(String id, String filename, boolean loop, float volume) {
+	public void addSound(String id, String filename, boolean loop, float volume, float pan) {
 		if (sounds == null)
 			sounds = new HashMap<String, SoundFX>();
 
-		sounds.put(id, new SoundFX(filename, loop, volume));
+		sounds.put(id, new SoundFX(id, filename, loop, volume, pan));
 	}
 
 	public void addSound(SoundFX s) {
 		if (sounds == null)
 			sounds = new HashMap<String, SoundFX>();
 
-		sounds.put(s.getFilename(), s);
+		sounds.put(s.getId(), s);
 	}
 
 	public void playSound(String id) {
@@ -157,7 +157,7 @@ public void playSound(String id) {
 			s.play();
 			playingSound = id;
 		} else {
-			EngineLogger.debug("Sound Not Found: " + s);
+			EngineLogger.debug("Sound Not Found: " + id);
 		}
 	}
 

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

@@ -21,26 +21,30 @@
 
 public class SoundFX implements AssetConsumer {
 	transient private Sound s;
+	private String id;
 	private boolean loop;
 	private String filename;
 	private float volume = 1f;
+	private float pan = 0f;
 
 	public SoundFX() {
 
 	}
 
-	public SoundFX(String filename, boolean loop, float volume) {
-		this.setFilename(filename);
+	public SoundFX(String id, String filename, boolean loop, float volume, float pan) {
+		this.id = id;
+		this.filename = filename;
 		this.loop = loop;
-		this.setVolume(volume);
+		this.volume = volume;
+		this.pan = pan;
 	}
 
 	public void play() {
 		if(s==null)
 			return;
 
 		if(loop) s.loop();
-		else s.play(getVolume());
+		else s.play(volume, 1, pan);
 	}
 
 	public void stop() {
@@ -68,6 +72,22 @@ public boolean getLoop() {
 		return loop;
 	}
 
+	public String getId() {
+		return id != null? id: filename;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public float getPan() {
+		return pan;
+	}
+
+	public void setPan(float pan) {
+		this.pan = pan;
+	}
+
 	public void setLoop(boolean loop) {
 		this.loop = loop;
 	}