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

define saber declaratively

Browse Source
This commit is contained in:
Kevin Ngo
2018-09-21 04:58:04 -07:00
parent a4b88e4502
commit ac36d57fb6
3 changed files with 53 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/cursor-mesh.js
View File

@@ -35,6 +35,8 @@ AFRAME.registerComponent('cursor-mesh', {
// Update cursor mesh.
intersection = cursorEl.components.raycaster.getIntersection(intersectedEl);
if (!intersection) { return; }
el.object3D.position.copy(intersection.point);
if (scenePivotEl) {

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

@@ -1,85 +1,40 @@
AFRAME.registerComponent('saber-controls', {
schema: {
hand: {default: 'right', oneOf: ['left', 'right']},
bladeEnabled: {default: true}
},
colors: {
right: '#78aaff', // Blue
left: '#ffa8a8' // Red
enabled: {default: false},
hand: {default: 'right', oneOf: ['left', 'right']}
},
init: function () {
var el = this.el;
var data = this.data;
this.controllerType = '';
el.addEventListener('controllerconnected', this.initSaber.bind(this));
const hand = {hand: data.hand, model: false};
el.setAttribute('oculus-touch-controls', hand);
el.setAttribute('vive-controls', hand);
el.setAttribute('windows-motion-controls', hand);
this.bladeEl = this.el.querySelector('.blade');
},
update: function () {
if (!this.bladeEl) { return; }
this.bladeEl.object3D.visible = this.data.bladeEnabled;
if (this.data.bladeEnabled) {
this.bladeElPivot.object3D.scale.set(0.0001, 0.001, 0.0001);
update: function (oldData) {
if (!oldData.bladeEnabled && this.data.bladeEnabled) {
this.bladeEl.emit('drawblade');
}
},
tick: function () {
if (!this.bladeEl || !this.bladeEl.getObject3D('mesh')) { return; }
if (!this.data.enabled) { return; }
this.boundingBox.setFromObject(this.bladeEl.getObject3D('mesh'));
},
initSaber: function (evt) {
var el = this.el;
var saberHandleEl = document.createElement('a-entity');
var bladeEl = this.bladeEl = document.createElement('a-entity');
var bladeElPivot = this.bladeElPivot = document.createElement('a-entity');
var saberPivotEl = document.createElement('a-entity');
var highlightTop = document.createElement('a-entity');
var highlightBottom = document.createElement('a-entity');
var controllerConfig = this.config[evt.detail.name];
this.boundingBox = new THREE.Box3();
bladeEl.setAttribute('material', {shader: 'flat', color: this.colors[this.data.hand]});
bladeEl.setAttribute('geometry', {primitive: 'box', height: 0.9, depth: 0.020, width: 0.020});
bladeEl.setAttribute('position', '0 -0.55 0');
bladeEl.setAttribute('play-sound', {event: 'drawblade', sound: "#saberDraw"});
bladeEl.object3D.visible = this.data.bladeEnabled;
// For blade saber draw animation.
bladeElPivot.appendChild(bladeEl);
bladeElPivot.setAttribute('animation', 'property: scale; from: 0 0 0; to: 1.0 1.0 1.0; dur: 750; easing: linear; startEvents: drawblade');
saberHandleEl.setAttribute('material', {shader: 'flat', color: '#151515'});
saberHandleEl.setAttribute('geometry', {primitive: 'box', height: 0.2, depth: 0.025, width: 0.025});
saberHandleEl.setAttribute('position', '0 0 0');
highlightTop.setAttribute('material', {shader: 'flat', color: this.colors[this.data.hand]});
highlightTop.setAttribute('geometry', {primitive: 'box', height: 0.18, depth: 0.005, width: 0.005});
highlightTop.setAttribute('position', '0 0 0.0125');
highlightBottom.setAttribute('material', {shader: 'flat', color: this.colors[this.data.hand]});
highlightBottom.setAttribute('geometry', {primitive: 'box', height: 0.18, depth: 0.005, width: 0.005});
highlightBottom.setAttribute('position', '0 0 -0.0125');
saberHandleEl.appendChild(highlightTop);
saberHandleEl.appendChild(highlightBottom)
saberPivotEl.setAttribute('rotation', '90 0 0');
saberPivotEl.appendChild(saberHandleEl);
saberPivotEl.appendChild(bladeElPivot);
el.appendChild(saberPivotEl);
this.controllerConnected = true;
this.controllerType = evt.detail.name;
el.setAttribute('cursor', controllerConfig.cursor || {});
this.el.setAttribute('cursor', this.config[this.controllerType].cursor || {});
},
config: {