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

Fix for TRUNCATE_IK_CAPSULE globals

Browse source
This commit is contained in:
Anthony J. Thibault 2016-09-13 10:26:38 -07:00
parent 362e185098
commit 0fde3a2d76
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,9 +86,9 @@ const float MyAvatar::ZOOM_DEFAULT = 1.5f;
extern bool OUTOFBODY_HACK_ENABLE_DEBUG_DRAW_IK_TARGETS; extern bool OUTOFBODY_HACK_ENABLE_DEBUG_DRAW_IK_TARGETS;
// OUTOFBODY_HACK defined in SkeletonModel.cpp // OUTOFBODY_HACK defined in SkeletonModel.cpp
extern const glm::vec3 TRUNCATE_IK_CAPSULE_POSITION; extern glm::vec3 TRUNCATE_IK_CAPSULE_POSITION;
extern const float TRUNCATE_IK_CAPSULE_LENGTH; extern float TRUNCATE_IK_CAPSULE_LENGTH;
extern const float TRUNCATE_IK_CAPSULE_RADIUS; extern float TRUNCATE_IK_CAPSULE_RADIUS;
MyAvatar::MyAvatar(RigPointer rig) : MyAvatar::MyAvatar(RigPointer rig) :
Avatar(rig), Avatar(rig),

6
interface/src/avatar/SkeletonModel.cpp
View file

@ -23,9 +23,9 @@
#include "InterfaceLogging.h" #include "InterfaceLogging.h"
#include "AnimDebugDraw.h" #include "AnimDebugDraw.h"
const glm::vec3 TRUNCATE_IK_CAPSULE_POSITION(0.0f, 0.0f, 0.0f); glm::vec3 TRUNCATE_IK_CAPSULE_POSITION(0.0f, 0.0f, 0.0f);
const float TRUNCATE_IK_CAPSULE_LENGTH = 1000.0f; float TRUNCATE_IK_CAPSULE_LENGTH = 1000.0f;
const float TRUNCATE_IK_CAPSULE_RADIUS = 0.5f; float TRUNCATE_IK_CAPSULE_RADIUS = 0.5f;
SkeletonModel::SkeletonModel(Avatar* owningAvatar, QObject* parent, RigPointer rig) : SkeletonModel::SkeletonModel(Avatar* owningAvatar, QObject* parent, RigPointer rig) :
Model(rig, parent), Model(rig, parent),