diff --git a/src/assets/avatars/Bot_SkinnedWithAnimation.glb b/src/assets/avatars/Bot_SkinnedWithAnimation.glb index 7d2d8468967957470e272a96b4f1e1fbc238a4fe..b39d63867b2cd94e3ab1d7a5224a4b745a31a615 100755 Binary files a/src/assets/avatars/Bot_SkinnedWithAnimation.glb and b/src/assets/avatars/Bot_SkinnedWithAnimation.glb differ diff --git a/src/components/animated-robot-hands.js b/src/components/animated-robot-hands.js index 7cd092373b019d823d434897cfd8c1cce2fe4826..134ef1cf9e63749bee75499ba89f710566cbc9a7 100644 --- a/src/components/animated-robot-hands.js +++ b/src/components/animated-robot-hands.js @@ -19,8 +19,8 @@ AFRAME.registerComponent("animated-robot-hands", { }, init: function() { + window.hands = this; this.playAnimation = this.playAnimation.bind(this); - this.onModelLoaded = this.onModelLoaded.bind(this); // Get the three.js object in the scene graph that has the animation data const root = this.el.querySelector("a-gltf-entity .RootScene").object3D.children[0]; diff --git a/src/room.html b/src/room.html index 4b517dc411be8b941e996a86d174099d68730031..9fa50635061ce8ed3777e08b81f899af59aad434 100644 --- a/src/room.html +++ b/src/room.html @@ -26,7 +26,7 @@ light="defaultLightsEnabled: false"> <a-assets> - <a-asset-item id="bot-skinned-mesh" response-type="arraybuffer" src="./assets/avatars/Bot_SingleSkin_Rigged.glb"></a-asset-item> + <a-asset-item id="bot-skinned-mesh" response-type="arraybuffer" src="./assets/avatars/Bot_SkinnedWithAnimation.glb"></a-asset-item> <a-asset-item id="watch-model" response-type="arraybuffer" src="./assets/hud/watch.glb"></a-asset-item> <a-asset-item id="meeting-space1-mesh" response-type="arraybuffer" src="./assets/environments/MeetingSpace1_mesh.glb"></a-asset-item> @@ -100,6 +100,7 @@ wasd-to-analog2d character-controller="pivot: #player-camera" ik-root + animated-robot-hands > <a-entity id="player-camera"