From 244b4a17f7a122a6398f7711e30a78c5ee696e96 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 8 May 2013 18:06:13 -0700 Subject: [PATCH 1/9] lowered voxel count so Ryan can run, and handle too many voxels case slightly more gracefully than crashing --- interface/src/VoxelSystem.cpp | 5 +++++ libraries/voxels/src/VoxelConstants.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index 5aedb698e0..696c2bf0af 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -220,6 +220,11 @@ int VoxelSystem::newTreeToArrays(VoxelNode* node) { } int VoxelSystem::newway__updateNodeInArray(VoxelNode* node) { + // If we've run out of room, then just bail... + if (_voxelsInWriteArrays >= MAX_VOXELS_PER_SYSTEM) { + return 0; + } + if (node->getShouldRender()) { glm::vec3 startVertex = node->getCorner(); float voxelScale = node->getScale(); diff --git a/libraries/voxels/src/VoxelConstants.h b/libraries/voxels/src/VoxelConstants.h index 9df2cdbc5e..156a310476 100644 --- a/libraries/voxels/src/VoxelConstants.h +++ b/libraries/voxels/src/VoxelConstants.h @@ -19,7 +19,7 @@ const int TREE_SCALE = 128; const int NUMBER_OF_CHILDREN = 8; const int MAX_VOXEL_PACKET_SIZE = 1492; const int MAX_TREE_SLICE_BYTES = 26; -const int MAX_VOXELS_PER_SYSTEM = 500000; +const int MAX_VOXELS_PER_SYSTEM = 200000; const int VERTICES_PER_VOXEL = 24; const int VERTEX_POINTS_PER_VOXEL = 3 * VERTICES_PER_VOXEL; const int INDICES_PER_VOXEL = 3 * 12; From cadc07c63d147a087c7af61ba59af71d82a08307 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 8 May 2013 18:07:33 -0700 Subject: [PATCH 2/9] merge conflict fix --- voxel-edit/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voxel-edit/src/main.cpp b/voxel-edit/src/main.cpp index 6e193315e1..222bf3f15b 100644 --- a/voxel-edit/src/main.cpp +++ b/voxel-edit/src/main.cpp @@ -24,7 +24,7 @@ void addLandscape(VoxelTree * tree) { printf("Adding Landscape...\n"); } -void addScene(VoxelTree * tree) { +void voxelTutorial(VoxelTree * tree) { printf("adding scene...\n"); // We want our corner voxels to be about 1/2 meter high, and our TREE_SCALE is in meters, so... From 7a24c50063f35971ebbd03db0c08cb437b55af16 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 8 May 2013 19:22:21 -0700 Subject: [PATCH 3/9] put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer --- interface/src/Avatar.cpp | 1 - interface/src/Avatar.h | 5 +- interface/src/AvatarRenderer.cpp | 61 ++++++++++++++++++- interface/src/AvatarRenderer.h | 4 +- interface/src/main.cpp | 6 +- .../{shared => avatars}/src/Orientation.cpp | 0 .../{shared => avatars}/src/Orientation.h | 0 7 files changed, 71 insertions(+), 6 deletions(-) rename libraries/{shared => avatars}/src/Orientation.cpp (100%) rename libraries/{shared => avatars}/src/Orientation.h (100%) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index c47e84640d..32f1960f9b 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -5,7 +5,6 @@ // Created by Philip Rosedale on 9/11/12. // adapted by Jeffrey Ventrella // Copyright (c) 2013 Physical, Inc.. All rights reserved. -// #include #include diff --git a/interface/src/Avatar.h b/interface/src/Avatar.h index 4709764c73..d6602dc395 100644 --- a/interface/src/Avatar.h +++ b/interface/src/Avatar.h @@ -102,7 +102,10 @@ public: void setLeanSideways(float dist); void addLean(float x, float z); const glm::vec3& getHeadPosition() const ; - const glm::vec3& getJointPosition(AvatarJointID j) const { return _joint[j].position; }; + + //const glm::vec3& getJointPosition(AvatarJointID j) const { return _joint[j].position; }; + const glm::vec3& getJointPosition(AvatarJointID j) const { return _joint[j].springyPosition; }; + const glm::vec3& getBodyUpDirection() const { return _orientation.getUp(); }; float getSpeed() const { return _speed; }; float getGirth(); diff --git a/interface/src/AvatarRenderer.cpp b/interface/src/AvatarRenderer.cpp index 02a2f1db83..26fb442447 100644 --- a/interface/src/AvatarRenderer.cpp +++ b/interface/src/AvatarRenderer.cpp @@ -15,5 +15,62 @@ AvatarRenderer::AvatarRenderer() { } // this method renders the avatar -void AvatarRenderer::render(Avatar *avatar, bool lookingInMirror) { -} \ No newline at end of file +void AvatarRenderer::render(Avatar *avatarToRender, bool lookingInMirror, glm::vec3 cameraPosition) { + + avatar = avatarToRender; + + /* + // show avatar position + glColor4f(0.5f, 0.5f, 0.5f, 0.6); + glPushMatrix(); + glm::vec3 j( avatar->getJointPosition( AVATAR_JOINT_PELVIS ) ); + glTranslatef(j.x, j.y, j.z); + glScalef(0.08, 0.08, 0.08); + glutSolidSphere(1, 10, 10); + glPopMatrix(); + */ + + //renderDiskShadow(avatar->getJointPosition( AVATAR_JOINT_PELVIS ), glm::vec3(0.0f, 1.0f, 0.0f), 0.1f, 0.2f); + + //renderBody(); +} + + + + + + +void AvatarRenderer::renderBody() { +/* + // Render joint positions as spheres + for (int b = 0; b < NUM_AVATAR_JOINTS; b++) { + + if (b != AVATAR_JOINT_HEAD_BASE) { // the head is rendered as a special case in "renderHead" + + //show direction vectors of the bone orientation + //renderOrientationDirections(_joint[b].springyPosition, _joint[b].orientation, _joint[b].radius * 2.0); + + glm::vec3 j( avatar->getJointPosition( AVATAR_JOINT_PELVIS ) ); + glColor3fv(skinColor); + glPushMatrix(); + glTranslatef(j.x, j.y, j.z); + glutSolidSphere(_joint[b].radius, 20.0f, 20.0f); + glPopMatrix(); + } + } + + // Render lines connecting the joint positions + glColor3f(0.4f, 0.5f, 0.6f); + glLineWidth(3.0); + + for (int b = 1; b < NUM_AVATAR_JOINTS; b++) { + if (_joint[b].parent != AVATAR_JOINT_NULL) + if (b != AVATAR_JOINT_HEAD_TOP) { + glBegin(GL_LINE_STRIP); + glVertex3fv(&_joint[ _joint[ b ].parent ].springyPosition.x); + glVertex3fv(&_joint[ b ].springyPosition.x); + glEnd(); + } + } + */ +} diff --git a/interface/src/AvatarRenderer.h b/interface/src/AvatarRenderer.h index 80728ba560..74795eaaf9 100644 --- a/interface/src/AvatarRenderer.h +++ b/interface/src/AvatarRenderer.h @@ -16,10 +16,12 @@ class AvatarRenderer { public: AvatarRenderer(); - void render(Avatar *avatar, bool lookingInMirror); + void render(Avatar *avatarToRender, bool lookingInMirror, glm::vec3 cameraPosition ); private: + Avatar *avatar; + void renderBody(); }; #endif diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 81541fcbcd..c091399f8f 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -75,6 +75,7 @@ #include "ViewFrustum.h" #include "HandControl.h" +#include "AvatarRenderer.h" using namespace std; @@ -112,6 +113,8 @@ Avatar myAvatar(true); // The rendered avatar of oneself Camera myCamera; // My view onto the world (sometimes on myself :) Camera viewFrustumOffsetCamera; // The camera we use to sometimes show the view frustum from an offset mode +AvatarRenderer avatarRenderer; + // Starfield information char starFile[] = "https://s3-us-west-1.amazonaws.com/highfidelity/stars.txt"; char starCacheFile[] = "cachedStars.txt"; @@ -719,7 +722,8 @@ void displaySide(Camera& whichCamera) { //Render my own avatar myAvatar.render(::lookingInMirror, ::myCamera.getPosition()); - + avatarRenderer.render(&myAvatar, ::lookingInMirror, ::myCamera.getPosition()); + glPopMatrix(); } diff --git a/libraries/shared/src/Orientation.cpp b/libraries/avatars/src/Orientation.cpp similarity index 100% rename from libraries/shared/src/Orientation.cpp rename to libraries/avatars/src/Orientation.cpp diff --git a/libraries/shared/src/Orientation.h b/libraries/avatars/src/Orientation.h similarity index 100% rename from libraries/shared/src/Orientation.h rename to libraries/avatars/src/Orientation.h From fc549b73bdb287bfbf5867d2eafbfc027db47452 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 8 May 2013 19:25:23 -0700 Subject: [PATCH 4/9] fixed merge conflict --- interface/src/main.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index a5a4f55557..59339ad618 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -750,11 +750,7 @@ void displaySide(Camera& whichCamera) { // brad's frustum for debugging if (::frustumOn) renderViewFrustum(::viewFrustum); - - //Render my own avatar - myAvatar.render(::lookingInMirror, ::myCamera.getPosition()); - avatarRenderer.render(&myAvatar, ::lookingInMirror, ::myCamera.getPosition()); - + glPopMatrix(); } From 76c5a748763ec2851d4e5635e3a3e306035e6f33 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 8 May 2013 19:35:48 -0700 Subject: [PATCH 5/9] Added gyro pitch to view, moved onscreen displays around to look nicer. --- interface/src/Audio.cpp | 27 ++++++------ interface/src/Avatar.cpp | 2 +- interface/src/Avatar.h | 4 +- interface/src/Oscilloscope.cpp | 5 ++- interface/src/Oscilloscope.h | 2 +- interface/src/main.cpp | 77 ++++++++++++++++++++-------------- 6 files changed, 65 insertions(+), 52 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 7474f434b7..48de0dcffe 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -436,15 +436,15 @@ float Audio::getInputLoudness() const { void Audio::render(int screenWidth, int screenHeight) { if (initialized) { - glLineWidth(3); + glLineWidth(2.0); glBegin(GL_LINES); glColor3f(1,1,1); - int startX = 50.0; + int startX = 20.0; int currentX = startX; - int topY = screenHeight - 90; - int bottomY = screenHeight - 50; - float frameWidth = 50.0; + int topY = screenHeight - 40; + int bottomY = screenHeight - 20; + float frameWidth = 20.0; float halfY = topY + ((bottomY - topY) / 2.0); // draw the lines for the base of the ring buffer @@ -484,10 +484,10 @@ void Audio::render(int screenWidth, int screenHeight) } glBegin(GL_QUADS); - glVertex2f(startX, topY + 5); - glVertex2f(startX + (remainingBuffer + timeLeftInCurrentBuffer)/AUDIO_CALLBACK_MSECS*frameWidth, topY + 5); - glVertex2f(startX + (remainingBuffer + timeLeftInCurrentBuffer)/AUDIO_CALLBACK_MSECS*frameWidth, bottomY - 5); - glVertex2f(startX, bottomY - 5); + glVertex2f(startX, topY + 2); + glVertex2f(startX + (remainingBuffer + timeLeftInCurrentBuffer)/AUDIO_CALLBACK_MSECS*frameWidth, topY + 2); + glVertex2f(startX + (remainingBuffer + timeLeftInCurrentBuffer)/AUDIO_CALLBACK_MSECS*frameWidth, bottomY - 2); + glVertex2f(startX, bottomY - 2); glEnd(); if (audioData->averagedLatency == 0.0) audioData->averagedLatency = remainingBuffer + timeLeftInCurrentBuffer; @@ -504,7 +504,7 @@ void Audio::render(int screenWidth, int screenHeight) char out[40]; sprintf(out, "%3.0f\n", audioData->averagedLatency); - drawtext(startX + audioData->averagedLatency/AUDIO_CALLBACK_MSECS*frameWidth - 10, topY-10, 0.08, 0, 1, 0, out, 1,1,0); + drawtext(startX + audioData->averagedLatency/AUDIO_CALLBACK_MSECS*frameWidth - 10, topY-10, 0.10, 0, 1, 0, out, 1,1,0); //drawtext(startX + 0, topY-10, 0.08, 0, 1, 0, out, 1,1,0); // Show a Cyan bar with the most recently measured jitter stdev @@ -520,13 +520,10 @@ void Audio::render(int screenWidth, int screenHeight) glEnd(); sprintf(out,"%3.1f\n", audioData->measuredJitter); - drawtext(startX + jitterPels - 5, topY-10, 0.08, 0, 1, 0, out, 0,1,1); + drawtext(startX + jitterPels - 5, topY-10, 0.10, 0, 1, 0, out, 0,1,1); sprintf(out, "%3.1fms\n", JITTER_BUFFER_LENGTH_MSECS); - drawtext(startX - 10, bottomY + 20, 0.1, 0, 1, 0, out, 1, 0, 0); - - sprintf(out, "%hd samples\n", JITTER_BUFFER_SAMPLES); - drawtext(startX - 10, bottomY + 35, 0.1, 0, 1, 0, out, 1, 0, 0); + drawtext(startX - 10, bottomY + 15, 0.1, 0, 1, 0, out, 1, 0, 0); } } diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 1bda97b94f..54c984ec47 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -265,7 +265,7 @@ void Avatar::reset() { // Update avatar head rotation with sensor data -void Avatar::UpdateGyros(float frametime, SerialInterface* serialInterface, glm::vec3* gravity) { +void Avatar::updateHeadFromGyros(float frametime, SerialInterface* serialInterface, glm::vec3* gravity) { float measuredPitchRate = 0.0f; float measuredRollRate = 0.0f; float measuredYawRate = 0.0f; diff --git a/interface/src/Avatar.h b/interface/src/Avatar.h index 4709764c73..389dc9c697 100644 --- a/interface/src/Avatar.h +++ b/interface/src/Avatar.h @@ -82,8 +82,8 @@ public: Avatar* clone() const; void reset(); - void UpdateGyros(float frametime, SerialInterface * serialInterface, glm::vec3 * gravity); - + + void updateHeadFromGyros(float frametime, SerialInterface * serialInterface, glm::vec3 * gravity); void setNoise (float mag) {_head.noise = mag;} void setScale(float s) {_head.scale = s; }; void setRenderYaw(float y) {_renderYaw = y;} diff --git a/interface/src/Oscilloscope.cpp b/interface/src/Oscilloscope.cpp index 8c7240ffe2..dc582d4c49 100644 --- a/interface/src/Oscilloscope.cpp +++ b/interface/src/Oscilloscope.cpp @@ -80,7 +80,7 @@ void Oscilloscope::addSamples(unsigned ch, short const* data, unsigned n) { _arrWritePos[ch] = newWritePos; } -void Oscilloscope::render() { +void Oscilloscope::render(int x, int y) { if (! enabled) { return; @@ -113,8 +113,9 @@ void Oscilloscope::render() { } } + glLineWidth(2.0); glPushMatrix(); - glTranslatef(0.0f, _valHeight / 2.0f, 0.0f); + glTranslatef((float)x + 0.0f, (float)y + _valHeight / 2.0f, 0.0f); glScaled(1.0f, _valHeight / 32767.0f, 1.0f); glVertexPointer(2, GL_SHORT, 0, _arrVertices); glEnableClientState(GL_VERTEX_ARRAY); diff --git a/interface/src/Oscilloscope.h b/interface/src/Oscilloscope.h index 47c6375eb1..2474753cdf 100644 --- a/interface/src/Oscilloscope.h +++ b/interface/src/Oscilloscope.h @@ -36,7 +36,7 @@ public: void addSamples(unsigned ch, short const* data, unsigned n); - void render(); + void render(int x, int y); void setLowpass(float w) { assert(w > 0.0f && w <= 1.0f); _valLowpass = w; } void setDownsampling(unsigned f) { assert(f > 0); _valDownsample = f; } diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 47f9004f2b..2f7a475b3b 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -124,8 +124,6 @@ glm::vec3 box(WORLD_SIZE,WORLD_SIZE,WORLD_SIZE); VoxelSystem voxels; -bool wantToKillLocalVoxels = false; - Environment environment; @@ -153,6 +151,8 @@ bool perfStatsOn = false; // Do we want to display perfStats? bool logOn = true; // Whether to show on-screen log +bool wantToKillLocalVoxels = false; + int noiseOn = 0; // Whether to add random noise float noise = 1.0; // Overall magnitude scaling for random noise levels @@ -371,20 +371,29 @@ void reset_sensors() { // // Using gyro data, update both view frustum and avatar head position // -void updateAvatar(float frametime) { - float gyroPitchRate = serialPort.getRelativeValue(HEAD_PITCH_RATE); - float gyroYawRate = serialPort.getRelativeValue(HEAD_YAW_RATE ); +void updateAvatar(float deltaTime) { - myAvatar.UpdateGyros(frametime, &serialPort, &gravity); - + // Update my avatar's head position from gyros + myAvatar.updateHeadFromGyros(deltaTime, &serialPort, &gravity); + + // Grab latest readings from the gyros + float measuredYawRate, measuredPitchRate; + if (USING_INVENSENSE_MPU9150) { + measuredPitchRate = serialPort.getLastPitchRate(); + measuredYawRate = serialPort.getLastYawRate(); + } else { + measuredPitchRate = serialPort.getRelativeValue(HEAD_PITCH_RATE); + measuredYawRate = serialPort.getRelativeValue(HEAD_YAW_RATE); + } + // Update gyro-based mouse (X,Y on screen) const float MIN_MOUSE_RATE = 30.0; const float MOUSE_SENSITIVITY = 0.1f; - if (powf(gyroYawRate*gyroYawRate + - gyroPitchRate*gyroPitchRate, 0.5) > MIN_MOUSE_RATE) + if (powf(measuredYawRate * measuredYawRate + + measuredPitchRate * measuredPitchRate, 0.5) > MIN_MOUSE_RATE) { - headMouseX += gyroYawRate*MOUSE_SENSITIVITY; - headMouseY += gyroPitchRate*MOUSE_SENSITIVITY*(float)HEIGHT/(float)WIDTH; + headMouseX += measuredYawRate*MOUSE_SENSITIVITY; + headMouseY += measuredPitchRate*MOUSE_SENSITIVITY*(float)HEIGHT/(float)WIDTH; } headMouseX = max(headMouseX, 0); headMouseX = min(headMouseX, WIDTH); @@ -394,26 +403,31 @@ void updateAvatar(float frametime) { // Update head and body pitch and yaw based on measured gyro rates if (::gyroLook) { // Yaw - const float MIN_YAW_RATE = 50; - const float YAW_SENSITIVITY = 1.0; + const float MIN_YAW_RATE = 20.f; + const float YAW_MAGNIFY = 3.0; - if (fabs(gyroYawRate) > MIN_YAW_RATE) { - float addToBodyYaw = (gyroYawRate > 0.f) - ? gyroYawRate - MIN_YAW_RATE : gyroYawRate + MIN_YAW_RATE; + if (fabs(measuredYawRate) > MIN_YAW_RATE) { + float addToBodyYaw = (measuredYawRate > 0.f) + ? measuredYawRate - MIN_YAW_RATE : measuredYawRate + MIN_YAW_RATE; - myAvatar.addBodyYaw(-addToBodyYaw * YAW_SENSITIVITY * frametime); + // If we are rotating the body (render angle), move the head reverse amount to compensate + myAvatar.addBodyYaw(-addToBodyYaw * YAW_MAGNIFY * deltaTime); + myAvatar.addHeadYaw(addToBodyYaw * YAW_MAGNIFY * deltaTime); } - // Pitch NOTE: PER - Need to make camera able to pitch first! - /* - const float MIN_PITCH_RATE = 50; - const float PITCH_SENSITIVITY = 1.0; + // Pitch + const float MIN_PITCH_RATE = 20.f; + const float PITCH_MAGNIFY = 2.0; - if (fabs(gyroPitchRate) > MIN_PITCH_RATE) { - float addToBodyPitch = (gyroPitchRate > 0.f) - ? gyroPitchRate - MIN_PITCH_RATE : gyroPitchRate + MIN_PITCH_RATE; + if (fabs(measuredPitchRate) > MIN_PITCH_RATE) { + float addToBodyPitch = (measuredPitchRate > 0.f) + ? measuredPitchRate - MIN_PITCH_RATE : measuredPitchRate + MIN_PITCH_RATE; - myAvatar.addBodyPitch(addToBodyPitch * PITCH_SENSITIVITY * frametime); - */ + myAvatar.setRenderPitch(myAvatar.getRenderPitch() + addToBodyPitch * PITCH_MAGNIFY * deltaTime); + + } + // Always decay the render pitch, assuming that we are never going to want to permanently look up or down + const float RENDER_PITCH_DECAY = 1.0; + myAvatar.setRenderPitch(myAvatar.getRenderPitch() * (1.f - RENDER_PITCH_DECAY * deltaTime)); } // Get audio loudness data from audio input device @@ -438,7 +452,6 @@ void updateAvatar(float frametime) { myAvatar.setCameraFarClip(::viewFrustum.getFarClip()); AgentList* agentList = AgentList::getInstance(); - if (agentList->getOwnerID() != UNKNOWN_AGENT_ID) { // if I know my ID, send head/hand data to the avatar mixer and voxel server unsigned char broadcastString[200]; @@ -912,7 +925,7 @@ void displayOverlay() { #ifndef _WIN32 audio.render(WIDTH, HEIGHT); - audioScope.render(); + audioScope.render(20, HEIGHT - 200); #endif //noiseTest(WIDTH, HEIGHT); @@ -1024,12 +1037,12 @@ void display(void) //float firstPersonDistance = 0.0f; //float firstPersonTightness = 100.0f; - float firstPersonPitch = 20.0f; + float firstPersonPitch = 20.0f + myAvatar.getRenderPitch(); float firstPersonUpShift = 0.1f; float firstPersonDistance = 0.4f; float firstPersonTightness = 100.0f; - float thirdPersonPitch = 0.0f; + float thirdPersonPitch = 0.0f + myAvatar.getRenderPitch(); float thirdPersonUpShift = -0.2f; float thirdPersonDistance = 1.2f; float thirdPersonTightness = 8.0f; @@ -1095,12 +1108,14 @@ void display(void) myCamera.update( 1.f/FPS ); // Render anything (like HUD items) that we want to be in 3D but not in worldspace + /* const float HUD_Z_OFFSET = -5.f; glPushMatrix(); glm::vec3 test(0.5, 0.5, 0.5); glTranslatef(1, 1, HUD_Z_OFFSET); drawVector(&test); glPopMatrix(); + */ // Note: whichCamera is used to pick between the normal camera myCamera for our @@ -1699,7 +1714,7 @@ void idle(void) { serialPort.readData(); } - // Sample hardware, update view frustum if needed, Lsend avatar data to mixer/agents + // Sample hardware, update view frustum if needed, and send avatar data to mixer/agents updateAvatar(deltaTime); // read incoming packets from network From 4bb8f49132ef4506643cd683e7f64b7d9a4f1cf0 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 8 May 2013 20:02:29 -0700 Subject: [PATCH 6/9] Added new cooler movement sound that is velocity sensitive. --- interface/src/AudioData.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/interface/src/AudioData.cpp b/interface/src/AudioData.cpp index f86af9a06e..83b53b0ea3 100644 --- a/interface/src/AudioData.cpp +++ b/interface/src/AudioData.cpp @@ -30,13 +30,14 @@ AudioData::~AudioData() { // Take a pointer to the acquired microphone input samples and add procedural sounds void AudioData::addProceduralSounds(int16_t* inputBuffer, int numSamples) { - const float MAX_AUDIBLE_VELOCITY = 3.0; + const float MAX_AUDIBLE_VELOCITY = 6.0; const float MIN_AUDIBLE_VELOCITY = 0.1; - const float VOLUME = 200; float speed = glm::length(_lastVelocity); + float volume = 400 * (1.f - speed/MAX_AUDIBLE_VELOCITY); + // Add a noise-modulated sinewave with volume that tapers off with speed increasing if ((speed > MIN_AUDIBLE_VELOCITY) && (speed < MAX_AUDIBLE_VELOCITY)) { for (int i = 0; i < numSamples; i++) { - inputBuffer[i] += (int16_t) ((randFloat() - 0.5f) * VOLUME * speed) ; + inputBuffer[i] += (int16_t) ((cosf((float)i / 8.f * speed) * randFloat()) * volume * speed) ; } } From 14f0ecdc519e4b56aedfaeff295bc8d64fcbc7bb Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 8 May 2013 20:07:27 -0700 Subject: [PATCH 7/9] Lowered avatar drag to allow faster flight, increased drag when near others --- interface/src/Avatar.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 10f494dbdd..4b09db0f05 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -30,7 +30,7 @@ const float BODY_SPIN_FRICTION = 5.0; const float BODY_UPRIGHT_FORCE = 10.0; const float BODY_PITCH_WHILE_WALKING = 30.0; const float BODY_ROLL_WHILE_TURNING = 0.1; -const float LIN_VEL_DECAY = 5.0; +const float LIN_VEL_DECAY = 2.0; const float MY_HAND_HOLDING_PULL = 0.2; const float YOUR_HAND_HOLDING_PULL = 1.0; const float BODY_SPRING_DEFAULT_TIGHTNESS = 1500.0f; @@ -411,8 +411,8 @@ void Avatar::simulate(float deltaTime) { _velocity *= (1.0 - LIN_VEL_DECAY * deltaTime); // If someone is near, damp velocity as a function of closeness - const float AVATAR_BRAKING_RANGE = 1.2f; - const float AVATAR_BRAKING_STRENGTH = 25.f; + const float AVATAR_BRAKING_RANGE = 1.6f; + const float AVATAR_BRAKING_STRENGTH = 35.f; if (_isMine && (_distanceToNearestAvatar < AVATAR_BRAKING_RANGE)) { _velocity *= (1.f - deltaTime * AVATAR_BRAKING_STRENGTH * From 408a21b5154ad51ebfd6b3544370799f560e0877 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 8 May 2013 20:26:38 -0700 Subject: [PATCH 8/9] Fixed Eve's missing mouth and the bad triangles! --- interface/src/Avatar.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 4b09db0f05..a976555a70 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -949,7 +949,13 @@ void Avatar::renderHead(bool lookingInMirror) { glColor3f(0,0,0); glRotatef(_head.mouthPitch, 1, 0, 0); glRotatef(_head.mouthYaw, 0, 0, 1); - glScalef(_head.mouthWidth*(.7 + sqrt(_head.averageLoudness)/60.0), _head.mouthHeight*(1.0 + sqrt(_head.averageLoudness)/30.0), 1); + if (_head.averageLoudness > 1.f) { + glScalef(_head.mouthWidth * (.7f + sqrt(_head.averageLoudness) /60.f), + _head.mouthHeight * (1.f + sqrt(_head.averageLoudness) /30.f), 1); + } else { + glScalef(_head.mouthWidth, _head.mouthHeight, 1); + } + glutSolidCube(0.5); glPopMatrix(); From 395e4a7852ccbfb2935ea167166494e232d5fec5 Mon Sep 17 00:00:00 2001 From: tosh <-@--PC.(none)> Date: Thu, 9 May 2013 12:08:19 +0200 Subject: [PATCH 9/9] removes equator, achieves uniform distribution of stars implementing rejection sampling, adds UNIX script header --- interface/resources/gen_stars.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/interface/resources/gen_stars.py b/interface/resources/gen_stars.py index d18ec28b86..c1ddf4be15 100644 --- a/interface/resources/gen_stars.py +++ b/interface/resources/gen_stars.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + # # gen_stars.py # interface @@ -12,7 +14,7 @@ from random import random,randint from math import sqrt, hypot, atan2, pi, fmod, degrees from sys import argv,stderr -hemisphere_only, equator, meridians= False, 1000, 1000 +hemisphere_only, equator, meridians= False, 0, 1000 n_random = 100000 if len(argv) > 1: @@ -50,10 +52,13 @@ for i in range(n_random): g = max(0,min(255,w + randint(-20,60))) b = max(0,min(255,w + randint(-10,100))) # position - x,y,z = random()*2-1,random(),random()*2-1 - if not hemisphere_only: - y = y*2-1 - l = sqrt(x*x + y*y + z*z) + while True: + x,y,z = random()*2-1,random(),random()*2-1 + if not hemisphere_only: + y = y*2-1 + l = sqrt(x*x + y*y + z*z) + if l <= 1.0: + break x /= l; y /= l; z /= l xz = hypot(x,z)