From 995fbcf4f952f53fe55c62da474c1da12e39b74f Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Fri, 24 May 2013 14:46:26 -0700 Subject: [PATCH 1/3] mohawk also follows body pitch when accelerating --- interface/src/Head.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 6fec0837c6..99237ba6b4 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -229,7 +229,7 @@ void Head::renderMohawk(bool lookingInMirror) { glTranslatef(_position.x, _position.y, _position.z); glRotatef((lookingInMirror ? (_bodyRotation.y - _yaw) : (_bodyRotation.y + _yaw)), 0, 1, 0); glRotatef(lookingInMirror ? _roll: -_roll, 0, 0, 1); - glRotatef(-_pitch, 1, 0, 0); + glRotatef(-_pitch - _bodyRotation.x, 1, 0, 0); glBegin(GL_TRIANGLE_FAN); for (int i = 0; i < MOHAWK_TRIANGLES; i++) { From 608a4f71bfe423cb784bd85f55d647cbaa1d87ce Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Fri, 24 May 2013 14:51:06 -0700 Subject: [PATCH 2/3] ground surface is 20 meters across. play on! --- interface/src/Application.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d97e5f83a2..c478554903 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1667,7 +1667,8 @@ void Application::displaySide(Camera& whichCamera) { glPopMatrix(); //draw a grid ground plane.... - drawGroundPlaneGrid(10.f); + const float EDGE_SIZE_GROUND_PLANE = 20.f; + drawGroundPlaneGrid(EDGE_SIZE_GROUND_PLANE); // Draw voxels if (_renderVoxels->isChecked()) { From 12d0ccb7124dc8835ecd4fa1ac9092dae4105112 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 24 May 2013 16:32:52 -0700 Subject: [PATCH 3/3] tune the distance attenuation to use log of base 2.5 --- audio-mixer/src/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp index 73263ae05e..e4a4f83b07 100644 --- a/audio-mixer/src/main.cpp +++ b/audio-mixer/src/main.cpp @@ -167,7 +167,8 @@ int main(int argc, const char* argv[]) { float minCoefficient = std::min(1.0f, powf(0.5, - (logf(DISTANCE_RATIO * distanceToAgent) / logf(2)) - 1)); + (logf(DISTANCE_RATIO * distanceToAgent) / logf(2.5)) + - 1)); distanceCoefficients[lowAgentIndex][highAgentIndex] = minCoefficient; }