Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 02:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

clean up diff

Browse source
This commit is contained in:
Seth Alves 2015-05-21 18:17:07 -07:00
parent 90a5dd6dd1
commit f85cc89946
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@ public:
bool& keepSearching, OctreeElement*& element, float& distance, BoxFace& face, bool& keepSearching, OctreeElement*& element, float& distance, BoxFace& face,
void** intersectedObject, bool precisionPicking) const; void** intersectedObject, bool precisionPicking) const;
virtual Model* getModel(EntityTreeRenderer* renderer); Model* getModel(EntityTreeRenderer* renderer);
bool needsToCallUpdate() const; bool needsToCallUpdate() const;
@ -65,7 +65,7 @@ private:
Model* _model; Model* _model;
bool _needsInitialSimulation; bool _needsInitialSimulation;
bool _needsModelReload = true; bool _needsModelReload;
EntityTreeRenderer* _myRenderer; EntityTreeRenderer* _myRenderer;
QString _currentTextures; QString _currentTextures;
QStringList _originalTextures; QStringList _originalTextures;

2
libraries/entities/src/ModelEntityItem.h
View file

@ -56,7 +56,7 @@ public:
const rgbColor& getColor() const { return _color; } const rgbColor& getColor() const { return _color; }
xColor getXColor() const { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; } xColor getXColor() const { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; }
virtual bool hasModel() const { return !_modelURL.isEmpty(); } bool hasModel() const { return !_modelURL.isEmpty(); }
virtual bool hasCompoundShapeURL() const { return !_compoundShapeURL.isEmpty(); } virtual bool hasCompoundShapeURL() const { return !_compoundShapeURL.isEmpty(); }
static const QString DEFAULT_MODEL_URL; static const QString DEFAULT_MODEL_URL;