Browse Source

Editor: fixed some oddities in fog UI behavior after importing scene.

Still fog color picker widget behaves weird: it doesn't display color selected by mouse after setting value from JS, yet value gets transmitted fine. Maybe it's a Chrome bug.
alteredq 12 years ago
parent
commit
0a0bdec1eb
1 changed files with 23 additions and 0 deletions
  1. 23 0
      editor/js/ui/Viewport.js

+ 23 - 0
editor/js/ui/Viewport.js

@@ -550,6 +550,29 @@ var Viewport = function ( signals ) {
 
 		}
 
+		if ( newScene.fog ) {
+
+			oldFogColor = newScene.fog.color.getHex();
+
+			if ( newScene.fog instanceof THREE.Fog ) {
+
+				oldFogType = "Fog";
+				oldFogNear = newScene.fog.near;
+				oldFogFar = newScene.fog.far;
+
+			} else if ( newScene.fog instanceof THREE.FogExp2 ) {
+
+				oldFogType = "FogExp2";
+				oldFogDensity = newScene.fog.density;
+
+			}
+
+		} else {
+
+			oldFogType = "None";
+
+		}
+
 		if ( enableHelpersFog )	{
 
 			sceneHelpers.fog = scene.fog;