diff --git a/assets/models/businessman/business_male_4__low_poly_style/license.txt b/assets/models/businessman/license.txt similarity index 100% rename from assets/models/businessman/business_male_4__low_poly_style/license.txt rename to assets/models/businessman/license.txt diff --git a/assets/models/businessman/business_male_4__low_poly_style/scene.bin b/assets/models/businessman/scene.bin similarity index 100% rename from assets/models/businessman/business_male_4__low_poly_style/scene.bin rename to assets/models/businessman/scene.bin diff --git a/assets/models/businessman/business_male_4__low_poly_style/scene.gltf b/assets/models/businessman/scene.gltf similarity index 100% rename from assets/models/businessman/business_male_4__low_poly_style/scene.gltf rename to assets/models/businessman/scene.gltf diff --git a/assets/models/businessman/business_male_4__low_poly_style/textures/LPBP_AtlasMat_baseColor.png b/assets/models/businessman/textures/LPBP_AtlasMat_baseColor.png similarity index 100% rename from assets/models/businessman/business_male_4__low_poly_style/textures/LPBP_AtlasMat_baseColor.png rename to assets/models/businessman/textures/LPBP_AtlasMat_baseColor.png diff --git a/assets/models/school/Schoolhouse.glb b/assets/models/school/Schoolhouse.glb new file mode 100644 index 0000000..20ef324 Binary files /dev/null and b/assets/models/school/Schoolhouse.glb differ diff --git a/main.js b/main.js index d14b4d8..086c6f3 100644 --- a/main.js +++ b/main.js @@ -2,7 +2,7 @@ Author: Daniel Jones IDE: Webstorm Browsers tested: Firefox 125 -Last change: 08/26/24 +Last change: 09/5/24 purpose: portfolio website to show to potential freelance customers/web developer positions */ @@ -43,8 +43,8 @@ const cmpLoader = new GLTFLoader(); cmpLoader.load('./assets/models/Comp_and_Floppy/scene.gltf',(gltfScene)=>{ loadedCmpModel = gltfScene; console.log("UwU whats this? My computer model loaded! OwO"); - gltfScene.scene.position.z = 50; - gltfScene.scene.position.y = 20; + gltfScene.scene.position.z = 250; + gltfScene.scene.position.y = 15; gltfScene.scene.scale.set(10,10,10); scene.add(loadedCmpModel.scene); @@ -52,20 +52,36 @@ cmpLoader.load('./assets/models/Comp_and_Floppy/scene.gltf',(gltfScene)=>{ } ); -//the thinker model -let loadedThinkerModel; -const thnkerLoader = new GLTFLoader(); -thnkerLoader.load('./assets/models/thinker/scene.gltf', (gltfScene) =>{ - loadedThinkerModel = gltfScene; - console.log("The thinker loaded! I wish I had muscles that big."); - gltfScene.scene.position.z = 100; - gltfScene.scene.position.y = 10; - gltfScene.scene.scale.set(10,10,10); - - - scene.add(loadedThinkerModel.scene); +let loadedSchlModel; // model for PC +const SchlLoader = new GLTFLoader(); +SchlLoader.load('./assets/models/school/Schoolhouse.glb',(gltfScene)=>{ + loadedSchlModel = gltfScene; + gltfScene.scene.position.z = 50; + gltfScene.scene.position.y = 5; + gltfScene.scene.scale.set(3,3,3); + + scene.add(loadedSchlModel.scene); + } -) +); + + + + + +let loadedManModel; // model for PC +const ManLoader = new GLTFLoader(); +ManLoader.load('./assets/models/businessman/scene.gltf',(gltfScene)=>{ + loadedManModel = gltfScene; + gltfScene.scene.position.z = 50; + gltfScene.scene.position.y = 5; + gltfScene.scene.scale.set(10,10,10); + + scene.add(loadedManModel.scene); + +} +); + const ambientLight = new THREE.AmbientLight(0xffffff); diff --git a/package-lock.json b/package-lock.json index 920c78b..43646a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "three": "^0.161.0" }, "devDependencies": { - "vite": "^5.4.2" + "vite": "^5.4.3" } }, "node_modules/@esbuild/aix-ppc64": { @@ -667,15 +667,15 @@ } }, "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", "dev": true }, "node_modules/postcss": { - "version": "8.4.41", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz", - "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==", + "version": "8.4.45", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz", + "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==", "dev": true, "funding": [ { @@ -750,13 +750,13 @@ "integrity": "sha512-LC28VFtjbOyEu5b93K0bNRLw1rQlMJ85lilKsYj6dgTu+7i17W+JCCEbvrpmNHF1F3NAUqDSWq50UD7w9H2xQw==" }, "node_modules/vite": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.2.tgz", - "integrity": "sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz", + "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==", "dev": true, "dependencies": { "esbuild": "^0.21.3", - "postcss": "^8.4.41", + "postcss": "^8.4.43", "rollup": "^4.20.0" }, "bin": { diff --git a/package.json b/package.json index 736e373..86d6225 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "devDependencies": { - "vite": "^5.4.2" + "vite": "^5.4.3" }, "dependencies": { "three": "^0.161.0"