Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-17 10:16:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update scripts

Browse source
This commit is contained in:
Atlante45 2015-06-24 16:45:38 -07:00
parent 55c490043f
commit bc1abbe9b2
2 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/acScripts/rain.js
View file

@ -123,7 +123,7 @@ var RainSquall = function (properties) {
function setUp() { function setUp() {
if (debug) { if (debug) {
squallCircle = Overlays.addOverlay("circle3d", { squallCircle = Overlays.addOverlay("circle3d", {
size: { x: 2 * squallRadius, y: 2 * squallRadius }, size: { x: squallRadius, y: squallRadius },
color: SQUALL_CIRCLE_COLOR, color: SQUALL_CIRCLE_COLOR,
alpha: SQUALL_CIRCLE_ALPHA, alpha: SQUALL_CIRCLE_ALPHA,
solid: true, solid: true,

52
examples/libraries/entitySelectionTool.js
View file

@ -392,7 +392,8 @@ SelectionDisplay = (function () {
var grabberSpotLightCircle = Overlays.addOverlay("circle3d", { var grabberSpotLightCircle = Overlays.addOverlay("circle3d", {
color: lightOverlayColor, color: lightOverlayColor,
isSolid: false isSolid: false,
visible: false
}); });
var grabberSpotLightLineT = Overlays.addOverlay("line3d", spotLightLineProperties); var grabberSpotLightLineT = Overlays.addOverlay("line3d", spotLightLineProperties);
var grabberSpotLightLineB = Overlays.addOverlay("line3d", spotLightLineProperties); var grabberSpotLightLineB = Overlays.addOverlay("line3d", spotLightLineProperties);
@ -409,17 +410,20 @@ SelectionDisplay = (function () {
var grabberPointLightCircleX = Overlays.addOverlay("circle3d", { var grabberPointLightCircleX = Overlays.addOverlay("circle3d", {
rotation: Quat.fromPitchYawRollDegrees(0, 90, 0), rotation: Quat.fromPitchYawRollDegrees(0, 90, 0),
color: lightOverlayColor, color: lightOverlayColor,
isSolid: false isSolid: false,
visible: false
}); });
var grabberPointLightCircleY = Overlays.addOverlay("circle3d", { var grabberPointLightCircleY = Overlays.addOverlay("circle3d", {
rotation: Quat.fromPitchYawRollDegrees(90, 0, 0), rotation: Quat.fromPitchYawRollDegrees(90, 0, 0),
color: lightOverlayColor, color: lightOverlayColor,
isSolid: false isSolid: false,
visible: false
}); });
var grabberPointLightCircleZ = Overlays.addOverlay("circle3d", { var grabberPointLightCircleZ = Overlays.addOverlay("circle3d", {
rotation: Quat.fromPitchYawRollDegrees(0, 0, 0), rotation: Quat.fromPitchYawRollDegrees(0, 0, 0),
color: lightOverlayColor, color: lightOverlayColor,
isSolid: false isSolid: false,
visible: false
}); });
var grabberPointLightT = Overlays.addOverlay("cube", grabberPropertiesEdge); var grabberPointLightT = Overlays.addOverlay("cube", grabberPropertiesEdge);
var grabberPointLightB = Overlays.addOverlay("cube", grabberPropertiesEdge); var grabberPointLightB = Overlays.addOverlay("cube", grabberPropertiesEdge);
@ -546,7 +550,7 @@ SelectionDisplay = (function () {
var rotateOverlayTarget = Overlays.addOverlay("circle3d", { var rotateOverlayTarget = Overlays.addOverlay("circle3d", {
position: { x:0, y: 0, z: 0}, position: { x:0, y: 0, z: 0},
size: rotateOverlayTargetSize * 2, size: rotateOverlayTargetSize,
color: { red: 0, green: 0, blue: 0 }, color: { red: 0, green: 0, blue: 0 },
alpha: 0.0, alpha: 0.0,
solid: true, solid: true,
@ -1186,7 +1190,7 @@ SelectionDisplay = (function () {
}); });
Overlays.editOverlay(grabberSpotLightCircle, { Overlays.editOverlay(grabberSpotLightCircle, {
position: NEAR, position: NEAR,
dimensions: { x: distance * 2, y: distance * 2, z: 1 }, dimensions: { x: distance, y: distance, z: 1 },
lineWidth: 1.5, lineWidth: 1.5,
rotation: rotation, rotation: rotation,
visible: true, visible: true,
@ -1258,19 +1262,19 @@ SelectionDisplay = (function () {
Overlays.editOverlay(grabberPointLightCircleX, { Overlays.editOverlay(grabberPointLightCircleX, {
position: position, position: position,
rotation: Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(0, 90, 0)), rotation: Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(0, 90, 0)),
dimensions: { x: properties.dimensions.z, y: properties.dimensions.z, z: 1 }, dimensions: { x: properties.dimensions.z / 2.0, y: properties.dimensions.z / 2.0, z: 1 },
visible: true, visible: true,
}); });
Overlays.editOverlay(grabberPointLightCircleY, { Overlays.editOverlay(grabberPointLightCircleY, {
position: position, position: position,
rotation: Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(90, 0, 0)), rotation: Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(90, 0, 0)),
dimensions: { x: properties.dimensions.z, y: properties.dimensions.z, z: 1 }, dimensions: { x: properties.dimensions.z / 2.0, y: properties.dimensions.z / 2.0, z: 1 },
visible: true, visible: true,
}); });
Overlays.editOverlay(grabberPointLightCircleZ, { Overlays.editOverlay(grabberPointLightCircleZ, {
position: position, position: position,
rotation: rotation, rotation: rotation,
dimensions: { x: properties.dimensions.z, y: properties.dimensions.z, z: 1 }, dimensions: { x: properties.dimensions.z / 2.0, y: properties.dimensions.z / 2.0, z: 1 },
visible: true, visible: true,
}); });
@ -1966,7 +1970,7 @@ SelectionDisplay = (function () {
Overlays.editOverlay(rotateOverlayInner, Overlays.editOverlay(rotateOverlayInner,
{ {
visible: true, visible: true,
size: innerRadius * 2, size: innerRadius,
innerRadius: 0.9, innerRadius: 0.9,
startAt: 0, startAt: 0,
endAt: 360, endAt: 360,
@ -1976,7 +1980,7 @@ SelectionDisplay = (function () {
Overlays.editOverlay(rotateOverlayOuter, Overlays.editOverlay(rotateOverlayOuter,
{ {
visible: true, visible: true,
size: outerRadius * 2, size: outerRadius,
innerRadius: 0.9, innerRadius: 0.9,
startAt: 0, startAt: 0,
endAt: 360, endAt: 360,
@ -1986,7 +1990,7 @@ SelectionDisplay = (function () {
Overlays.editOverlay(rotateOverlayCurrent, Overlays.editOverlay(rotateOverlayCurrent,
{ {
visible: true, visible: true,
size: outerRadius * 2, size: outerRadius,
startAt: 0, startAt: 0,
endAt: 0, endAt: 0,
innerRadius: 0.9, innerRadius: 0.9,
@ -2064,13 +2068,13 @@ SelectionDisplay = (function () {
if (snapToInner) { if (snapToInner) {
Overlays.editOverlay(rotateOverlayOuter, { startAt: 0, endAt: 360 }); Overlays.editOverlay(rotateOverlayOuter, { startAt: 0, endAt: 360 });
Overlays.editOverlay(rotateOverlayInner, { startAt: startAtRemainder, endAt: endAtRemainder }); Overlays.editOverlay(rotateOverlayInner, { startAt: startAtRemainder, endAt: endAtRemainder });
Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius * 2, Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius,
majorTickMarksAngle: innerSnapAngle, minorTickMarksAngle: 0, majorTickMarksAngle: innerSnapAngle, minorTickMarksAngle: 0,
majorTickMarksLength: -0.25, minorTickMarksLength: 0, }); majorTickMarksLength: -0.25, minorTickMarksLength: 0, });
} else { } else {
Overlays.editOverlay(rotateOverlayInner, { startAt: 0, endAt: 360 }); Overlays.editOverlay(rotateOverlayInner, { startAt: 0, endAt: 360 });
Overlays.editOverlay(rotateOverlayOuter, { startAt: startAtRemainder, endAt: endAtRemainder }); Overlays.editOverlay(rotateOverlayOuter, { startAt: startAtRemainder, endAt: endAtRemainder });
Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius * 2, Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius,
majorTickMarksAngle: 45.0, minorTickMarksAngle: 5, majorTickMarksAngle: 45.0, minorTickMarksAngle: 5,
majorTickMarksLength: 0.25, minorTickMarksLength: 0.1, }); majorTickMarksLength: 0.25, minorTickMarksLength: 0.1, });
} }
@ -2095,7 +2099,7 @@ SelectionDisplay = (function () {
Overlays.editOverlay(rotateOverlayInner, Overlays.editOverlay(rotateOverlayInner,
{ {
visible: true, visible: true,
size: innerRadius * 2, size: innerRadius,
innerRadius: 0.9, innerRadius: 0.9,
startAt: 0, startAt: 0,
endAt: 360, endAt: 360,
@ -2105,7 +2109,7 @@ SelectionDisplay = (function () {
Overlays.editOverlay(rotateOverlayOuter, Overlays.editOverlay(rotateOverlayOuter,
{ {
visible: true, visible: true,
size: outerRadius * 2, size: outerRadius,
innerRadius: 0.9, innerRadius: 0.9,
startAt: 0, startAt: 0,
endAt: 360, endAt: 360,
@ -2115,7 +2119,7 @@ SelectionDisplay = (function () {
Overlays.editOverlay(rotateOverlayCurrent, Overlays.editOverlay(rotateOverlayCurrent,
{ {
visible: true, visible: true,
size: outerRadius * 2, size: outerRadius,
startAt: 0, startAt: 0,
endAt: 0, endAt: 0,
innerRadius: 0.9, innerRadius: 0.9,
@ -2186,13 +2190,13 @@ SelectionDisplay = (function () {
if (snapToInner) { if (snapToInner) {
Overlays.editOverlay(rotateOverlayOuter, { startAt: 0, endAt: 360 }); Overlays.editOverlay(rotateOverlayOuter, { startAt: 0, endAt: 360 });
Overlays.editOverlay(rotateOverlayInner, { startAt: startAtRemainder, endAt: endAtRemainder }); Overlays.editOverlay(rotateOverlayInner, { startAt: startAtRemainder, endAt: endAtRemainder });
Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius * 2, Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius,
majorTickMarksAngle: innerSnapAngle, minorTickMarksAngle: 0, majorTickMarksAngle: innerSnapAngle, minorTickMarksAngle: 0,
majorTickMarksLength: -0.25, minorTickMarksLength: 0, }); majorTickMarksLength: -0.25, minorTickMarksLength: 0, });
} else { } else {
Overlays.editOverlay(rotateOverlayInner, { startAt: 0, endAt: 360 }); Overlays.editOverlay(rotateOverlayInner, { startAt: 0, endAt: 360 });
Overlays.editOverlay(rotateOverlayOuter, { startAt: startAtRemainder, endAt: endAtRemainder }); Overlays.editOverlay(rotateOverlayOuter, { startAt: startAtRemainder, endAt: endAtRemainder });
Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius * 2, Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius,
majorTickMarksAngle: 45.0, minorTickMarksAngle: 5, majorTickMarksAngle: 45.0, minorTickMarksAngle: 5,
majorTickMarksLength: 0.25, minorTickMarksLength: 0.1, }); majorTickMarksLength: 0.25, minorTickMarksLength: 0.1, });
} }
@ -2216,7 +2220,7 @@ SelectionDisplay = (function () {
Overlays.editOverlay(rotateOverlayInner, Overlays.editOverlay(rotateOverlayInner,
{ {
visible: true, visible: true,
size: innerRadius * 2, size: innerRadius,
innerRadius: 0.9, innerRadius: 0.9,
startAt: 0, startAt: 0,
endAt: 360, endAt: 360,
@ -2226,7 +2230,7 @@ SelectionDisplay = (function () {
Overlays.editOverlay(rotateOverlayOuter, Overlays.editOverlay(rotateOverlayOuter,
{ {
visible: true, visible: true,
size: outerRadius * 2, size: outerRadius,
innerRadius: 0.9, innerRadius: 0.9,
startAt: 0, startAt: 0,
endAt: 360, endAt: 360,
@ -2236,7 +2240,7 @@ SelectionDisplay = (function () {
Overlays.editOverlay(rotateOverlayCurrent, Overlays.editOverlay(rotateOverlayCurrent,
{ {
visible: true, visible: true,
size: outerRadius * 2, size: outerRadius,
startAt: 0, startAt: 0,
endAt: 0, endAt: 0,
innerRadius: 0.9, innerRadius: 0.9,
@ -2306,13 +2310,13 @@ SelectionDisplay = (function () {
if (snapToInner) { if (snapToInner) {
Overlays.editOverlay(rotateOverlayOuter, { startAt: 0, endAt: 360 }); Overlays.editOverlay(rotateOverlayOuter, { startAt: 0, endAt: 360 });
Overlays.editOverlay(rotateOverlayInner, { startAt: startAtRemainder, endAt: endAtRemainder }); Overlays.editOverlay(rotateOverlayInner, { startAt: startAtRemainder, endAt: endAtRemainder });
Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius * 2, Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius,
majorTickMarksAngle: innerSnapAngle, minorTickMarksAngle: 0, majorTickMarksAngle: innerSnapAngle, minorTickMarksAngle: 0,
majorTickMarksLength: -0.25, minorTickMarksLength: 0, }); majorTickMarksLength: -0.25, minorTickMarksLength: 0, });
} else { } else {
Overlays.editOverlay(rotateOverlayInner, { startAt: 0, endAt: 360 }); Overlays.editOverlay(rotateOverlayInner, { startAt: 0, endAt: 360 });
Overlays.editOverlay(rotateOverlayOuter, { startAt: startAtRemainder, endAt: endAtRemainder }); Overlays.editOverlay(rotateOverlayOuter, { startAt: startAtRemainder, endAt: endAtRemainder });
Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius * 2, Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius,
majorTickMarksAngle: 45.0, minorTickMarksAngle: 5, majorTickMarksAngle: 45.0, minorTickMarksAngle: 5,
majorTickMarksLength: 0.25, minorTickMarksLength: 0.1, }); majorTickMarksLength: 0.25, minorTickMarksLength: 0.1, });
} }