History

Merge pull request #3393 from ey6es/master

shared TextRenderer instances; hostname for Faceshift connection

AndrewMeadows committed 12 years ago

Commit 49af6202 parents d3d4717 b1cfafd13 files · +151 −41Browse files

Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 13 files). Show all

Unified · Split

interface/src/ui/PreferencesDialog.cpp+5−0
@@ -121,6 +121,8 @@ void PreferencesDialog::loadPreferences() { · 120 unmodified lines
121 ui.faceshiftEyeDeflectionSider->setValue(menuInstance->getFaceshiftEyeDeflection() *121 ui.faceshiftEyeDeflectionSider->setValue(menuInstance->getFaceshiftEyeDeflection() *
122 ui.faceshiftEyeDeflectionSider->maximum());122 ui.faceshiftEyeDeflectionSider->maximum());
123 123
124 ui.faceshiftHostnameEdit->setText(menuInstance->getFaceshiftHostname());
125
124 const InboundAudioStream::Settings& streamSettings = menuInstance->getReceivedAudioStreamSettings();126 const InboundAudioStream::Settings& streamSettings = menuInstance->getReceivedAudioStreamSettings();
125 127
126 ui.dynamicJitterBuffersCheckBox->setChecked(streamSettings._dynamicJitterBuffers);128 ui.dynamicJitterBuffersCheckBox->setChecked(streamSettings._dynamicJitterBuffers);
@@ -221,6 +223,9 @@ void PreferencesDialog::savePreferences() { · 94 unmodified lines
221 223
222 Menu::getInstance()->setFaceshiftEyeDeflection(ui.faceshiftEyeDeflectionSider->value() /224 Menu::getInstance()->setFaceshiftEyeDeflection(ui.faceshiftEyeDeflectionSider->value() /
223 (float)ui.faceshiftEyeDeflectionSider->maximum());225 (float)ui.faceshiftEyeDeflectionSider->maximum());
226
227 Menu::getInstance()->setFaceshiftHostname(ui.faceshiftHostnameEdit->text());
228
224 Menu::getInstance()->setMaxVoxelPacketsPerSecond(ui.maxVoxelsPPSSpin->value());229 Menu::getInstance()->setMaxVoxelPacketsPerSecond(ui.maxVoxelsPPSSpin->value());
225 230
226 Menu::getInstance()->setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->value());231 Menu::getInstance()->setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->value());