Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-21 22:00:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use utils.js, move easing function, use mixes

Browse source 
some cleanup
This commit is contained in:
Triplelexx 2017-03-15 11:08:54 +00:00
parent 84d157ab18
commit 9e0091ebe0
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/developer/libraries/utils.js
View file

@ -311,3 +311,6 @@ clamp = function(val, min, max){
return Math.max(min, Math.min(max, val)) return Math.max(min, Math.min(max, val))
} }
easeIn = function(t) {
return Math.pow(t / 1, 5);
}

27
scripts/system/audioMuteOverlay.js
View file

@ -15,8 +15,10 @@
// //
(function() { // BEGIN LOCAL_SCOPE (function() { // BEGIN LOCAL_SCOPE
Script.include(utilsPath);
var TWEEN_SPEED = 0.025; var TWEEN_SPEED = 0.025;
var LERP_AMOUNT = 0.25; var MIX_AMOUNT = 0.25;
var overlayPosition = Vec3.ZERO; var overlayPosition = Vec3.ZERO;
var tweenPosition = 0; var tweenPosition = 0;
@ -47,14 +49,6 @@
} }
} }
function lerp(a, b, val) {
return (1 - val) * a + val * b;
}
function easeIn(t) {
return Math.pow(t / 1, 5);
}
function getOffsetPosition() { function getOffsetPosition() {
return Vec3.sum(Camera.position, Quat.getFront(Camera.orientation)); return Vec3.sum(Camera.position, Quat.getFront(Camera.orientation));
} }
@ -88,19 +82,10 @@
endColor[color] = storedColor; endColor[color] = storedColor;
} }
} }
// mix previous position with new and mix colors
// update position based on LERP_AMOUNT overlayPosition = Vec3.mix(overlayPosition, getOffsetPosition(), MIX_AMOUNT);
var offsetPosition = getOffsetPosition();
overlayPosition.x = lerp(overlayPosition.x, offsetPosition.x, LERP_AMOUNT);
overlayPosition.y = lerp(overlayPosition.y, offsetPosition.y, LERP_AMOUNT);
overlayPosition.z = lerp(overlayPosition.z, offsetPosition.z, LERP_AMOUNT);
Overlays.editOverlay(overlayID, { Overlays.editOverlay(overlayID, {
color: { color: colorMix(startColor, endColor, easeIn(tweenPosition)),
red: lerp(startColor.red, endColor.red, easeIn(tweenPosition)),
green: lerp(startColor.green, endColor.green, easeIn(tweenPosition)),
blue: lerp(startColor.blue, endColor.blue, easeIn(tweenPosition))
},
position: overlayPosition, position: overlayPosition,
rotation: Camera.orientation rotation: Camera.orientation
}); });