make requested changes

This commit is contained in:
Dante Ruiz 2018-06-26 11:53:45 -07:00
parent 17f4a27ceb
commit d8834af749
8 changed files with 7 additions and 12 deletions

View file

@ -141,6 +141,7 @@ protected:
bool _needsRenderUpdate { false }; bool _needsRenderUpdate { false };
// Only touched on the rendering thread // Only touched on the rendering thread
bool _renderUpdateQueued{ false }; bool _renderUpdateQueued{ false };
Transform _renderTransform;
std::unordered_map<std::string, graphics::MultiMaterial> _materials; std::unordered_map<std::string, graphics::MultiMaterial> _materials;
std::mutex _materialsLock; std::mutex _materialsLock;

View file

@ -35,7 +35,6 @@ private:
glm::vec2 _materialMappingPos; glm::vec2 _materialMappingPos;
glm::vec2 _materialMappingScale; glm::vec2 _materialMappingScale;
float _materialMappingRot; float _materialMappingRot;
Transform _renderTransform;
std::shared_ptr<NetworkMaterial> _drawMaterial; std::shared_ptr<NetworkMaterial> _drawMaterial;
}; };

View file

@ -89,7 +89,6 @@ private:
BufferPointer _particleBuffer{ std::make_shared<Buffer>() }; BufferPointer _particleBuffer{ std::make_shared<Buffer>() };
BufferView _uniformBuffer; BufferView _uniformBuffer;
quint64 _lastSimulated { 0 }; quint64 _lastSimulated { 0 };
Transform _renderTransform;
NetworkTexturePointer _networkTexture; NetworkTexturePointer _networkTexture;
ScenePointer _scene; ScenePointer _scene;

View file

@ -40,7 +40,6 @@ private:
Procedural _procedural; Procedural _procedural;
QString _lastUserData; QString _lastUserData;
Transform _renderTransform;
entity::Shape _shape { entity::Sphere }; entity::Shape _shape { entity::Sphere };
std::shared_ptr<graphics::Material> _material; std::shared_ptr<graphics::Material> _material;
glm::vec3 _position; glm::vec3 _position;

View file

@ -77,11 +77,11 @@ void TextEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scen
} }
void TextEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) { void TextEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
_textColor = toGlm(entity->getTextColorX()); _textColor = toGlm(entity->getTextColorX());
_backgroundColor = toGlm(entity->getBackgroundColorX()); _backgroundColor = toGlm(entity->getBackgroundColorX());
_faceCamera = entity->getFaceCamera(); _faceCamera = entity->getFaceCamera();
_lineHeight = entity->getLineHeight(); _lineHeight = entity->getLineHeight();
_text = entity->getText(); _text = entity->getText();
} }

View file

@ -35,12 +35,11 @@ private:
bool _faceCamera; bool _faceCamera;
glm::vec3 _dimensions; glm::vec3 _dimensions;
glm::vec3 _textColor; glm::vec3 _textColor;
Transform _renderTransform;
glm::vec3 _backgroundColor; glm::vec3 _backgroundColor;
QString _text; QString _text;
float _lineHeight; float _lineHeight;
}; };
} } } }
#endif // hifi_RenderableTextEntityItem_h #endif // hifi_RenderableTextEntityItem_h

View file

@ -68,7 +68,6 @@ private:
bool _lastLocked; bool _lastLocked;
QTimer _timer; QTimer _timer;
uint64_t _lastRenderTime { 0 }; uint64_t _lastRenderTime { 0 };
Transform _renderTransform;
}; };
} } // namespace } } // namespace

View file

@ -123,7 +123,6 @@ private:
bool _pendingSkyboxTexture{ false }; bool _pendingSkyboxTexture{ false };
QString _proceduralUserData; QString _proceduralUserData;
Transform _renderTransform;
}; };
} } // namespace } } // namespace