mirror of
https://github.com/overte-org/overte.git
synced 2025-04-25 21:36:12 +02:00
Beams arc to each other. BAM
This commit is contained in:
parent
2c02e7ad63
commit
514cb7a329
3 changed files with 12 additions and 16 deletions
|
@ -26,7 +26,7 @@ ArcBall = function(spawnPosition) {
|
||||||
|
|
||||||
|
|
||||||
var containerBall = Entities.addEntity({
|
var containerBall = Entities.addEntity({
|
||||||
type: "Sphere",
|
type: "Box",
|
||||||
name: "Arc Ball",
|
name: "Arc Ball",
|
||||||
script: scriptURL,
|
script: scriptURL,
|
||||||
position: Vec3.sum(spawnPosition, {
|
position: Vec3.sum(spawnPosition, {
|
||||||
|
@ -37,7 +37,7 @@ ArcBall = function(spawnPosition) {
|
||||||
dimensions: {
|
dimensions: {
|
||||||
x: .2,
|
x: .2,
|
||||||
y: .2,
|
y: .2,
|
||||||
z: .2
|
z: .5
|
||||||
},
|
},
|
||||||
color: {
|
color: {
|
||||||
red: 15,
|
red: 15,
|
||||||
|
@ -53,13 +53,6 @@ ArcBall = function(spawnPosition) {
|
||||||
// },
|
// },
|
||||||
userData: JSON.stringify({
|
userData: JSON.stringify({
|
||||||
grabbableKey: {
|
grabbableKey: {
|
||||||
spatialKey: {
|
|
||||||
relativePosition: {
|
|
||||||
x: 0,
|
|
||||||
y: .1,
|
|
||||||
z: 0
|
|
||||||
}
|
|
||||||
},
|
|
||||||
invertSolidWhileHeld: true
|
invertSolidWhileHeld: true
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -42,7 +42,8 @@
|
||||||
dimensions: {x: .1, y: .1, z: 1},
|
dimensions: {x: .1, y: .1, z: 1},
|
||||||
color: {red: 200, green: 10, blue: 10},
|
color: {red: 200, green: 10, blue: 10},
|
||||||
position: startPosition,
|
position: startPosition,
|
||||||
rotation: emitOrientation
|
rotation: emitOrientation,
|
||||||
|
visible: false
|
||||||
});
|
});
|
||||||
var color = {
|
var color = {
|
||||||
red: 200,
|
red: 200,
|
||||||
|
@ -53,6 +54,8 @@
|
||||||
type: "ParticleEffect",
|
type: "ParticleEffect",
|
||||||
name: "Particle Arc",
|
name: "Particle Arc",
|
||||||
parentID: this.entityID,
|
parentID: this.entityID,
|
||||||
|
parentJointIndex: -1,
|
||||||
|
position: startPosition,
|
||||||
isEmitting: true,
|
isEmitting: true,
|
||||||
colorStart: color,
|
colorStart: color,
|
||||||
color: {
|
color: {
|
||||||
|
|
|
@ -25,10 +25,10 @@ var basePosition = Vec3.sum(MyAvatar.position, Vec3.multiply(1, Quat.getFront(Ca
|
||||||
basePosition.y = MyAvatar.position.y + 1;
|
basePosition.y = MyAvatar.position.y + 1;
|
||||||
|
|
||||||
// RAVE ITEMS
|
// RAVE ITEMS
|
||||||
var lightBall = new LightBall(basePosition);
|
// var lightBall = new LightBall(basePosition);
|
||||||
|
|
||||||
// var arcBall = new ArcBall(basePosition);
|
var arcBall = new ArcBall(basePosition);
|
||||||
// var arcBall2 = new ArcBall(Vec3.sum(basePosition, {x: -1, y: 0, z: 0}));
|
var arcBall2 = new ArcBall(Vec3.sum(basePosition, {x: -1, y: 0, z: 0}));
|
||||||
var raveStick = new RaveStick(Vec3.sum(basePosition, {x: 1, y: 0.5, z: 1}));
|
var raveStick = new RaveStick(Vec3.sum(basePosition, {x: 1, y: 0.5, z: 1}));
|
||||||
var lightSaber = new LightSaber(Vec3.sum(basePosition, {x: 3, y: 0.5, z: 1}));
|
var lightSaber = new LightSaber(Vec3.sum(basePosition, {x: 3, y: 0.5, z: 1}));
|
||||||
|
|
||||||
|
@ -81,9 +81,9 @@ function cleanup() {
|
||||||
Entities.deleteEntity(raveRoom);
|
Entities.deleteEntity(raveRoom);
|
||||||
Entities.deleteEntity(lightZone);
|
Entities.deleteEntity(lightZone);
|
||||||
Entities.deleteEntity(floor);
|
Entities.deleteEntity(floor);
|
||||||
lightBall.cleanup();
|
// lightBall.cleanup();
|
||||||
// arcBall.cleanup();
|
arcBall.cleanup();
|
||||||
// arcBall2.cleanup();
|
arcBall2.cleanup();
|
||||||
raveStick.cleanup();
|
raveStick.cleanup();
|
||||||
lightSaber.cleanup();
|
lightSaber.cleanup();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue