mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 23:14:34 +02:00
Update bool name "isTransparentWeb" -> "transparent"
This commit is contained in:
parent
204789bd42
commit
103288b8de
1 changed files with 3 additions and 3 deletions
|
@ -307,14 +307,14 @@ void WebEntityRenderer::doRender(RenderArgs* args) {
|
||||||
glm::vec4 color;
|
glm::vec4 color;
|
||||||
Transform transform;
|
Transform transform;
|
||||||
bool forward;
|
bool forward;
|
||||||
bool isTransparentWeb;
|
bool transparent;
|
||||||
withReadLock([&] {
|
withReadLock([&] {
|
||||||
float fadeRatio = _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f;
|
float fadeRatio = _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f;
|
||||||
color = glm::vec4(toGlm(_color), _alpha * fadeRatio);
|
color = glm::vec4(toGlm(_color), _alpha * fadeRatio);
|
||||||
color = EntityRenderer::calculatePulseColor(color, _pulseProperties, _created);
|
color = EntityRenderer::calculatePulseColor(color, _pulseProperties, _created);
|
||||||
transform = _renderTransform;
|
transform = _renderTransform;
|
||||||
forward = _renderLayer != RenderLayer::WORLD || args->_renderMethod == render::Args::FORWARD;
|
forward = _renderLayer != RenderLayer::WORLD || args->_renderMethod == render::Args::FORWARD;
|
||||||
isTransparentWeb = isTransparent();
|
transparent = isTransparent();
|
||||||
});
|
});
|
||||||
|
|
||||||
if (color.a == 0.0f) {
|
if (color.a == 0.0f) {
|
||||||
|
@ -328,7 +328,7 @@ void WebEntityRenderer::doRender(RenderArgs* args) {
|
||||||
|
|
||||||
// Turn off jitter for these entities
|
// Turn off jitter for these entities
|
||||||
batch.pushProjectionJitter();
|
batch.pushProjectionJitter();
|
||||||
DependencyManager::get<GeometryCache>()->bindWebBrowserProgram(batch, isTransparentWeb, forward);
|
DependencyManager::get<GeometryCache>()->bindWebBrowserProgram(batch, transparent, forward);
|
||||||
DependencyManager::get<GeometryCache>()->renderQuad(batch, topLeft, bottomRight, texMin, texMax, color, _geometryId);
|
DependencyManager::get<GeometryCache>()->renderQuad(batch, topLeft, bottomRight, texMin, texMax, color, _geometryId);
|
||||||
batch.popProjectionJitter();
|
batch.popProjectionJitter();
|
||||||
batch.setResourceTexture(0, nullptr);
|
batch.setResourceTexture(0, nullptr);
|
||||||
|
|
Loading…
Reference in a new issue