Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 03:16:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed editor auto format errors

Browse source
This commit is contained in:
amantley 2018-06-26 17:07:55 -07:00
parent 7ecf8c24df
commit 1fcaf16b0c
3 changed files with 38 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
View file

@ -1873,8 +1873,6 @@ void Avatar::processMaterials() {
} }
} }
scriptable::ScriptableModelBase Avatar::getScriptableModel() { scriptable::ScriptableModelBase Avatar::getScriptableModel() {
if (!_skeletonModel || !_skeletonModel->isLoaded()) { if (!_skeletonModel || !_skeletonModel->isLoaded()) {
return scriptable::ScriptableModelBase(); return scriptable::ScriptableModelBase();

22
libraries/avatars-renderer/src/avatars-renderer/Avatar.h
View file

@ -26,10 +26,6 @@
#include "Head.h" #include "Head.h"
#include "SkeletonModel.h" #include "SkeletonModel.h"
#include "Rig.h" #include "Rig.h"
#include "../../interface/src/ui/overlays/Overlays.h"
#include "../../interface/src/ui/overlays/Sphere3DOverlay.h"
#include <ThreadSafeValueCache.h> #include <ThreadSafeValueCache.h>
namespace render { namespace render {
@ -39,8 +35,6 @@ namespace render {
template <> uint32_t metaFetchMetaSubItems(const AvatarSharedPointer& avatar, ItemIDs& subItems); template <> uint32_t metaFetchMetaSubItems(const AvatarSharedPointer& avatar, ItemIDs& subItems);
} }
// namespace render
static const float SCALING_RATIO = .05f; static const float SCALING_RATIO = .05f;
extern const float CHAT_MESSAGE_SCALE; extern const float CHAT_MESSAGE_SCALE;
@ -172,12 +166,8 @@ public:
virtual int parseDataFromBuffer(const QByteArray& buffer) override; virtual int parseDataFromBuffer(const QByteArray& buffer) override;
static void renderJointConnectingCone(gpu::Batch& batch, static void renderJointConnectingCone(gpu::Batch& batch, glm::vec3 position1, glm::vec3 position2,
glm::vec3 position1, float radius1, float radius2, const glm::vec4& color);
glm::vec3 position2,
float radius1,
float radius2,
const glm::vec4& color);
virtual void applyCollision(const glm::vec3& contactPoint, const glm::vec3& penetration) { } virtual void applyCollision(const glm::vec3& contactPoint, const glm::vec3& penetration) { }
@ -435,13 +425,9 @@ protected:
float getUnscaledEyeHeightFromSkeleton() const; float getUnscaledEyeHeightFromSkeleton() const;
void buildUnscaledEyeHeightCache(); void buildUnscaledEyeHeightCache();
void clearUnscaledEyeHeightCache(); void clearUnscaledEyeHeightCache();
virtual const QString& getSessionDisplayNameForTransport() const override { virtual const QString& getSessionDisplayNameForTransport() const override { return _empty; } // Save a tiny bit of bandwidth. Mixer won't look at what we send.
return _empty;
} // Save a tiny bit of bandwidth. Mixer won't look at what we send.
QString _empty{}; QString _empty{};
virtual void maybeUpdateSessionDisplayNameFromTransport(const QString& sessionDisplayName) override { virtual void maybeUpdateSessionDisplayNameFromTransport(const QString& sessionDisplayName) override { _sessionDisplayName = sessionDisplayName; } // don't use no-op setter!
_sessionDisplayName = sessionDisplayName;
} // don't use no-op setter!
SkeletonModelPointer _skeletonModel; SkeletonModelPointer _skeletonModel;

2
libraries/avatars/src/AvatarData.h
View file

@ -55,8 +55,6 @@
#include "PathUtils.h" #include "PathUtils.h"
#include <graphics/Material.h> #include <graphics/Material.h>
//#include "Overlays.h"
//#include "Sphere3DOverlay.h"
using AvatarSharedPointer = std::shared_ptr<AvatarData>; using AvatarSharedPointer = std::shared_ptr<AvatarData>;
using AvatarWeakPointer = std::weak_ptr<AvatarData>; using AvatarWeakPointer = std::weak_ptr<AvatarData>;