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

Change way to calculate stroke end strokes. End of stroke === no increase on angles with respect to x and y planes. (fix #152)

Browse Source
This commit is contained in:
Diego Marcos
2018-10-31 09:45:14 -07:00
parent a4c8a6df80
commit aa086d7567
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,8 +62,9 @@ AFRAME.registerComponent('saber-controls', {
var strokeMinSpeed = this.swinging ? startSpeed : this.data.strokeMinSpeed;
// Tip of the blade position in world coordinates.
this.bladeTipPosition.set(0, 0.9, 0);
this.bladeTipPosition.set(0, 0.1, 0);
this.bladePosition.set(0, 0, 0);
bladeObject = this.el.object3D;
bladeObject.parent.updateMatrixWorld();
bladeObject.localToWorld(this.bladeTipPosition);
@@ -97,23 +98,33 @@ AFRAME.registerComponent('saber-controls', {
this.maxAnglePlaneY = 0;
this.maxAnglePlaneXY = 0;
}
this.maxAnglePlaneX = anglePlaneX > this.maxAnglePlaneX ? anglePlaneX : this.maxAnglePlaneX;
this.maxAnglePlaneY = anglePlaneY > this.maxAnglePlaneY ? anglePlaneY : this.maxAnglePlaneY;
this.maxAnglePlaneXY = anglePlaneXY > this.maxAnglePlaneXY ? anglePlaneXY : this.maxAnglePlaneXY;
const anglePlaneXIncreased = anglePlaneX > this.maxAnglePlaneX;
const anglePlaneYIncreased = anglePlaneY > this.maxAnglePlaneY;
const anglePlaneXYIncreased = anglePlaneXY > this.maxAnglePlaneXY;
this.maxAnglePlaneX = anglePlaneXIncreased ? anglePlaneX : this.maxAnglePlaneX;
this.maxAnglePlaneY = anglePlaneYIncreased ? anglePlaneY : this.maxAnglePlaneY;
this.maxAnglePlaneXY = anglePlaneXYIncreased ? anglePlaneXY : this.maxAnglePlaneXY;
if (!anglePlaneXIncreased && !anglePlaneYIncreased) { this.endStroke(); }
} else {
// Stroke finishes. Reset swinging state.
if (this.swinging) {
// console.log("MaxAngle " + this.maxAnglePlaneX * 180 / Math.PI);
this.el.emit('strokeend');
this.swinging = false;
this.accumulatedDistance = 0;
for (let i = 0; i < this.distanceSamples.length; i++) { this.distanceSamples[i] = 0; }
}
this.swinging = false;
this.endStroke();
}
this.bladeTipPreviousPosition.copy(this.bladeTipPosition);
},
endStroke: function () {
// console.log("MaxAngle " + this.maxAnglePlaneX * 180 / Math.PI);
this.el.emit('strokeend');
if (this.swinging) { return; }
this.accumulatedDistance = 0;
this.maxAnglePlaneX = 0;
this.maxAnglePlaneY = 0;
this.maxAnglePlaneXY = 0;
for (let i = 0; i < this.distanceSamples.length; i++) { this.distanceSamples[i] = 0; }
},
initSaber: function (evt) {
this.controllerType = evt.detail.name;
this.el.setAttribute('cursor', this.config[this.controllerType].cursor || {});

3
src/state/index.js
View File

@@ -128,7 +128,8 @@ AFRAME.registerState({
state.score.multiplier = state.score.combo >= 8
? 8
: 2 * Math.floor(Math.log2(state.score.combo));
// console.log("BEAT SCORE: " + score);
// console.log("BEAT SCORE: " + score + " " + payload.angleBeforeHit + " " + payload.angleAfterHit);
},
beatmiss: state => {