Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-26 15:49:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1492 from stojce/19466

Browse source 
Code Review for Job #19466
This commit is contained in:
Philip Rosedale 2014-01-10 11:19:43 -08:00
commit f0460bac5f
5 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Menu.cpp
View file

@ -824,6 +824,10 @@ void Menu::editPreferences() {
leanScale->setValue(applicationInstance->getAvatar()->getLeanScale()); leanScale->setValue(applicationInstance->getAvatar()->getLeanScale());
form->addRow("Lean Scale:", leanScale); form->addRow("Lean Scale:", leanScale);
QDoubleSpinBox* avatarScale = new QDoubleSpinBox();
avatarScale->setValue(applicationInstance->getAvatar()->getScale());
form->addRow("Avatar Scale:", avatarScale);
QSpinBox* audioJitterBufferSamples = new QSpinBox(); QSpinBox* audioJitterBufferSamples = new QSpinBox();
audioJitterBufferSamples->setMaximum(10000); audioJitterBufferSamples->setMaximum(10000);
audioJitterBufferSamples->setMinimum(-10000); audioJitterBufferSamples->setMinimum(-10000);
@ -887,6 +891,7 @@ void Menu::editPreferences() {
_maxVoxelPacketsPerSecond = maxVoxelsPPS->value(); _maxVoxelPacketsPerSecond = maxVoxelsPPS->value();
applicationInstance->getAvatar()->setLeanScale(leanScale->value()); applicationInstance->getAvatar()->setLeanScale(leanScale->value());
applicationInstance->getAvatar()->setNewScale(avatarScale->value());
_audioJitterBufferSamples = audioJitterBufferSamples->value(); _audioJitterBufferSamples = audioJitterBufferSamples->value();

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

@ -24,8 +24,6 @@
#include "devices/SerialInterface.h" #include "devices/SerialInterface.h"
#include "devices/Transmitter.h" #include "devices/Transmitter.h"
static const float MAX_SCALE = 1000.f;
static const float MIN_SCALE = .005f;
static const float SCALING_RATIO = .05f; static const float SCALING_RATIO = .05f;
static const float SMOOTHING_RATIO = .05f; // 0 < ratio < 1 static const float SMOOTHING_RATIO = .05f; // 0 < ratio < 1
static const float RESCALING_TOLERANCE = .02f; static const float RESCALING_TOLERANCE = .02f;

1
interface/src/ui/LogDialog.h
View file

@ -15,6 +15,7 @@
#include <QPushButton> #include <QPushButton>
#include <QCheckBox> #include <QCheckBox>
#include <QSyntaxHighlighter> #include <QSyntaxHighlighter>
#include <pthread.h>
#include "AbstractLoggerInterface.h" #include "AbstractLoggerInterface.h"

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

@ -295,3 +295,13 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
return sourceBuffer - startPosition; return sourceBuffer - startPosition;
} }
void AvatarData::setNewScale(float newScale) {
if (newScale > MAX_SCALE) {
newScale = MAX_SCALE;
} else if (newScale < MIN_SCALE) {
newScale = MIN_SCALE;
}
_newScale = newScale;
qDebug() << "Changed scale to " << _newScale << "\n";
}

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

@ -32,6 +32,9 @@ const int HAND_STATE_START_BIT = 2; // 3rd and 4th bits
const int IS_FACESHIFT_CONNECTED = 4; // 5th bit const int IS_FACESHIFT_CONNECTED = 4; // 5th bit
const int IS_CHAT_CIRCLING_ENABLED = 5; const int IS_CHAT_CIRCLING_ENABLED = 5;
static const float MAX_SCALE = 1000.f;
static const float MIN_SCALE = .005f;
const float MAX_AUDIO_LOUDNESS = 1000.0; // close enough for mouth animation const float MAX_AUDIO_LOUDNESS = 1000.0; // close enough for mouth animation
enum KeyState enum KeyState
@ -80,7 +83,7 @@ public:
// Scale // Scale
float getNewScale() const { return _newScale; } float getNewScale() const { return _newScale; }
void setNewScale(float newScale) { _newScale = newScale; } void setNewScale(float);
// Hand State // Hand State
void setHandState(char s) { _handState = s; } void setHandState(char s) { _handState = s; }