Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-08 05:26:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix transparency check bug.

Browse source 
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
This commit is contained in:
Kasen IO 2020-08-18 03:21:34 -04:00
parent fe1ea6ca72
commit c379f6c92f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
View file

@ -175,6 +175,7 @@ void WebEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene
_alpha = entity->getAlpha(); _alpha = entity->getAlpha();
_pulseProperties = entity->getPulseProperties(); _pulseProperties = entity->getPulseProperties();
_billboardMode = entity->getBillboardMode(); _billboardMode = entity->getBillboardMode();
_useBackground = entity->getUseBackground();
if (_contentType == ContentType::NoContent) { if (_contentType == ContentType::NoContent) {
_tryingToBuildURL = newSourceURL; _tryingToBuildURL = newSourceURL;
@ -300,14 +301,14 @@ void WebEntityRenderer::doRender(RenderArgs* args) {
glm::vec4 color; glm::vec4 color;
Transform transform; Transform transform;
bool forward; bool forward;
bool isTransparent; bool isTransparentWeb;
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;
isTransparent = isTransparent(); isTransparentWeb = isTransparent();
}); });
if (color.a == 0.0f) { if (color.a == 0.0f) {
@ -321,7 +322,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, isTransparent, forward); DependencyManager::get<GeometryCache>()->bindWebBrowserProgram(batch, isTransparentWeb, 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);