Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 22:33:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

move a couple avatar initialisations outside avatar maanger

Browse source
This commit is contained in:
Atlante45 2015-01-29 16:00:57 -08:00
parent 9095eeeeb9
commit 6b7a391885
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/Avatar.h
View file

@ -55,10 +55,6 @@ enum ScreenTintLayer {
NUM_SCREEN_TINT_LAYERS
};
// Where one's own Avatar begins in the world (will be overwritten if avatar data file is found).
// This is the start location in the Sandbox (xyz: 6270, 211, 6000).
const glm::vec3 START_LOCATION(0.38269043f * TREE_SCALE, 0.01287842f * TREE_SCALE, 0.36621094f * TREE_SCALE);
class Texture;
class Avatar : public AvatarData {

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

@ -56,8 +56,6 @@ AvatarManager::AvatarManager(QObject* parent) :
void AvatarManager::init() {
_myAvatar->init();
_myAvatar->setPosition(START_LOCATION);
_myAvatar->setDisplayingLookatVectors(false);
_avatarHash.insert(MY_AVATAR_KEY, _myAvatar);
}

2
libraries/audio-client/src/AudioClient.cpp
View file

@ -923,7 +923,7 @@ void AudioClient::parseAudioEnvironmentData(const QByteArray &packet) {
void AudioClient::toggleMute() {
_muted = !_muted;
muteToggled();
emit muteToggled();
}
void AudioClient::setIsStereoInput(bool isStereoInput) {

10
libraries/avatars/src/AvatarData.h
View file

@ -110,6 +110,10 @@ const int AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS = 5000;
const QUrl DEFAULT_HEAD_MODEL_URL = QUrl("http://public.highfidelity.io/models/heads/defaultAvatar_head.fst");
const QUrl DEFAULT_BODY_MODEL_URL = QUrl("http://public.highfidelity.io/models/skeletons/defaultAvatar_body.fst");
// Where one's own Avatar begins in the world (will be overwritten if avatar data file is found).
// This is the start location in the Sandbox (xyz: 6270, 211, 6000).
const glm::vec3 START_LOCATION(0.38269043f * TREE_SCALE, 0.01287842f * TREE_SCALE, 0.36621094f * TREE_SCALE);
enum KeyState {
NO_KEY_DOWN = 0,
INSERT_KEY_DOWN,
@ -329,7 +333,7 @@ public slots:
protected:
QUuid _sessionUUID;
glm::vec3 _position;
glm::vec3 _position = START_LOCATION;
glm::vec3 _handPosition;
Referential* _referential;
@ -357,8 +361,8 @@ protected:
HeadData* _headData;
HandData* _handData;
QUrl _faceModelURL;
QUrl _skeletonModelURL;
QUrl _faceModelURL = DEFAULT_HEAD_MODEL_URL;
QUrl _skeletonModelURL = DEFAULT_BODY_MODEL_URL;
QVector<AttachmentData> _attachmentData;
QString _displayName;