Skip to content

Commit

Permalink
fix(avatar): keep critical models in arena-core
Browse files Browse the repository at this point in the history
  • Loading branch information
mwfarb committed Apr 22, 2022
1 parent fd434d3 commit cb9dd47
Show file tree
Hide file tree
Showing 12 changed files with 48,550 additions and 14 deletions.
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
node_modules/
/node_modules
defaults.js
conf/
/conf

## parcel build
dist/
/dist
.parcel-cache

# private repos
models/
store
/models
/store

# arena test versions
*dev.*
Expand Down
14 changes: 7 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ <h3><img alt="CONIX Logo" class="title-logo" src="static/images/xr-logo-v7.png"/
</div>
<div class="form-floating mb-3">
<select aria-label="HeadModel" class="form-select mb-3" id="headModelPathSelect">
<option value="/store/models/avatars/robobit.glb">Robot</option>
<option value="/store/models/avatars/DamagedHelmet.glb">Damaged Helmet</option>
<option value="/store/models/avatars/Avocado.glb">Avocado</option>
<option value="/store/models/avatars/Duck.glb">Duck</option>
<option value="/store/models/avatars/suzanne.glb">Suzanne</option>
<option value="/media/models/avatars/robobit.glb">Robot</option>
<option value="/media/models/avatars/DamagedHelmet.glb">Damaged Helmet</option>
<option value="/media/models/avatars/Avocado.glb">Avocado</option>
<option value="/media/models/avatars/Duck.glb">Duck</option>
<option value="/media/models/avatars/suzanne.glb">Suzanne</option>
</select>
<label for="presenceSelect">Select Head Model</label>
</div>
Expand Down Expand Up @@ -151,8 +151,8 @@ <h3><img alt="CONIX Logo" class="title-logo" src="static/images/xr-logo-v7.png"/
ar-hit-test="enabled: true">
<a-assets>
<!-- Vive controller 3d model -->
<a-asset-item id="viveControl-obj" src="store/models/vr_controller_vive.obj"></a-asset-item>
<a-asset-item id="viveControl-mtl" src="store/models/vr_controller_vive.mtl"></a-asset-item>
<a-asset-item id="viveControl-obj" src="media/models/hands/vr_controller_vive.obj"></a-asset-item>
<a-asset-item id="viveControl-mtl" src="media/models/hands/vr_controller_vive.mtl"></a-asset-item>
</a-assets>

<a-entity id="sceneRoot">
Expand Down
Binary file added media/models/avatars/Avocado.glb
Binary file not shown.
Binary file added media/models/avatars/DamagedHelmet.glb
Binary file not shown.
Binary file added media/models/avatars/Duck.glb
Binary file not shown.
Binary file added media/models/avatars/robobit.glb
Binary file not shown.
Binary file added media/models/avatars/suzanne.glb
Binary file not shown.
215 changes: 215 additions & 0 deletions media/models/hands/valve_index_left.gltf

Large diffs are not rendered by default.

215 changes: 215 additions & 0 deletions media/models/hands/valve_index_right.gltf

Large diffs are not rendered by default.

86 changes: 86 additions & 0 deletions media/models/hands/vr_controller_vive.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
# File Created: 29.06.2016 17:16:48

newmtl body
Ns 10.0000
Ni 1.5000
d 1.0000
Tr 0.0000
Tf 1.0000 1.0000 1.0000
illum 2
Ka 0.5882 0.5882 0.5882
Kd 0.5882 0.5882 0.5882
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000

newmtl touchpad
Ns 10.0000
Ni 1.5000
d 1.0000
Tr 0.0000
Tf 1.0000 1.0000 1.0000
illum 2
Ka 0.5882 0.5882 0.5882
Kd 0.5882 0.5882 0.5882
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000

newmtl trigger
Ns 10.0000
Ni 1.5000
d 1.0000
Tr 0.0000
Tf 1.0000 1.0000 1.0000
illum 2
Ka 0.5882 0.5882 0.5882
Kd 0.5882 0.5882 0.5882
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000

newmtl leftgrip
Ns 10.0000
Ni 1.5000
d 1.0000
Tr 0.0000
Tf 1.0000 1.0000 1.0000
illum 2
Ka 0.5880 0.5880 0.5880
Kd 0.5880 0.5880 0.5880
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000

newmtl rightgrip
Ns 10.0000
Ni 1.5000
d 1.0000
Tr 0.0000
Tf 1.0000 1.0000 1.0000
illum 2
Ka 0.5882 0.5882 0.5882
Kd 0.5882 0.5882 0.5882
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000

newmtl menubutton
Ns 10.0000
Ni 1.5000
d 1.0000
Tr 0.0000
Tf 1.0000 1.0000 1.0000
illum 2
Ka 0.5882 0.5882 0.5882
Kd 0.5882 0.5882 0.5882
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000

newmtl systembutton
Ns 10.0000
Ni 1.5000
d 1.0000
Tr 0.0000
Tf 1.0000 1.0000 1.0000
illum 2
Ka 0.5882 0.5882 0.5882
Kd 0.5882 0.5882 0.5882
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
Loading

0 comments on commit cb9dd47

Please sign in to comment.