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

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

Browse source
This commit is contained in:
Stephen Birarda 2015-02-13 10:19:00 -08:00
commit e3475d4d7f
4 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/editEntities.js
View file

@ -190,6 +190,7 @@ var toolBar = (function () {
cameraManager.enable(); cameraManager.enable();
entityListTool.setVisible(true); entityListTool.setVisible(true);
gridTool.setVisible(true); gridTool.setVisible(true);
grid.setEnabled(true);
propertiesTool.setVisible(true); propertiesTool.setVisible(true);
Window.setFocus(); Window.setFocus();
} }

6
examples/html/gridControls.html
View file

@ -30,8 +30,8 @@
elPosY.value = origin.y.toFixed(2); elPosY.value = origin.y.toFixed(2);
} }
if (data.minorGridSpacing !== undefined) { if (data.minorGridWidth !== undefined) {
elMinorSpacing.value = data.minorGridSpacing; elMinorSpacing.value = data.minorGridWidth;
} }
if (data.majorGridEvery !== undefined) { if (data.majorGridEvery !== undefined) {
@ -57,7 +57,7 @@
origin: { origin: {
y: elPosY.value, y: elPosY.value,
}, },
minorGridSpacing: elMinorSpacing.value, minorGridWidth: elMinorSpacing.value,
majorGridEvery: elMajorSpacing.value, majorGridEvery: elMajorSpacing.value,
gridColor: gridColor, gridColor: gridColor,
colorIndex: gridColorIndex, colorIndex: gridColorIndex,

45
interface/src/ui/ApplicationOverlay.cpp
View file

@ -788,13 +788,12 @@ void ApplicationOverlay::renderAudioMeter() {
// Audio VU Meter and Mute Icon // Audio VU Meter and Mute Icon
const int MUTE_ICON_SIZE = 24; const int MUTE_ICON_SIZE = 24;
const int AUDIO_METER_INSET = 2;
const int MUTE_ICON_PADDING = 10; const int MUTE_ICON_PADDING = 10;
const int AUDIO_METER_WIDTH = MIRROR_VIEW_WIDTH - MUTE_ICON_SIZE - AUDIO_METER_INSET - MUTE_ICON_PADDING; const int AUDIO_METER_WIDTH = MIRROR_VIEW_WIDTH - MUTE_ICON_SIZE - MUTE_ICON_PADDING;
const int AUDIO_METER_SCALE_WIDTH = AUDIO_METER_WIDTH - 2 * AUDIO_METER_INSET; const int AUDIO_METER_SCALE_WIDTH = AUDIO_METER_WIDTH - 2 ;
const int AUDIO_METER_HEIGHT = 8; const int AUDIO_METER_HEIGHT = 8;
const int AUDIO_METER_GAP = 5; const int AUDIO_METER_GAP = 5;
const int AUDIO_METER_X = MIRROR_VIEW_LEFT_PADDING + MUTE_ICON_SIZE + AUDIO_METER_INSET + AUDIO_METER_GAP; const int AUDIO_METER_X = MIRROR_VIEW_LEFT_PADDING + MUTE_ICON_SIZE + AUDIO_METER_GAP;
int audioMeterY; int audioMeterY;
bool smallMirrorVisible = Menu::getInstance()->isOptionChecked(MenuOption::Mirror) && !OculusManager::isConnected(); bool smallMirrorVisible = Menu::getInstance()->isOptionChecked(MenuOption::Mirror) && !OculusManager::isConnected();
@ -847,7 +846,7 @@ void ApplicationOverlay::renderAudioMeter() {
// Draw audio meter background Quad // Draw audio meter background Quad
DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X, audioMeterY, AUDIO_METER_WIDTH, AUDIO_METER_HEIGHT, DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X, audioMeterY, AUDIO_METER_WIDTH, AUDIO_METER_HEIGHT,
glm::vec4(0, 0, 0, 1)); glm::vec4(0.298f, 0.757f, 0.722f, 1));
if (audioLevel > AUDIO_RED_START) { if (audioLevel > AUDIO_RED_START) {
glm::vec4 quadColor; glm::vec4 quadColor;
@ -857,10 +856,10 @@ void ApplicationOverlay::renderAudioMeter() {
quadColor = glm::vec4(1, 1, 1, 1); quadColor = glm::vec4(1, 1, 1, 1);
} }
// Draw Red Quad // Draw Red Quad
DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X + AUDIO_METER_INSET + AUDIO_RED_START, DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X + AUDIO_RED_START,
audioMeterY + AUDIO_METER_INSET, audioMeterY,
audioLevel - AUDIO_RED_START, audioLevel - AUDIO_RED_START,
AUDIO_METER_HEIGHT - AUDIO_METER_INSET, quadColor, AUDIO_METER_HEIGHT, quadColor,
_audioRedQuad); _audioRedQuad);
audioLevel = AUDIO_RED_START; audioLevel = AUDIO_RED_START;
@ -874,26 +873,28 @@ void ApplicationOverlay::renderAudioMeter() {
quadColor = glm::vec4(1, 1, 1, 1); quadColor = glm::vec4(1, 1, 1, 1);
} }
// Draw Green Quad // Draw Green Quad
DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X + AUDIO_METER_INSET + AUDIO_GREEN_START, DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X + AUDIO_GREEN_START,
audioMeterY + AUDIO_METER_INSET, audioMeterY,
audioLevel - AUDIO_GREEN_START, audioLevel - AUDIO_GREEN_START,
AUDIO_METER_HEIGHT - AUDIO_METER_INSET, quadColor, AUDIO_METER_HEIGHT, quadColor,
_audioGreenQuad); _audioGreenQuad);
audioLevel = AUDIO_GREEN_START; audioLevel = AUDIO_GREEN_START;
} }
// Draw Blue Quad
glm::vec4 quadColor; if (audioLevel >= 0) {
if (!isClipping) { glm::vec4 quadColor;
quadColor = AUDIO_METER_BLUE; if (!isClipping) {
} else { quadColor = AUDIO_METER_BLUE;
quadColor = glm::vec4(1, 1, 1, 1); } else {
quadColor = glm::vec4(1, 1, 1, 1);
}
// Draw Blue (low level) quad
DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X,
audioMeterY,
audioLevel, AUDIO_METER_HEIGHT, quadColor,
_audioBlueQuad);
} }
// Draw Blue (low level) quad
DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X + AUDIO_METER_INSET,
audioMeterY + AUDIO_METER_INSET,
audioLevel, AUDIO_METER_HEIGHT - AUDIO_METER_INSET, quadColor,
_audioBlueQuad);
} }
void ApplicationOverlay::renderStatsAndLogs() { void ApplicationOverlay::renderStatsAndLogs() {

2
libraries/audio/src/AudioInjector.cpp
View file

@ -58,7 +58,7 @@ void AudioInjector::setIsFinished(bool isFinished) {
if (_shouldDeleteAfterFinish) { if (_shouldDeleteAfterFinish) {
// we've been asked to delete after finishing, trigger a queued deleteLater here // we've been asked to delete after finishing, trigger a queued deleteLater here
qDebug() << "triggering the delete since we are finished"; qDebug() << "AudioInjector triggering delete from setIsFinished";
QMetaObject::invokeMethod(this, "deleteLater", Qt::QueuedConnection); QMetaObject::invokeMethod(this, "deleteLater", Qt::QueuedConnection);
} }
} }