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

Smoother ease in / out functions

Browse source
This commit is contained in:
Olivier Prat 2017-07-04 14:35:43 +02:00
parent 7d851c1cbd
commit 98d915cf0f
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/render-utils/src/Fade.slh
View file

@ -45,7 +45,8 @@ vec2 hash2D(vec3 position) {
} }
float noise3D(vec3 position) { float noise3D(vec3 position) {
return textureLod(fadeMaskMap, hash2D(position), 0).r; float n = textureLod(fadeMaskMap, hash2D(position), 0).r;
return pow(n, 1.0/2.2); // Need to fix this later directly in the texture
} }
float evalFadeNoiseGradient(vec3 position) { float evalFadeNoiseGradient(vec3 position) {
@ -87,8 +88,6 @@ float evalFadeGradient(vec3 position) {
} }
float evalFadeAlpha(vec3 position) { float evalFadeAlpha(vec3 position) {
//float edgeWidth = fadeParameters[fadeCategory]._edgeWidthInvWidth.x;
//float cutoff = mix(-edgeWidth, 1.0+edgeWidth, fadeThreshold);
float cutoff = fadeThreshold; float cutoff = fadeThreshold;
return evalFadeGradient(position)-cutoff; return evalFadeGradient(position)-cutoff;

14
libraries/render-utils/src/FadeEffect.cpp
View file

@ -385,7 +385,7 @@ void FadeConfigureJob::configure(const Config& config) {
configuration._edgeWidthInvWidth.y = 1.f / configuration._edgeWidthInvWidth.x; configuration._edgeWidthInvWidth.y = 1.f / configuration._edgeWidthInvWidth.x;
configuration._innerEdgeColor = config.edgeInnerColor[i]; configuration._innerEdgeColor = config.edgeInnerColor[i];
configuration._outerEdgeColor = config.edgeOuterColor[i]; configuration._outerEdgeColor = config.edgeOuterColor[i];
_parameters->_thresholdScale[i] = 1.f + 2.f*(configuration._edgeWidthInvWidth.x + std::max(0.f, (config.noiseLevel[i] + config.baseLevel[i])*0.5f-0.5f)); _parameters->_thresholdScale[i] = 1.f + (configuration._edgeWidthInvWidth.x + std::max(0.f, (config.noiseLevel[i] + config.baseLevel[i])*0.5f-0.5f));
_parameters->_noiseSpeed[i] = config.noiseSpeed[i]; _parameters->_noiseSpeed[i] = config.noiseSpeed[i];
_parameters->_timing[i] = (FadeJobConfig::Timing) config.timing[i]; _parameters->_timing[i] = (FadeJobConfig::Timing) config.timing[i];
} }
@ -495,14 +495,14 @@ float FadeRenderJob::computeElementEnterThreshold(double time, const double peri
fadeAlpha = fraction; fadeAlpha = fraction;
break; break;
case FadeJobConfig::EASE_IN: case FadeJobConfig::EASE_IN:
fadeAlpha = fraction*fraction; fadeAlpha = fraction*fraction*fraction;
break; break;
case FadeJobConfig::EASE_OUT: case FadeJobConfig::EASE_OUT:
fadeAlpha = 1.f - fraction; fadeAlpha = 1.f - fraction;
fadeAlpha = 1.f- fadeAlpha*fadeAlpha; fadeAlpha = 1.f- fadeAlpha*fadeAlpha*fadeAlpha;
break; break;
case FadeJobConfig::EASE_IN_OUT: case FadeJobConfig::EASE_IN_OUT:
fadeAlpha = fraction*fraction*(3 - 2 * fraction); fadeAlpha = fraction*fraction*fraction*(fraction*(fraction * 6 - 15) + 10);
break; break;
} }
} }
@ -552,7 +552,11 @@ void FadeRenderJob::updateFadeEdit(const render::RenderContextPointer& renderCon
} }
} }
renderContext->jobConfig->setProperty("threshold", _editThreshold); float threshold = _editThreshold;
if (editedCategory != FadeJobConfig::BUBBLE_ISECT_OWNER) {
threshold = (threshold - 0.5f)*_parameters->_thresholdScale[editedCategory] + 0.5f;
}
renderContext->jobConfig->setProperty("threshold", threshold);
_editNoiseOffset = _parameters->_noiseSpeed[editedCategory] * (float)_editTime; _editNoiseOffset = _parameters->_noiseSpeed[editedCategory] * (float)_editTime;