Remove DataStream.js

njibhu · Sep 15, 2024 · 2736a9f · 2736a9f
1 parent f89e7a3
commit 2736a9f
Show file tree

Hide file tree

Showing 148 changed files with 400 additions and 94,995 deletions.
diff --git a/browser/.eslintrc.js b/browser/.eslintrc.js
diff --git a/browser/rollup.config.cjs b/browser/rollup.config.cjs
@@ -20,7 +20,6 @@ module.exports = {
         { src: '../node_modules/three/examples/js/controls/OrbitControls.js', dest: './dist/static' },
         { src: '../node_modules/three/examples/js/exporters/OBJExporter.js', dest: './dist/static' },
         { src: '../node_modules/jquery/dist/jquery.js', dest: './dist/static' },
-        { src: '../node_modules/DataStream.js/DataStream.js', dest: './dist/static' },
         { src: '../library/build/T3D.js', dest: './dist/static' },
         { src: '../library/build/T3D.js.map', dest: './dist/static' },
         { src: '../parser/build/t3d-parser.js', dest: './dist/static' },

diff --git a/browser/src/index.html b/browser/src/index.html
@@ -83,7 +83,6 @@
   <body>
     <div id="layout" style="width: 100%; height: 100%"></div>
     <script src="./static/jquery.js"></script>
-    <script src="./static/DataStream.js"></script>
     <script src="./static/three.js"></script>
     <script src="./static/PointerLockControls.js"></script>
     <script src="./static/OrbitControls.js"></script>

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -10,7 +10,6 @@ export default [
         ...globals.node,
         Stats: "readonly",
         THREE: "readonly",
-        DataStream: "readonly",
         T3D: "writable",
         $: "readonly",
         w2ui: "readonly",

diff --git a/examples/.eslintrc.js b/examples/.eslintrc.js
diff --git a/examples/rollup.config.cjs b/examples/rollup.config.cjs
@@ -23,7 +23,6 @@ module.exports = [
           { src: '../node_modules/three/examples/js/controls/OrbitControls.js', dest: 'dist/static' },
           { src: '../node_modules/three/examples/js/exporters/OBJExporter.js', dest: 'dist/static' },
           { src: '../node_modules/jquery/dist/jquery.js', dest: 'dist/static' },
-          { src: '../node_modules/DataStream.js/DataStream.js', dest: 'dist/static' },
           { src: '../library/build/T3D.js', dest: 'dist/static' },
           { src: '../library/build/T3D.js.map', dest: 'dist/static' },
           { src: '../parser/build/t3d-parser.js', dest: 'dist/static' },

diff --git a/examples/src/MapExplorer/index.html b/examples/src/MapExplorer/index.html
@@ -112,10 +112,10 @@
       <p id="keys">Move: W/A/S/D - Tilt: Q/E - Up: R - Down: F - Look: Press mouse / Arrow keys</p>
     </div>
     <script src="../static/jquery.js"></script>
-    <script src="../static/DataStream.js"></script>
     <script src="../static/three.js"></script>
     <script src="../static/stats.min.js"></script>
     <script src="../static/FlyControls.js"></script>
+    <script src="../static/t3d-parser.js"></script>
     <script src="../static/T3D.js"></script>
     <script type="text/javascript" src="./index.js"></script>
   </body>

diff --git a/examples/src/MapExplorer/renderer.js b/examples/src/MapExplorer/renderer.js
@@ -150,8 +150,7 @@ class AppRenderer {
     // Cache mapFile for later use
     if (parseInt(this.mapData.id)) {
       this.localReader.loadFile(this.mapData.id, (arrayBuffer) => {
-        const ds = new DataStream(arrayBuffer, 0, DataStream.LITTLE_ENDIAN);
-        this.mapData.mapFile = new T3D.GW2File(ds, 0);
+        this.mapData.mapFile = new FileParser(arrayBuffer);
       });
     }
   }

diff --git a/examples/src/MapScan/index.html b/examples/src/MapScan/index.html
@@ -12,7 +12,7 @@
     <p class="logs"></p>
     <p class="fileList"></p>
     <script src="../static/jquery.js"></script>
-    <script src="../static/DataStream.js"></script>
+    <script src="../static/t3d-parser.js"></script>
     <script src="../static/T3D.js"></script>
     <script src="./index.js"></script>
   </body>

diff --git a/examples/src/ModelRenderer/index.html b/examples/src/ModelRenderer/index.html
@@ -72,9 +72,9 @@ <h1>Single Model Render</h1>
     </p>
     <div id="log"></div>
     <script src="../static/jquery.js"></script>
-    <script src="../static/DataStream.js"></script>
     <script src="../static/three.js"></script>
     <script src="../static/OrbitControls.js"></script>
+    <script src="../static/t3d-parser.js"></script>
     <script src="../static/T3D.js"></script>
     <script type="text/javascript" src="./index.js"></script>
   </body>

diff --git a/examples/src/SimpleMapRenderer/index.html b/examples/src/SimpleMapRenderer/index.html
@@ -79,9 +79,9 @@ <h1>Simple Map Render</h1>
 
     <div id="log"></div>
     <script src="../static/jquery.js"></script>
-    <script src="../static/DataStream.js"></script>
     <script src="../static/three.js"></script>
     <script src="../static/OrbitControls.js"></script>
+    <script src="../static/t3d-parser.js"></script>
     <script src="../static/T3D.js"></script>
     <script type="text/javascript" src="./index.js"></script>
   </body>

diff --git a/examples/src/SimpleMapRenderer/index.js b/examples/src/SimpleMapRenderer/index.js
@@ -187,8 +187,7 @@ function onRendererDone(context) {
 function loadMapFile(fileId, callback) {
   if (parseInt(fileId)) {
     mapRenderer.localReader.loadFile(fileId, function (arrayBuffer) {
-      const ds = new DataStream(arrayBuffer, 0, DataStream.LITTLE_ENDIAN);
-      const mapFile = new T3D.GW2File(ds, 0);
+      const mapFile = new FileParser(arrayBuffer);
       callback(mapFile);
     });
   }

diff --git a/experiments/.eslintrc.js b/experiments/.eslintrc.js
diff --git a/experiments/rollup.config.cjs b/experiments/rollup.config.cjs
@@ -27,12 +27,11 @@ module.exports = {
         { src: '../node_modules/three/examples/js/exporters/OBJExporter.js', dest: 'dist/static' },
         { src: '../node_modules/three/examples/js/exporters/GLTFExporter.js', dest: 'dist/static' },
         { src: '../node_modules/jquery/dist/jquery.js', dest: 'dist/static' },
-        { src: '../node_modules/DataStream.js/DataStream.js', dest: 'dist/static' },
         { src: '../library/build/T3D.js', dest: 'dist/static' },
         { src: '../library/build/T3D.js.map', dest: 'dist/static' },
         { src: '../parser/build/t3d-parser.js', dest: 'dist/static' },
         { src: '../parser/build/t3d-parser.js.map', dest: 'dist/static' },
       ],
     }),
   ],
-};
+};
diff --git a/experiments/src/collision-exporter.html b/experiments/src/collision-exporter.html
@@ -73,10 +73,10 @@ <h1>Maps Collisions GLTF exporter</h1>
 
     <div id="log"></div>
     <script src="./static/jquery.js"></script>
-    <script src="./static/DataStream.js"></script>
     <script src="./static/three.js"></script>
     <script src="./static/OrbitControls.js"></script>
     <script src="./static/GLTFExporter.js"></script>
+    <script src="./static/t3d-parser.js"></script>
     <script src="./static/T3D.js"></script>
     <script type="text/javascript" src="./js/collision-exporter.js"></script>
   </body>

diff --git a/experiments/src/js/local-reader-v2.js b/experiments/src/js/local-reader-v2.js
@@ -12,7 +12,7 @@ $("#filePicker").change(function (evt) {
       await Promise.all(
         myFiles.map((elt) =>
           localReader.readFile(elt.mftId).then((r) => {
-            myFilesData[elt.mftId] = new T3D.GW2File(new DataStream(r.buffer), 0);
+            myFilesData[elt.mftId] = new FileParser(r.buffer);
             console.log("Done with", elt.mftId);
           })
         )

diff --git a/experiments/src/local-reader-v2.html b/experiments/src/local-reader-v2.html
@@ -9,9 +9,9 @@
       <input id="filePicker" type="file" />
     </label>
     <script src="./static/jquery.js"></script>
-    <script src="./static/DataStream.js"></script>
     <script src="./static/three.js"></script>
     <script src="./static/PointerLockControls.js"></script>
+    <script src="./static/t3d-parser.js"></script>
     <script src="./static/T3D.js"></script>
     <script src="./js/local-reader-v2.js"></script>
   </body>

diff --git a/explorer/.eslintrc.js b/explorer/.eslintrc.js
diff --git a/explorer/rollup.config.cjs b/explorer/rollup.config.cjs
@@ -28,7 +28,6 @@ module.exports = {
         `../node_modules/three/examples/js/controls/PointerLockControls.js`,
         `../node_modules/three/examples/js/libs/stats.min.js`,
         `../node_modules/jquery/dist/jquery.js`,
-        `../node_modules/DataStream.js/DataStream.js`,
         `../library/build/T3D.js`,
         `../library/build/T3D.js.map`,
         `../parser/build/t3d-parser.js`,
@@ -40,4 +39,4 @@ module.exports = {
       ].map(src => ({ src, dest: 'dist/static' })),
     }),
   ],
-};
+};
diff --git a/explorer/src/index.html b/explorer/src/index.html
@@ -68,7 +68,6 @@ <h3>Contacts</h3>
             T3D is powered by:
             <a href="http://threejs.org/" target="_blank">three.js</a>
             <a href="https://jquery.com/" target="_blank">jQuery</a>
-            <a href="https://github.com/kig/DataStream.js" target="_blank">DataStream.js</a>
           </p>
           <h3>ArenaNet copyright notice</h3>
           <p>
@@ -183,11 +182,11 @@ <h3 id="loadingValue"></h3>
         Third parties
       -->
     <script src="static/jquery.js"></script>
-    <script src="static/DataStream.js"></script>
     <script src="static/three.js"></script>
     <script src="static/FlyControls.js"></script>
     <script src="static/OrbitControls.js"></script>
     <script src="static/stats.min.js"></script>
+    <script src="static/t3d-parser.js"></script>
     <script src="static/T3D.js"></script>
 
     <!--

diff --git a/library/eslint.config.mjs b/library/eslint.config.mjs
@@ -23,7 +23,6 @@ export default tseslint.config(
         Atomics: "readonly",
         SharedArrayBuffer: "readonly",
         THREE: "readonly",
-        DataStream: "readonly",
         T3D: "writable",
         $: "readonly",
         w2ui: "readonly",

diff --git a/library/package.json b/library/package.json
@@ -11,7 +11,6 @@
     "test": "exit 0"
   },
   "dependencies": {
-    "DataStream.js": "github:kig/DataStream.js",
     "t3d-parser": "*",
     "three": "0.123.0",
     "vblob": "1.0.2",

diff --git a/library/rollup.config.cjs b/library/rollup.config.cjs
@@ -10,12 +10,15 @@ module.exports = {
         file: './build/T3D.js',
         format: 'iife',
         name: 'T3D',
-        sourcemap: true
+        sourcemap: true,
+        globals: {
+          "t3d-parser": "T3DParser"
+        }
     },
     external: ["t3d-parser"],
     plugins: [
         resolve(),
         commonjs(),
         typescript(),
     ]
-}
+}