Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-08 17:08:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Scale-in play area from zero size

Browse source
This commit is contained in:
David Rowe 2018-08-02 14:45:09 +12:00
parent 07049b9481
commit eed0159b5e
1 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
scripts/system/controllers/controllerModules/teleport.js
View file

@ -198,6 +198,11 @@ Script.include("/~/system/libraries/controllers.js");
this.playAreaCenterOffset = this.PLAY_AREA_OVERLAY_OFFSET; this.playAreaCenterOffset = this.PLAY_AREA_OVERLAY_OFFSET;
this.isPlayAreaVisible = false; this.isPlayAreaVisible = false;
this.isPlayAreaAvailable = false; this.isPlayAreaAvailable = false;
this.PLAY_AREA_SCALE_DURATION = 500;
this.PLAY_AREA_SCALE_TIMEOUT = 20;
this.playAreaScaleTimer = null;
this.playAreaScaleStart = 0;
this.playAreaScaleFactor = 0;
this.playAreaOverlay = Overlays.addOverlay("model", { this.playAreaOverlay = Overlays.addOverlay("model", {
url: this.PLAY_AREA_OVERLAY_MODEL, url: this.PLAY_AREA_OVERLAY_MODEL,
@ -228,7 +233,7 @@ Script.include("/~/system/libraries/controllers.js");
Overlays.editOverlay(this.playAreaOverlay, { Overlays.editOverlay(this.playAreaOverlay, {
dimensions: dimensions:
Vec3.multiply(avatarScale, { Vec3.multiply(this.playAreaScaleFactor * avatarScale, {
x: this.playArea.width, x: this.playArea.width,
y: this.PLAY_AREA_OVERLAY_MODEL_UNIT_HEIGHT, y: this.PLAY_AREA_OVERLAY_MODEL_UNIT_HEIGHT,
z: this.playArea.height z: this.playArea.height
@ -239,10 +244,9 @@ Script.include("/~/system/libraries/controllers.js");
var localPosition = this.playAreaSensorPositions[i]; var localPosition = this.playAreaSensorPositions[i];
localPosition = Vec3.multiply(avatarScale, localPosition); localPosition = Vec3.multiply(avatarScale, localPosition);
localPosition.y = avatarScale * this.PLAY_AREA_SENSOR_OVERLAY_DIMENSIONS.y / 2 localPosition.y = avatarScale * this.PLAY_AREA_SENSOR_OVERLAY_DIMENSIONS.y / 2
- this.playAreaCenterOffset.y / 2; // Position on the floor. - this.playAreaCenterOffset.y / 2; // Position on the floor.
Overlays.editOverlay(this.playAreaSensorPositionOverlays[i], { Overlays.editOverlay(this.playAreaSensorPositionOverlays[i], {
dimensions: Vec3.multiply(avatarScale, this.PLAY_AREA_SENSOR_OVERLAY_DIMENSIONS), dimensions: Vec3.multiply(this.playAreaScaleFactor * avatarScale, this.PLAY_AREA_SENSOR_OVERLAY_DIMENSIONS),
parentID: this.playAreaOverlay, parentID: this.playAreaOverlay,
localPosition: localPosition localPosition: localPosition
}); });
@ -255,14 +259,38 @@ Script.include("/~/system/libraries/controllers.js");
} }
}; };
this.scaleInPlayArea = function () {
_this.playAreaScaleFactor = Math.min((Date.now() - _this.playAreaScaleStart) / _this.PLAY_AREA_SCALE_DURATION, 1);
_this.setPlayAreaDimensions();
if (_this.playAreaScaleFactor < 1) {
_this.playAreaScaleTimer = Script.setTimeout(_this.scaleInPlayArea, _this.PLAY_AREA_SCALE_TIMEOUT);
} else {
_this.playAreaScaleTimer = null;
}
};
this.setPlayAreaVisible = function (visible) { this.setPlayAreaVisible = function (visible) {
if (!this.isPlayAreaAvailable || this.isPlayAreaVisible === visible) { if (!this.isPlayAreaAvailable || this.isPlayAreaVisible === visible) {
return; return;
} }
this.isPlayAreaVisible = visible; this.isPlayAreaVisible = visible;
Overlays.editOverlay(this.playAreaOverlay, { visible: visible }); Overlays.editOverlay(this.playAreaOverlay, {
visible: visible,
dimensions: Vec3.ZERO
});
for (var i = 0; i < this.playAreaSensorPositionOverlays.length; i++) { for (var i = 0; i < this.playAreaSensorPositionOverlays.length; i++) {
Overlays.editOverlay(this.playAreaSensorPositionOverlays[i], { visible: visible }); Overlays.editOverlay(this.playAreaSensorPositionOverlays[i], {
visible: visible,
dimensions: Vec3.ZERO
});
}
if (visible) {
this.playAreaScaleStart = Date.now();
this.playAreaScaleFactor = 0;
this.scaleInPlayArea();
} else if (this.playAreaScaleTimer !== null) {
Script.clearTimeout(this.playAreaScaleTimer);
this.playAreaScaleTimer = null;
} }
}; };