Browse Source

Editor: plugged in active camera into SceneExporter.

alteredq 12 years ago
parent
commit
95f72d1596

+ 9 - 1
editor/js/ui/Sidebar.Outliner.js

@@ -25,6 +25,8 @@ Sidebar.Outliner = function ( signals ) {
 
 
 	var scene = null;
 	var scene = null;
 
 
+	var activeCamera = null;
+
 	var clearColor = new THREE.Color( 0xaaaaaa );
 	var clearColor = new THREE.Color( 0xaaaaaa );
 	var clearAlpha = 1;
 	var clearAlpha = 1;
 
 
@@ -99,9 +101,15 @@ Sidebar.Outliner = function ( signals ) {
 
 
 	} );
 	} );
 
 
+	signals.cameraChanged.add( function ( camera ) {
+
+		activeCamera = camera;
+
+	} );
+
 	function exportScene() {
 	function exportScene() {
 
 
-		var output = new THREE.SceneExporter().parse( scene, clearColor, clearAlpha );
+		var output = new THREE.SceneExporter().parse( scene, clearColor, clearAlpha, activeCamera );
 
 
 		var blob = new Blob( [ output ], { type: 'text/plain' } );
 		var blob = new Blob( [ output ], { type: 'text/plain' } );
 		var objectURL = URL.createObjectURL( blob );
 		var objectURL = URL.createObjectURL( blob );

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

@@ -430,6 +430,8 @@ var Viewport = function ( signals ) {
 	renderer.autoUpdateScene = false;
 	renderer.autoUpdateScene = false;
 	container.dom.appendChild( renderer.domElement );
 	container.dom.appendChild( renderer.domElement );
 
 
+	signals.cameraChanged.dispatch( camera );
+
 	animate();
 	animate();
 
 
 	//
 	//

+ 2 - 4
examples/js/exporters/SceneExporter.js

@@ -8,7 +8,7 @@ THREE.SceneExporter.prototype = {
 
 
 	constructor: THREE.SceneExporter,
 	constructor: THREE.SceneExporter,
 
 
-	parse: function ( scene, clearColor, clearAlpha ) {
+	parse: function ( scene, clearColor, clearAlpha, activeCamera ) {
 
 
 		var position = Vector3String( scene.position );
 		var position = Vector3String( scene.position );
 		var rotation = Vector3String( scene.rotation );
 		var rotation = Vector3String( scene.rotation );
@@ -123,11 +123,9 @@ THREE.SceneExporter.prototype = {
 		var materials = generateMultiLineString( materialsArray, ",\n\n\t" );
 		var materials = generateMultiLineString( materialsArray, ",\n\n\t" );
 		var textures = generateMultiLineString( texturesArray, ",\n\n\t" );
 		var textures = generateMultiLineString( texturesArray, ",\n\n\t" );
 
 
-		// todo: get somehow these from Viewport's renderer
-
 		var bgcolor = ColorString( clearColor );
 		var bgcolor = ColorString( clearColor );
 		var bgalpha = clearAlpha;
 		var bgalpha = clearAlpha;
-		var defcamera = LabelString( "default_camera" );
+		var defcamera = LabelString( getObjectName( activeCamera ) );
 
 
 		//
 		//