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

Merge pull request #761 from daleglass/fix-more-warnings

Browse source 
Fix more warnings
This commit is contained in:
kasenvr 2020-10-03 14:25:09 -04:00 committed by GitHub
commit 01185c94b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/RenderableGizmoEntityItem.h
View file

@ -29,7 +29,7 @@ protected:
bool isTransparent() const override;
private:
virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity);
virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override;
virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override;
virtual void doRender(RenderArgs* args) override;

1
libraries/fbx/src/GLTFSerializer.cpp
View file

@ -1628,7 +1628,6 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash&
// Mesh extents must be at least a minimum size, in particular for blendshapes to work on planar meshes.
const float MODEL_MIN_DIMENSION = 0.001f;
auto x = EPSILON;
auto delta = glm::max(glm::vec3(MODEL_MIN_DIMENSION) - mesh.meshExtents.size(), glm::vec3(0.0f)) / 2.0f;
mesh.meshExtents.minimum -= delta;
mesh.meshExtents.maximum += delta;