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

Merge pull request #10381 from Triplelexx/21297

Browse source 
DNM 21297 - Edit.js: Make the default particle system attractive
This commit is contained in:
Thijs Wenker 2017-05-17 15:55:40 +02:00 committed by GitHub
commit 2d6c6af37f
1 changed files with 47 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
scripts/system/edit.js
View file

@ -309,7 +309,7 @@ var toolBar = (function () {
gravity: dynamic ? { x: 0, y: -10, z: 0 } : { x: 0, y: 0, z: 0 } gravity: dynamic ? { x: 0, y: -10, z: 0 } : { x: 0, y: 0, z: 0 }
}); });
} }
} }
} }
function fromQml(message) { // messages are {method, params}, like json-rpc. See also sendToQml. function fromQml(message) { // messages are {method, params}, like json-rpc. See also sendToQml.
@ -482,22 +482,52 @@ var toolBar = (function () {
createNewEntity({ createNewEntity({
type: "ParticleEffect", type: "ParticleEffect",
isEmitting: true, isEmitting: true,
emitterShouldTrail: true,
color: {
red: 200,
green: 200,
blue: 200
},
colorSpread: {
red: 0,
green: 0,
blue: 0
},
colorStart: {
red: 200,
green: 200,
blue: 200
},
colorFinish: {
red: 0,
green: 0,
blue: 0
},
emitAcceleration: { emitAcceleration: {
x: 0, x: -0.5,
y: -1, y: 2.5,
z: 0 z: -0.5
}, },
accelerationSpread: { accelerationSpread: {
x: 5, x: 0.5,
y: 0, y: 1,
z: 5 z: 0.5
}, },
emitSpeed: 1, emitRate: 5.5,
lifespan: 1, emitSpeed: 0,
particleRadius: 0.025, speedSpread: 0,
lifespan: 1.5,
maxParticles: 10,
particleRadius: 0.25,
radiusStart: 0,
radiusFinish: 0.1,
radiusSpread: 0,
alpha: 0,
alphaStart: 1,
alphaFinish: 0, alphaFinish: 0,
emitRate: 100, polarStart: 0,
textures: "https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png" polarFinish: 0,
textures: "https://content.highfidelity.com/DomainContent/production/Particles/wispy-smoke.png"
}); });
}); });
@ -656,7 +686,7 @@ function handleOverlaySelectionToolUpdates(channel, message, sender) {
return; return;
var data = JSON.parse(message); var data = JSON.parse(message);
if (data.method === "selectOverlay") { if (data.method === "selectOverlay") {
print("setting selection to overlay " + data.overlayID); print("setting selection to overlay " + data.overlayID);
var entity = entityIconOverlayManager.findEntity(data.overlayID); var entity = entityIconOverlayManager.findEntity(data.overlayID);
@ -664,7 +694,7 @@ function handleOverlaySelectionToolUpdates(channel, message, sender) {
if (entity !== null) { if (entity !== null) {
selectionManager.setSelections([entity]); selectionManager.setSelections([entity]);
} }
} }
} }
Messages.subscribe("entityToolUpdates"); Messages.subscribe("entityToolUpdates");
@ -774,7 +804,7 @@ function wasTabletClicked(event) {
var result = Overlays.findRayIntersection(rayPick, true, [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID]); var result = Overlays.findRayIntersection(rayPick, true, [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID]);
return result.intersects; return result.intersects;
} }
function mouseClickEvent(event) { function mouseClickEvent(event) {
var wantDebug = false; var wantDebug = false;
var result, properties, tabletClicked; var result, properties, tabletClicked;
@ -784,7 +814,7 @@ function mouseClickEvent(event) {
if (tabletClicked) { if (tabletClicked) {
return; return;
} }
if (result === null || result === undefined) { if (result === null || result === undefined) {
if (!event.isShifted) { if (!event.isShifted) {
selectionManager.clearSelections(); selectionManager.clearSelections();
@ -2062,7 +2092,7 @@ function selectParticleEntity(entityID) {
selectedParticleEntity = entityID; selectedParticleEntity = entityID;
particleExplorerTool.setActiveParticleEntity(entityID); particleExplorerTool.setActiveParticleEntity(entityID);
particleExplorerTool.webView.emitScriptEvent(JSON.stringify(particleData)); particleExplorerTool.webView.emitScriptEvent(JSON.stringify(particleData));
// Switch to particle explorer // Switch to particle explorer
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");