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

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

Browse source
This commit is contained in:
milad 2019-11-13 10:14:14 -08:00
commit abf592f533
4 changed files with 32 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
interface/resources/avatar/avatar-animation.json
View file

@ -5994,14 +5994,6 @@
"state": "INAIRRUN", "state": "INAIRRUN",
"var": "isInAirRun" "var": "isInAirRun"
}, },
{
"state": "strafeRightHmd",
"var": "isMovingRightHmd"
},
{
"state": "strafeLeftHmd",
"var": "isMovingLeftHmd"
},
{ {
"state": "seated", "state": "seated",
"var": "isSeated" "var": "isSeated"
@ -6062,14 +6054,6 @@
"state": "INAIRRUN", "state": "INAIRRUN",
"var": "isInAirRun" "var": "isInAirRun"
}, },
{
"state": "strafeRightHmd",
"var": "isMovingRightHmd"
},
{
"state": "strafeLeftHmd",
"var": "isMovingLeftHmd"
},
{ {
"state": "seated", "state": "seated",
"var": "isSeated" "var": "isSeated"
@ -6214,7 +6198,7 @@
"transitions": [ "transitions": [
{ {
"state": "idleSettle", "state": "idleSettle",
"var": "isNotInput" "var": "isNotMoving"
}, },
{ {
"state": "WALKFWD", "state": "WALKFWD",
@ -6228,14 +6212,6 @@
"state": "strafeLeftHmd", "state": "strafeLeftHmd",
"var": "isMovingLeftHmd" "var": "isMovingLeftHmd"
}, },
{
"state": "STRAFERIGHT",
"var": "isInputRight"
},
{
"state": "STRAFELEFT",
"var": "isInputLeft"
},
{ {
"state": "turnRight", "state": "turnRight",
"var": "isTurningRight" "var": "isTurningRight"
@ -6278,7 +6254,7 @@
"transitions": [ "transitions": [
{ {
"state": "idleSettle", "state": "idleSettle",
"var": "isNotInput" "var": "isNotMoving"
}, },
{ {
"state": "WALKFWD", "state": "WALKFWD",
@ -6292,14 +6268,6 @@
"state": "strafeRightHmd", "state": "strafeRightHmd",
"var": "isMovingRightHmd" "var": "isMovingRightHmd"
}, },
{
"state": "STRAFERIGHT",
"var": "isInputRight"
},
{
"state": "STRAFELEFT",
"var": "isInputLeft"
},
{ {
"state": "turnRight", "state": "turnRight",
"var": "isTurningRight" "var": "isTurningRight"

16
libraries/animation/src/Rig.cpp
View file

@ -1510,19 +1510,29 @@ void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPos
if (_previousControllerParameters.inputX > 0.0f) { if (_previousControllerParameters.inputX > 0.0f) {
// right // right
if (!_headEnabled) {
_animVars.set("isInputRight", true);
} else {
_animVars.set("isInputRight", false);
}
_animVars.set("isInputLeft", false);
_animVars.set("isInputForward", false); _animVars.set("isInputForward", false);
_animVars.set("isInputBackward", false); _animVars.set("isInputBackward", false);
_animVars.set("isInputRight", true);
_animVars.set("isInputLeft", false);
_animVars.set("isNotInput", false); _animVars.set("isNotInput", false);
_animVars.set("isNotInputSlow", false); _animVars.set("isNotInputSlow", false);
_animVars.set("isNotInputNoMomentum", false); _animVars.set("isNotInputNoMomentum", false);
} else { } else {
// left // left
if (!_headEnabled) {
_animVars.set("isInputLeft", true);
} else {
_animVars.set("isInputLeft", false);
}
_animVars.set("isInputForward", false); _animVars.set("isInputForward", false);
_animVars.set("isInputBackward", false); _animVars.set("isInputBackward", false);
_animVars.set("isInputRight", false); _animVars.set("isInputRight", false);
_animVars.set("isInputLeft", true);
_animVars.set("isNotInput", false); _animVars.set("isNotInput", false);
_animVars.set("isNotInputSlow", false); _animVars.set("isNotInputSlow", false);
_animVars.set("isNotInputNoMomentum", false); _animVars.set("isNotInputNoMomentum", false);

18
libraries/audio-client/src/AudioClient.cpp
View file

@ -111,11 +111,17 @@ QList<HifiAudioDeviceInfo> getAvailableDevices(QAudio::Mode mode, const QString&
} }
if (defaultDesktopDevice.getDevice().isNull()) { if (defaultDesktopDevice.getDevice().isNull()) {
qCDebug(audioclient) << __FUNCTION__ << "Default device not found in list:" << defDeviceName if (devices.size() > 0) {
<< "Setting Default to: " << devices.first().deviceName(); qCDebug(audioclient) << __FUNCTION__ << "Default device not found in list:" << defDeviceName
defaultDesktopDevice = HifiAudioDeviceInfo(devices.first(), true, mode, HifiAudioDeviceInfo::desktop); << "Setting Default to: " << devices.first().deviceName();
newDevices.push_front(HifiAudioDeviceInfo(devices.first(), true, mode, HifiAudioDeviceInfo::desktop));
} else {
//current audio list is empty for some reason.
qCDebug(audioclient) << __FUNCTION__ << "Default device not found in list no alternative selection available";
}
} else {
newDevices.push_front(defaultDesktopDevice);
} }
newDevices.push_front(defaultDesktopDevice);
if (!hmdName.isNull()) { if (!hmdName.isNull()) {
HifiAudioDeviceInfo hmdDevice; HifiAudioDeviceInfo hmdDevice;
@ -1829,6 +1835,8 @@ bool AudioClient::switchInputToAudioDevice(const HifiAudioDeviceInfo inputDevice
_audioInput->deleteLater(); _audioInput->deleteLater();
_audioInput = NULL; _audioInput = NULL;
_numInputCallbackBytes = 0; _numInputCallbackBytes = 0;
_inputDeviceInfo.setDevice(QAudioDeviceInfo());
} }
if (_dummyAudioInput) { if (_dummyAudioInput) {
@ -2075,6 +2083,8 @@ bool AudioClient::switchOutputToAudioDevice(const HifiAudioDeviceInfo outputDevi
delete[] _localOutputMixBuffer; delete[] _localOutputMixBuffer;
_localOutputMixBuffer = NULL; _localOutputMixBuffer = NULL;
_outputDeviceInfo.setDevice(QAudioDeviceInfo());
} }
// cleanup any resamplers // cleanup any resamplers

4
libraries/render-utils/src/HighlightEffect.cpp
View file

@ -192,7 +192,9 @@ void DrawHighlightMask::run(const render::RenderContextPointer& renderContext, c
ShapeKey::Builder(), ShapeKey::Builder().withFade(), ShapeKey::Builder(), ShapeKey::Builder().withFade(),
ShapeKey::Builder().withDeformed(), ShapeKey::Builder().withDeformed().withFade(), ShapeKey::Builder().withDeformed(), ShapeKey::Builder().withDeformed().withFade(),
ShapeKey::Builder().withDeformed().withDualQuatSkinned(), ShapeKey::Builder().withDeformed().withDualQuatSkinned().withFade(), ShapeKey::Builder().withDeformed().withDualQuatSkinned(), ShapeKey::Builder().withDeformed().withDualQuatSkinned().withFade(),
ShapeKey::Builder().withOwnPipeline(), ShapeKey::Builder().withOwnPipeline().withFade() ShapeKey::Builder().withOwnPipeline(), ShapeKey::Builder().withOwnPipeline().withFade(),
ShapeKey::Builder().withDeformed().withOwnPipeline(), ShapeKey::Builder().withDeformed().withOwnPipeline().withFade(),
ShapeKey::Builder().withDeformed().withDualQuatSkinned().withOwnPipeline(), ShapeKey::Builder().withDeformed().withDualQuatSkinned().withOwnPipeline().withFade(),
}; };
std::vector<std::vector<ShapeKey>> sortedShapeKeys(keys.size()); std::vector<std::vector<ShapeKey>> sortedShapeKeys(keys.size());