Fix desactivate Scene3DManager when mouse is over Flex UI and reactiv…

…ate when mouse is over the scene3D. Add more light on Gizmos
awaytools · Mar 1, 2013 · 9d55db8 · 9d55db8
1 parent 63d3448
commit 9d55db8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 25 deletions.
diff --git a/awaybuilder-core/src/awaybuilder/scene/controllers/Scene3DManager.as b/awaybuilder-core/src/awaybuilder/scene/controllers/Scene3DManager.as
@@ -131,7 +131,9 @@ package awaybuilder.scene.controllers
 			stage.addEventListener(KeyboardEvent.KEY_DOWN, instance.onKeyDown);
 			stage.addEventListener(KeyboardEvent.KEY_UP, instance.onKeyUp);			
 			stage.addEventListener(MouseEvent.MOUSE_DOWN, instance.onMouseDown);
-			stage.addEventListener(MouseEvent.MOUSE_UP, instance.onMouseUp);
+			stage.addEventListener(MouseEvent.MOUSE_UP, instance.onMouseUp);			
+			scope.addEventListener(MouseEvent.MOUSE_OVER, instance.onMouseOver);
+			scope.addEventListener(MouseEvent.MOUSE_OUT, instance.onMouseOut);
 
 			scope.addEventListener(Event.RESIZE, instance.handleScreenSize);
 			instance.handleScreenSize();
@@ -167,6 +169,18 @@ package awaybuilder.scene.controllers
 
 		// Mouse Events *************************************************************************************************************************************************
 
+		private function onMouseOut(e:MouseEvent):void
+		{		
+			CameraManager.active = false;
+			Scene3DManager.active = false;			
+		}
+
+		private function onMouseOver(e:MouseEvent):void
+		{
+			CameraManager.active = true;
+			Scene3DManager.active = true;				
+		}			
+
 		private function onMouseDown(e:MouseEvent):void
 		{
 
@@ -183,35 +197,25 @@ package awaybuilder.scene.controllers
 		//Change gizmo mode to transform the selected mesh
 		public static function setTransformMode(mode:String):void
 		{
+			currentGizmo.active = false;
+			currentGizmo.hide();			
+
 			switch (mode) 
 			{													
-				case GizmoMode.TRANSLATE :
-
-					currentGizmo.active = false;
-					currentGizmo.hide();
-					currentGizmo = translateGizmo;
-					if (selectedObject) currentGizmo.show(selectedObject);
+				case GizmoMode.TRANSLATE : currentGizmo = translateGizmo;
 
 					break;				
 
-				case GizmoMode.ROTATE:
-
-					currentGizmo.active = false;
-					currentGizmo.hide();
-					currentGizmo = rotateGizmo;
-					if (selectedObject) currentGizmo.show(selectedObject);
+				case GizmoMode.ROTATE: currentGizmo = rotateGizmo;
 
 					break;				
 
-				case GizmoMode.SCALE:
-
-					currentGizmo.active = false;
-					currentGizmo.hide();
-					currentGizmo = scaleGizmo;
-					if (selectedObject) currentGizmo.show(selectedObject);
+				case GizmoMode.SCALE: currentGizmo = scaleGizmo;
 
 					break;													
-			}						
+			}
+
+			if (selectedObject) currentGizmo.show(selectedObject);			
 		}
 
 

diff --git a/awaybuilder-core/src/awaybuilder/scene/controls/Gizmo3DBase.as b/awaybuilder-core/src/awaybuilder/scene/controls/Gizmo3DBase.as
@@ -38,9 +38,9 @@ package awaybuilder.scene.controls
 			ambientLight = new DirectionalLight(1, 1, 1);
 			ambientLight.name = "AmbientLight";
 			ambientLight.color = 0xFFFFFF;
-			ambientLight.ambient = 0.5;
-			ambientLight.diffuse = 1;
-			ambientLight.specular = 0.1;			
+			ambientLight.ambient = 0.75;
+			ambientLight.diffuse = 0.5;
+			ambientLight.specular = 0.5;			
 
 			var picker:StaticLightPicker = new StaticLightPicker([ambientLight]);
 

diff --git a/awaybuilder-core/src/awaybuilder/view/components/CoreEditor.mxml b/awaybuilder-core/src/awaybuilder/view/components/CoreEditor.mxml
@@ -2,8 +2,11 @@
 <s:SkinnableContainer xmlns:fx="http://ns.adobe.com/mxml/2009" 
 	xmlns:s="library://ns.adobe.com/flex/spark" 
 	xmlns:mx="library://ns.adobe.com/flex/mx"
-	backgroundAlpha="0" creationComplete="skinnablecontainer1_creationCompleteHandler(event)"
-	xmlns:flextoolbox="library://ns.flextoolbox.com/flex"  xmlns:components="awaybuilder.view.components.*" xmlns:tree="awaybuilder.view.components.tree.*">
+	backgroundAlpha="0"
+	creationComplete="skinnablecontainer1_creationCompleteHandler(event)"
+	xmlns:flextoolbox="library://ns.flextoolbox.com/flex" 
+	xmlns:components="awaybuilder.view.components.*" 
+	xmlns:tree="awaybuilder.view.components.tree.*">
 
 	<s:layout>
 		<s:VerticalLayout gap="0" paddingTop="0" paddingRight="0" paddingBottom="0" paddingLeft="0"/>