History

turn down collision sounds

Philip Rosedale committed 13 years ago

Commit bc1ac6b1 parent ba2c98a4 files · +13 −14Browse files

Showing the changes to interface/src/Util.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Util.cpp+7−1
@@ -339,6 +339,7 @@ void renderCollisionOverlay(int width, int height, float magnitude) { · 338 unmodified lines
339339 }
340340
341341 void renderGroundPlaneGrid(float size, float impact) {
342+ float IMPACT_SOUND_MAGNITUDE_FOR_RECOLOR = 0.3f;
342343 glLineWidth(2.0);
343344 glm::vec4 impactColor(1, 0, 0, 1);
344345 glm::vec3 lineColor(0.4, 0.5, 0.3);
@@ -355,7 +356,12 @@ void renderGroundPlaneGrid(float size, float impact) { · 10 unmodified lines
355356 }
356357
357358 // Draw the floor, colored for recent impact
358− glm::vec4 floorColor = impact * impactColor + (1.f - impact) * surfaceColor;
359+ glm::vec4 floorColor;
360+ if (impact > IMPACT_SOUND_MAGNITUDE_FOR_RECOLOR) {
361+ floorColor = impact * impactColor + (1.f - impact) * surfaceColor;
362+ } else {
363+ floorColor = surfaceColor;
364+ }
359365 glColor4fv(&floorColor.x);
360366 glBegin(GL_QUADS);
361367 glVertex3f(0, 0, 0);