diff --git a/package-lock.json b/package-lock.json index b8324b5a..c7624391 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14744,126 +14744,6 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, - "node_modules/copy-webpack-plugin": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz", - "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==", - "dev": true, - "dependencies": { - "fast-glob": "^3.2.11", - "glob-parent": "^6.0.1", - "globby": "^13.1.1", - "normalize-path": "^3.0.0", - "schema-utils": "^4.0.0", - "serialize-javascript": "^6.0.0" - }, - "engines": { - "node": ">= 14.15.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" - } - }, - "node_modules/copy-webpack-plugin/node_modules/ajv": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz", - "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/copy-webpack-plugin/node_modules/ajv-keywords": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.3" - }, - "peerDependencies": { - "ajv": "^8.8.2" - } - }, - "node_modules/copy-webpack-plugin/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/copy-webpack-plugin/node_modules/globby": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.1.tgz", - "integrity": "sha512-XMzoDZbGZ37tufiv7g0N4F/zp3zkwdFtVbV3EHsVl1KQr4RPLfNoT068/97RPshz2J5xYNEjLKKBKaGHifBd3Q==", - "dev": true, - "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.11", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/copy-webpack-plugin/node_modules/schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", - "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" - }, - "engines": { - "node": ">= 12.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/copy-webpack-plugin/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/core-js": { "version": "2.6.12", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", @@ -34538,7 +34418,6 @@ "@typescript-eslint/eslint-plugin": "^6.18.1", "@typescript-eslint/parser": "^6.18.1", "canvas": "^2.11.2", - "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.8.1", "cypress": "^13.6.2", "cypress-image-snapshot": "^4.0.1", @@ -48046,89 +47925,6 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, - "copy-webpack-plugin": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz", - "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==", - "dev": true, - "requires": { - "fast-glob": "^3.2.11", - "glob-parent": "^6.0.1", - "globby": "^13.1.1", - "normalize-path": "^3.0.0", - "schema-utils": "^4.0.0", - "serialize-javascript": "^6.0.0" - }, - "dependencies": { - "ajv": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz", - "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "ajv-keywords": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.3" - } - }, - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - }, - "globby": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.1.tgz", - "integrity": "sha512-XMzoDZbGZ37tufiv7g0N4F/zp3zkwdFtVbV3EHsVl1KQr4RPLfNoT068/97RPshz2J5xYNEjLKKBKaGHifBd3Q==", - "dev": true, - "requires": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.11", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^4.0.0" - } - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", - "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" - } - }, - "slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true - } - } - }, "core-js": { "version": "2.6.12", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", @@ -61662,7 +61458,6 @@ "@typescript-eslint/parser": "^6.18.1", "array-move": "^4.0.0", "canvas": "^2.11.2", - "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.8.1", "cypress": "^13.6.2", "cypress-image-snapshot": "^4.0.1", diff --git a/packages/tecrock-simulation/package.json b/packages/tecrock-simulation/package.json index 04e0ef95..18f0bd2d 100644 --- a/packages/tecrock-simulation/package.json +++ b/packages/tecrock-simulation/package.json @@ -100,7 +100,6 @@ "@typescript-eslint/eslint-plugin": "^6.18.1", "@typescript-eslint/parser": "^6.18.1", "canvas": "^2.11.2", - "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.8.1", "cypress": "^13.6.2", "cypress-image-snapshot": "^4.0.1", diff --git a/packages/tecrock-simulation/public/android-chrome-192x192.png b/packages/tecrock-simulation/public/android-chrome-192x192.png deleted file mode 100644 index 489f9416..00000000 Binary files a/packages/tecrock-simulation/public/android-chrome-192x192.png and /dev/null differ diff --git a/packages/tecrock-simulation/public/android-chrome-512x512.png b/packages/tecrock-simulation/public/android-chrome-512x512.png deleted file mode 100644 index 03c6201a..00000000 Binary files a/packages/tecrock-simulation/public/android-chrome-512x512.png and /dev/null differ diff --git a/packages/tecrock-simulation/public/apple-touch-icon.png b/packages/tecrock-simulation/public/apple-touch-icon.png deleted file mode 100644 index 70b1d80a..00000000 Binary files a/packages/tecrock-simulation/public/apple-touch-icon.png and /dev/null differ diff --git a/packages/tecrock-simulation/public/browserconfig.xml b/packages/tecrock-simulation/public/browserconfig.xml deleted file mode 100644 index b3930d0f..00000000 --- a/packages/tecrock-simulation/public/browserconfig.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - #da532c - - - diff --git a/packages/tecrock-simulation/public/favicon-16x16.png b/packages/tecrock-simulation/public/favicon-16x16.png deleted file mode 100644 index 471f6973..00000000 Binary files a/packages/tecrock-simulation/public/favicon-16x16.png and /dev/null differ diff --git a/packages/tecrock-simulation/public/favicon-32x32.png b/packages/tecrock-simulation/public/favicon-32x32.png deleted file mode 100644 index 0d6d09d3..00000000 Binary files a/packages/tecrock-simulation/public/favicon-32x32.png and /dev/null differ diff --git a/packages/tecrock-simulation/public/mstile-150x150.png b/packages/tecrock-simulation/public/mstile-150x150.png deleted file mode 100644 index a4c785d7..00000000 Binary files a/packages/tecrock-simulation/public/mstile-150x150.png and /dev/null differ diff --git a/packages/tecrock-simulation/public/site.webmanifest b/packages/tecrock-simulation/public/site.webmanifest deleted file mode 100644 index b20abb7c..00000000 --- a/packages/tecrock-simulation/public/site.webmanifest +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "", - "short_name": "", - "icons": [ - { - "src": "/android-chrome-192x192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "/android-chrome-512x512.png", - "sizes": "512x512", - "type": "image/png" - } - ], - "theme_color": "#ffffff", - "background_color": "#ffffff", - "display": "standalone" -} diff --git a/packages/tecrock-simulation/public/data/2-plate-icon@3x.png b/packages/tecrock-simulation/src/data/2-plate-icon@3x.png similarity index 100% rename from packages/tecrock-simulation/public/data/2-plate-icon@3x.png rename to packages/tecrock-simulation/src/data/2-plate-icon@3x.png diff --git a/packages/tecrock-simulation/public/data/3-plate-icon@3x.png b/packages/tecrock-simulation/src/data/3-plate-icon@3x.png similarity index 100% rename from packages/tecrock-simulation/public/data/3-plate-icon@3x.png rename to packages/tecrock-simulation/src/data/3-plate-icon@3x.png diff --git a/packages/tecrock-simulation/public/data/4-plate-icon@3x.png b/packages/tecrock-simulation/src/data/4-plate-icon@3x.png similarity index 100% rename from packages/tecrock-simulation/public/data/4-plate-icon@3x.png rename to packages/tecrock-simulation/src/data/4-plate-icon@3x.png diff --git a/packages/tecrock-simulation/public/data/5-plate-icon@3x.png b/packages/tecrock-simulation/src/data/5-plate-icon@3x.png similarity index 100% rename from packages/tecrock-simulation/public/data/5-plate-icon@3x.png rename to packages/tecrock-simulation/src/data/5-plate-icon@3x.png diff --git a/packages/tecrock-simulation/public/data/5-plate-uneven-distribution-icon@3x.png b/packages/tecrock-simulation/src/data/5-plate-uneven-distribution-icon@3x.png similarity index 100% rename from packages/tecrock-simulation/public/data/5-plate-uneven-distribution-icon@3x.png rename to packages/tecrock-simulation/src/data/5-plate-uneven-distribution-icon@3x.png diff --git a/packages/tecrock-simulation/public/data/benchmark.png b/packages/tecrock-simulation/src/data/benchmark.png similarity index 100% rename from packages/tecrock-simulation/public/data/benchmark.png rename to packages/tecrock-simulation/src/data/benchmark.png diff --git a/packages/tecrock-simulation/public/data/continentOceanCollision.png b/packages/tecrock-simulation/src/data/continentOceanCollision.png similarity index 100% rename from packages/tecrock-simulation/public/data/continentOceanCollision.png rename to packages/tecrock-simulation/src/data/continentOceanCollision.png diff --git a/packages/tecrock-simulation/public/data/continentalCollision1.png b/packages/tecrock-simulation/src/data/continentalCollision1.png similarity index 100% rename from packages/tecrock-simulation/public/data/continentalCollision1.png rename to packages/tecrock-simulation/src/data/continentalCollision1.png diff --git a/packages/tecrock-simulation/public/data/continentalCollision1v2.png b/packages/tecrock-simulation/src/data/continentalCollision1v2.png similarity index 100% rename from packages/tecrock-simulation/public/data/continentalCollision1v2.png rename to packages/tecrock-simulation/src/data/continentalCollision1v2.png diff --git a/packages/tecrock-simulation/public/data/continentalCollision2.png b/packages/tecrock-simulation/src/data/continentalCollision2.png similarity index 100% rename from packages/tecrock-simulation/public/data/continentalCollision2.png rename to packages/tecrock-simulation/src/data/continentalCollision2.png diff --git a/packages/tecrock-simulation/public/data/continentalCollision3.png b/packages/tecrock-simulation/src/data/continentalCollision3.png similarity index 100% rename from packages/tecrock-simulation/public/data/continentalCollision3.png rename to packages/tecrock-simulation/src/data/continentalCollision3.png diff --git a/packages/tecrock-simulation/public/data/continentalCollision4.png b/packages/tecrock-simulation/src/data/continentalCollision4.png similarity index 100% rename from packages/tecrock-simulation/public/data/continentalCollision4.png rename to packages/tecrock-simulation/src/data/continentalCollision4.png diff --git a/packages/tecrock-simulation/public/data/divergentBoundary.png b/packages/tecrock-simulation/src/data/divergentBoundary.png similarity index 100% rename from packages/tecrock-simulation/public/data/divergentBoundary.png rename to packages/tecrock-simulation/src/data/divergentBoundary.png diff --git a/packages/tecrock-simulation/public/data/divergentBoundary2.png b/packages/tecrock-simulation/src/data/divergentBoundary2.png similarity index 100% rename from packages/tecrock-simulation/public/data/divergentBoundary2.png rename to packages/tecrock-simulation/src/data/divergentBoundary2.png diff --git a/packages/tecrock-simulation/public/data/earth.png b/packages/tecrock-simulation/src/data/earth.png similarity index 100% rename from packages/tecrock-simulation/public/data/earth.png rename to packages/tecrock-simulation/src/data/earth.png diff --git a/packages/tecrock-simulation/public/data/islandCollision.png b/packages/tecrock-simulation/src/data/islandCollision.png similarity index 100% rename from packages/tecrock-simulation/public/data/islandCollision.png rename to packages/tecrock-simulation/src/data/islandCollision.png diff --git a/packages/tecrock-simulation/public/data/mountains.jpg b/packages/tecrock-simulation/src/data/mountains.jpg similarity index 100% rename from packages/tecrock-simulation/public/data/mountains.jpg rename to packages/tecrock-simulation/src/data/mountains.jpg diff --git a/packages/tecrock-simulation/public/data/plateDivision1.png b/packages/tecrock-simulation/src/data/plateDivision1.png similarity index 100% rename from packages/tecrock-simulation/public/data/plateDivision1.png rename to packages/tecrock-simulation/src/data/plateDivision1.png diff --git a/packages/tecrock-simulation/public/data/plateDivision2.png b/packages/tecrock-simulation/src/data/plateDivision2.png similarity index 100% rename from packages/tecrock-simulation/public/data/plateDivision2.png rename to packages/tecrock-simulation/src/data/plateDivision2.png diff --git a/packages/tecrock-simulation/public/data/plateMerge.png b/packages/tecrock-simulation/src/data/plateMerge.png similarity index 100% rename from packages/tecrock-simulation/public/data/plateMerge.png rename to packages/tecrock-simulation/src/data/plateMerge.png diff --git a/packages/tecrock-simulation/public/data/plates2.png b/packages/tecrock-simulation/src/data/plates2.png similarity index 100% rename from packages/tecrock-simulation/public/data/plates2.png rename to packages/tecrock-simulation/src/data/plates2.png diff --git a/packages/tecrock-simulation/public/data/plates3.png b/packages/tecrock-simulation/src/data/plates3.png similarity index 100% rename from packages/tecrock-simulation/public/data/plates3.png rename to packages/tecrock-simulation/src/data/plates3.png diff --git a/packages/tecrock-simulation/public/data/plates4.png b/packages/tecrock-simulation/src/data/plates4.png similarity index 100% rename from packages/tecrock-simulation/public/data/plates4.png rename to packages/tecrock-simulation/src/data/plates4.png diff --git a/packages/tecrock-simulation/public/data/plates5.png b/packages/tecrock-simulation/src/data/plates5.png similarity index 100% rename from packages/tecrock-simulation/public/data/plates5.png rename to packages/tecrock-simulation/src/data/plates5.png diff --git a/packages/tecrock-simulation/public/data/plates5Uneven.png b/packages/tecrock-simulation/src/data/plates5Uneven.png similarity index 100% rename from packages/tecrock-simulation/public/data/plates5Uneven.png rename to packages/tecrock-simulation/src/data/plates5Uneven.png diff --git a/packages/tecrock-simulation/public/data/subduction.png b/packages/tecrock-simulation/src/data/subduction.png similarity index 100% rename from packages/tecrock-simulation/public/data/subduction.png rename to packages/tecrock-simulation/src/data/subduction.png diff --git a/packages/tecrock-simulation/public/data/test1.png b/packages/tecrock-simulation/src/data/test1.png similarity index 100% rename from packages/tecrock-simulation/public/data/test1.png rename to packages/tecrock-simulation/src/data/test1.png diff --git a/packages/tecrock-simulation/public/data/transformBoundary.png b/packages/tecrock-simulation/src/data/transformBoundary.png similarity index 100% rename from packages/tecrock-simulation/public/data/transformBoundary.png rename to packages/tecrock-simulation/src/data/transformBoundary.png diff --git a/packages/tecrock-simulation/src/index.html b/packages/tecrock-simulation/src/index.html index 88977e7a..86684fa6 100644 --- a/packages/tecrock-simulation/src/index.html +++ b/packages/tecrock-simulation/src/index.html @@ -5,14 +5,6 @@ Tectonic Explorer - - - - - - - - diff --git a/packages/tecrock-simulation/src/plates-view/plate-mesh.ts b/packages/tecrock-simulation/src/plates-view/plate-mesh.ts index 85f35995..7d790768 100644 --- a/packages/tecrock-simulation/src/plates-view/plate-mesh.ts +++ b/packages/tecrock-simulation/src/plates-view/plate-mesh.ts @@ -18,6 +18,7 @@ import FieldStore from "../stores/field-store"; import { Rock } from "../plates-model/rock-properties"; import { getRockPatternImgSrc } from "../colors/rock-colors"; import { MAX_NORMALIZED_AGE } from "../plates-model/field"; +import mountainsImg from "../data/mountains.jpg"; const MIN_SPEED_TO_RENDER_POLE = 0.002; // Render every nth velocity arrow (performance). @@ -40,7 +41,7 @@ const LAYER_DIFF = 0.004; const EARTHQUAKES_LAYER_DIFF = 1 * LAYER_DIFF; const VOLCANIC_ERUPTIONS_LAYER_DIFF = 2 * LAYER_DIFF; -const SHARED_BUMP_MAP = new THREE.TextureLoader().load("data/mountains.jpg"); +const SHARED_BUMP_MAP = new THREE.TextureLoader().load(mountainsImg); SHARED_BUMP_MAP.colorSpace = THREE.NoColorSpace; // If there's a new rock type added, it needs to be included in the map below and the plate-mesh-fragment.glsl file diff --git a/packages/tecrock-simulation/src/presets.ts b/packages/tecrock-simulation/src/presets.ts index b8445ffb..f7e15947 100644 --- a/packages/tecrock-simulation/src/presets.ts +++ b/packages/tecrock-simulation/src/presets.ts @@ -1,6 +1,32 @@ import * as THREE from "three"; import config from "./config"; import Plate from "./plates-model/plate"; +import subductionImg from "./data/subduction.png"; +import divergentBoundaryImg from "./data/divergentBoundary.png"; +import divergentBoundary2Img from "./data/divergentBoundary2.png"; +import plateDivision1Img from "./data/plateDivision1.png"; +import plateDivision2Img from "./data/plateDivision2.png"; +import transformBoundaryImg from "./data/transformBoundary.png"; +import continentalCollision1v2Img from "./data/continentalCollision1v2.png"; +import continentalCollision2Img from "./data/continentalCollision2.png"; +import continentalCollision3Img from "./data/continentalCollision3.png"; +import continentalCollision4Img from "./data/continentalCollision4.png"; +import continentOceanCollisionImg from "./data/continentOceanCollision.png"; +import islandCollisionImg from "./data/islandCollision.png"; +import plateMergeImg from "./data/plateMerge.png"; +import earthImg from "./data/earth.png"; +import test1Img from "./data/test1.png"; +import benchmarkImg from "./data/benchmark.png"; +import plates2Img from "./data/plates2.png"; +import plates3Img from "./data/plates3.png"; +import plates4Img from "./data/plates4.png"; +import plates5Img from "./data/plates5.png"; +import plates5UnevenImg from "./data/plates5Uneven.png"; +import plate2Icon from "./data/2-plate-icon@3x.png"; +import plate3Icon from "./data/3-plate-icon@3x.png"; +import plate4Icon from "./data/4-plate-icon@3x.png"; +import plate5Icon from "./data/5-plate-icon@3x.png"; +import plate5UnevenDistributionIcon from "./data/5-plate-uneven-distribution-icon@3x.png"; interface IPreset { img: string; @@ -13,7 +39,7 @@ interface IPreset { // not in the rendered model (it uses different colors, based on plate ID, defined in `plateHues` constant). const presets: Record = { "subduction": { - img: "data/subduction.png", + img: subductionImg, init(plates: Record) { const bluePlate = plates[210]; // 210 hue const yellowPlate = plates[70]; // 70 hue @@ -23,7 +49,7 @@ const presets: Record = { } }, "divergentBoundary": { - img: "data/divergentBoundary.png", + img: divergentBoundaryImg, init(plates: Record) { const bluePlate = plates[210]; // 210 hue const yellowPlate = plates[70]; // 70 hue @@ -34,7 +60,7 @@ const presets: Record = { } }, "divergentBoundary2": { - img: "data/divergentBoundary2.png", + img: divergentBoundary2Img, init(plates: Record) { const bluePlate = plates[210]; // 210 hue const yellowPlate = plates[70]; // 70 hue @@ -45,13 +71,13 @@ const presets: Record = { } }, "plateDivision1": { - img: "data/plateDivision1.png" + img: plateDivision1Img }, "plateDivision2": { - img: "data/plateDivision2.png" + img: plateDivision2Img }, "transformBoundary": { - img: "data/transformBoundary.png", + img: transformBoundaryImg, init(plates: Record) { const pinkPlate = plates[320]; // 320 hue const greenPlate = plates[130]; // 130 hue @@ -64,7 +90,7 @@ const presets: Record = { } }, "continentalCollision1": { - img: "data/continentalCollision1v2.png", + img: continentalCollision1v2Img, init(plates: Record) { const bluePlate = plates[210]; // 210 hue const yellowPlate = plates[70]; // 70 hue @@ -75,7 +101,7 @@ const presets: Record = { } }, "continentalCollision2": { - img: "data/continentalCollision2.png", + img: continentalCollision2Img, init(plates: Record) { const bluePlate = plates[210]; // 210 hue const yellowPlate = plates[70]; // 70 hue @@ -86,7 +112,7 @@ const presets: Record = { } }, "continentalCollision3": { - img: "data/continentalCollision3.png", + img: continentalCollision3Img, init(plates: Record) { const bluePlate = plates[210]; // 210 hue const yellowPlate = plates[70]; // 70 hue @@ -98,7 +124,7 @@ const presets: Record = { } }, "continentalCollision4": { - img: "data/continentalCollision4.png", + img: continentalCollision4Img, init(plates: Record) { const bluePlate = plates[210]; // 210 hue const yellowPlate = plates[70]; // 70 hue @@ -108,7 +134,7 @@ const presets: Record = { } }, "continentOceanCollision": { - img: "data/continentOceanCollision.png", + img: continentOceanCollisionImg, init(plates: Record) { const bluePlate = plates[210]; // 210 hue const yellowPlate = plates[70]; // 70 hue @@ -119,7 +145,7 @@ const presets: Record = { } }, "islandCollision": { - img: "data/islandCollision.png", + img: islandCollisionImg, init(plates: Record) { const bluePlate = plates[210]; // 210 hue const yellowPlate = plates[70]; // 70 hue @@ -129,7 +155,7 @@ const presets: Record = { } }, "plateMerge": { - img: "data/plateMerge.png", + img: plateMergeImg, init(plates: Record) { const pinkPlate = plates[320]; // 320 hue const greenPlate = plates[130]; // 130 hue @@ -145,10 +171,10 @@ const presets: Record = { } }, "earth": { - img: "data/earth.png", + img: earthImg, }, "test1": { - img: "data/test1.png", + img: test1Img, init(plates: Record) { const bluePlate = plates[210]; // 210 hue const pinkPlate = plates[320]; // 320 hue @@ -164,7 +190,7 @@ const presets: Record = { } }, "benchmark": { - img: "data/benchmark.png", + img: benchmarkImg, init(plates: Record) { const bluePlate = plates[210]; // 210 hue const pinkPlate = plates[320]; // 320 hue @@ -180,8 +206,8 @@ const presets: Record = { } }, "plates2": { - img: "data/plates2.png", - icon: "data/2-plate-icon@3x.png", + img: plates2Img, + icon: plate2Icon, init(plates: Record) { const pinkPlate = plates[320]; // 320 hue const greenPlate = plates[130]; // 130 hue @@ -190,8 +216,8 @@ const presets: Record = { } }, "plates3": { - img: "data/plates3.png", - icon: "data/3-plate-icon@3x.png", + img: plates3Img, + icon: plate3Icon, init(plates: Record) { const pinkPlate = plates[320]; // 320 hue const greenPlate = plates[130]; // 130 hue @@ -202,8 +228,8 @@ const presets: Record = { } }, "plates4": { - img: "data/plates4.png", - icon: "data/4-plate-icon@3x.png", + img: plates4Img, + icon: plate4Icon, init(plates: Record) { const pinkPlate = plates[320]; // 320 hue const greenPlate = plates[130]; // 130 hue @@ -216,8 +242,8 @@ const presets: Record = { } }, "plates5": { - img: "data/plates5.png", - icon: "data/5-plate-icon@3x.png", + img: plates5Img, + icon: plate5Icon, init(plates: Record) { const pinkPlate = plates[320]; // 320 hue const greenPlate = plates[130]; // 130 hue @@ -232,8 +258,8 @@ const presets: Record = { } }, "plates5Uneven": { - img: "data/plates5Uneven.png", - icon: "data/5-plate-uneven-distribution-icon@3x.png", + img: plates5UnevenImg, + icon: plate5UnevenDistributionIcon, init(plates: Record) { const brownPlate = plates[30]; // 30 hue const pinkPlate = plates[300]; // 300 hue diff --git a/packages/tecrock-simulation/webpack.config.js b/packages/tecrock-simulation/webpack.config.js index 7b627104..519f6bd6 100644 --- a/packages/tecrock-simulation/webpack.config.js +++ b/packages/tecrock-simulation/webpack.config.js @@ -1,6 +1,5 @@ var path = require('path') var webpack = require('webpack') -var CopyWebpackPlugin = require('copy-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin'); @@ -166,9 +165,6 @@ module.exports = { }, plugins: [ new webpack.optimize.ModuleConcatenationPlugin(), - new CopyWebpackPlugin({ - patterns: [{ from: 'public' }] - }), new HtmlWebpackPlugin({ filename: 'index.html', template: './src/index.html',