Skip to content
Snippets Groups Projects
Commit 858b0135 authored by Robert Long's avatar Robert Long
Browse files

Fix html formatting

parent afaa407f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 123 additions and 43 deletions
src/hub.html
+ 123
− 43
View file @ 858b0135
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
<meta http-equiv="origin-trial" data-feature="WebVR (For Chrome M62+)" data-expires="<%= ORIGIN_TRIAL_EXPIRES %>" content="<%= ORIGIN_TRIAL_TOKEN %>"> <meta http-equiv="origin-trial" data-feature="WebVR (For Chrome M62+)" data-expires="<%= ORIGIN_TRIAL_EXPIRES %>" content="<%= ORIGIN_TRIAL_TOKEN %>">
<% if(NODE_ENV === "production") { %> <% if(NODE_ENV === "production") { %>
<script src="https://cdn.rawgit.com/brianpeiris/aframe/845825ae694449524c185c44a314d361eead4680/dist/aframe-master.min.js"></script> <script src="https://cdn.rawgit.com/brianpeiris/aframe/845825ae694449524c185c44a314d361eead4680/dist/aframe-master.min.js"></script>
<% } else { %> <% } else { %>
<script src="https://cdn.rawgit.com/brianpeiris/aframe/845825ae694449524c185c44a314d361eead4680/dist/aframe-master.js"></script> <script src="https://cdn.rawgit.com/brianpeiris/aframe/845825ae694449524c185c44a314d361eead4680/dist/aframe-master.js"></script>
<% } %> <% } %>
</head> </head>
<body data-html-prefix="<%= HTML_PREFIX %>"> <body data-html-prefix="<%= HTML_PREFIX %>">
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
> >
<a-assets> <a-assets>
<img id="unmuted" src="./assets/hud/unmuted.png"> <img id="unmuted" src="./assets/hud/unmuted.png" >
<img id="muted" src="./assets/hud/muted.png"> <img id="muted" src="./assets/hud/muted.png" >
<img id="avatar" src="./assets/hud/avatar.jpg"> <img id="avatar" src="./assets/hud/avatar.jpg" >
<a-asset-item id="botdefault" response-type="arraybuffer" src="https://asset-bundles-dev.reticulum.io/bots/BotDefault_Avatar-9f71f8ff22.gltf"></a-asset-item> <a-asset-item id="botdefault" response-type="arraybuffer" src="https://asset-bundles-dev.reticulum.io/bots/BotDefault_Avatar-9f71f8ff22.gltf"></a-asset-item>
<a-asset-item id="botbobo" response-type="arraybuffer" src="https://asset-bundles-dev.reticulum.io/bots/BotBobo_Avatar-f9740a010b.gltf"></a-asset-item> <a-asset-item id="botbobo" response-type="arraybuffer" src="https://asset-bundles-dev.reticulum.io/bots/BotBobo_Avatar-f9740a010b.gltf"></a-asset-item>
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
<a-asset-item id="botrobert" response-type="arraybuffer" src="https://asset-bundles-dev.reticulum.io/bots/BotRobert_Avatar-e9554880f3.gltf"></a-asset-item> <a-asset-item id="botrobert" response-type="arraybuffer" src="https://asset-bundles-dev.reticulum.io/bots/BotRobert_Avatar-e9554880f3.gltf"></a-asset-item>
<a-asset-item id="botwoody" response-type="arraybuffer" src="https://asset-bundles-dev.reticulum.io/bots/BotWoody_Avatar-0140485a23.gltf"></a-asset-item> <a-asset-item id="botwoody" response-type="arraybuffer" src="https://asset-bundles-dev.reticulum.io/bots/BotWoody_Avatar-0140485a23.gltf"></a-asset-item>
<a-asset-item id="watch-model" response-type="arraybuffer" src="./assets/hud/watch.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="interactable-duck" response-type="arraybuffer" src="./assets/interactables/duck/DuckyMesh.glb"></a-asset-item> <a-asset-item id="interactable-duck" response-type="arraybuffer" src="./assets/interactables/duck/DuckyMesh.glb"></a-asset-item>
<img id="water-normal-map" src="./assets/waternormals.jpg"> <img id="water-normal-map" src="./assets/waternormals.jpg"></a-asset-item>
</a-asset-item>
<!-- Templates --> <!-- Templates -->
...@@ -67,9 +67,15 @@ ...@@ -67,9 +67,15 @@
</template> </template>
<template data-selector=".Neck"> <template data-selector=".Neck">
<a-entity> <a-entity>
<a-entity class="nametag" billboard text="side: double; align: center; color: #ddd" position="0 1 0" scale="6 6 6"></a-entity> <a-entity
</a-entity> class="nametag"
billboard
text="side: double; align: center; color: #ddd"
position="0 1 0"
scale="6 6 6"
></a-entity>
</a-entity>
</template> </template>
<template data-selector=".Chest"> <template data-selector=".Chest">
...@@ -98,34 +104,75 @@ ...@@ -98,34 +104,75 @@
</template> </template>
<template id="interactable-template"> <template id="interactable-template">
<a-entity gltf-model-plus="src: #interactable-duck" scale="2 2 2" class="interactable" super-networked-interactable="counter: #counter; mass: 5;" <a-entity
body="type: dynamic; mass: 5; shape: box;" grabbable stretchable="useWorldPosition: true;"></a-entity> gltf-model-plus="src: #interactable-duck"
scale="2 2 2"
class="interactable"
super-networked-interactable="counter: #counter; mass: 5;"
body="type: dynamic; mass: 5; shape: box;"
grabbable
stretchable="useWorldPosition: true;"
></a-entity>
</template> </template>
<a-mixin id="super-hands" super-hands="colliderEvent: collisions; colliderEventProperty: els; <a-mixin id="super-hands"
super-hands="colliderEvent: collisions; colliderEventProperty: els;
colliderEndEvent: collisions; colliderEndEventProperty: clearedEls; colliderEndEvent: collisions; colliderEndEventProperty: clearedEls;
grabStartButtons: action_grab; grabEndButtons: action_release; grabStartButtons: action_grab; grabEndButtons: action_release;
stretchStartButtons: action_grab; stretchEndButtons: action_release; stretchStartButtons: action_grab; stretchEndButtons: action_release;
dragDropStartButtons: action_grab; dragDropEndButtons: action_release; dragDropStartButtons: action_grab; dragDropEndButtons: action_release;
" collision-filter="collisionForces: false" physics-collider></a-mixin> "
collision-filter="collisionForces: false"
physics-collider
></a-mixin>
</a-assets> </a-assets>
<!-- Interactables --> <!-- Interactables -->
<a-entity id="counter" networked-counter="max: 3; ttl: 120"></a-entity> <a-entity id="counter" networked-counter="max: 3; ttl: 120"></a-entity>
<a-entity gltf-model-plus="src: #interactable-duck" scale="2 2 2" class="interactable" super-spawner="template: #interactable-template;" <a-entity
position="2.5 1.2 0" body="mass: 0; type: static; shape: box;"></a-entity> gltf-model-plus="src: #interactable-duck"
scale="2 2 2"
<a-entity id="super-cursor" super-cursor="cursor: #3d-cursor; camera: #player-camera;" raycaster="objects: .collidable, .interactable; far: 10;"> class="interactable"
<a-sphere id="3d-cursor" radius=0.02 static-body="shape: sphere;" mixin="super-hands" segments-height="9" segments-width="9"></a-sphere> super-spawner="template: #interactable-template;"
position="2.5 1.2 0"
body="mass: 0; type: static; shape: box;"
></a-entity>
<a-entity
id="super-cursor"
super-cursor="cursor: #3d-cursor; camera: #player-camera;"
raycaster="objects: .collidable, .interactable; far: 10;"
>
<a-sphere
id="3d-cursor"
radius=0.02
static-body="shape: sphere;"
mixin="super-hands"
segments-height="9"
segments-width="9"
></a-sphere>
</a-entity> </a-entity>
<!-- Player Rig --> <!-- Player Rig -->
<a-entity id="player-rig" networked="template: #remote-avatar-template; attachLocalTemplate: false;" spawn-controller="radius: 4;" <a-entity
wasd-to-analog2d character-controller="pivot: #player-camera" ik-root app-mode-toggle-playing__character-controller="mode: hud; invert: true;" id="player-rig"
app-mode-toggle-playing__wasd-to-analog2d="mode: hud; invert: true;" player-info> networked="template: #remote-avatar-template; attachLocalTemplate: false;"
spawn-controller="radius: 4;"
wasd-to-analog2d
character-controller="pivot: #player-camera"
ik-root
app-mode-toggle-playing__character-controller="mode: hud; invert: true;"
app-mode-toggle-playing__wasd-to-analog2d="mode: hud; invert: true;"
player-info
>
<a-entity id="player-hud" hud-controller="head: #player-camera;" vr-mode-toggle-visibility vr-mode-toggle-playing__hud-controller> <a-entity
id="player-hud"
hud-controller="head: #player-camera;"
vr-mode-toggle-visibility
vr-mode-toggle-playing__hud-controller
>
<a-entity in-world-hud="haptic:#player-right-controller;raycaster:#player-right-controller;" rotation="-39 0 0"> <a-entity in-world-hud="haptic:#player-right-controller;raycaster:#player-right-controller;" rotation="-39 0 0">
<a-box geometry="height:0.13;width:0.6;depth:0.001" material="depthTest:false; color:#000000;opacity:0.35" class="hud bg"></a-box> <a-box geometry="height:0.13;width:0.6;depth:0.001" material="depthTest:false; color:#000000;opacity:0.35" class="hud bg"></a-box>
<a-image src="#unmuted" scale="-0.1 0.1 0.1" position="-0.2 0 0.001" class="hud mic" material="alphaTest:0.1;depthTest:false;"></a-image> <a-image src="#unmuted" scale="-0.1 0.1 0.1" position="-0.2 0 0.001" class="hud mic" material="alphaTest:0.1;depthTest:false;"></a-image>
...@@ -173,12 +220,16 @@ ...@@ -173,12 +220,16 @@
<a-entity gltf-model-plus="inflate: true;" class="model"> <a-entity gltf-model-plus="inflate: true;" class="model">
<template data-selector=".RootScene"> <template data-selector=".RootScene">
<a-entity ik-controller animated-robot-hands animation-mixer></a-entity> <a-entity
ik-controller
animated-robot-hands
animation-mixer
></a-entity>
</template> </template>
<template data-selector=".Neck"> <template data-selector=".Neck">
<a-entity> <a-entity>
<a-entity class="nametag" visible="false" text></a-entity> <a-entity class="nametag" visible="false" text ></a-entity>
</a-entity> </a-entity>
</template> </template>
...@@ -216,27 +267,56 @@ ...@@ -216,27 +267,56 @@
</a-entity> </a-entity>
</template> </template>
</a-entity>
</a-entity> </a-entity>
</a-entity>
<!-- Lights --> <!-- Lights -->
<a-entity hide-when-quality="low" light="type: directional; color: #F9FFCE; intensity: 0.6" position="0.002 5.231 -15.3"></a-entity> <a-entity
hide-when-quality="low"
<!-- Environment --> light="type: directional; color: #F9FFCE; intensity: 0.6"
<a-entity id="environment-root" position="0 0 0" /> position="0.002 5.231 -15.3"
></a-entity>
<a-entity id="skybox" id="skybox" scale="8000 8000 8000" skybox="azimuth:0.280; inclination:0.440" light="type: ambient; color: #FFF"
layers="reflection:true" xr="ar: false"></a-entity> <!-- Environment -->
<a-entity id="environment-root" position="0 0 0"/>
<a-entity id="water" water="forceMobile: true; normalMap:#water-normal-map" rotation="-90 0 0" position="0 -88.358 -332.424"
xr="ar: false"></a-entity> <a-entity id="skybox"
id="skybox"
<a-cylinder position="0 0.45 0" material="visible: false" height="1" radius="3.1" segments-radial="12" static-body class="collidable"></a-cylinder> scale="8000 8000 8000"
skybox="azimuth:0.280; inclination:0.440"
<a-plane material="visible: false" rotation="-90 0 0" height="35" width="35" static-body class="collidable"></a-plane> light="type: ambient; color: #FFF"
layers="reflection:true"
xr="ar: false"
></a-entity>
<a-entity
id="water"
water="forceMobile: true; normalMap:#water-normal-map"
rotation="-90 0 0"
position="0 -88.358 -332.424"
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
class="collidable"
></a-cylinder>
<a-plane
material="visible: false"
rotation="-90 0 0"
height="35"
width="35"
static-body
class="collidable"
></a-plane>
</a-scene> </a-scene>
<div id="ui-root"></div> <div id="ui-root"></div>
</body> </body>
</html> </html>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment