mirror of
https://github.com/lubosz/overte.git
synced 2025-04-10 00:04:18 +02:00
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
This commit is contained in:
Sam Gateau
commit
3e3c4c2e70
7 changed files with 76 additions and 41 deletions
|
|
@ -257,27 +257,26 @@ endif()
|
|||
|
||||
def installQt(self):
|
||||
qt5InstallPath = self.getQt5InstallPath()
|
||||
if os.getenv('QT_CMAKE_PREFIX_PATH') == None:
|
||||
if not os.path.isdir(qt5InstallPath):
|
||||
print ('Downloading Qt from AWS')
|
||||
dest, tail = os.path.split(qt5InstallPath)
|
||||
if not os.path.isdir(qt5InstallPath):
|
||||
print ('Downloading Qt from AWS')
|
||||
dest, tail = os.path.split(qt5InstallPath)
|
||||
|
||||
url = 'NOT DEFINED'
|
||||
if platform.system() == 'Windows':
|
||||
url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-windows3.tar.gz'
|
||||
elif platform.system() == 'Darwin':
|
||||
url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-macos3.tar.gz'
|
||||
elif platform.system() == 'Linux':
|
||||
if platform.linux_distribution()[1][:3] == '16.':
|
||||
url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04-with-symbols.tar.gz'
|
||||
elif platform.linux_distribution()[1][:3] == '18.':
|
||||
url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-18.04.tar.gz'
|
||||
else:
|
||||
print('UNKNOWN LINUX VERSION!!!')
|
||||
url = 'NOT DEFINED'
|
||||
if platform.system() == 'Windows':
|
||||
url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-windows3.tar.gz'
|
||||
elif platform.system() == 'Darwin':
|
||||
url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-macos3.tar.gz'
|
||||
elif platform.system() == 'Linux':
|
||||
if platform.linux_distribution()[1][:3] == '16.':
|
||||
url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04-with-symbols.tar.gz'
|
||||
elif platform.linux_distribution()[1][:3] == '18.':
|
||||
url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-18.04.tar.gz'
|
||||
else:
|
||||
print('UNKNOWN OPERATING SYSTEM!!!')
|
||||
|
||||
print('Extracting ' + url + ' to ' + dest)
|
||||
hifi_utils.downloadAndExtract(url, dest)
|
||||
print('UNKNOWN LINUX VERSION!!!')
|
||||
else:
|
||||
print ('Qt has already been downloaded')
|
||||
print('UNKNOWN OPERATING SYSTEM!!!')
|
||||
|
||||
print('Extracting ' + url + ' to ' + dest)
|
||||
hifi_utils.downloadAndExtract(url, dest)
|
||||
else:
|
||||
print ('Qt has already been downloaded')
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -3799,8 +3799,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "reactionPoint",
|
||||
"interpDuration": 18,
|
||||
"interpTarget": 18,
|
||||
"interpDuration": 10,
|
||||
"interpTarget": 10,
|
||||
"interpType": "evaluateBoth",
|
||||
"transitions": [
|
||||
{
|
||||
|
|
@ -4610,9 +4610,9 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "idle",
|
||||
"interpDuration": 30,
|
||||
"interpTarget": 30,
|
||||
"interpType": "evaluateBoth",
|
||||
"interpDuration": 10,
|
||||
"interpTarget": 10,
|
||||
"interpType": "snapshotPrev",
|
||||
"transitions": [
|
||||
{
|
||||
"state": "WALKFWD",
|
||||
|
|
@ -4742,14 +4742,34 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "idleSettle",
|
||||
"interpDuration": 12,
|
||||
"interpTarget": 12,
|
||||
"interpType": "evaluateBoth",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpType": "snapshotPrev",
|
||||
"transitions": [
|
||||
{
|
||||
"state": "idle",
|
||||
"var": "idleSettleOnDone"
|
||||
},
|
||||
{
|
||||
"state": "idle",
|
||||
"var": "reactionPositiveTrigger"
|
||||
},
|
||||
{
|
||||
"state": "idle",
|
||||
"var": "reactionNegativeTrigger"
|
||||
},
|
||||
{
|
||||
"state": "idle",
|
||||
"var": "reactionRaiseHandEnabled"
|
||||
},
|
||||
{
|
||||
"state": "idle",
|
||||
"var": "reactionApplaudEnabled"
|
||||
},
|
||||
{
|
||||
"state": "idle",
|
||||
"var": "reactionPointEnabled"
|
||||
},
|
||||
{
|
||||
"state": "WALKFWD",
|
||||
"var": "isMovingForward"
|
||||
|
|
@ -4810,7 +4830,7 @@
|
|||
},
|
||||
{
|
||||
"id": "WALKFWD",
|
||||
"interpDuration": 10,
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 35,
|
||||
"interpType": "snapshotPrev",
|
||||
"transitions": [
|
||||
|
|
@ -4874,7 +4894,7 @@
|
|||
},
|
||||
{
|
||||
"id": "WALKBWD",
|
||||
"interpDuration": 10,
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 35,
|
||||
"interpType": "snapshotPrev",
|
||||
"transitions": [
|
||||
|
|
@ -4938,7 +4958,7 @@
|
|||
},
|
||||
{
|
||||
"id": "STRAFERIGHT",
|
||||
"interpDuration": 8,
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 25,
|
||||
"interpType": "snapshotPrev",
|
||||
"transitions": [
|
||||
|
|
@ -5002,7 +5022,7 @@
|
|||
},
|
||||
{
|
||||
"id": "STRAFELEFT",
|
||||
"interpDuration": 8,
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 25,
|
||||
"interpType": "snapshotPrev",
|
||||
"transitions": [
|
||||
|
|
@ -5873,7 +5893,6 @@
|
|||
},
|
||||
"id": "userAnimStateMachine",
|
||||
"type": "stateMachine"
|
||||
|
||||
},
|
||||
"version": "1.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,9 @@ Rectangle {
|
|||
property bool inventoryFullyReceived: false
|
||||
|
||||
Component.onCompleted: {
|
||||
var numTimesRun = Settings.getValue("simplifiedUI/SUIScriptExecutionCount", 0);
|
||||
numTimesRun++;
|
||||
Settings.setValue("simplifiedUI/SUIScriptExecutionCount", numTimesRun);
|
||||
Commerce.getLoginStatus();
|
||||
}
|
||||
|
||||
|
|
@ -52,7 +55,7 @@ Rectangle {
|
|||
if ((MyAvatar.skeletonModelURL.indexOf("defaultAvatar") > -1 || MyAvatar.skeletonModelURL.indexOf("fst") === -1) &&
|
||||
topBarInventoryModel.count > 0) {
|
||||
Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true);
|
||||
MyAvatar.skeletonModelURL = topBarInventoryModel.get(0).download_url;
|
||||
MyAvatar.useFullAvatarURL = topBarInventoryModel.get(0).download_url;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4144,6 +4144,7 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition,
|
|||
_goToOrientation = quatOrientation;
|
||||
}
|
||||
|
||||
resetLookAtRotation(_goToPosition, _goToOrientation);
|
||||
emit transformChanged();
|
||||
}
|
||||
|
||||
|
|
@ -5996,6 +5997,7 @@ bool MyAvatar::pinJoint(int index, const glm::vec3& position, const glm::quat& o
|
|||
}
|
||||
|
||||
slamPosition(position);
|
||||
resetLookAtRotation(position, orientation);
|
||||
setWorldOrientation(orientation);
|
||||
|
||||
auto it = std::find(_pinnedJoints.begin(), _pinnedJoints.end(), index);
|
||||
|
|
@ -6662,6 +6664,15 @@ void MyAvatar::resetHeadLookAt() {
|
|||
}
|
||||
}
|
||||
|
||||
void MyAvatar::resetLookAtRotation(const glm::vec3& avatarPosition, const glm::quat& avatarOrientation) {
|
||||
// Align the look at values to the given avatar orientation
|
||||
float yaw = safeEulerAngles(avatarOrientation).y;
|
||||
_lookAtYaw = glm::angleAxis(yaw, avatarOrientation * Vectors::UP);
|
||||
_lookAtPitch = Quaternions::IDENTITY;
|
||||
_lookAtCameraTarget = avatarPosition + avatarOrientation * Vectors::FRONT;
|
||||
resetHeadLookAt();
|
||||
}
|
||||
|
||||
void MyAvatar::updateHeadLookAt(float deltaTime) {
|
||||
if (_skeletonModelLoaded) {
|
||||
glm::vec3 lookAtTarget = _scriptControlsHeadLookAt ? _lookAtScriptTarget : _lookAtCameraTarget;
|
||||
|
|
|
|||
|
|
@ -2654,11 +2654,6 @@ private:
|
|||
bool _scriptControlsHeadLookAt { false };
|
||||
float _scriptHeadControlTimer { 0.0f };
|
||||
|
||||
// LookAt camera data
|
||||
float _selfieTriggerAngle { 55.0f };
|
||||
float _frontLookAtSpeed { 0.15f };
|
||||
float _backLookAtSpeed { 0.25f };
|
||||
|
||||
Setting::Handle<float> _realWorldFieldOfView;
|
||||
Setting::Handle<bool> _useAdvancedMovementControls;
|
||||
Setting::Handle<bool> _showPlayArea;
|
||||
|
|
@ -2685,6 +2680,7 @@ private:
|
|||
void initFlowFromFST();
|
||||
void updateHeadLookAt(float deltaTime);
|
||||
void resetHeadLookAt();
|
||||
void resetLookAtRotation(const glm::vec3& avatarPosition, const glm::quat& avatarOrientation);
|
||||
|
||||
// Avatar Preferences
|
||||
QUrl _fullAvatarURLFromPreferences;
|
||||
|
|
|
|||
|
|
@ -532,6 +532,11 @@ function onGeometryChanged(rect) {
|
|||
}
|
||||
}
|
||||
|
||||
function onWindowMinimizedChanged() {
|
||||
// prerequisite placeholder for Reduce Friction of Customer Acquisition sub task: https://highfidelity.atlassian.net/browse/DEV-585
|
||||
print("WINDOW MINIMIZED CHANGED SIGNAL");
|
||||
}
|
||||
|
||||
function onDisplayModeChanged(isHMDMode) {
|
||||
if (isHMDMode) {
|
||||
Camera.setModeString("first person");
|
||||
|
|
@ -612,6 +617,7 @@ function startup() {
|
|||
Audio.mutedDesktopChanged.connect(onDesktopInputDeviceMutedChanged);
|
||||
Audio.mutedHMDChanged.connect(onHMDInputDeviceMutedChanged);
|
||||
Window.geometryChanged.connect(onGeometryChanged);
|
||||
Window.minimizedChanged.connect(onWindowMinimizedChanged);
|
||||
HMD.displayModeChanged.connect(onDisplayModeChanged);
|
||||
Audio.avatarGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
|
||||
Audio.localInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
|
||||
|
|
@ -657,6 +663,7 @@ function shutdown() {
|
|||
Audio.mutedDesktopChanged.disconnect(onDesktopInputDeviceMutedChanged);
|
||||
Audio.mutedHMDChanged.disconnect(onHMDInputDeviceMutedChanged);
|
||||
Window.geometryChanged.disconnect(onGeometryChanged);
|
||||
Window.minimizedChanged.disconnect(onWindowMinimizedChanged);
|
||||
HMD.displayModeChanged.disconnect(onDisplayModeChanged);
|
||||
Audio.avatarGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);
|
||||
Audio.localInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);
|
||||
|
|
|
|||
Loading…
Reference in a new issue