Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

updates

Browse source
This commit is contained in:
James B. Pollack 2015-12-14 13:01:03 -08:00
parent 4d9cb6a6df
commit 76487bca7a
4 changed files with 108 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
examples/controllers/handControllerGrab-particles.js
View file

@ -437,47 +437,49 @@ function MyController(hand) {
}); });
var finalRotation = Quat.multiply(orientation, rotation); var finalRotation = Quat.multiply(orientation, rotation);
var lifespan = LINE_LENGTH / 10;
var speed = 5;
var spread = 2;
if (this.particleBeam === null) { if (this.particleBeam === null) {
this.createParticleBeam(position, finalRotation, color); this.createParticleBeam(position, finalRotation, color, speed, spread, lifespan);
} else { } else {
this.updateParticleBeam(position, finalRotation, color); this.updateParticleBeam(position, finalRotation, color, speed, spread, lifespan);
} }
}; };
this.handleDistantParticleBeam = function(handPosition, objectPosition, objectRotation, color) { this.handleDistantParticleBeam = function(handPosition, objectPosition, color) {
var handToObject = Vec3.subtract(objectPosition, handPosition); var handToObject = Vec3.subtract(objectPosition, handPosition);
var finalRotation = Quat.rotationBetween(Vec3.multiply(-1, Vec3.UP), handToObject); var finalRotation = Quat.rotationBetween(Vec3.multiply(-1, Vec3.UP), handToObject);
var distance = Vec3.distance(handPosition, objectPosition); var distance = Vec3.distance(handPosition, objectPosition);
var speed = distance * 1; var speed = 5;
var spread = 0;
var lifespan = distance / speed;
var lifepsan = distance / speed;
var lifespan = 1;
if (this.particleBeam === null) { if (this.particleBeam === null) {
this.createParticleBeam(objectPosition, finalRotation, color, speed); this.createParticleBeam(objectPosition, finalRotation, color, speed, spread, lifespan);
} else { } else {
this.updateParticleBeam(objectPosition, finalRotation, color, speed, lifepsan); this.updateParticleBeam(objectPosition, finalRotation, color, speed, spread, lifespan);
} }
}; };
this.createParticleBeam = function(position, orientation, color, speed, lifepsan) { this.createParticleBeam = function(position, orientation, color, speed, spread, lifespan) {
var particleBeamProperties = { var particleBeamProperties = {
type: "ParticleEffect", type: "ParticleEffect",
isEmitting: true, isEmitting: true,
position: position, position: position,
visible: false, visible: false,
//rotation:Quat.fromPitchYawRollDegrees(-90.0, 0.0, 0.0),
"name": "Particle Beam", "name": "Particle Beam",
"color": color, "color": color,
"maxParticles": 2000, "maxParticles": 2000,
"lifespan": LINE_LENGTH / 10, "lifespan": lifespan,
"emitRate": 50, "emitRate": 50,
"emitSpeed": 5, "emitSpeed": speed,
"speedSpread": 2, "speedSpread": spread,
"emitOrientation": { "emitOrientation": {
"x": -1, "x": -1,
"y": 0, "y": 0,
@ -519,22 +521,23 @@ function MyController(hand) {
"alphaSpread": 0, "alphaSpread": 0,
"alphaStart": 1, "alphaStart": 1,
"alphaFinish": 1, "alphaFinish": 1,
"additiveBlending": 1, "additiveBlending": 0,
"textures": "https://hifi-content.s3.amazonaws.com/alan/dev/textures/grabsprite-3.png" "textures": "https://hifi-content.s3.amazonaws.com/alan/dev/textures/grabsprite-3.png"
} }
this.particleBeam = Entities.addEntity(particleBeamProperties); this.particleBeam = Entities.addEntity(particleBeamProperties);
}; };
this.updateParticleBeam = function(position, orientation, color, speed, lifepsan) { this.updateParticleBeam = function(position, orientation, color, speed, spread, lifespan) {
print('lifespan::' + lifespan);
Entities.editEntity(this.particleBeam, { Entities.editEntity(this.particleBeam, {
rotation: orientation, rotation: orientation,
position: position, position: position,
visible: true, visible: true,
color: color, color: color,
emitSpeed: speed, emitSpeed: speed,
lifepsan: lifepsan speedSpread:spread,
lifespan: lifespan
}) })
@ -1108,7 +1111,8 @@ function MyController(hand) {
this.overlayLineOn(handPosition, grabbedProperties.position, INTERSECT_COLOR); this.overlayLineOn(handPosition, grabbedProperties.position, INTERSECT_COLOR);
} }
if (USE_PARTICLE_BEAM_FOR_MOVING === true) { if (USE_PARTICLE_BEAM_FOR_MOVING === true) {
this.handleDistantParticleBeam(handPosition, grabbedProperties.position, this.currentObjectRotation, INTERSECT_COLOR) this.handleDistantParticleBeam(handPosition,grabbedProperties.position, INTERSECT_COLOR)
// this.handleDistantParticleBeam(handPosition, this.currentObjectPosition, INTERSECT_COLOR)
} }
if (USE_POINTLIGHT === true) { if (USE_POINTLIGHT === true) {
this.handlePointLight(this.grabbedEntity); this.handlePointLight(this.grabbedEntity);
@ -1399,7 +1403,10 @@ function MyController(hand) {
} }
} }
this.lineOn(pickRay.origin, Vec3.multiply(pickRay.direction, LINE_LENGTH), NO_INTERSECT_COLOR); if (USE_ENTITY_LINES_FOR_MOVING === true) {
this.lineOn(pickRay.origin, Vec3.multiply(pickRay.direction, LINE_LENGTH), NO_INTERSECT_COLOR);
}
Entities.callEntityMethod(this.grabbedEntity, "continueFarTrigger"); Entities.callEntityMethod(this.grabbedEntity, "continueFarTrigger");
}; };

47
examples/controllers/handControllerGrab-pointlight.js
View file

@ -437,47 +437,49 @@ function MyController(hand) {
}); });
var finalRotation = Quat.multiply(orientation, rotation); var finalRotation = Quat.multiply(orientation, rotation);
var lifespan = LINE_LENGTH / 10;
var speed = 5;
var spread = 2;
if (this.particleBeam === null) { if (this.particleBeam === null) {
this.createParticleBeam(position, finalRotation, color); this.createParticleBeam(position, finalRotation, color, speed, spread, lifespan);
} else { } else {
this.updateParticleBeam(position, finalRotation, color); this.updateParticleBeam(position, finalRotation, color, speed, spread, lifespan);
} }
}; };
this.handleDistantParticleBeam = function(handPosition, objectPosition, objectRotation, color) { this.handleDistantParticleBeam = function(handPosition, objectPosition, color) {
var handToObject = Vec3.subtract(objectPosition, handPosition); var handToObject = Vec3.subtract(objectPosition, handPosition);
var finalRotation = Quat.rotationBetween(Vec3.multiply(-1, Vec3.UP), handToObject); var finalRotation = Quat.rotationBetween(Vec3.multiply(-1, Vec3.UP), handToObject);
var distance = Vec3.distance(handPosition, objectPosition); var distance = Vec3.distance(handPosition, objectPosition);
var speed = distance * 1; var speed = 5;
var spread = 0;
var lifespan = distance / speed;
var lifepsan = distance / speed;
var lifespan = 1;
if (this.particleBeam === null) { if (this.particleBeam === null) {
this.createParticleBeam(objectPosition, finalRotation, color, speed); this.createParticleBeam(objectPosition, finalRotation, color, speed, spread, lifespan);
} else { } else {
this.updateParticleBeam(objectPosition, finalRotation, color, speed, lifepsan); this.updateParticleBeam(objectPosition, finalRotation, color, speed, spread, lifespan);
} }
}; };
this.createParticleBeam = function(position, orientation, color, speed, lifepsan) { this.createParticleBeam = function(position, orientation, color, speed, spread, lifespan) {
var particleBeamProperties = { var particleBeamProperties = {
type: "ParticleEffect", type: "ParticleEffect",
isEmitting: true, isEmitting: true,
position: position, position: position,
visible: false, visible: false,
//rotation:Quat.fromPitchYawRollDegrees(-90.0, 0.0, 0.0),
"name": "Particle Beam", "name": "Particle Beam",
"color": color, "color": color,
"maxParticles": 2000, "maxParticles": 2000,
"lifespan": LINE_LENGTH / 10, "lifespan": lifespan,
"emitRate": 50, "emitRate": 50,
"emitSpeed": 5, "emitSpeed": speed,
"speedSpread": 2, "speedSpread": spread,
"emitOrientation": { "emitOrientation": {
"x": -1, "x": -1,
"y": 0, "y": 0,
@ -519,22 +521,23 @@ function MyController(hand) {
"alphaSpread": 0, "alphaSpread": 0,
"alphaStart": 1, "alphaStart": 1,
"alphaFinish": 1, "alphaFinish": 1,
"additiveBlending": 1, "additiveBlending": 0,
"textures": "https://hifi-content.s3.amazonaws.com/alan/dev/textures/grabsprite-3.png" "textures": "https://hifi-content.s3.amazonaws.com/alan/dev/textures/grabsprite-3.png"
} }
this.particleBeam = Entities.addEntity(particleBeamProperties); this.particleBeam = Entities.addEntity(particleBeamProperties);
}; };
this.updateParticleBeam = function(position, orientation, color, speed, lifepsan) { this.updateParticleBeam = function(position, orientation, color, speed, spread, lifespan) {
print('lifespan::' + lifespan);
Entities.editEntity(this.particleBeam, { Entities.editEntity(this.particleBeam, {
rotation: orientation, rotation: orientation,
position: position, position: position,
visible: true, visible: true,
color: color, color: color,
emitSpeed: speed, emitSpeed: speed,
lifepsan: lifepsan speedSpread:spread,
lifespan: lifespan
}) })
@ -1108,7 +1111,8 @@ function MyController(hand) {
this.overlayLineOn(handPosition, grabbedProperties.position, INTERSECT_COLOR); this.overlayLineOn(handPosition, grabbedProperties.position, INTERSECT_COLOR);
} }
if (USE_PARTICLE_BEAM_FOR_MOVING === true) { if (USE_PARTICLE_BEAM_FOR_MOVING === true) {
this.handleDistantParticleBeam(handPosition, grabbedProperties.position, this.currentObjectRotation, INTERSECT_COLOR) this.handleDistantParticleBeam(handPosition,grabbedProperties.position, INTERSECT_COLOR)
// this.handleDistantParticleBeam(handPosition, this.currentObjectPosition, INTERSECT_COLOR)
} }
if (USE_POINTLIGHT === true) { if (USE_POINTLIGHT === true) {
this.handlePointLight(this.grabbedEntity); this.handlePointLight(this.grabbedEntity);
@ -1399,7 +1403,10 @@ function MyController(hand) {
} }
} }
this.lineOn(pickRay.origin, Vec3.multiply(pickRay.direction, LINE_LENGTH), NO_INTERSECT_COLOR); if (USE_ENTITY_LINES_FOR_MOVING === true) {
this.lineOn(pickRay.origin, Vec3.multiply(pickRay.direction, LINE_LENGTH), NO_INTERSECT_COLOR);
}
Entities.callEntityMethod(this.grabbedEntity, "continueFarTrigger"); Entities.callEntityMethod(this.grabbedEntity, "continueFarTrigger");
}; };

47
examples/controllers/handControllerGrab-spotlight.js
View file

@ -437,47 +437,49 @@ function MyController(hand) {
}); });
var finalRotation = Quat.multiply(orientation, rotation); var finalRotation = Quat.multiply(orientation, rotation);
var lifespan = LINE_LENGTH / 10;
var speed = 5;
var spread = 2;
if (this.particleBeam === null) { if (this.particleBeam === null) {
this.createParticleBeam(position, finalRotation, color); this.createParticleBeam(position, finalRotation, color, speed, spread, lifespan);
} else { } else {
this.updateParticleBeam(position, finalRotation, color); this.updateParticleBeam(position, finalRotation, color, speed, spread, lifespan);
} }
}; };
this.handleDistantParticleBeam = function(handPosition, objectPosition, objectRotation, color) { this.handleDistantParticleBeam = function(handPosition, objectPosition, color) {
var handToObject = Vec3.subtract(objectPosition, handPosition); var handToObject = Vec3.subtract(objectPosition, handPosition);
var finalRotation = Quat.rotationBetween(Vec3.multiply(-1, Vec3.UP), handToObject); var finalRotation = Quat.rotationBetween(Vec3.multiply(-1, Vec3.UP), handToObject);
var distance = Vec3.distance(handPosition, objectPosition); var distance = Vec3.distance(handPosition, objectPosition);
var speed = distance * 1; var speed = 5;
var spread = 0;
var lifespan = distance / speed;
var lifepsan = distance / speed;
var lifespan = 1;
if (this.particleBeam === null) { if (this.particleBeam === null) {
this.createParticleBeam(objectPosition, finalRotation, color, speed); this.createParticleBeam(objectPosition, finalRotation, color, speed, spread, lifespan);
} else { } else {
this.updateParticleBeam(objectPosition, finalRotation, color, speed, lifepsan); this.updateParticleBeam(objectPosition, finalRotation, color, speed, spread, lifespan);
} }
}; };
this.createParticleBeam = function(position, orientation, color, speed, lifepsan) { this.createParticleBeam = function(position, orientation, color, speed, spread, lifespan) {
var particleBeamProperties = { var particleBeamProperties = {
type: "ParticleEffect", type: "ParticleEffect",
isEmitting: true, isEmitting: true,
position: position, position: position,
visible: false, visible: false,
//rotation:Quat.fromPitchYawRollDegrees(-90.0, 0.0, 0.0),
"name": "Particle Beam", "name": "Particle Beam",
"color": color, "color": color,
"maxParticles": 2000, "maxParticles": 2000,
"lifespan": LINE_LENGTH / 10, "lifespan": lifespan,
"emitRate": 50, "emitRate": 50,
"emitSpeed": 5, "emitSpeed": speed,
"speedSpread": 2, "speedSpread": spread,
"emitOrientation": { "emitOrientation": {
"x": -1, "x": -1,
"y": 0, "y": 0,
@ -519,22 +521,23 @@ function MyController(hand) {
"alphaSpread": 0, "alphaSpread": 0,
"alphaStart": 1, "alphaStart": 1,
"alphaFinish": 1, "alphaFinish": 1,
"additiveBlending": 1, "additiveBlending": 0,
"textures": "https://hifi-content.s3.amazonaws.com/alan/dev/textures/grabsprite-3.png" "textures": "https://hifi-content.s3.amazonaws.com/alan/dev/textures/grabsprite-3.png"
} }
this.particleBeam = Entities.addEntity(particleBeamProperties); this.particleBeam = Entities.addEntity(particleBeamProperties);
}; };
this.updateParticleBeam = function(position, orientation, color, speed, lifepsan) { this.updateParticleBeam = function(position, orientation, color, speed, spread, lifespan) {
print('lifespan::' + lifespan);
Entities.editEntity(this.particleBeam, { Entities.editEntity(this.particleBeam, {
rotation: orientation, rotation: orientation,
position: position, position: position,
visible: true, visible: true,
color: color, color: color,
emitSpeed: speed, emitSpeed: speed,
lifepsan: lifepsan speedSpread:spread,
lifespan: lifespan
}) })
@ -1108,7 +1111,8 @@ function MyController(hand) {
this.overlayLineOn(handPosition, grabbedProperties.position, INTERSECT_COLOR); this.overlayLineOn(handPosition, grabbedProperties.position, INTERSECT_COLOR);
} }
if (USE_PARTICLE_BEAM_FOR_MOVING === true) { if (USE_PARTICLE_BEAM_FOR_MOVING === true) {
this.handleDistantParticleBeam(handPosition, grabbedProperties.position, this.currentObjectRotation, INTERSECT_COLOR) this.handleDistantParticleBeam(handPosition,grabbedProperties.position, INTERSECT_COLOR)
// this.handleDistantParticleBeam(handPosition, this.currentObjectPosition, INTERSECT_COLOR)
} }
if (USE_POINTLIGHT === true) { if (USE_POINTLIGHT === true) {
this.handlePointLight(this.grabbedEntity); this.handlePointLight(this.grabbedEntity);
@ -1399,7 +1403,10 @@ function MyController(hand) {
} }
} }
this.lineOn(pickRay.origin, Vec3.multiply(pickRay.direction, LINE_LENGTH), NO_INTERSECT_COLOR); if (USE_ENTITY_LINES_FOR_MOVING === true) {
this.lineOn(pickRay.origin, Vec3.multiply(pickRay.direction, LINE_LENGTH), NO_INTERSECT_COLOR);
}
Entities.callEntityMethod(this.grabbedEntity, "continueFarTrigger"); Entities.callEntityMethod(this.grabbedEntity, "continueFarTrigger");
}; };

47
examples/controllers/handControllerGrab.js
View file

@ -437,47 +437,49 @@ function MyController(hand) {
}); });
var finalRotation = Quat.multiply(orientation, rotation); var finalRotation = Quat.multiply(orientation, rotation);
var lifespan = LINE_LENGTH / 10;
var speed = 5;
var spread = 2;
if (this.particleBeam === null) { if (this.particleBeam === null) {
this.createParticleBeam(position, finalRotation, color); this.createParticleBeam(position, finalRotation, color, speed, spread, lifespan);
} else { } else {
this.updateParticleBeam(position, finalRotation, color); this.updateParticleBeam(position, finalRotation, color, speed, spread, lifespan);
} }
}; };
this.handleDistantParticleBeam = function(handPosition, objectPosition, objectRotation, color) { this.handleDistantParticleBeam = function(handPosition, objectPosition, color) {
var handToObject = Vec3.subtract(objectPosition, handPosition); var handToObject = Vec3.subtract(objectPosition, handPosition);
var finalRotation = Quat.rotationBetween(Vec3.multiply(-1, Vec3.UP), handToObject); var finalRotation = Quat.rotationBetween(Vec3.multiply(-1, Vec3.UP), handToObject);
var distance = Vec3.distance(handPosition, objectPosition); var distance = Vec3.distance(handPosition, objectPosition);
var speed = distance * 1; var speed = 5;
var spread = 0;
var lifespan = distance / speed;
var lifepsan = distance / speed;
var lifespan = 1;
if (this.particleBeam === null) { if (this.particleBeam === null) {
this.createParticleBeam(objectPosition, finalRotation, color, speed); this.createParticleBeam(objectPosition, finalRotation, color, speed, spread, lifespan);
} else { } else {
this.updateParticleBeam(objectPosition, finalRotation, color, speed, lifepsan); this.updateParticleBeam(objectPosition, finalRotation, color, speed, spread, lifespan);
} }
}; };
this.createParticleBeam = function(position, orientation, color, speed, lifepsan) { this.createParticleBeam = function(position, orientation, color, speed, spread, lifespan) {
var particleBeamProperties = { var particleBeamProperties = {
type: "ParticleEffect", type: "ParticleEffect",
isEmitting: true, isEmitting: true,
position: position, position: position,
visible: false, visible: false,
//rotation:Quat.fromPitchYawRollDegrees(-90.0, 0.0, 0.0),
"name": "Particle Beam", "name": "Particle Beam",
"color": color, "color": color,
"maxParticles": 2000, "maxParticles": 2000,
"lifespan": LINE_LENGTH / 10, "lifespan": lifespan,
"emitRate": 50, "emitRate": 50,
"emitSpeed": 5, "emitSpeed": speed,
"speedSpread": 2, "speedSpread": spread,
"emitOrientation": { "emitOrientation": {
"x": -1, "x": -1,
"y": 0, "y": 0,
@ -519,22 +521,23 @@ function MyController(hand) {
"alphaSpread": 0, "alphaSpread": 0,
"alphaStart": 1, "alphaStart": 1,
"alphaFinish": 1, "alphaFinish": 1,
"additiveBlending": 1, "additiveBlending": 0,
"textures": "https://hifi-content.s3.amazonaws.com/alan/dev/textures/grabsprite-3.png" "textures": "https://hifi-content.s3.amazonaws.com/alan/dev/textures/grabsprite-3.png"
} }
this.particleBeam = Entities.addEntity(particleBeamProperties); this.particleBeam = Entities.addEntity(particleBeamProperties);
}; };
this.updateParticleBeam = function(position, orientation, color, speed, lifepsan) { this.updateParticleBeam = function(position, orientation, color, speed, spread, lifespan) {
print('lifespan::' + lifespan);
Entities.editEntity(this.particleBeam, { Entities.editEntity(this.particleBeam, {
rotation: orientation, rotation: orientation,
position: position, position: position,
visible: true, visible: true,
color: color, color: color,
emitSpeed: speed, emitSpeed: speed,
lifepsan: lifepsan speedSpread:spread,
lifespan: lifespan
}) })
@ -1108,7 +1111,8 @@ function MyController(hand) {
this.overlayLineOn(handPosition, grabbedProperties.position, INTERSECT_COLOR); this.overlayLineOn(handPosition, grabbedProperties.position, INTERSECT_COLOR);
} }
if (USE_PARTICLE_BEAM_FOR_MOVING === true) { if (USE_PARTICLE_BEAM_FOR_MOVING === true) {
this.handleDistantParticleBeam(handPosition, grabbedProperties.position, this.currentObjectRotation, INTERSECT_COLOR) this.handleDistantParticleBeam(handPosition,grabbedProperties.position, INTERSECT_COLOR)
// this.handleDistantParticleBeam(handPosition, this.currentObjectPosition, INTERSECT_COLOR)
} }
if (USE_POINTLIGHT === true) { if (USE_POINTLIGHT === true) {
this.handlePointLight(this.grabbedEntity); this.handlePointLight(this.grabbedEntity);
@ -1399,7 +1403,10 @@ function MyController(hand) {
} }
} }
this.lineOn(pickRay.origin, Vec3.multiply(pickRay.direction, LINE_LENGTH), NO_INTERSECT_COLOR); if (USE_ENTITY_LINES_FOR_MOVING === true) {
this.lineOn(pickRay.origin, Vec3.multiply(pickRay.direction, LINE_LENGTH), NO_INTERSECT_COLOR);
}
Entities.callEntityMethod(this.grabbedEntity, "continueFarTrigger"); Entities.callEntityMethod(this.grabbedEntity, "continueFarTrigger");
}; };