Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 18:58:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/worklist/hifi

Browse source
This commit is contained in:
Philip Rosedale 2013-06-09 12:48:52 -07:00
commit 02c62a82d1
4 changed files with 501 additions and 480 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

971
interface/src/Application.cpp
View file

File diff suppressed because it is too large Load diff

4
interface/src/Application.h
View file

@ -112,7 +112,6 @@ private slots:
void decreaseVoxelSize(); void decreaseVoxelSize();
void increaseVoxelSize(); void increaseVoxelSize();
void chooseVoxelPaintColor(); void chooseVoxelPaintColor();
void setAutosave(bool wantsAutosave);
void loadSettings(QSettings* set = NULL); void loadSettings(QSettings* set = NULL);
void saveSettings(QSettings* set = NULL); void saveSettings(QSettings* set = NULL);
void importSettings(); void importSettings();
@ -132,6 +131,7 @@ private:
void initDisplay(); void initDisplay();
void init(); void init();
void update(float deltaTime);
void updateAvatar(float deltaTime); void updateAvatar(float deltaTime);
void loadViewFrustum(Camera& camera, ViewFrustum& viewFrustum); void loadViewFrustum(Camera& camera, ViewFrustum& viewFrustum);
@ -293,8 +293,6 @@ private:
int _packetsPerSecond; int _packetsPerSecond;
int _bytesPerSecond; int _bytesPerSecond;
int _bytesCount; int _bytesCount;
bool _autosave; // True if the autosave is on.
}; };
#endif /* defined(__interface__Application__) */ #endif /* defined(__interface__Application__) */

4
interface/src/Avatar.cpp
View file

@ -1225,6 +1225,8 @@ void Avatar::loadData(QSettings* set) {
_position.y = set->value("position_y", _position.y).toFloat(); _position.y = set->value("position_y", _position.y).toFloat();
_position.z = set->value("position_z", _position.z).toFloat(); _position.z = set->value("position_z", _position.z).toFloat();
_voxels.setVoxelURL(set->value("voxelURL").toUrl());
set->endGroup(); set->endGroup();
} }
@ -1244,6 +1246,8 @@ void Avatar::saveData(QSettings* set) {
set->setValue("position_y", _position.y); set->setValue("position_y", _position.y);
set->setValue("position_z", _position.z); set->setValue("position_z", _position.z);
set->setValue("voxelURL", _voxels.getVoxelURL());
set->endGroup(); set->endGroup();
} }

2
interface/src/Camera.cpp
View file

@ -71,7 +71,7 @@ void Camera::updateFollowMode(float deltaTime) {
_distance = _previousDistance * (1.0f - _modeShift) + _newDistance * _modeShift; _distance = _previousDistance * (1.0f - _modeShift) + _newDistance * _modeShift;
_tightness = _previousTightness * (1.0f - _modeShift) + _newTightness * _modeShift; _tightness = _previousTightness * (1.0f - _modeShift) + _newTightness * _modeShift;
if (_linearModeShift > 1.0f ) { if (_needsToInitialize || _linearModeShift > 1.0f) {
_linearModeShift = 1.0f; _linearModeShift = 1.0f;
_modeShift = 1.0f; _modeShift = 1.0f;
_upShift = _newUpShift; _upShift = _newUpShift;