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

resolve conflicts on merge with upstream master

Browse source
This commit is contained in:
Stephen Birarda 2014-01-14 16:09:12 -08:00
parent 767a241105
commit 274989935d
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/Avatar.cpp Executable file → Normal file
View file

@ -146,8 +146,8 @@ glm::quat Avatar::getWorldAlignedOrientation () const {
} }
void Avatar::simulate(float deltaTime, Transmitter* transmitter) { void Avatar::simulate(float deltaTime, Transmitter* transmitter) {
if (_scale != _newScale) { if (_scale != _targetScale) {
setScale(_newScale); setScale(_targetScale);
} }
// copy velocity so we can use it later for acceleration // copy velocity so we can use it later for acceleration

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

@ -88,7 +88,7 @@ void MyAvatar::simulate(float deltaTime, Transmitter* transmitter) {
} }
if (_scale != _newScale) { if (_scale != _newScale) {
float scale = (1.f - SMOOTHING_RATIO) * _scale + SMOOTHING_RATIO * _newScale; float scale = (1.f - SMOOTHING_RATIO) * _scale + SMOOTHING_RATIO * _targetScale;
setScale(scale); setScale(scale);
Application::getInstance()->getCamera()->setScale(scale); Application::getInstance()->getCamera()->setScale(scale);
} }

4
libraries/avatars/src/AvatarData.cpp
View file

@ -29,7 +29,7 @@ AvatarData::AvatarData(Node* owningNode) :
_bodyYaw(-90.0), _bodyYaw(-90.0),
_bodyPitch(0.0), _bodyPitch(0.0),
_bodyRoll(0.0), _bodyRoll(0.0),
_newScale(1.0f), _targetScale(1.0f),
_handState(0), _handState(0),
_keyState(NO_KEY_DOWN), _keyState(NO_KEY_DOWN),
_isChatCirclingEnabled(false), _isChatCirclingEnabled(false),
@ -75,7 +75,7 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _bodyRoll); destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _bodyRoll);
// Body scale // Body scale
destinationBuffer += packFloatRatioToTwoByte(destinationBuffer, _newScale); destinationBuffer += packFloatRatioToTwoByte(destinationBuffer, _targetScale);
// Head rotation (NOTE: This needs to become a quaternion to save two bytes) // Head rotation (NOTE: This needs to become a quaternion to save two bytes)
destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _headData->_yaw); destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _headData->_yaw);

2
libraries/voxels/src/VoxelTreeElement.h
View file

@ -92,4 +92,4 @@ protected:
}; };
#endif /* defined(__hifi__VoxelTreeElement__) */ #endif /* defined(__hifi__VoxelTreeElement__) */