Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 20:58:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

far grabbing arc balls

Browse source
This commit is contained in:
ericrius1 2015-12-21 13:59:00 -08:00
parent cabc47e7a9
commit 876d8ab6b2
3 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
examples/flowArts/arcBall/arcBall.js
View file

@ -15,7 +15,7 @@
Script.include("../../libraries/utils.js");
var scriptURL = Script.resolvePath("arcBallEntityScript.js");
var scriptURL = Script.resolvePath("arcBallEntityScript.js?v1" + Math.random());
ArcBall = function(spawnPosition) {
var colorPalette = [{
@ -50,11 +50,11 @@ ArcBall = function(spawnPosition) {
userData: JSON.stringify({
grabbableKey: {
spatialKey: {
relativePosition: {
x: 0,
y: 0.0,
z: -0.5
},
// relativePosition: {
// x: 0,
// y: -0.5,
// z: 0.0
// },
},
// invertSolidWhileHeld: true
}

16
examples/flowArts/arcBall/arcBallEntityScript.js
View file

@ -27,12 +27,11 @@
ArcBall.prototype = {
isGrabbed: false,
startDistanceGrab: function() {
startDistantGrab: function() {
this.searchForNearbyArcBalls();
},
startFarGrab: function() {
startNearGrab: function() {
this.searchForNearbyArcBalls();
},
@ -58,7 +57,6 @@
var emitOrientation = Quat.rotationBetween(Vec3.UNIT_Z, sourceToTargetVec);
emitOrientation = Quat.multiply(Quat.inverse(rotation), emitOrientation);
var color = this.colorPalette[randInt(0, this.colorPalette.length)];
var props = {
type: "ParticleEffect",
@ -75,10 +73,10 @@
},
colorFinish: color,
maxParticles: 100000,
lifespan: 2,
lifespan: 1,
emitRate: 1000,
emitOrientation: emitOrientation,
emitSpeed: .1,
emitSpeed: 1,
speedSpread: 0.02,
emitDimensions: {
x: .01,
@ -105,7 +103,7 @@
alpha: 0.5,
alphaSpread: .1,
alphaStart: 0.5,
alphaFinish: 0.0,
alphaFinish: 0.5,
textures: "https://s3.amazonaws.com/hifi-public/eric/textures/particleSprites/beamParticle.png",
emitterShouldTrail: true
}
@ -117,12 +115,10 @@
return;
}
var startPosition = Entities.getEntityProperties(this.entityID, "position").position;
var targetPosition = Entities.getEntityProperties(this.target, "position").position;
var rotation = Entities.getEntityProperties(this.entityID, "rotation").rotation;
var sourceToTargetVec = Vec3.subtract(targetPosition, startPosition);
var emitOrientation = Quat.rotationBetween(Vec3.UNIT_Z, sourceToTargetVec);
// emitOrientation = Quat.multiply(emitOrientation,Quat.inverse(rotation));
Entities.editEntity(this.particleArc, {
emitOrientation: emitOrientation
});
@ -132,7 +128,7 @@
this.updateBeam();
},
continueDistanceGrab: function() {
continueDistantGrab: function() {
this.updateBeam();
},

1
examples/flowArts/lightSaber/lightSaberEntityScript.js
View file

@ -54,7 +54,6 @@
createBeam: function() {
this.props = Entities.getEntityProperties(this.entityID, ["position", "rotation"]);
var forwardVec = Quat.getFront(Quat.multiply(this.props.rotation, Quat.fromPitchYawRollDegrees(-90, 0, 0)));
// forwardVec = Vec3.normalize(forwardVec);