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

Fixes for OS X warnings.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-02-13 17:07:57 -08:00
parent b08d452749
commit 1afd3ab712
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/avatar/MyAvatar.cpp
View file

@ -1002,7 +1002,6 @@ void MyAvatar::updateCollisionWithAvatars(float deltaTime) {
avatar->getPosition(), theirCapsuleRadius, theirCapsuleHeight, penetration)) { avatar->getPosition(), theirCapsuleRadius, theirCapsuleHeight, penetration)) {
// move the avatar out by half the penetration // move the avatar out by half the penetration
setPosition(_position - 0.5f * penetration); setPosition(_position - 0.5f * penetration);
glm::vec3 pushOut = 0.5f * penetration;
} }
} }
} }

6
interface/src/renderer/GeometryCache.cpp
View file

@ -300,6 +300,8 @@ QSharedPointer<NetworkGeometry> GeometryCache::getGeometry(const QUrl& url, cons
return geometry; return geometry;
} }
const float NetworkGeometry::NO_HYSTERESIS = -1.0f;
NetworkGeometry::NetworkGeometry(const QUrl& url, const QSharedPointer<NetworkGeometry>& fallback, NetworkGeometry::NetworkGeometry(const QUrl& url, const QSharedPointer<NetworkGeometry>& fallback,
const QVariantHash& mapping, const QUrl& textureBase) : const QVariantHash& mapping, const QUrl& textureBase) :
_request(url), _request(url),
@ -307,9 +309,9 @@ NetworkGeometry::NetworkGeometry(const QUrl& url, const QSharedPointer<NetworkGe
_mapping(mapping), _mapping(mapping),
_textureBase(textureBase.isValid() ? textureBase : url), _textureBase(textureBase.isValid() ? textureBase : url),
_fallback(fallback), _fallback(fallback),
_attempts(0),
_startedLoading(false), _startedLoading(false),
_failedToLoad(false) { _failedToLoad(false),
_attempts(0) {
if (!url.isValid()) { if (!url.isValid()) {
return; return;

2
interface/src/renderer/GeometryCache.h
View file

@ -63,7 +63,7 @@ class NetworkGeometry : public QObject {
public: public:
/// A hysteresis value indicating that we have no state memory. /// A hysteresis value indicating that we have no state memory.
static const float NO_HYSTERESIS = -1.0f; static const float NO_HYSTERESIS;
NetworkGeometry(const QUrl& url, const QSharedPointer<NetworkGeometry>& fallback, NetworkGeometry(const QUrl& url, const QSharedPointer<NetworkGeometry>& fallback,
const QVariantHash& mapping = QVariantHash(), const QUrl& textureBase = QUrl()); const QVariantHash& mapping = QVariantHash(), const QUrl& textureBase = QUrl());