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

a calculated change

Browse source
This commit is contained in:
SamGondelman 2016-08-01 18:45:25 -07:00
parent 6154aaddda
commit 0b5c7909b8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/render-utils/src/MeshPartPayload.cpp
View file

@ -352,7 +352,7 @@ void ModelMeshPartPayload::initCache() {
}
float ModelMeshPartPayload::calcFadeRatio() const {
float ModelMeshPartPayload::calculateFadeRatio() const {
const float FADE_TIME = 0.5f;
float t = std::min(((float)(usecTimestampNow() - _fadeStartTime)) / ((float)(FADE_TIME * USECS_PER_SECOND)), 1.0f);
return -(cosf((float)M_PI_2 * t) - 1.0f);
@ -397,7 +397,7 @@ ItemKey ModelMeshPartPayload::getKey() const {
}
}
if (calcFadeRatio() < 1.0f) {
if (calculateFadeRatio() < 1.0f) {
builder.withTransparent();
}
@ -452,7 +452,7 @@ ShapeKey ModelMeshPartPayload::getShapeKey() const {
}
ShapeKey::Builder builder;
if (isTranslucent || calcFadeRatio() < 0.9f) {
if (isTranslucent || calculateFadeRatio() < 0.9f) {
builder.withTranslucent();
}
if (hasTangents) {
@ -493,7 +493,7 @@ void ModelMeshPartPayload::bindMesh(gpu::Batch& batch) const {
batch.setInputStream(2, _drawMesh->getVertexStream().makeRangedStream(2));
}
float fadeRatio = calcFadeRatio();
float fadeRatio = calculateFadeRatio();
if (!_hasColorAttrib || fadeRatio < 1.0f) {
batch._glColor4f(1.0f, 1.0f, 1.0f, fadeRatio);
}

2
libraries/render-utils/src/MeshPartPayload.h
View file

@ -82,7 +82,7 @@ public:
void updateTransformForSkinnedMesh(const Transform& transform, const Transform& offsetTransform, const QVector<glm::mat4>& clusterMatrices);
// Entity fade in
float calcFadeRatio() const;
float calculateFadeRatio() const;
void startFade() { _fadeStartTime = usecTimestampNow(); }
bool hasStartedFade() { return _hasStartedFade; }
void setHasStartedFade(bool hasStartedFade) { _hasStartedFade = hasStartedFade; }