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

new member variables related to rendering collision hulls

Browse source
This commit is contained in:
Seth Alves 2015-04-01 17:52:18 -07:00
parent 00449ef7c0
commit 8940ba0c2a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -91,7 +91,7 @@ public:
void reset();
virtual void simulate(float deltaTime, bool fullUpdate = true);
enum RenderMode { DEFAULT_RENDER_MODE, SHADOW_RENDER_MODE, DIFFUSE_RENDER_MODE, NORMAL_RENDER_MODE };
enum RenderMode { DEFAULT_RENDER_MODE, SHADOW_RENDER_MODE, DIFFUSE_RENDER_MODE, NORMAL_RENDER_MODE, DEBUG_RENDER_MODE };
bool render(float alpha = 1.0f, RenderMode mode = DEFAULT_RENDER_MODE, RenderArgs* args = NULL);
@ -111,6 +111,7 @@ public:
// Set the model to use for collisions
Q_INVOKABLE void setCollisionModelURL(const QUrl& url);
const QUrl& getCollisionURL() const { return _collisionUrl; }
void setCollisionGeometryScale(glm::vec3 newScale) { _collisionGeometryScale = newScale; }
/// Sets the distance parameter used for LOD computations.
void setLODDistance(float distance) { _lodDistance = distance; }
@ -295,6 +296,7 @@ private:
float _nextLODHysteresis;
QSharedPointer<NetworkGeometry> _collisionGeometry;
QSharedPointer<NetworkGeometry> _saveNonCollisionGeometry;
float _pupilDilation;
QVector<float> _blendshapeCoefficients;
@ -479,6 +481,8 @@ private:
static AbstractViewStateInterface* _viewState;
bool _renderCollisionHull;
glm::vec3 _collisionGeometryScale;
};
Q_DECLARE_METATYPE(QPointer<Model>)