diff --git a/app/pages/PageEnigma/js/character.js b/app/pages/PageEnigma/js/character.js index c6b6c9c3e5..f461bb9804 100644 --- a/app/pages/PageEnigma/js/character.js +++ b/app/pages/PageEnigma/js/character.js @@ -72,7 +72,6 @@ class Character { } animate(clip) { - console.log(clip); this.currentAction = this.mixer.clipAction(clip); this.currentAction.play(); } @@ -90,10 +89,9 @@ class Character { } load_animation(filepath, callback = null) { - let fbxLoader = new FBXLoader(); - fbxLoader.load(filepath, + let glbLoader = new GLTFLoader(); + glbLoader.load(filepath, (object) => { - console.log("loaded " + filepath); let animationAction = this.mixer.clipAction(object.animations[0]); this.anims.push(animationAction); if (callback != null) { diff --git a/app/pages/PageEnigma/js/scene.js b/app/pages/PageEnigma/js/scene.js index 0670fbf715..196f82c3b2 100644 --- a/app/pages/PageEnigma/js/scene.js +++ b/app/pages/PageEnigma/js/scene.js @@ -67,7 +67,7 @@ class Scene { this.scene.add(child); children_uuids.push(child.uuid); }); - this.characters[character_name].load_animation("/resources/models/fox/hanashi_IdleAnim.fbx", this.play_anim_demo.bind(this)); + this.characters[character_name].load_animation("/resources/models/fox/fox_idle.glb", this.play_anim_demo.bind(this)); } play_anim_demo(character_name) { @@ -183,7 +183,7 @@ class Scene { _create_base_lighting() { const color = 0xFCECE7; - const light = new THREE.AmbientLight(color, 0.8); + const light = new THREE.HemisphereLight(color, 0x8d8d8d, 3.5); this.scene.add(light); const directional_light = new THREE.DirectionalLight(color, 3.5); diff --git a/public/resources/models/fox/fox_idle.glb b/public/resources/models/fox/fox_idle.glb new file mode 100644 index 0000000000..db63611741 Binary files /dev/null and b/public/resources/models/fox/fox_idle.glb differ diff --git a/public/resources/models/fox/hanashi_idle.fbx b/public/resources/models/fox/hanashi_idle.fbx new file mode 100644 index 0000000000..d4b9678f2a Binary files /dev/null and b/public/resources/models/fox/hanashi_idle.fbx differ