Skip to content

Commit 69d579c

Browse files
committed
change to load obj
1 parent afee64b commit 69d579c

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

src/main.js

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,10 @@ export class App {
285285
this.createControls()
286286
this.createLights()
287287
// this.setupCube()
288-
// this.loadTexure()
289-
// this.loadMaterial()
290-
// this.loadModel()
291-
this.loadGLTF()
288+
this.loadTexure()
289+
this.loadMaterial()
290+
this.loadModel()
291+
// this.loadGLTF()
292292
// this.loadJSON()
293293
// this.loadCustomModel()
294294
if (this.state.postProcessing) {
@@ -820,16 +820,16 @@ export class App {
820820

821821
this.controls.maxDistance = size * 10
822822

823-
// this.camera.near = size / 100
824-
// this.camera.far = size * 100
825-
// this.camera.updateProjectionMatrix()
823+
this.camera.near = size / 100
824+
this.camera.far = size * 100
825+
this.camera.setFocalLength(30)
826+
this.camera.updateProjectionMatrix()
826827

827-
// this.camera.position.copy(center)
828-
this.camera.position.x += size / 8.0
829-
this.camera.position.y += size / 9.0
830-
this.camera.position.z += size / 1.0
831-
832-
// this.camera.lookAt(center)
828+
this.camera.position.copy(center)
829+
this.camera.position.x += size / 3.0
830+
this.camera.position.y -= size / 3.0
831+
this.camera.position.z += size * 2
832+
this.camera.lookAt(center)
833833

834834
// this.setCamera(this.camera)
835835

@@ -843,6 +843,11 @@ export class App {
843843
// this.teeth.upperTeethMesh = meshMap.get("UpperTeeth")
844844
// this.teeth.lowerTeethMesh = meshMap.get("LowerTeeth")
845845
// this.tongue.tougueMesh = meshMap.get("Tongue")
846+
847+
this.updateLights()
848+
// this.updateGUI()
849+
this.updateEnvironment()
850+
this.updateDisplay()
846851
})
847852
}
848853

@@ -913,7 +918,7 @@ export class App {
913918
this.camera.lookAt(center)
914919

915920
this.setCamera(this.camera)
916-
// this.controls.saveState()
921+
this.controls.saveState()
917922

918923
this.scene.add(object)
919924
this.meshRoot = object
@@ -1046,7 +1051,7 @@ export class App {
10461051
this.gui = new GUI()
10471052

10481053
const displaceFolder = this.gui.addFolder("Display")
1049-
// displaceFolder.close()
1054+
displaceFolder.close()
10501055
const envBackgroundCtrl = displaceFolder.add(this.state, "background")
10511056
envBackgroundCtrl.onChange(() => this.updateEnvironment())
10521057
const autoRotateCtrl = displaceFolder.add(this.state, "autoRotate")

0 commit comments

Comments
 (0)