Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Examples: Modularize JSZip. #19201

Merged
merged 1 commit into from
Apr 25, 2020
Merged

Examples: Modularize JSZip. #19201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion editor/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 2 additions & 0 deletions editor/js/Loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions editor/js/Menubar.File.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down
2 changes: 1 addition & 1 deletion editor/sw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion examples/js/loaders/3MFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {

Expand Down
2 changes: 1 addition & 1 deletion examples/js/loaders/AMFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {

Expand Down
2 changes: 1 addition & 1 deletion examples/js/loaders/KMZLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' ] ) {

Expand Down
15 changes: 15 additions & 0 deletions examples/jsm/libs/jszip.module.min.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion examples/jsm/loaders/3MFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import {
TextureLoader,
sRGBEncoding
} from "../../../build/three.module.js";
import { JSZip } from "../libs/jszip.module.min.js";

var ThreeMFLoader = function ( manager ) {

Expand Down Expand Up @@ -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 ) {

Expand Down
3 changes: 2 additions & 1 deletion examples/jsm/loaders/AMFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
Mesh,
MeshPhongMaterial
} from "../../../build/three.module.js";
import { JSZip } from "../libs/jszip.module.min.js";

var AMFLoader = function ( manager ) {

Expand Down Expand Up @@ -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 ) {

Expand Down
3 changes: 2 additions & 1 deletion examples/jsm/loaders/KMZLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {

Expand Down Expand Up @@ -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' ] ) {

Expand Down
4 changes: 2 additions & 2 deletions examples/webgl2_materials_texture2darray.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down
2 changes: 0 additions & 2 deletions examples/webgl_loader_3mf.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 0 additions & 2 deletions examples/webgl_loader_3mf_materials.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 0 additions & 2 deletions examples/webgl_loader_amf.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 0 additions & 2 deletions examples/webgl_loader_kmz.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 3 additions & 3 deletions utils/modularize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' ] },
Expand All @@ -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: [] },
Expand Down