Skip to content

Commit f878d51

Browse files
wmurphyrdwmurphyrd
committed
remove state mixins from machinima tests
1 parent b32a39c commit f878d51

File tree

11 files changed

+68
-52
lines changed

11 files changed

+68
-52
lines changed

‎machinima_tests/scenes/drop-targets.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
hoverable grabbable stretchable draggable
1414
droppable="acceptEvent: drag-drop-accepted; rejectEvent: drag-drop-rejected"
1515
event-set__accept="_event: drag-drop-accepted; geometry.primitive: sphere; geometry.radius: 0.25"
16-
event-set__reject="_event: drag-drop-rejected; geometry.primitive: tetrahedron; geometry.radius: 0.25"></a-mixin>
16+
event-set__reject="_event: drag-drop-rejected; geometry.primitive: tetrahedron; geometry.radius: 0.25"
17+
event-set__hoveron="_event: hover-start; material.opacity: 0.7; transparent: true"
18+
event-set__hoveroff="_event: hover-end; material.opacity: 1; transparent: false"
19+
event-set__dragon="_event: dragover-start; wireframe: true"
20+
event-set__dragoff="_event: dragover-end; wireframe: false"></a-mixin>
1721
<a-mixin id="red" material="color: red" droppable="accepts: [mixin~='red']"></a-mixin>
1822
<a-mixin id="green" material="color: green" droppable="accepts: [mixin~='green']"></a-mixin>
1923
<a-mixin id="blue" material="color: blue" droppable="accepts: [mixin~='blue']"></a-mixin>
20-
<a-mixin id="cube-hovered" material="opacity: 0.7; transparent: true">
21-
</a-mixin>
22-
<a-mixin id="cube-dragover" material="wireframe: true;"></a-mixin>
2324
</a-assets>
2425
<a-entity id="lhand" hand-controls="left" mixin="controller"></a-entity>
2526
<a-entity id="rhand" hand-controls="right" mixin="controller"></a-entity>

‎machinima_tests/scenes/hands-laser.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
sphere-collider="objects: .cube, a-link"></a-mixin>
1717
<a-mixin id="cube" geometry="primitive: box; width: 0.5; height: 0.5; depth: 0.5"
1818
hoverable grabbable
19-
event-set="_event: drag-drop; geometry.primitive: sphere; geometry.radius: 0.25"></a-mixin>
20-
<a-mixin id="cube-hovered" material="opacity: 0.7; transparent: true">
21-
<a-mixin id="cube-grabbed" material="opacity: 0.7; transparent: true">
22-
</a-mixin>
23-
<a-mixin id="cube-dragover" material="wireframe: true;"></a-mixin>
19+
event-set="_event: drag-drop; geometry.primitive: sphere; geometry.radius: 0.25"
20+
event-set__hoveron="_event: hover-start; material.opacity: 0.7; transparent: true"
21+
event-set__hoveroff="_event: hover-end; material.opacity: 1; transparent: false"
22+
event-set__grabon="_event: grab-start; material.opacity: 0.7; transparent: true"
23+
event-set__graboff="_event: grab-end; material.opacity: 1; transparent: false"
24+
event-set__dragon="_event: dragover-start; wireframe: true"
25+
event-set__dragoff="_event: dragover-end; wireframe: false"></a-mixin>
2426
</a-assets>
2527
<!-- <a-entity id="lhand" laser-controls="hand: left" mixin="controller"></a-entity> -->
2628
<a-entity id="rhand" laser-controls="hand: right" mixin="controller"></a-entity>

‎machinima_tests/scenes/hands-nostretch.html‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66
<a-scene avatar-recorder="spectatorPlay: true; spectatorPosition: 0 1.6 2">
77
<a-assets>
88
<!-- <img id="grid" src="grid.png"/> -->
9-
10-
<a-mixin id="controller" super-hands
9+
10+
<a-mixin id="controller" super-hands
1111
sphere-collider="objects: .cube"></a-mixin>
1212
<a-mixin id="cube" geometry="primitive: box; width: 0.5; height: 0.5; depth: 0.5"
1313
hoverable grabbable draggable droppable
14-
event-set="_event: drag-drop; geometry.primitive: sphere; geometry.radius: 0.25"></a-mixin>
15-
<a-mixin id="cube-hovered" material="opacity: 0.7; transparent: true">
16-
</a-mixin>
17-
<a-mixin id="cube-dragover" material="wireframe: true;"></a-mixin>
14+
event-set="_event: drag-drop; geometry.primitive: sphere; geometry.radius: 0.25"
15+
event-set__hoveron="_event: hover-start; material.opacity: 0.7; transparent: true"
16+
event-set__hoveroff="_event: hover-end; material.opacity: 1; transparent: false"
17+
event-set__dragon="_event: dragover-start; wireframe: true"
18+
event-set__dragoff="_event: dragover-end; wireframe: false"></a-mixin>
1819
</a-assets>
1920
<a-entity id="lhand" hand-controls="left" mixin="controller"></a-entity>
2021
<a-entity id="rhand" hand-controls="right" mixin="controller"></a-entity>
@@ -28,4 +29,4 @@
2829
width="50" height="50"></a-plane>
2930
</a-scene>
3031
</body>
31-
</html>
32+
</html>

‎machinima_tests/scenes/hands.html‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66
<a-scene avatar-recorder="spectatorPlay: true; spectatorPosition: 0 1.6 2">
77
<a-assets>
88
<!-- <img id="grid" src="grid.png"/> -->
9-
10-
<a-mixin id="controller" super-hands
9+
10+
<a-mixin id="controller" super-hands
1111
sphere-collider="objects: .cube"></a-mixin>
1212
<a-mixin id="cube" geometry="primitive: box; width: 0.5; height: 0.5; depth: 0.5"
1313
hoverable grabbable stretchable draggable droppable
14-
event-set="_event: drag-drop; geometry.primitive: sphere; geometry.radius: 0.25"></a-mixin>
15-
<a-mixin id="cube-hovered" material="opacity: 0.7; transparent: true">
16-
</a-mixin>
17-
<a-mixin id="cube-dragover" material="wireframe: true;"></a-mixin>
14+
event-set="_event: drag-drop; geometry.primitive: sphere; geometry.radius: 0.25"
15+
event-set__hoveron="_event: hover-start; material.opacity: 0.7; transparent: true"
16+
event-set__hoveroff="_event: hover-end; material.opacity: 1; transparent: false"
17+
event-set__dragon="_event: dragover-start; wireframe: true"
18+
event-set__dragoff="_event: dragover-end; wireframe: false"></a-mixin>
1819
</a-assets>
1920
<a-entity id="lhand" hand-controls="left" mixin="controller"></a-entity>
2021
<a-entity id="rhand" hand-controls="right" mixin="controller"></a-entity>
@@ -28,4 +29,4 @@
2829
width="50" height="50"></a-plane>
2930
</a-scene>
3031
</body>
31-
</html>
32+
</html>

‎machinima_tests/scenes/locomotor.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
sphere-collider="objects: .cube"></a-mixin>
1212
<a-mixin id="cube" geometry="primitive: box; width: 0.5; height: 0.5; depth: 0.5"
1313
hoverable grabbable stretchable draggable droppable
14-
event-set="_event: drag-drop; geometry.primitive: sphere; geometry.radius: 0.25"></a-mixin>
15-
<a-mixin id="cube-hovered" material="opacity: 0.7; transparent: true">
16-
</a-mixin>
17-
<a-mixin id="cube-dragover" material="wireframe: true;"></a-mixin>
14+
event-set="_event: drag-drop; geometry.primitive: sphere; geometry.radius: 0.25"
15+
event-set__hoveron="_event: hover-start; material.opacity: 0.7; transparent: true"
16+
event-set__hoveroff="_event: hover-end; material.opacity: 1; transparent: false"
17+
event-set__dragon="_event: dragover-start; wireframe: true"
18+
event-set__dragoff="_event: dragover-end; wireframe: false"></a-mixin>
1819
</a-assets>
1920
<a-locomotor stretchable>
2021
<!--<a-entity camera="userHeight: 1.6" look-controls></a-entity>-->

‎machinima_tests/scenes/nested.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
sphere-collider="objects: .sp"></a-mixin>
1212
<a-mixin id="sp" geometry="primitive: sphere"
1313
material="wireframe: true; transparent: true; opacity: 0.7"
14-
hoverable grabbable stretchable draggable droppable></a-mixin>
15-
<a-mixin id="sp-hovered" material="wireframe: false;"></a-mixin>
14+
hoverable grabbable stretchable draggable droppable
15+
event-set__hoveron="_event: hover-start; wireframe: false"
16+
event-set__hoveroff="_event: hover-end; wireframe: true">
17+
</a-mixin>
1618
</a-assets>
1719
<a-entity id="lhand" hand-controls="left" mixin="controller"></a-entity>
1820
<a-entity id="rhand" hand-controls="right" mixin="controller"></a-entity>

‎machinima_tests/scenes/overlapped.html‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,26 @@
66
<a-scene avatar-recorder="spectatorPlay: true; spectatorPosition: 0 1.6 2">
77
<a-assets>
88
<!-- <img id="grid" src="grid.png"/> -->
9-
10-
<a-mixin id="controller" super-hands
9+
10+
<a-mixin id="controller" super-hands
1111
sphere-collider="objects: .sp"></a-mixin>
1212
<a-mixin id="sp" geometry="primitive: sphere"
1313
material="wireframe: true; transparent: true; opacity: 0.7"
14-
hoverable grabbable stretchable draggable droppable></a-mixin>
15-
<a-mixin id="sp-hovered" material="wireframe: false;"></a-mixin>
14+
hoverable grabbable stretchable draggable droppable
15+
event-set__hoveron="_event: hover-start; wireframe: false"
16+
event-set__hoveroff="_event: hover-end; wireframe: true">
17+
</a-mixin>
1618
</a-assets>
1719
<a-entity id="lhand" hand-controls="left" mixin="controller"></a-entity>
1820
<a-entity id="rhand" hand-controls="right" mixin="controller"></a-entity>
19-
<a-entity id="outter" class="sp" mixin="sp" position="0 1 -1"
21+
<a-entity id="outter" class="sp" mixin="sp" position="0 1 -1"
2022
geometry="radius: 1" material="color: red"></a-entity>
21-
<a-entity id="middle" class="sp" mixin="sp" position="0 1 -1"
23+
<a-entity id="middle" class="sp" mixin="sp" position="0 1 -1"
2224
geometry="radius: 0.5" material="color: blue"></a-entity>
23-
<a-entity id="inner" class="sp" mixin="sp" position="0 1 -1"
25+
<a-entity id="inner" class="sp" mixin="sp" position="0 1 -1"
2426
geometry="radius: 0.1" material="color: yellow"></a-entity>
2527
<a-plane rotation="-90 0 0" color="#888"
2628
width="50" height="50"></a-plane>
2729
</a-scene>
2830
</body>
29-
</html>
31+
</html>

‎machinima_tests/scenes/physics-worker.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
<a-mixin id="cube" geometry="primitive: box; width: 0.5; height: 0.5; depth: 0.5"
1515
hoverable grabbable="usePhysics: only" stretchable draggable droppable
1616
dynamic-body
17-
event-set="_event: drag-drop; geometry.primitive: sphere; geometry.radius: 0.25"></a-mixin>
18-
<a-mixin id="cube-hovered" material="opacity: 0.7; transparent: true">
19-
</a-mixin>
20-
<a-mixin id="cube-dragover" material="wireframe: true;"></a-mixin>
17+
event-set="_event: drag-drop; geometry.primitive: sphere; geometry.radius: 0.25"
18+
event-set__hoveron="_event: hover-start; material.opacity: 0.7; transparent: true"
19+
event-set__hoveroff="_event: hover-end; material.opacity: 1; transparent: false"
20+
event-set__dragon="_event: dragover-start; wireframe: true"
21+
event-set__dragoff="_event: dragover-end; wireframe: false"></a-mixin>
2122
</a-assets>
2223
<a-entity id="lhand" hand-controls="left" mixin="controller"></a-entity>
2324
<a-entity id="rhand" hand-controls="right" mixin="controller"></a-entity>

‎machinima_tests/scenes/physics.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99

1010
<a-mixin id="controller" super-hands controller-loaded
1111
sphere-collider="objects: .dynamic"
12-
static-body="shape: sphere; sphereRadius: 0.02;"></a-mixin>
13-
<a-mixin id="sp-hovered" material="wireframe: false;"></a-mixin>
12+
static-body="shape: sphere; sphereRadius: 0.02;"
13+
event-set__hoveron="_event: hover-start; wireframe: false"
14+
event-set__hoveroff="_event: hover-end; wireframe: true">
15+
</a-mixin>
1416
</a-assets>
1517
<a-entity id="lhand" hand-controls="left" mixin="controller"></a-entity>
1618
<a-entity id="rhand" hand-controls="right" mixin="controller"></a-entity>

‎machinima_tests/scenes/progressive-hands.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
<a-assets>
88
<a-mixin id="cube" geometry="primitive: box; width: 0.5; height: 0.5; depth: 0.5"
99
hoverable grabbable stretchable draggable droppable
10-
event-set="_event: drag-drop; geometry.primitive: sphere; geometry.radius: 0.25"></a-mixin>
11-
<a-mixin id="cube-hovered" material="opacity: 0.7; transparent: true">
12-
</a-mixin>
13-
<a-mixin id="cube-dragover" material="wireframe: true;"></a-mixin>
10+
event-set="_event: drag-drop; geometry.primitive: sphere; geometry.radius: 0.25"
11+
event-set__hoveron="_event: hover-start; material.opacity: 0.7; transparent: true"
12+
event-set__hoveroff="_event: hover-end; material.opacity: 1; transparent: false"
13+
event-set__dragon="_event: dragover-start; wireframe: true"
14+
event-set__dragoff="_event: dragover-end; wireframe: false"></a-mixin>
1415
</a-assets>
1516
<a-entity progressive-controls="objects: .cube">
1617
<a-entity id="lhand" class="left-controller"></a-entity>

0 commit comments

Comments
 (0)