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

one more try

Browse source
This commit is contained in:
SamGondelman 2019-01-29 15:26:49 -08:00
parent 5be6a31b6c
commit 56096708d3
2 changed files with 5 additions and 5 deletions
libraries
entities-renderer/src
RenderableShapeEntityItem.cpp
render-utils/src
MeshPartPayload.cpp

4
libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
View file

@ -53,7 +53,7 @@ bool ShapeEntityRenderer::needsRenderUpdate() const {
}
auto mat = _materials.find("0");
if (mat != _materials.end() && mat->second.needsUpdate()) {
if (mat != _materials.end() && (mat->second.needsUpdate() || mat->second.areTexturesLoading())) {
return true;
}
@ -188,7 +188,7 @@ bool ShapeEntityRenderer::useMaterialPipeline(const graphics::MultiMaterial& mat
ShapeKey ShapeEntityRenderer::getShapeKey() {
auto mat = _materials.find("0");
if (mat != _materials.end() && mat->second.needsUpdate()) {
if (mat != _materials.end() && (mat->second.needsUpdate() || mat->second.areTexturesLoading())) {
RenderPipelines::updateMultiMaterial(mat->second);
}

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

@ -83,7 +83,7 @@ void MeshPartPayload::updateKey(const render::ItemKey& key) {
ItemKey::Builder builder(key);
builder.withTypeShape();
if (_drawMaterials.needsUpdate()) {
if (_drawMaterials.needsUpdate() || _drawMaterials.areTexturesLoading()) {
RenderPipelines::updateMultiMaterial(_drawMaterials);
}
@ -329,7 +329,7 @@ void ModelMeshPartPayload::updateKey(const render::ItemKey& key) {
builder.withDeformed();
}
if (_drawMaterials.needsUpdate()) {
if (_drawMaterials.needsUpdate() || _drawMaterials.areTexturesLoading()) {
RenderPipelines::updateMultiMaterial(_drawMaterials);
}
@ -347,7 +347,7 @@ void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, PrimitiveMode pr
return;
}
if (_drawMaterials.needsUpdate()) {
if (_drawMaterials.needsUpdate() || _drawMaterials.areTexturesLoading()) {
RenderPipelines::updateMultiMaterial(_drawMaterials);
}