updates from vongott

OpenEd/Assets/Plugins/OpenEd/Drawers/OEPrefabsDrawer.js

@@ -30,12 +30,22 @@ public class OEPrefabsDrawer extends OEDrawer {
 		placeButton.gameObject.SetActive ( true );
 	}
 
-	public function SetPicker ( callback : Function, type : System.Type ) {
+	public function SetPicker ( callback : Function, type : System.Type, sender : String ) {
+		if ( !currentFolder ) {
+			Start ();
+		}
+
+		OGRoot.GetInstance().GoToPage ( "Home" );
+
 		typeFilter = type;
 		Populate ();
 
 		placeButton.func = function () {
-			callback ( Resources.Load ( path + "/" + selectedObject ) );	
+			callback ( Resources.Load ( path + "/" + selectedObject ) as GameObject );
+
+			if ( !String.IsNullOrEmpty ( sender ) ) {
+				OGRoot.GetInstance().GoToPage ( sender );
+			}
 		};
 	}
 
@@ -140,7 +150,6 @@ public class OEPrefabsDrawer extends OEDrawer {
 	public function Add () {
 		if ( !String.IsNullOrEmpty ( selectedObject ) ) {
 			OEWorkspace.GetInstance().AddPrefab ( path + "/" + selectedObject );
-
 			OEWorkspace.GetInstance().toolbar.Clear ();
 		}
 	}
@@ -150,6 +159,5 @@ public class OEPrefabsDrawer extends OEDrawer {
 		path = currentFolder.name;
 		Populate ();
 		objectName.text = "";
-		placeButton.func = null;
 	}
 }

OpenEd/Assets/Plugins/OpenEd/Inspectors/OEAudioSourceInspector.js

@@ -1,24 +1,86 @@
 #pragma strict
 
 public class OEAudioSourceInspector extends OEComponentInspector {
+	private var audio : AudioSource;
+
 	override function get type () : System.Type { return typeof ( AudioSource ); }
 
 	override function Inspector () {
-		var audio : AudioSource = target.GetComponent.< AudioSource >();
+		if ( !audio ) {
+		       audio = target.GetComponent.< AudioSource >();
+		}
 
-		audio.clip = ObjectField ( "Clip", audio.clip, typeof ( AudioClip ), OEObjectField.Target.Asset ) as AudioClip;
-		audio.dopplerLevel = FloatField ( "Doppler level", audio.dopplerLevel );
+		audio.clip = AssetLinkField ( "Clip", "clip", target, typeof ( AudioClip ), "ogg" ) as AudioClip;
+
+		offset.y += 20;
+
+		audio.loop = Toggle ( "Loop", audio.loop );
+		audio.playOnAwake = Toggle ( "Play on awake", audio.playOnAwake );
 		audio.ignoreListenerPause = Toggle ( "Ignore pause", audio.ignoreListenerPause );
 		audio.ignoreListenerVolume = Toggle ( "Ignore volume", audio.ignoreListenerVolume );
-		audio.loop = Toggle ( "Loop", audio.loop );
-		audio.maxDistance = FloatField ( "Max distance", audio.maxDistance );
+
+		offset.y += 20;
+
+		audio.dopplerLevel = FloatField ( "Doppler level", audio.dopplerLevel );
 		audio.minDistance = FloatField ( "Min distance", audio.minDistance );
+		audio.maxDistance = FloatField ( "Max distance", audio.maxDistance );
 		audio.panLevel = FloatField ( "Pan level", audio.panLevel );
-		audio.pitch = Slider ( "Pitch", audio.pitch, -3, 3 );
-		audio.playOnAwake = Toggle ( "Play on awake", audio.playOnAwake );
-		audio.priority = Slider ( "Priority", audio.priority, 0, 255 );
-		audio.rolloffMode = Popup ( "Rolloff mode", audio.rolloffMode, System.Enum.GetNames ( AudioRolloffMode ) );
 		audio.spread = FloatField ( "Spread", audio.spread );
+
+		offset.y += 20;
+
+		audio.rolloffMode = Popup ( "Rolloff mode", audio.rolloffMode, System.Enum.GetNames ( AudioRolloffMode ) );
+
+		offset.y += 20;
+
 		audio.volume = Slider ( "Volume", audio.volume, 0, 1 );
-	}	
+		audio.pitch = Slider ( "Pitch", audio.pitch, -3, 3 );
+		audio.priority = Slider ( "Priority", audio.priority, 0, 255 );
+
+		offset.y += 20;
+
+		if ( audio.isPlaying ) {
+			if ( Button ( "Stop" ) ) {
+				audio.Stop ();
+			}
+
+		} else {
+			if ( Button ( "Play" ) ) {
+				audio.Play ();
+			}
+
+		}
+	}
+
+	override function DrawGL () {
+		if ( audio ) {
+			GL.Begin ( GL.LINES );
+
+			OEWorkspace.GetInstance().cam.materials.highlight.SetPass ( 0 );
+
+			var degRad = Mathf.PI / 180;
+			var center : Vector3 = audio.transform.position;
+			var radius : float = audio.maxDistance;
+			var nextVector : Vector3;
+
+			for ( var theta : float = 0; theta < ( 2 * Mathf.PI ); theta += 0.01 ) {
+				nextVector = new Vector3 ( Mathf.Cos ( theta ) * radius + center.x, Mathf.Sin ( theta ) * radius + center.y, center.z );
+				GL.Vertex ( nextVector );
+			}
+
+			GL.Vertex ( nextVector );
+
+			for ( theta = 0; theta < ( 2 * Mathf.PI ); theta += 0.01 ) {
+				nextVector = new Vector3 ( center.x, Mathf.Sin ( theta ) * radius + center.y, Mathf.Cos ( theta ) * radius + center.z );
+				GL.Vertex ( nextVector );
+			}
+
+			for ( theta = 0; theta < ( 2 * Mathf.PI ); theta += 0.01 ) {
+				nextVector = new Vector3 ( Mathf.Sin ( theta ) * radius + center.x, center.y, Mathf.Cos ( theta ) * radius + center.z );
+				GL.Vertex ( nextVector );
+			}
+
+			GL.End ();
+		}
+	}
 }