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

Fixing build warnings

Browse source
This commit is contained in:
Andrew Meadows 2014-03-04 09:54:34 -08:00
parent d0ac8eec74
commit 3d426a24f1
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/renderer/Model.cpp
View file

@ -21,9 +21,9 @@ using namespace std;
Model::Model(QObject* parent) : Model::Model(QObject* parent) :
QObject(parent), QObject(parent),
_shapesAreDirty(true),
_lodDistance(0.0f), _lodDistance(0.0f),
_pupilDilation(0.0f), _pupilDilation(0.0f) {
_shapesAreDirty(true) {
// we may have been created in the network thread, but we live in the main thread // we may have been created in the network thread, but we live in the main thread
moveToThread(Application::getInstance()->thread()); moveToThread(Application::getInstance()->thread());
} }
@ -741,7 +741,6 @@ void Model::renderCollisionProxies(float alpha) {
glPushMatrix(); glPushMatrix();
Application::getInstance()->loadTranslatedViewMatrix(_translation); Application::getInstance()->loadTranslatedViewMatrix(_translation);
updateShapePositions(); updateShapePositions();
float uniformScale = extractUniformScale(_scale);
const int BALL_SUBDIVISIONS = 10; const int BALL_SUBDIVISIONS = 10;
glm::quat inverseRotation = glm::inverse(_rotation); glm::quat inverseRotation = glm::inverse(_rotation);
for (int i = 0; i < _shapes.size(); i++) { for (int i = 0; i < _shapes.size(); i++) {
@ -763,9 +762,6 @@ void Model::renderCollisionProxies(float alpha) {
} else if (shape->getType() == Shape::CAPSULE_SHAPE) { } else if (shape->getType() == Shape::CAPSULE_SHAPE) {
CapsuleShape* capsule = static_cast<CapsuleShape*>(shape); CapsuleShape* capsule = static_cast<CapsuleShape*>(shape);
// translate to capsule center
glm::vec3 point = inverseRotation * (capsule->getPosition() - _translation);
// draw a blue sphere at the capsule endpoint // draw a blue sphere at the capsule endpoint
glm::vec3 endPoint; glm::vec3 endPoint;
capsule->getEndPoint(endPoint); capsule->getEndPoint(endPoint);