Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-12 17:03:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

PR code clean up

Browse source
This commit is contained in:
danteruiz 2018-08-27 11:01:29 -07:00
parent e4293d9ad5
commit e2cd695dfb
8 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.h
View file

@ -233,7 +233,7 @@ public:
bool getPreferAvatarFingerOverStylus() { return false; }
void setPreferAvatarFingerOverStylus(bool value);
float getDomainLoadProgress() { return _octreeProcessor.domainLoadProgress(); }
float getDomainLoadingProgress() { return _octreeProcessor.domainLoadingProgress(); }
float getSettingConstrainToolbarPosition() { return _constrainToolbarPosition.get(); }
void setSettingConstrainToolbarPosition(bool setting);

1
interface/src/avatar/MyAvatar.cpp
View file

@ -2432,7 +2432,6 @@ void MyAvatar::setHasScriptedBlendshapes(bool hasScriptedBlendshapes) {
// send a forced avatarData update to make sure the script can send neutal blendshapes on unload
// without having to wait for the update loop, make sure _hasScriptedBlendShapes is still true
// before sending the update, or else it won't send the neutal blendshapes to the receiving clients
sendAvatarDataPacket(true);
}
_hasScriptedBlendShapes = hasScriptedBlendshapes;

2
interface/src/octree/OctreePacketProcessor.cpp
View file

@ -142,6 +142,6 @@ bool OctreePacketProcessor::isEntitiesRenderReady() const {
return _safeLanding->entitiesRenderReady();
}
float OctreePacketProcessor::domainLoadProgress() {
float OctreePacketProcessor::domainLoadingProgress() {
return _safeLanding->loadingProgressPercentage();
}

2
interface/src/octree/OctreePacketProcessor.h
View file

@ -28,7 +28,7 @@ public:
void startEntitySequence();
bool isLoadSequenceComplete() const;
bool isEntitiesRenderReady() const;
float domainLoadProgress();
float domainLoadingProgress();
signals:
void packetVersionMismatch();

2
interface/src/scripting/WindowScriptingInterface.cpp
View file

@ -590,5 +590,5 @@ void WindowScriptingInterface::onMessageBoxSelected(int button) {
float WindowScriptingInterface::domainLoadingProgress() {
return qApp->getDomainLoadProgress();
return qApp->getDomainLoadingProgress();
}

1
interface/src/ui/OverlayConductor.cpp
View file

@ -103,7 +103,6 @@ void OverlayConductor::update(float dt) {
bool targetVisible = Menu::getInstance()->isOptionChecked(MenuOption::Overlays) && !_suppressedByHead;
if (targetVisible != currentVisible) {
qDebug() << "setting pinned: " << !targetVisible;
offscreenUi->setPinned(!targetVisible);
}
if (shouldRecenter && !_suppressedByHead) {

1
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -1305,7 +1305,6 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
if (_hasModel) {
if (model && _didLastVisualGeometryRequestSucceed) {
visuallyReady = (_prevModelLoaded && _texturesLoaded);
// qDebug() << visuallyReady;
}
}
entity->setVisuallyReady(visuallyReady);

4
libraries/entities-renderer/src/RenderableModelEntityItem.h
View file

@ -38,13 +38,11 @@ class ModelEntityWrapper : public ModelEntityItem {
using Parent = ModelEntityItem;
friend class render::entities::ModelEntityRenderer;
public:
bool isModelLoaded() const;
protected:
ModelEntityWrapper(const EntityItemID& entityItemID) : Parent(entityItemID) {}
void setModel(const ModelPointer& model);
ModelPointer getModel() const;
bool isModelLoaded() const;
bool _needsInitialSimulation{ true };
private: