mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-25 17:14:59 +02:00
merge
This commit is contained in:
parent
6cf8ec32a7
commit
17c961f1b0
1 changed files with 13 additions and 11 deletions
|
@ -29,24 +29,22 @@ enum KeyState
|
|||
class AvatarData : public AgentData {
|
||||
public:
|
||||
AvatarData();
|
||||
~AvatarData();
|
||||
|
||||
AvatarData* clone() const;
|
||||
|
||||
const glm::vec3& getPosition() const;
|
||||
void setPosition(glm::vec3 position);
|
||||
void setHandPosition(glm::vec3 handPosition);
|
||||
const glm::vec3& getPosition() const { return _position; }
|
||||
void setPosition(const glm::vec3 position) { _position = position; }
|
||||
void setHandPosition(const glm::vec3 handPosition) { _handPosition = handPosition; }
|
||||
|
||||
int getBroadcastData(unsigned char* destinationBuffer);
|
||||
int parseData(unsigned char* sourceBuffer, int numBytes);
|
||||
|
||||
// Body Rotation
|
||||
float getBodyYaw();
|
||||
float getBodyPitch();
|
||||
float getBodyRoll();
|
||||
void setBodyYaw(float bodyYaw);
|
||||
void setBodyPitch(float bodyPitch);
|
||||
void setBodyRoll(float bodyRoll);
|
||||
float getBodyYaw() const { return _bodyYaw; }
|
||||
void setBodyYaw(float bodyYaw) { _bodyYaw = bodyYaw; }
|
||||
float getBodyPitch() const { return _bodyPitch; }
|
||||
void setBodyPitch(float bodyPitch) { _bodyPitch = bodyPitch; }
|
||||
float getBodyRoll() const {return _bodyRoll; }
|
||||
void setBodyRoll(float bodyRoll) { _bodyRoll = bodyRoll; }
|
||||
|
||||
// Head Rotation
|
||||
void setHeadPitch(float p);
|
||||
|
@ -110,6 +108,10 @@ public:
|
|||
void setWantDelta(bool wantDelta) { _wantDelta = wantDelta; }
|
||||
|
||||
protected:
|
||||
// privatize the copy constructor and assignment operator so they cannot be called
|
||||
AvatarData(const AvatarData&);
|
||||
AvatarData& operator= (const AvatarData&);
|
||||
|
||||
glm::vec3 _position;
|
||||
glm::vec3 _handPosition;
|
||||
|
||||
|
|
Loading…
Reference in a new issue