mirror of
https://github.com/lubosz/overte.git
synced 2025-04-26 07:15:37 +02:00
commit
3446229bd8
4 changed files with 3 additions and 4 deletions
interface/src
libraries/networking/src
|
@ -157,7 +157,7 @@ void Avatar::animateScaleChanges(float deltaTime) {
|
|||
|
||||
// snap to the end when we get close enough
|
||||
const float MIN_RELATIVE_SCALE_ERROR = 0.03f;
|
||||
if (fabsf(_targetScale - currentScale) / _targetScale < 0.03f) {
|
||||
if (fabsf(_targetScale - currentScale) / _targetScale < MIN_RELATIVE_SCALE_ERROR) {
|
||||
animatedScale = _targetScale;
|
||||
}
|
||||
|
||||
|
|
|
@ -77,7 +77,7 @@ void AvatarActionHold::prepareForPhysicsSimulation() {
|
|||
// getTarget would get the palm position of the previous location of the avatar (because
|
||||
// bullet has moved the av's rigid body but the rigid body's location has not yet been
|
||||
// copied out into the Avatar class.
|
||||
glm::quat avatarRotationInverse = glm::inverse(avatarRigidBodyRotation);
|
||||
//glm::quat avatarRotationInverse = glm::inverse(avatarRigidBodyRotation);
|
||||
|
||||
// the offset should be in the frame of the avatar, but something about the order
|
||||
// things are updated makes this wrong:
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
static const quint64 MSECS_TO_USECS = 1000ULL;
|
||||
static const quint64 TOOLTIP_DELAY = 500 * MSECS_TO_USECS;
|
||||
|
||||
static const float RETICLE_COLOR[] = { 0.0f, 198.0f / 255.0f, 244.0f / 255.0f };
|
||||
static const float reticleSize = TWO_PI / 100.0f;
|
||||
|
||||
static const float CURSOR_PIXEL_SIZE = 32.0f;
|
||||
|
|
|
@ -91,7 +91,7 @@ Assignment::Assignment(ReceivedMessage& message) :
|
|||
#endif
|
||||
|
||||
|
||||
Assignment::Assignment(const Assignment& otherAssignment) {
|
||||
Assignment::Assignment(const Assignment& otherAssignment) : QObject() {
|
||||
_uuid = otherAssignment._uuid;
|
||||
_command = otherAssignment._command;
|
||||
_type = otherAssignment._type;
|
||||
|
|
Loading…
Reference in a new issue