juni/junisaber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apply cursor to hand entity directly

Browse Source
This commit is contained in:
Kevin Ngo
2018-09-20 17:43:12 -07:00
parent 164010d7fd
commit eb234e7999
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/saber-controls.js
View File

@@ -79,7 +79,7 @@ AFRAME.registerComponent('saber-controls', {
this.controllerConnected = true;
this.controllerType = evt.detail.name;
el.querySelector('.raycaster').setAttribute('cursor', controllerConfig.cursor || {});
el.setAttribute('cursor', controllerConfig.cursor || {});
},
config: {

17
src/index.html
View File

@@ -62,24 +62,21 @@
{% macro saber (hand, otherHand, color) %}
<a-entity id="{{ hand }}Hand"
mixin="raycaster"
bind__hand-swapper="enabled: menu.active && activeHand === '{{ otherHand }}'"
bind__pauser="enabled: !menu.active"
bind__raycaster="enabled: menu.active && activeHand === '{{ hand }}'; showLine: menu.active && activeHand === '{{ hand }}'"
bind__saber-controls="bladeEnabled: !menu.active"
cursor
saber-controls="hand: {{ hand }}"
haptics="events: mouseenter; dur: 35; force: 0.075">
haptics="events: mouseenter; dur: 35; force: 0.075"
line="color: {{ color }}">
<a-entity class="fakeGlow" rotation="90 0 0" position="0 0.01 0" bind__visible="menu.active">
<a-entity geometry="primitive: cylinder; height: 0.1831; radius: 0.0055" material="color: {{ color }}; shader: flat; opacity: 0.11"></a-entity>
<a-entity geometry="primitive: cylinder; height: 0.1832; radius: 0.0065" material="color: {{ color }}; shader: flat; opacity: 0.09"></a-entity>
<a-entity geometry="primitive: cylinder; height: 0.1833; radius: 0.0075" material="color: {{ color }}; shader: flat; opacity: 0.06"></a-entity>
<a-entity geometry="primitive: cylinder; height: 0.1834; radius: 0.0085" material="color: {{ color }}; shader: flat; opacity: 0.04"></a-entity>
</a-entity>
<a-entity
id="{{ hand }}Cursor"
class="raycaster"
mixin="raycaster"
bind__raycaster="enabled: menu.active && activeHand === '{{ hand }}'; showLine: menu.active && activeHand === '{{ hand }}'"
cursor
line="color: {{ color }}"></a-entity>
</a-entity>
{% endmacro %}
@@ -91,8 +88,8 @@
id="cursorMesh"
geometry="primitive: plane; width: 0.26; height: 0.26"
material="shader: flat; color: white; transparent: true; src: #cursorMeshImage; side: both; depthTest: false"></a-mixin>
<a-entity id="leftCursorMesh" mixin="cursorMesh" cursor-mesh="cursorEl: #leftCursor"></a-entity>
<a-entity id="rightCursorMesh" mixin="cursorMesh" cursor-mesh="cursorEl: #rightCursor"></a-entity>
<a-entity id="leftCursorMesh" mixin="cursorMesh" cursor-mesh="cursorEl: #leftHand"></a-entity>
<a-entity id="rightCursorMesh" mixin="cursorMesh" cursor-mesh="cursorEl: #rightHand"></a-entity>
{% if not IS_PRODUCTION %}
<a-entity id="mouseCursor" mixin="raycaster" cursor="rayOrigin: mouse"
bind__raycaster="enabled: !inVR" raycaster="showLine: false"></a-entity>