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

remove cruft and fix typo in rebase

Browse source
This commit is contained in:
Andrew Meadows 2016-08-17 09:57:53 -07:00
parent d801b3521c
commit 2f16aca114
3 changed files with 3 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

@ -503,7 +503,7 @@ void EntityTreeRenderer::processEraseMessage(ReceivedMessage& message, const Sha
std::static_pointer_cast<EntityTree>(_tree)->processEraseMessage(message, sourceNode); std::static_pointer_cast<EntityTree>(_tree)->processEraseMessage(message, sourceNode);
} }
ModelPointer EntityTreeRenderer::allocateModel(const QString& url, loadingPriority) { ModelPointer EntityTreeRenderer::allocateModel(const QString& url, float loadingPriority) {
ModelPointer model = nullptr; ModelPointer model = nullptr;
// Only create and delete models on the thread that owns the EntityTreeRenderer // Only create and delete models on the thread that owns the EntityTreeRenderer

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

@ -180,6 +180,7 @@ void RenderableModelEntityItem::doInitialModelSimulation() {
_needsInitialSimulation = false; _needsInitialSimulation = false;
} }
/*
// TODO: we need a solution for changes to the postion/rotation/etc of a model... // TODO: we need a solution for changes to the postion/rotation/etc of a model...
// this current code path only addresses that in this setup case... not the changing/moving case // this current code path only addresses that in this setup case... not the changing/moving case
bool RenderableModelEntityItem::readyToAddToScene(RenderArgs* renderArgs) { bool RenderableModelEntityItem::readyToAddToScene(RenderArgs* renderArgs) {
@ -197,6 +198,7 @@ bool RenderableModelEntityItem::readyToAddToScene(RenderArgs* renderArgs) {
bool ready = !_needsInitialSimulation && _model && _model->readyToAddToScene(); bool ready = !_needsInitialSimulation && _model && _model->readyToAddToScene();
return ready; return ready;
} }
*/
class RenderableModelEntityItemMeta { class RenderableModelEntityItemMeta {
public: public:

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

@ -82,9 +82,6 @@ public:
void setVisibleInScene(bool newValue, std::shared_ptr<render::Scene> scene); void setVisibleInScene(bool newValue, std::shared_ptr<render::Scene> scene);
bool needsFixupInScene() const; bool needsFixupInScene() const;
bool readyToAddToScene(RenderArgs* renderArgs = nullptr) const {
return !_needsReload && isRenderable() && isActive();
}
bool needsReload() const { return _needsReload; } bool needsReload() const { return _needsReload; }
bool initWhenReady(render::ScenePointer scene); bool initWhenReady(render::ScenePointer scene);
bool addToScene(std::shared_ptr<render::Scene> scene, bool addToScene(std::shared_ptr<render::Scene> scene,