diff --git a/src/assets/avatars/BotBobo_Avatar.glb b/src/assets/avatars/BotBobo_Avatar.glb
new file mode 100644
index 0000000000000000000000000000000000000000..66862adb28f35fb3bb1ca4954d840a1f9a91bb96
Binary files /dev/null and b/src/assets/avatars/BotBobo_Avatar.glb differ
diff --git a/src/assets/avatars/BotBobo_Avatar_Unlit.glb b/src/assets/avatars/BotBobo_Avatar_Unlit.glb
new file mode 100644
index 0000000000000000000000000000000000000000..e4a939a242fc930dc52c7d60aa145b7b86023330
Binary files /dev/null and b/src/assets/avatars/BotBobo_Avatar_Unlit.glb differ
diff --git a/src/assets/avatars/BotDom_Avatar.glb b/src/assets/avatars/BotDom_Avatar.glb
index 9c72e3d2fc170d6b0782d741eca441a62780daad..098a042ead7b919170c6c4c6a63ba40f62a1b81b 100644
Binary files a/src/assets/avatars/BotDom_Avatar.glb and b/src/assets/avatars/BotDom_Avatar.glb differ
diff --git a/src/assets/avatars/BotDom_Avatar_Unlit.glb b/src/assets/avatars/BotDom_Avatar_Unlit.glb
index 30b6af80ec3ab756eca52ff426e184890260e463..88c830ae9f73581683050705ad75f321bdeecb37 100644
Binary files a/src/assets/avatars/BotDom_Avatar_Unlit.glb and b/src/assets/avatars/BotDom_Avatar_Unlit.glb differ
diff --git a/src/assets/avatars/BotGreg_Avatar.glb b/src/assets/avatars/BotGreg_Avatar.glb
index 92dc4e48291683d740b47c59871a62a8f1730ea4..33ca3ee66249ed267688353ef0ab82fd97dfc8bc 100644
Binary files a/src/assets/avatars/BotGreg_Avatar.glb and b/src/assets/avatars/BotGreg_Avatar.glb differ
diff --git a/src/assets/avatars/BotGreg_Avatar_Unlit.glb b/src/assets/avatars/BotGreg_Avatar_Unlit.glb
index 5aa65d9c30c90bdbacbe18df0a3a32041ef195f2..ed0a5291790f79029b6c7e624a45253c5f6caeb3 100644
Binary files a/src/assets/avatars/BotGreg_Avatar_Unlit.glb and b/src/assets/avatars/BotGreg_Avatar_Unlit.glb differ
diff --git a/src/assets/avatars/BotGuest_Avatar.glb b/src/assets/avatars/BotGuest_Avatar.glb
new file mode 100644
index 0000000000000000000000000000000000000000..e0be8e9cbad1a1d6167c0c0ccf333285d0857472
Binary files /dev/null and b/src/assets/avatars/BotGuest_Avatar.glb differ
diff --git a/src/assets/avatars/BotGuest_Avatar_Unlit.glb b/src/assets/avatars/BotGuest_Avatar_Unlit.glb
new file mode 100644
index 0000000000000000000000000000000000000000..3bc50b18e3ffbf9f9007a6f7790a8512284949a7
Binary files /dev/null and b/src/assets/avatars/BotGuest_Avatar_Unlit.glb differ
diff --git a/src/assets/avatars/BotJim_Avatar.glb b/src/assets/avatars/BotJim_Avatar.glb
new file mode 100644
index 0000000000000000000000000000000000000000..34c1a8cf274d0ed62b2bc22b51d573f6bafc1728
Binary files /dev/null and b/src/assets/avatars/BotJim_Avatar.glb differ
diff --git a/src/assets/avatars/BotJim_Avatar_Unlit.glb b/src/assets/avatars/BotJim_Avatar_Unlit.glb
new file mode 100644
index 0000000000000000000000000000000000000000..534356f80deb17b8808bc778db2db048811baf6a
Binary files /dev/null and b/src/assets/avatars/BotJim_Avatar_Unlit.glb differ
diff --git a/src/assets/avatars/BotKev_Avatar.glb b/src/assets/avatars/BotKev_Avatar.glb
new file mode 100644
index 0000000000000000000000000000000000000000..a20a54bcc42926a79b623e360a4ed9ddb2380695
Binary files /dev/null and b/src/assets/avatars/BotKev_Avatar.glb differ
diff --git a/src/assets/avatars/BotKev_Avatar_Unlit.glb b/src/assets/avatars/BotKev_Avatar_Unlit.glb
new file mode 100644
index 0000000000000000000000000000000000000000..d70196b7a3f83f25445cef27cf0fbc7493805cd2
Binary files /dev/null and b/src/assets/avatars/BotKev_Avatar_Unlit.glb differ
diff --git a/src/assets/avatars/BotPinky_Avatar.glb b/src/assets/avatars/BotPinky_Avatar.glb
index b41c3b4cadc810fddad7f13e15dcdf353f60a4df..da14ccd6ada339e7d28c1dfcd636a0810d45907c 100644
Binary files a/src/assets/avatars/BotPinky_Avatar.glb and b/src/assets/avatars/BotPinky_Avatar.glb differ
diff --git a/src/assets/avatars/BotPinky_Avatar_Unlit.glb b/src/assets/avatars/BotPinky_Avatar_Unlit.glb
index 4b4cc3d36a5e05c7f2f84a4ac45a10153299e404..4029c8c6feb3dfe137d932ff0e7eb9223c60b6d1 100644
Binary files a/src/assets/avatars/BotPinky_Avatar_Unlit.glb and b/src/assets/avatars/BotPinky_Avatar_Unlit.glb differ
diff --git a/src/assets/avatars/BotRobert_Avatar.glb b/src/assets/avatars/BotRobert_Avatar.glb
index 8cb2a57c63234639c0913717f2e13610e4ecbb21..68d28e5a19616eae6e5e5c8694182efe02643c65 100644
Binary files a/src/assets/avatars/BotRobert_Avatar.glb and b/src/assets/avatars/BotRobert_Avatar.glb differ
diff --git a/src/assets/avatars/BotRobert_Avatar_Unlit.glb b/src/assets/avatars/BotRobert_Avatar_Unlit.glb
index e457f49cf3a5f5ad3e48399ec4a91b405e5bb598..505eae50b5604bdbe3a7076421dabd1847e561f1 100644
Binary files a/src/assets/avatars/BotRobert_Avatar_Unlit.glb and b/src/assets/avatars/BotRobert_Avatar_Unlit.glb differ
diff --git a/src/assets/avatars/BotWoody_Avatar.glb b/src/assets/avatars/BotWoody_Avatar.glb
new file mode 100644
index 0000000000000000000000000000000000000000..0a205ee9311b5c73f96f5fdf562970bd362b1a21
Binary files /dev/null and b/src/assets/avatars/BotWoody_Avatar.glb differ
diff --git a/src/assets/avatars/BotWoody_Avatar_Unlit.glb b/src/assets/avatars/BotWoody_Avatar_Unlit.glb
new file mode 100644
index 0000000000000000000000000000000000000000..bd330d47f269ccaae436fbb3a33aa85b51eee6fd
Binary files /dev/null and b/src/assets/avatars/BotWoody_Avatar_Unlit.glb differ
diff --git a/src/assets/avatars/avatars.json b/src/assets/avatars/avatars.json
index 04642a1278ad0ee48f6aba5d5621d19eb2f5e906..8f04c546fbe55d90507ab92ee2e3e599144d7d29 100644
--- a/src/assets/avatars/avatars.json
+++ b/src/assets/avatars/avatars.json
@@ -7,6 +7,13 @@
"high": "BotDefault_Avatar.glb"
}
},
+ {
+ "id": "botbobo",
+ "models": {
+ "low": "BotBobo_Avatar_Unlit.glb",
+ "high": "BotBobo_Avatar.glb"
+ }
+ },
{
"id": "botdom",
"models": {
@@ -21,6 +28,20 @@
"high": "BotGreg_Avatar.glb"
}
},
+ {
+ "id": "botguest",
+ "models": {
+ "low": "BotGuest_Avatar_Unlit.glb",
+ "high": "BotGuest_Avatar.glb"
+ }
+ },
+ {
+ "id": "botjim",
+ "models": {
+ "low": "BotJim_Avatar_Unlit.glb",
+ "high": "BotJim_Avatar.glb"
+ }
+ },
{
"id": "botpinky",
"models": {
@@ -34,6 +55,13 @@
"low": "BotRobert_Avatar_Unlit.glb",
"high": "BotRobert_Avatar.glb"
}
+ },
+ {
+ "id": "botwoody",
+ "models": {
+ "low": "BotWoody_Avatar_Unlit.glb",
+ "high": "BotWoody_Avatar.glb"
+ }
}
]
}
diff --git a/src/react-components/avatar-selector.js b/src/react-components/avatar-selector.js
index 72360e9822feafd1c1fddd5ce98a78be4aaad072..a32aae07fde7f4e8a80c3e2288a03cc6351757f9 100644
--- a/src/react-components/avatar-selector.js
+++ b/src/react-components/avatar-selector.js
@@ -36,7 +36,6 @@ class AvatarSelector extends Component {
}
render () {
- console.log(this.props.avatar);
const avatarAssets = this.props.avatars.map(avatar => (
<a-progressive-asset
id={avatar.id}
diff --git a/src/room.html b/src/room.html
index 0bc4d32f480927adc71b3d6fee8f06ed1891a60b..8e96ca98f5f3e502914910e4136f9ba242b150f7 100644
--- a/src/room.html
+++ b/src/room.html
@@ -24,13 +24,69 @@
<a-assets>
<a-progressive-asset
- id="bot-skinned-mesh"
+ id="botdefault"
response-type="arraybuffer"
src="./assets/avatars/BotDefault_Avatar_Unlit.glb"
high-src="./assets/avatars/BotDefault_Avatar.glb"
low-src="./assets/avatars/BotDefault_Avatar_Unlit.glb"
></a-progressive-asset>
- <a-asset-item id="bot-dom-mesh" response-type="arraybuffer" src="./assets/avatars/BotDom_Avatar.glb"></a-asset-item>
+ <a-progressive-asset
+ id="botbobo"
+ response-type="arraybuffer"
+ src="./assets/avatars/BotBobo_Avatar_Unlit.glb"
+ high-src="./assets/avatars/BotBobo_Avatar.glb"
+ low-src="./assets/avatars/BotBobo_Avatar_Unlit.glb"
+ ></a-progressive-asset>
+ <a-progressive-asset
+ id="botdom"
+ response-type="arraybuffer"
+ src="./assets/avatars/BotDom_Avatar_Unlit.glb"
+ high-src="./assets/avatars/BotDom_Avatar.glb"
+ low-src="./assets/avatars/BotDom_Avatar_Unlit.glb"
+ ></a-progressive-asset>
+ <a-progressive-asset
+ id="botgreg"
+ response-type="arraybuffer"
+ src="./assets/avatars/BotGreg_Avatar_Unlit.glb"
+ high-src="./assets/avatars/BotGreg_Avatar.glb"
+ low-src="./assets/avatars/BotGreg_Avatar_Unlit.glb"
+ ></a-progressive-asset>
+ <a-progressive-asset
+ id="botguest"
+ response-type="arraybuffer"
+ src="./assets/avatars/BotGuest_Avatar_Unlit.glb"
+ high-src="./assets/avatars/BotGuest_Avatar.glb"
+ low-src="./assets/avatars/BotGuest_Avatar_Unlit.glb"
+ ></a-progressive-asset>
+ <a-progressive-asset
+ id="botjim"
+ response-type="arraybuffer"
+ src="./assets/avatars/BotJim_Avatar_Unlit.glb"
+ high-src="./assets/avatars/BotJim_Avatar.glb"
+ low-src="./assets/avatars/BotJim_Avatar_Unlit.glb"
+ ></a-progressive-asset>
+ <a-progressive-asset
+ id="botpinky"
+ response-type="arraybuffer"
+ src="./assets/avatars/BotRobert_Avatar_Unlit.glb"
+ high-src="./assets/avatars/BotRobert_Avatar.glb"
+ low-src="./assets/avatars/BotRobert_Avatar_Unlit.glb"
+ ></a-progressive-asset>
+ <a-progressive-asset
+ id="botrobert"
+ response-type="arraybuffer"
+ src="./assets/avatars/BotRobert_Avatar_Unlit.glb"
+ high-src="./assets/avatars/BotRobert_Avatar.glb"
+ low-src="./assets/avatars/BotRobert_Avatar_Unlit.glb"
+ ></a-progressive-asset>
+ <a-progressive-asset
+ id="botwoody"
+ response-type="arraybuffer"
+ src="./assets/avatars/BotWoody_Avatar_Unlit.glb"
+ high-src="./assets/avatars/BotWoody_Avatar.glb"
+ low-src="./assets/avatars/BotWoody_Avatar_Unlit.glb"
+ ></a-progressive-asset>
+
<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>
@@ -96,7 +152,7 @@
<a-entity
gltf-model="#interactable-duck"
scale="2 2 2"
- class="collidable"
+ class="collidable"
super-networked-interactable="counter: #counter; mass: 5;"
body="type: dynamic; mass: 5; shape: box;"
grabbable
@@ -120,13 +176,13 @@
<!-- Interactables -->
<a-entity id="counter" networked-counter="max: 3; ttl: 120"></a-entity>
- <a-entity
+ <a-entity
gltf-model="#interactable-duck"
scale="2 2 2"
- class="collidable"
- class="collidable"
- super-spawner="template: #interactable-template;"
- position="2.5 1.2 0"
+ class="collidable"
+ class="collidable"
+ super-spawner="template: #interactable-template;"
+ position="2.5 1.2 0"
body="mass: 0; type: static; shape: box;"
></a-entity>
@@ -136,7 +192,7 @@
radius=0.02
static-body="shape: sphere;"
mixin="super-hands"
- ></a-sphere>
+ ></a-sphere>
<!-- Player Rig -->
@@ -185,7 +241,7 @@
<a-gltf-entity class="model" inflate="true">
<template data-selector=".RootScene">
<a-entity
- ik-controller
+ ik-controller
animated-robot-hands
animation-mixer
></a-entity>
@@ -288,23 +344,23 @@
xr="ar: false"
></a-entity>
- <a-cylinder
- position="0 0.45 0"
- material="visible: false"
- height="1" radius="3.1"
- segments-radial="12"
- static-body
+ <a-cylinder
+ position="0 0.45 0"
+ material="visible: false"
+ height="1" radius="3.1"
+ segments-radial="12"
+ static-body
class="collidable"
></a-cylinder>
- <a-plane
- material="visible: false"
- rotation="-90 0 0"
- height="35"
- width="35"
- static-body
+ <a-plane
+ material="visible: false"
+ rotation="-90 0 0"
+ height="35"
+ width="35"
+ static-body
class="collidable">
- </a-plane>
+ </a-plane>
</a-scene>
<div id="ui-root" class="ui"></div>
diff --git a/src/room.js b/src/room.js
index 5385909ee12d964a70b2d1cf3205f3e8e8a28b4b..386961a20fb0d7e554b626aa313b1e4a0c0e593e 100644
--- a/src/room.js
+++ b/src/room.js
@@ -133,7 +133,7 @@ async function exitScene() {
function applyProfile(playerRig) {
playerRig.setAttribute("player-info", {
displayName: store.state.profile.display_name,
- avatar: store.state.profile.avatar || "#bot-skinned-mesh"
+ avatar: '#' + (store.state.profile.avatar || "botdefault")
});
}