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

Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_fixed

Browse source
This commit is contained in:
Atlante45 2014-10-23 12:00:53 -07:00
commit 6df37b6d4a
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/resources/web/js/settings.js
View file

@ -529,7 +529,7 @@ function deleteTableRow(delete_glyphicon) {
row.html("<input type='hidden' class='form-control' name='" row.html("<input type='hidden' class='form-control' name='"
+ row.attr('name') + "' data-changed='true' value=''>"); + row.attr('name') + "' data-changed='true' value=''>");
} else { } else {
if (table.find('.' + Settings.DATA_ROW_CLASS).length) { if (table.find('.' + Settings.DATA_ROW_CLASS).length > 1) {
updateDataChangedForSiblingRows(row) updateDataChangedForSiblingRows(row)
// this isn't the last row - we can just remove it // this isn't the last row - we can just remove it

6
interface/src/Hair.cpp
View file

@ -92,7 +92,7 @@ Hair::Hair(int strands,
} }
} }
const float SOUND_THRESHOLD = 50.0f; const float SOUND_THRESHOLD = 40.0f;
void Hair::simulate(float deltaTime) { void Hair::simulate(float deltaTime) {
deltaTime = glm::clamp(deltaTime, 0.0f, 1.0f / 30.0f); deltaTime = glm::clamp(deltaTime, 0.0f, 1.0f / 30.0f);
@ -121,13 +121,13 @@ void Hair::simulate(float deltaTime) {
(_radius - glm::length(_hairPosition[vertexIndex])); (_radius - glm::length(_hairPosition[vertexIndex]));
} }
// Add random thing driven by loudness // Add random thing driven by loudness
float loudnessFactor = (_loudness > SOUND_THRESHOLD) ? logf(_loudness - SOUND_THRESHOLD) / 8000.0f : 0.0f; float loudnessFactor = (_loudness > SOUND_THRESHOLD) ? logf(_loudness - SOUND_THRESHOLD) / 2000.0f : 0.0f;
const float QUIESCENT_LOUDNESS = 0.0f; const float QUIESCENT_LOUDNESS = 0.0f;
_hairPosition[vertexIndex] += randVector() * (QUIESCENT_LOUDNESS + loudnessFactor) * ((float)link / (float)_links); _hairPosition[vertexIndex] += randVector() * (QUIESCENT_LOUDNESS + loudnessFactor) * ((float)link / (float)_links);
// Add gravity // Add gravity
const float SCALE_GRAVITY = 0.10f; const float SCALE_GRAVITY = 0.13f;
_hairPosition[vertexIndex] += _gravity * deltaTime * SCALE_GRAVITY; _hairPosition[vertexIndex] += _gravity * deltaTime * SCALE_GRAVITY;
// Add linear acceleration // Add linear acceleration

2
interface/src/Hair.h
View file

@ -26,7 +26,7 @@ const int HAIR_CONSTRAINTS = 2;
const int DEFAULT_HAIR_STRANDS = 20; const int DEFAULT_HAIR_STRANDS = 20;
const int DEFAULT_HAIR_LINKS = 10; const int DEFAULT_HAIR_LINKS = 10;
const float DEFAULT_HAIR_RADIUS = 0.15f; const float DEFAULT_HAIR_RADIUS = 0.15f;
const float DEFAULT_HAIR_LINK_LENGTH = 0.07f; const float DEFAULT_HAIR_LINK_LENGTH = 0.06f;
const float DEFAULT_HAIR_THICKNESS = 0.025f; const float DEFAULT_HAIR_THICKNESS = 0.025f;
class Hair { class Hair {