Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Editor: Post-release fixes.

Mr.doob 9 years ago
parent
785271e61a
commit
05964c5f53
3 changed files with 27 additions and 9 deletions
Split View Show Diff Stats
  1. 23 6
      editor/js/Menubar.File.js
  2. 2 0
      editor/js/Storage.js
  3. 2 3
      editor/js/libs/app/index.html

+ 23 - 6
editor/js/Menubar.File.js
View File 

@@ -218,6 +218,8 @@ Menubar.File = function ( editor ) {
 
 		output.metadata.type = 'App';
 
 		delete output.history;
 
 
+		var vr = output.project.vr;
 
+
 
 		output = JSON.stringify( output, null, '\t' );
 
 		output = output.replace( /[\n\t]+([\d\.e\-\[\]]+)/g, '$1' );
 
 
@@ -234,6 +236,17 @@ Menubar.File = function ( editor ) {
 
 		var loader = new THREE.XHRLoader( manager );
 
 		loader.load( 'js/libs/app/index.html', function ( content ) {
 
 
+			var includes = [];
 
+
 
+			if ( vr ) {
 
+
 
+				includes.push( '<script src="js/VRControls.js"></script>' );
 
+				includes.push( '<script src="js/VREffect.js"></script>' );
 
+
 
+			}
 
+
 
+			content = content.replace( '<!-- includes -->', includes.join( '\n\t\t' ) );
 
+
 
 			zip.file( 'index.html', content );
 
 
 		} );
 
@@ -248,17 +261,21 @@ Menubar.File = function ( editor ) {
 
 
 		} );
 
 
-		loader.load( '../examples/js/controls/VRControls.js', function ( content ) {
 
+		if ( vr ) {
 
 
-			zip.file( 'js/VRControls.js', content );
 
+			loader.load( '../examples/js/controls/VRControls.js', function ( content ) {
 
 
-		} );
 
+				zip.file( 'js/VRControls.js', content );
 
 
-		loader.load( '../examples/js/effects/VREffect.js', function ( content ) {
 
+			} );
 
 
-			zip.file( 'js/VREffect.js', content );
 
+			loader.load( '../examples/js/effects/VREffect.js', function ( content ) {
 
 
-		} );
 
+				zip.file( 'js/VREffect.js', content );
 
+
 
+			} );
 
+
 
+		}
 
 
 	} );
 
 	options.add( option );

+ 2 - 0
editor/js/Storage.js
View File 

@@ -80,6 +80,8 @@ var Storage = function () {
 
 
 		clear: function () {
 
 
+			if ( database === undefined ) return;
 
+
 
 			var transaction = database.transaction( [ 'states' ], 'readwrite' );
 
 			var objectStore = transaction.objectStore( 'states' );
 
 			var request = objectStore.clear();

+ 2 - 3
editor/js/libs/app/index.html
View File 

@@ -30,8 +30,7 @@
 
 	<body ontouchstart="">
 
 		<script src="js/three.min.js"></script>
 
 		<script src="js/app.js"></script>
 
-		<script src="js/VRControls.js"></script>
 
-		<script src="js/VREffect.js"></script>
 
+		<!-- includes -->
 
 		<script>
 
 
 			var loader = new THREE.XHRLoader();
 
@@ -54,7 +53,7 @@
 
 					button.addEventListener( 'click', function ( event ) {
 
 
 						var url = location.href.split( '/' ).slice( 0, - 1 ).join( '/' );
 
-						window.open( 'http://threejs.org/editor/#file=https://crossorigin.me/' + url + '/app.json' );
 
+						window.open( 'http://threejs.org/editor/#file=' + url + '/app.json' );
 
 
 					}, false );
 
 					document.body.appendChild( button );