Strona główna Odkrywaj Pomoc
Zaloguj się
javascript
/
three.js
kopia lustrzana https://github.com/tazdij/three.js.git
2
0
Forkuj 0
Pliki Problemy 0 Wiki
Przeglądaj źródła

Merge pull request #19201 from Mugen87/dev41

Examples: Modularize JSZip.
Mr.doob 5 lat temu
rodzic
9a29b92a29 f8467288af
commit
22749d1cbf
17 zmienionych plików z 30 dodań i 21 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 0 1
      editor/index.html
  2. 2 0
      editor/js/Loader.js
  3. 2 0
      editor/js/Menubar.File.js
  4. 1 1
      editor/sw.js
  5. 1 1
      examples/js/loaders/3MFLoader.js
  6. 1 1
      examples/js/loaders/AMFLoader.js
  7. 1 1
      examples/js/loaders/KMZLoader.js
  8. 11 0
      examples/jsm/libs/jszip.module.min.js
  9. 2 1
      examples/jsm/loaders/3MFLoader.js
  10. 2 1
      examples/jsm/loaders/AMFLoader.js
  11. 2 1
      examples/jsm/loaders/KMZLoader.js
  12. 2 2
      examples/webgl2_materials_texture2darray.html
  13. 0 2
      examples/webgl_loader_3mf.html
  14. 0 2
      examples/webgl_loader_3mf_materials.html
  15. 0 2
      examples/webgl_loader_amf.html
  16. 0 2
      examples/webgl_loader_kmz.html
  17. 3 3
      utils/modularize.js

+ 0 - 1
editor/index.html
Wyświetl plik 

@@ -11,7 +11,6 @@
 
 	<body>
 
 		<link rel="stylesheet" href="css/main.css">
 
 
-		<script src="../examples/js/libs/jszip.min.js"></script>
 
 		<script src="../examples/js/libs/draco/draco_encoder.js"></script>
 
 
 		<link rel="stylesheet" href="js/libs/codemirror/codemirror.css">

+ 2 - 0
editor/js/Loader.js
Wyświetl plik 

@@ -26,6 +26,8 @@ import { SetSceneCommand } from './commands/SetSceneCommand.js';
 
 
 import { LoaderUtils } from './LoaderUtils.js';
 
 
+import { JSZip } from '../../examples/jsm/libs/jszip.module.min.js';
 
+
 
 var Loader = function ( editor ) {
 
 
 	var scope = this;

+ 2 - 0
editor/js/Menubar.File.js
Wyświetl plik 

@@ -11,6 +11,8 @@ import { OBJExporter } from '../../examples/jsm/exporters/OBJExporter.js';
 
 import { PLYExporter } from '../../examples/jsm/exporters/PLYExporter.js';
 
 import { STLExporter } from '../../examples/jsm/exporters/STLExporter.js';
 
 
+import { JSZip } from '../../examples/jsm/libs/jszip.module.min.js';
 
+
 
 import { UIPanel, UIRow, UIHorizontalRule } from './libs/ui.js';
 
 
 var MenubarFile = function ( editor ) {

+ 1 - 1
editor/sw.js
Wyświetl plik 

@@ -11,8 +11,8 @@ const assets = [
 
 
 	'../examples/jsm/libs/chevrotain.module.min.js',
 
 	'../examples/jsm/libs/inflate.module.min.js',
 
+	'../examples/jsm/libs/jszip.module.min.js',
 
 
-	'../examples/js/libs/jszip.min.js',
 
 	'../examples/js/libs/draco/draco_decoder.js',
 
 	'../examples/js/libs/draco/draco_decoder.wasm',
 
 	'../examples/js/libs/draco/draco_encoder.js',

+ 1 - 1
examples/js/loaders/3MFLoader.js
Wyświetl plik 

@@ -70,7 +70,7 @@ THREE.ThreeMFLoader.prototype = Object.assign( Object.create( THREE.Loader.proto
 
 
 			try {
 
 
-				zip = new JSZip( data ); // eslint-disable-line no-undef
 
+				zip = new JSZip( data );
 
 
 			} catch ( e ) {

+ 1 - 1
examples/js/loaders/AMFLoader.js
Wyświetl plik 

@@ -59,7 +59,7 @@ THREE.AMFLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
 
 
 				try {
 
 
-					zip = new JSZip( data ); // eslint-disable-line no-undef
 
+					zip = new JSZip( data );
 
 
 				} catch ( e ) {

+ 1 - 1
examples/js/loaders/KMZLoader.js
Wyświetl plik 

@@ -63,7 +63,7 @@ THREE.KMZLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
 
 
 		//
 
 
-		var zip = new JSZip( data ); // eslint-disable-line no-undef
 
+		var zip = new JSZip( data );
 
 
 		if ( zip.files[ 'doc.kml' ] ) {

Plik diff jest za duży
+ 11 - 0
examples/jsm/libs/jszip.module.min.js


+ 2 - 1
examples/jsm/loaders/3MFLoader.js
Wyświetl plik 

@@ -40,6 +40,7 @@ import {
 
 	TextureLoader,
 
 	sRGBEncoding
 
 } from "../../../build/three.module.js";
 
+import { JSZip } from "../libs/jszip.module.min.js";
 
 
 var ThreeMFLoader = function ( manager ) {
 
 
@@ -93,7 +94,7 @@ ThreeMFLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
 
 
 			try {
 
 
-				zip = new JSZip( data ); // eslint-disable-line no-undef
 
+				zip = new JSZip( data );
 
 
 			} catch ( e ) {

+ 2 - 1
examples/jsm/loaders/AMFLoader.js
Wyświetl plik 

@@ -29,6 +29,7 @@ import {
 
 	Mesh,
 
 	MeshPhongMaterial
 
 } from "../../../build/three.module.js";
 
+import { JSZip } from "../libs/jszip.module.min.js";
 
 
 var AMFLoader = function ( manager ) {
 
 
@@ -71,7 +72,7 @@ AMFLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
 
 
 				try {
 
 
-					zip = new JSZip( data ); // eslint-disable-line no-undef
 
+					zip = new JSZip( data );
 
 
 				} catch ( e ) {

+ 2 - 1
examples/jsm/loaders/KMZLoader.js
Wyświetl plik 

@@ -9,6 +9,7 @@ import {
 
 	LoadingManager
 
 } from "../../../build/three.module.js";
 
 import { ColladaLoader } from "../loaders/ColladaLoader.js";
 
+import { JSZip } from "../libs/jszip.module.min.js";
 
 
 var KMZLoader = function ( manager ) {
 
 
@@ -71,7 +72,7 @@ KMZLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
 
 
 		//
 
 
-		var zip = new JSZip( data ); // eslint-disable-line no-undef
 
+		var zip = new JSZip( data );
 
 
 		if ( zip.files[ 'doc.kml' ] ) {

+ 2 - 2
examples/webgl2_materials_texture2darray.html
Wyświetl plik 

@@ -54,13 +54,13 @@
 
 			<a href="https://www.codeproject.com/info/cpol10.aspx" target="_blank" rel="noopener">CPOL</a>
 
 		</div>
 
 
-		<script src="js/libs/jszip.min.js"></script>
 
-
 
 		<script type="module">
 
 
 			import * as THREE from '../build/three.module.js';
 
 
 			import Stats from './jsm/libs/stats.module.js';
 
+			import { JSZip } from './jsm/libs/jszip.module.min.js';
 
+
 
 			import { WEBGL } from './jsm/WebGL.js';
 
 
 			if ( WEBGL.isWebGL2Available() === false ) {

+ 0 - 2
examples/webgl_loader_3mf.html
Wyświetl plik 

@@ -19,8 +19,6 @@
 
 			<div>Cube gears file from <a href="https://github.com/3MFConsortium/3mf-samples" target="_blank" rel="noopener">3mf-samples</a></div>
 
 		</div>
 
 
-		<script src="js/libs/jszip.min.js"></script>
 
-
 
 		<script type="module">
 
 
 			import * as THREE from '../build/three.module.js';

+ 0 - 2
examples/webgl_loader_3mf_materials.html
Wyświetl plik 

@@ -17,8 +17,6 @@
 
 			<a href="http://3mf.io" target="_blank" rel="noopener">3MF</a> file with materials
 
 		</div>
 
 
-		<script src="js/libs/jszip.min.js"></script>
 
-
 
 		<script type="module">
 
 
 			import * as THREE from '../build/three.module.js';

+ 0 - 2
examples/webgl_loader_amf.html
Wyświetl plik 

@@ -19,8 +19,6 @@
 
 			<div>Rook manufacturing file from <a href="http://amf.wikispaces.com/AMF+test+files" target="_blank" rel="noopener">AMF test files</a></div>
 
 		</div>
 
 
-		<script src="js/libs/jszip.min.js"></script>
 
-
 
 		<script type="module">
 
 
 			import * as THREE from '../build/three.module.js';

+ 0 - 2
examples/webgl_loader_kmz.html
Wyświetl plik 

@@ -12,8 +12,6 @@
 
 			<a href="https://developers.google.com/kml/documentation/kmzarchives" target="_blank" rel="noopener">KMZ</a> loader
 
 		</div>
 
 
-		<script src="js/libs/jszip.min.js"></script>
 
-
 
 		<script type="module">
 
 
 			import * as THREE from '../build/three.module.js';

+ 3 - 3
utils/modularize.js
Wyświetl plik 

@@ -69,8 +69,8 @@ var files = [
 
 	{ path: 'lines/Wireframe.js', dependencies: [ { name: 'LineSegmentsGeometry', path: 'lines/LineSegmentsGeometry.js' }, { name: 'LineMaterial', path: 'lines/LineMaterial.js' } ], ignoreList: [] },
 
 	{ path: 'lines/WireframeGeometry2.js', dependencies: [ { name: 'LineSegmentsGeometry', path: 'lines/LineSegmentsGeometry.js' } ], ignoreList: [] },
 
 
-	{ path: 'loaders/3MFLoader.js', dependencies: [], ignoreList: [] },
 
-	{ path: 'loaders/AMFLoader.js', dependencies: [], ignoreList: [] },
 
+	{ path: 'loaders/3MFLoader.js', dependencies: [ { name: 'JSZip', path: 'libs/jszip.module.min.js' } ], ignoreList: [] },
 
+	{ path: 'loaders/AMFLoader.js', dependencies: [ { name: 'JSZip', path: 'libs/jszip.module.min.js' } ], ignoreList: [] },
 
 	{ path: 'loaders/AssimpLoader.js', dependencies: [], ignoreList: [] },
 
 	{ path: 'loaders/BasisTextureLoader.js', dependencies: [], ignoreList: [] },
 
 	{ path: 'loaders/BVHLoader.js', dependencies: [], ignoreList: [ 'Bones' ] },
 
@@ -82,7 +82,7 @@ var files = [
 
 	{ path: 'loaders/GCodeLoader.js', dependencies: [], ignoreList: [] },
 
 	{ path: 'loaders/GLTFLoader.js', dependencies: [], ignoreList: [ 'NoSide', 'Matrix2', 'Camera', 'Texture' ] },
 
 	{ path: 'loaders/HDRCubeTextureLoader.js', dependencies: [ { name: 'RGBELoader', path: 'loaders/RGBELoader.js' } ], ignoreList: [] },
 
-	{ path: 'loaders/KMZLoader.js', dependencies: [ { name: 'ColladaLoader', path: 'loaders/ColladaLoader.js' } ], ignoreList: [] },
 
+	{ path: 'loaders/KMZLoader.js', dependencies: [ { name: 'ColladaLoader', path: 'loaders/ColladaLoader.js' }, { name: 'JSZip', path: 'libs/jszip.module.min.js' } ], ignoreList: [] },
 
 	{ path: 'loaders/LDrawLoader.js', dependencies: [], ignoreList: [ 'Cache', 'Material', 'Object3D' ] },
 
 	{ path: 'loaders/LWOLoader.js', dependencies: [], ignoreList: [] },
 
 	{ path: 'loaders/KTXLoader.js', dependencies: [], ignoreList: [] },

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików