Sākums Izpētīt Palīdzība
Pierakstīties
javascript
/
three.js
spogulis no https://github.com/tazdij/three.js.git
2
0
Atdalīts 0
Faili Problēmas 0 Vikivietne
Pārlūkot izejas kodu

Editor: Include VRControls/VREffect when needed.

Mr.doob 9 gadi atpakaļ
vecāks
31a78db2ec
revīzija
f8e0e542d4
2 mainītis faili ar 24 papildinājumiem un 8 dzēšanām
Apvienotais skats Rādīt salīdzināšanas statistiku
  1. 23 6
      editor/js/Menubar.File.js
  2. 1 2
      editor/js/libs/app/index.html

+ 23 - 6
editor/js/Menubar.File.js
Parādīt failu 

@@ -218,6 +218,8 @@ Menubar.File = function ( editor ) {
 
 		output.metadata.type = 'App';
 
 		output.metadata.type = 'App';
 
 		delete output.history;
 
 		delete output.history;
 
 
 
+		var vr = output.project.vr;
 
+
 
 		output = JSON.stringify( output, null, '\t' );
 
 		output = JSON.stringify( output, null, '\t' );
 
 		output = output.replace( /[\n\t]+([\d\.e\-\[\]]+)/g, '$1' );
 
 		output = output.replace( /[\n\t]+([\d\.e\-\[\]]+)/g, '$1' );
 
 
 
@@ -234,6 +236,17 @@ Menubar.File = function ( editor ) {
 
 		var loader = new THREE.XHRLoader( manager );
 
 		var loader = new THREE.XHRLoader( manager );
 
 		loader.load( 'js/libs/app/index.html', function ( content ) {
 
 		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 );
 
 			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 );
 
 	options.add( option );

+ 1 - 2
editor/js/libs/app/index.html
Parādīt failu 

@@ -30,8 +30,7 @@
 
 	<body ontouchstart="">
 
 	<body ontouchstart="">
 
 		<script src="js/three.min.js"></script>
 
 		<script src="js/three.min.js"></script>
 
 		<script src="js/app.js"></script>
 
 		<script src="js/app.js"></script>
 
-		<script src="js/VRControls.js"></script>
 
-		<script src="js/VREffect.js"></script>
 
+		<!-- includes -->
 
 		<script>
 
 		<script>
 
 
 
 			var loader = new THREE.XHRLoader();
 
 			var loader = new THREE.XHRLoader();