From 55f03608ab78cb2087ad62a6e3df7960e6e9ee18 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 10 Aug 2013 12:20:01 -0700 Subject: [PATCH] make voxel fade shorter elapsed time and logarithmic instead of linear --- interface/src/VoxelFade.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/src/VoxelFade.cpp b/interface/src/VoxelFade.cpp index 0bbcbeedc1..f7ec97ae30 100644 --- a/interface/src/VoxelFade.cpp +++ b/interface/src/VoxelFade.cpp @@ -13,11 +13,11 @@ #include "VoxelFade.h" const float VoxelFade::FADE_OUT_START = 0.5f; -const float VoxelFade::FADE_OUT_END = 0.0f; -const float VoxelFade::FADE_OUT_STEP = -0.005f; -const float VoxelFade::FADE_IN_START = 0.0f; +const float VoxelFade::FADE_OUT_END = 0.05f; +const float VoxelFade::FADE_OUT_STEP = 0.9f; +const float VoxelFade::FADE_IN_START = 0.05f; const float VoxelFade::FADE_IN_END = 0.5f; -const float VoxelFade::FADE_IN_STEP = 0.005f; +const float VoxelFade::FADE_IN_STEP = 1.1f; const float VoxelFade::DEFAULT_RED = 0.5f; const float VoxelFade::DEFAULT_GREEN = 0.5f; const float VoxelFade::DEFAULT_BLUE = 0.5f; @@ -45,7 +45,7 @@ void VoxelFade::render() { glPopMatrix(); glEnable(GL_LIGHTING); - opacity += (direction == FADE_OUT) ? FADE_OUT_STEP : FADE_IN_STEP; + opacity *= (direction == FADE_OUT) ? FADE_OUT_STEP : FADE_IN_STEP; } bool VoxelFade::isDone() const {