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

Merge branch 'master' of git://github.com/worklist/hifi into 19373

Browse source
This commit is contained in:
Atlante45 2013-07-10 12:46:50 -07:00
commit d79acea6a7
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Avatar.h
View file

@ -151,10 +151,6 @@ public:
// Get the position/rotation of a single body ball // Get the position/rotation of a single body ball
void getBodyBallTransform(AvatarJointID jointID, glm::vec3& position, glm::quat& rotation) const; void getBodyBallTransform(AvatarJointID jointID, glm::vec3& position, glm::quat& rotation) const;
//read/write avatar data
void writeAvatarDataToFile();
void readAvatarDataFromFile();
static void renderJointConnectingCone(glm::vec3 position1, glm::vec3 position2, float radius1, float radius2); static void renderJointConnectingCone(glm::vec3 position1, glm::vec3 position2, float radius1, float radius2);

4
interface/src/Swatch.cpp
View file

@ -3,8 +3,8 @@
Swatch::Swatch(QAction* action) : Swatch::Swatch(QAction* action) :
Tool(action, 0, -1, -1), Tool(action, 0, -1, -1),
_selected(1), _textRenderer(MONO_FONT_FAMILY, 10, 100),
_textRenderer(MONO_FONT_FAMILY, 10, 100) { _selected(1) {
} }
void Swatch::reset() { void Swatch::reset() {

2
interface/src/Tool.cpp
View file

@ -5,8 +5,8 @@
#include <QGLWidget> #include <QGLWidget>
Tool::Tool(QAction *action, GLuint texture, int x, int y) : Tool::Tool(QAction *action, GLuint texture, int x, int y) :
_texture(texture),
_action(action), _action(action),
_texture(texture),
_x(x), _x(x),
_y(y) { _y(y) {
} }

4
libraries/shared/src/SimpleMovingAverage.cpp
View file

@ -22,7 +22,7 @@ int SimpleMovingAverage::updateAverage(float sample) {
if (_numSamples > 0) { if (_numSamples > 0) {
_average = (ONE_MINUS_WEIGHTING * _average) + (WEIGHTING * sample); _average = (ONE_MINUS_WEIGHTING * _average) + (WEIGHTING * sample);
float eventDelta = (usecTimestampNow() - _lastEventTimestamp) / 1000000; float eventDelta = (usecTimestampNow() - _lastEventTimestamp) / 1000000.0f;
if (_numSamples > 1) { if (_numSamples > 1) {
_eventDeltaAverage = (ONE_MINUS_WEIGHTING * _eventDeltaAverage) + _eventDeltaAverage = (ONE_MINUS_WEIGHTING * _eventDeltaAverage) +
@ -46,7 +46,7 @@ void SimpleMovingAverage::reset() {
float SimpleMovingAverage::getEventDeltaAverage() { float SimpleMovingAverage::getEventDeltaAverage() {
return (ONE_MINUS_WEIGHTING * _eventDeltaAverage) + return (ONE_MINUS_WEIGHTING * _eventDeltaAverage) +
(WEIGHTING * ((usecTimestampNow() - _lastEventTimestamp) / 1000000)); (WEIGHTING * ((usecTimestampNow() - _lastEventTimestamp) / 1000000.0f));
} }
float SimpleMovingAverage::getAverageSampleValuePerSecond() { float SimpleMovingAverage::getAverageSampleValuePerSecond() {