Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 18:42:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR

Browse source
This commit is contained in:
HifiExperiments 2020-08-17 14:16:41 -07:00
parent 87fd039f99
commit e78ece7fc5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -496,7 +496,7 @@ void EntityTreeRenderer::updateChangedEntities(const render::ScenePointer& scene
} }
// compute average per-renderable update cost // compute average per-renderable update cost
_prevNumEntityUpdates = sortedRenderables.size() - _renderablesToUpdate.size(); _prevNumEntityUpdates = sortedRenderables.size() - _renderablesToUpdate.size();
size_t numUpdated = _prevNumEntityUpdates + 1; // add one to avoid divide by zero size_t numUpdated = _prevNumEntityUpdates + 1; // add one to avoid divide by zero
float cost = (float)(usecTimestampNow() - updateStart) / (float)(numUpdated); float cost = (float)(usecTimestampNow() - updateStart) / (float)(numUpdated);
const float BLEND = 0.1f; const float BLEND = 0.1f;

4
libraries/render-utils/src/Model.cpp
View file

@ -958,10 +958,10 @@ void Model::setCauterized(bool cauterized, const render::ScenePointer& scene) {
} }
} }
void Model::setPrimitiveMode(PrimitiveMode primitiveMode, const render::ScenePointer& scene) { void Model::setPrimitiveMode(PrimitiveMode primitiveMode) {
if (_primitiveMode != primitiveMode) { if (_primitiveMode != primitiveMode) {
_primitiveMode = primitiveMode; _primitiveMode = primitiveMode;
updateRenderItemsKey(scene); updateRenderItemsKey(nullptr);
} }
} }

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

@ -118,7 +118,7 @@ public:
bool isCauterized() const { return _cauterized; } bool isCauterized() const { return _cauterized; }
void setCauterized(bool value, const render::ScenePointer& scene); void setCauterized(bool value, const render::ScenePointer& scene);
void setPrimitiveMode(PrimitiveMode primitiveMode, const render::ScenePointer& scene = nullptr); void setPrimitiveMode(PrimitiveMode primitiveMode);
PrimitiveMode getPrimitiveMode() const { return _primitiveMode; } PrimitiveMode getPrimitiveMode() const { return _primitiveMode; }
void setCullWithParent(bool value); void setCullWithParent(bool value);