From 858b0135eea8f46050b865630c1b5eccf69a7c08 Mon Sep 17 00:00:00 2001
From: Robert Long <robert@robertlong.me>
Date: Fri, 6 Apr 2018 11:09:32 -0700
Subject: [PATCH] Fix html formatting
---
src/hub.html | 166 ++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 123 insertions(+), 43 deletions(-)
diff --git a/src/hub.html b/src/hub.html
index 63518bec0..5ff15546d 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -9,9 +9,9 @@
<meta http-equiv="origin-trial" data-feature="WebVR (For Chrome M62+)" data-expires="<%= ORIGIN_TRIAL_EXPIRES %>" content="<%= ORIGIN_TRIAL_TOKEN %>">
<% if(NODE_ENV === "production") { %>
<script src="https://cdn.rawgit.com/brianpeiris/aframe/845825ae694449524c185c44a314d361eead4680/dist/aframe-master.min.js"></script>
- <% } else { %>
- <script src="https://cdn.rawgit.com/brianpeiris/aframe/845825ae694449524c185c44a314d361eead4680/dist/aframe-master.js"></script>
- <% } %>
+ <% } else { %>
+ <script src="https://cdn.rawgit.com/brianpeiris/aframe/845825ae694449524c185c44a314d361eead4680/dist/aframe-master.js"></script>
+ <% } %>
</head>
<body data-html-prefix="<%= HTML_PREFIX %>">
@@ -27,9 +27,9 @@
>
<a-assets>
- <img id="unmuted" src="./assets/hud/unmuted.png">
- <img id="muted" src="./assets/hud/muted.png">
- <img id="avatar" src="./assets/hud/avatar.jpg">
+ <img id="unmuted" src="./assets/hud/unmuted.png" >
+ <img id="muted" src="./assets/hud/muted.png" >
+ <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="botbobo" response-type="arraybuffer" src="https://asset-bundles-dev.reticulum.io/bots/BotBobo_Avatar-f9740a010b.gltf"></a-asset-item>
@@ -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="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="interactable-duck" response-type="arraybuffer" src="./assets/interactables/duck/DuckyMesh.glb"></a-asset-item>
- <img id="water-normal-map" src="./assets/waternormals.jpg">
- </a-asset-item>
+ <img id="water-normal-map" src="./assets/waternormals.jpg"></a-asset-item>
<!-- Templates -->
@@ -67,9 +67,15 @@
</template>
<template data-selector=".Neck">
- <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>
+ <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 data-selector=".Chest">
@@ -98,34 +104,75 @@
</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;"
- body="type: dynamic; mass: 5; shape: box;" grabbable stretchable="useWorldPosition: true;"></a-entity>
+ <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>
- <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;
grabStartButtons: action_grab; grabEndButtons: action_release;
stretchStartButtons: action_grab; stretchEndButtons: 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>
<!-- Interactables -->
<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;"
- 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
+ gltf-model-plus="src: #interactable-duck"
+ scale="2 2 2"
+ class="interactable"
+ 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>
<!-- Player Rig -->
- <a-entity id="player-rig" 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-rig"
+ 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-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>
@@ -173,12 +220,16 @@
<a-entity gltf-model-plus="inflate: true;" class="model">
<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 data-selector=".Neck">
<a-entity>
- <a-entity class="nametag" visible="false" text></a-entity>
+ <a-entity class="nametag" visible="false" text ></a-entity>
</a-entity>
</template>
@@ -216,27 +267,56 @@
</a-entity>
</template>
- </a-entity>
</a-entity>
+ </a-entity>
- <!-- Lights -->
- <a-entity hide-when-quality="low" light="type: directional; color: #F9FFCE; intensity: 0.6" position="0.002 5.231 -15.3"></a-entity>
-
- <!-- Environment -->
- <a-entity id="environment-root" position="0 0 0" />
-
- <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>
-
- <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>
+ <!-- Lights -->
+ <a-entity
+ hide-when-quality="low"
+ light="type: directional; color: #F9FFCE; intensity: 0.6"
+ position="0.002 5.231 -15.3"
+ ></a-entity>
+
+ <!-- Environment -->
+ <a-entity id="environment-root" position="0 0 0"/>
+
+ <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>
+
+ <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>
<div id="ui-root"></div>
</body>
-</html>
\ No newline at end of file
+</html>
--
GitLab