diff --git a/favicon.svg b/favicon.svg deleted file mode 100644 index de4aedd..0000000 --- a/favicon.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/index.html b/index.html index b9146c7..68dcd62 100644 --- a/index.html +++ b/index.html @@ -82,23 +82,7 @@

Taco Bell

- - - - - - - - - - - - - - - - - + diff --git a/package-lock.json b/package-lock.json index 74d1ee1..9df2abf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,146 +1,176 @@ { "name": "three-demo", "version": "0.0.0", - "lockfileVersion": 1, + "lockfileVersion": 3, "requires": true, - "dependencies": { - "colorette": { + "packages": { + "": { + "name": "three-demo", + "version": "0.0.0", + "dependencies": { + "three": "^0.128.0" + }, + "devDependencies": { + "vite": "^2.3.0" + } + }, + "node_modules/colorette": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", "dev": true }, - "core-js": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.12.1.tgz", - "integrity": "sha512-Ne9DKPHTObRuB09Dru5AjwKjY4cJHVGu+y5f7coGn1E9Grkc3p2iBwE9AI/nJzsE29mQF7oq+mhYYRqOMFN1Bw==" - }, - "dat.gui": { - "version": "0.7.7", - "resolved": "https://registry.npmjs.org/dat.gui/-/dat.gui-0.7.7.tgz", - "integrity": "sha512-sRl/28gF/XRC5ywC9I4zriATTsQcpSsRG7seXCPnTkK8/EQMIbCu5NPMpICLGxX9ZEUvcXR3ArLYCtgreFoMDw==" - }, - "esbuild": { + "node_modules/esbuild": { "version": "0.11.20", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.11.20.tgz", "integrity": "sha512-QOZrVpN/Yz74xfat0H6euSgn3RnwLevY1mJTEXneukz1ln9qB+ieaerRMzSeETpz/UJWsBMzRVR/andBht5WKw==", - "dev": true + "dev": true, + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + } }, - "fsevents": { + "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, - "optional": true + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } }, - "function-bind": { + "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, - "has": { + "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dev": true, - "requires": { + "dependencies": { "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" } }, - "is-core-module": { + "node_modules/is-core-module": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz", "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==", "dev": true, - "requires": { + "dependencies": { "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "lodash-es": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", - "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" - }, - "nanoid": { + "node_modules/nanoid": { "version": "3.1.23", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz", "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==", - "dev": true + "dev": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } }, - "path-parse": { + "node_modules/path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", "dev": true }, - "postcss": { + "node_modules/postcss": { "version": "8.2.15", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.15.tgz", "integrity": "sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==", "dev": true, - "requires": { + "dependencies": { "colorette": "^1.2.2", "nanoid": "^3.1.23", "source-map": "^0.6.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" } }, - "resolve": { + "node_modules/resolve": { "version": "1.20.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", "dev": true, - "requires": { + "dependencies": { "is-core-module": "^2.2.0", "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "rollup": { + "node_modules/rollup": { "version": "2.47.0", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.47.0.tgz", "integrity": "sha512-rqBjgq9hQfW0vRmz+0S062ORRNJXvwRpzxhFXORvar/maZqY6za3rgQ/p1Glg+j1hnc1GtYyQCPiAei95uTElg==", "dev": true, - "requires": { + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=10.0.0" + }, + "optionalDependencies": { "fsevents": "~2.3.1" } }, - "smooth-scrollbar": { - "version": "8.6.2", - "resolved": "https://registry.npmjs.org/smooth-scrollbar/-/smooth-scrollbar-8.6.2.tgz", - "integrity": "sha512-ld0jfRM9ytP3ofjTUEwtURht6qjsTpsEK0/4a7Or+RMdPsMkpGrccZxWsJ1ycKW0rgkwdhKQPTyec6v3ElD9aA==", - "requires": { - "core-js": "^3.6.4", - "lodash-es": "^4.17.21", - "tslib": "^1.10.0" - } - }, - "source-map": { + "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "dev": true, + "engines": { + "node": ">=0.10.0" + } }, - "three": { + "node_modules/three": { "version": "0.128.0", "resolved": "https://registry.npmjs.org/three/-/three-0.128.0.tgz", "integrity": "sha512-i0ap/E+OaSfzw7bD1TtYnPo3VEplkl70WX5fZqZnfZsE3k3aSFudqrrC9ldFZfYFkn1zwDmBcdGfiIm/hnbyZA==" }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "vite": { + "node_modules/vite": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/vite/-/vite-2.3.2.tgz", "integrity": "sha512-QhLdOompDrfkyryCNTts9HE+eJhvhN9ibKNJ5Q8DpQai+6nOsuIlaveZNg67e1O/2QaWqXeBo82eHnAs1De2bQ==", "dev": true, - "requires": { + "dependencies": { "esbuild": "^0.11.20", - "fsevents": "~2.3.1", "postcss": "^8.2.10", "resolve": "^1.19.0", "rollup": "^2.38.5" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": ">=12.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.1" } } } diff --git a/public/favicon.svg b/public/favicon.svg new file mode 100644 index 0000000..5f2cb08 --- /dev/null +++ b/public/favicon.svg @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/jeff.png b/src/assets/jeff.png similarity index 100% rename from jeff.png rename to src/assets/jeff.png diff --git a/moon.jpg b/src/assets/moon.jpg similarity index 100% rename from moon.jpg rename to src/assets/moon.jpg diff --git a/normal.jpg b/src/assets/normal.jpg similarity index 100% rename from normal.jpg rename to src/assets/normal.jpg diff --git a/space.jpg b/src/assets/space.jpg similarity index 100% rename from space.jpg rename to src/assets/space.jpg diff --git a/main.js b/src/main.js similarity index 87% rename from main.js rename to src/main.js index 26e5545..ed744e1 100644 --- a/main.js +++ b/src/main.js @@ -1,5 +1,9 @@ import './style.css'; import * as THREE from 'three'; +import Jeff from './assets/jeff.png' +import Space from './assets/space.jpg' +import Moon from './assets/moon.jpg'; +import Normal from './assets/normal.jpg'; import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'; // Setup @@ -60,12 +64,12 @@ Array(200).fill().forEach(addStar); // Background -const spaceTexture = new THREE.TextureLoader().load('space.jpg'); +const spaceTexture = new THREE.TextureLoader().load(Space); scene.background = spaceTexture; // Avatar -const jeffTexture = new THREE.TextureLoader().load('jeff.png'); +const jeffTexture = new THREE.TextureLoader().load(Jeff); const jeff = new THREE.Mesh(new THREE.BoxGeometry(3, 3, 3), new THREE.MeshBasicMaterial({ map: jeffTexture })); @@ -73,8 +77,8 @@ scene.add(jeff); // Moon -const moonTexture = new THREE.TextureLoader().load('moon.jpg'); -const normalTexture = new THREE.TextureLoader().load('normal.jpg'); +const moonTexture = new THREE.TextureLoader().load(Moon); +const normalTexture = new THREE.TextureLoader().load(Normal); const moon = new THREE.Mesh( new THREE.SphereGeometry(3, 32, 32), diff --git a/style.css b/src/style.css similarity index 100% rename from style.css rename to src/style.css