From b06cc60665c9b05e7836b9983240065e7b5ff1a9 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Mon, 20 May 2013 12:14:32 -0700
Subject: [PATCH] moved constructor
---
libraries/avatars/src/AvatarData.cpp | 27 +++++++++++++++++++++++++++
libraries/avatars/src/AvatarData.h | 24 +-----------------------
2 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 2e11e8aa84..21e0397619 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -33,6 +33,33 @@ int unpackFloatAngleFromTwoByte(uint16_t* byteAnglePointer, float* destinationPo
return sizeof(uint16_t);
}
+AvatarData::AvatarData() :
+ _handPosition(0,0,0),
+ _bodyYaw(-90.0),
+ _bodyPitch(0.0),
+ _bodyRoll(0.0),
+ _headYaw(0),
+ _headPitch(0),
+ _headRoll(0),
+ _headLeanSideways(0),
+ _headLeanForward(0),
+ _audioLoudness(0),
+ _handState(0),
+ _cameraPosition(0,0,0),
+ _cameraDirection(0,0,0),
+ _cameraUp(0,0,0),
+ _cameraRight(0,0,0),
+ _cameraFov(0.0f),
+ _cameraAspectRatio(0.0f),
+ _cameraNearClip(0.0f),
+ _cameraFarClip(0.0f),
+ _keyState(NO_KEY_DOWN),
+ _wantResIn(false),
+ _wantColor(true)
+{
+};
+
+
int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
unsigned char* bufferStart = destinationBuffer;
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index f37c4f3396..eeb2e1eb7e 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -28,29 +28,7 @@ enum KeyState
class AvatarData : public AgentData {
public:
- AvatarData() :
- _handPosition(0,0,0),
- _bodyYaw(-90.0),
- _bodyPitch(0.0),
- _bodyRoll(0.0),
- _headYaw(0),
- _headPitch(0),
- _headRoll(0),
- _headLeanSideways(0),
- _headLeanForward(0),
- _audioLoudness(0),
- _handState(0),
- _cameraPosition(0,0,0),
- _cameraDirection(0,0,0),
- _cameraUp(0,0,0),
- _cameraRight(0,0,0),
- _cameraFov(0.0f),
- _cameraAspectRatio(0.0f),
- _cameraNearClip(0.0f),
- _cameraFarClip(0.0f),
- _keyState(NO_KEY_DOWN),
- _wantResIn(false),
- _wantColor(true) { };
+ AvatarData();
const glm::vec3& getPosition() const { return _position; }
void setPosition(const glm::vec3 position) { _position = position; }