mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 08:30:35 +02:00
Fix Unix build warnings and tidy initializers
This commit is contained in:
parent
e074bd85f9
commit
cafebf6a7e
2 changed files with 5 additions and 5 deletions
|
@ -34,9 +34,9 @@ ModelOverlay::ModelOverlay(const ModelOverlay* modelOverlay) :
|
||||||
_model(std::make_shared<Model>(nullptr, this)),
|
_model(std::make_shared<Model>(nullptr, this)),
|
||||||
_modelTextures(QVariantMap()),
|
_modelTextures(QVariantMap()),
|
||||||
_url(modelOverlay->_url),
|
_url(modelOverlay->_url),
|
||||||
|
_updateModel(false),
|
||||||
_scaleToFit(modelOverlay->_scaleToFit),
|
_scaleToFit(modelOverlay->_scaleToFit),
|
||||||
_loadPriority(modelOverlay->_loadPriority),
|
_loadPriority(modelOverlay->_loadPriority)
|
||||||
_updateModel(false)
|
|
||||||
{
|
{
|
||||||
_model->init();
|
_model->init();
|
||||||
_model->setLoadingPriority(_loadPriority);
|
_model->setLoadingPriority(_loadPriority);
|
||||||
|
|
|
@ -75,8 +75,8 @@ private:
|
||||||
QVariantMap _modelTextures;
|
QVariantMap _modelTextures;
|
||||||
|
|
||||||
QUrl _url;
|
QUrl _url;
|
||||||
bool _updateModel = { false };
|
bool _updateModel { false };
|
||||||
bool _scaleToFit = { false };
|
bool _scaleToFit { false };
|
||||||
float _loadPriority { 0.0f };
|
float _loadPriority { 0.0f };
|
||||||
|
|
||||||
AnimationPointer _animation;
|
AnimationPointer _animation;
|
||||||
|
@ -87,7 +87,7 @@ private:
|
||||||
bool _animationRunning { false };
|
bool _animationRunning { false };
|
||||||
bool _animationLoop { false };
|
bool _animationLoop { false };
|
||||||
float _animationFirstFrame { 0.0f };
|
float _animationFirstFrame { 0.0f };
|
||||||
float _animationLastFrame = { 0.0f };
|
float _animationLastFrame { 0.0f };
|
||||||
bool _animationHold { false };
|
bool _animationHold { false };
|
||||||
bool _animationAllowTranslation { false };
|
bool _animationAllowTranslation { false };
|
||||||
uint64_t _lastAnimated { 0 };
|
uint64_t _lastAnimated { 0 };
|
||||||
|
|
Loading…
Reference in a new issue