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

updating with default landing location

Browse source
This commit is contained in:
Wayne Chen 2018-08-29 16:53:22 -07:00
parent 3810984056
commit eb29c9c4a2
2 changed files with 67 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
interface/resources/serverless/redirect.json
View file

@ -23,9 +23,9 @@
"blue": 4.54052734375,
"green": 1.722428798675537,
"red": 4.593362331390381,
"x": 4.593362331390381,
"y": 1.722428798675537,
"z": 4.54052734375
"x": 0.5933623313903809,
"y": -7.777571201324463,
"z": 0.54052734375
},
"queryAACube": {
"scale": 0.8152676820755005,
@ -65,9 +65,9 @@
"blue": 3.9590959548950195,
"green": 1.738053798675537,
"red": 5.0181121826171875,
"x": 5.0181121826171875,
"y": 1.738053798675537,
"z": 3.9590959548950195
"x": 1.0181121826171875,
"y": -7.761946201324463,
"z": -0.04090404510498047
},
"queryAACube": {
"scale": 0.8152676820755005,
@ -106,9 +106,9 @@
"blue": 2.3440732955932617,
"green": 1.7684326171875,
"red": 1.8812973499298096,
"x": 1.8812973499298096,
"y": 1.7684326171875,
"z": 2.3440732955932617
"x": -2.1187026500701904,
"y": -7.7315673828125,
"z": -1.6559267044067383
},
"queryAACube": {
"scale": 24.9415340423584,
@ -194,9 +194,9 @@
"blue": 1.3712034225463867,
"green": 0.5220947265625,
"red": 2.6281180381774902,
"x": 2.6281180381774902,
"y": 0.5220947265625,
"z": 1.3712034225463867
"x": -1.3718819618225098,
"y": -8.9779052734375,
"z": -2.6287965774536133
},
"queryAACube": {
"scale": 22.932353973388672,
@ -243,9 +243,9 @@
"blue": 1.9063844680786133,
"green": 1.15850830078125,
"red": 0.16632509231567383,
"x": 0.16632509231567383,
"y": 1.15850830078125,
"z": 1.9063844680786133
"x": -3.833674907684326,
"y": -8.34149169921875,
"z": -2.0936155319213867
},
"queryAACube": {
"scale": 11.681488037109375,
@ -290,9 +290,9 @@
"blue": 1.3116319179534912,
"green": 0.0772705078125,
"red": 2.705613613128662,
"x": 2.705613613128662,
"y": 0.0772705078125,
"z": 1.3116319179534912
"x": -1.294386386871338,
"y": -9.4227294921875,
"z": -2.688368082046509
},
"queryAACube": {
"scale": 0.3464101552963257,
@ -334,9 +334,9 @@
"blue": 4.2324604988098145,
"green": 0.17547607421875,
"red": 4.802988529205322,
"x": 4.802988529205322,
"y": 0.17547607421875,
"z": 4.2324604988098145
"x": 0.8029885292053223,
"y": -9.32452392578125,
"z": 0.23246049880981445
},
"queryAACube": {
"scale": 12.771358489990234,
@ -375,9 +375,9 @@
"blue": 1.45927095413208,
"green": 1.6763916015625,
"red": 0,
"x": 0,
"y": 1.6763916015625,
"z": 1.45927095413208
"x": -4,
"y": -7.8236083984375,
"z": -2.54072904586792
},
"queryAACube": {
"scale": 3.6522583961486816,
@ -420,9 +420,9 @@
"blue": 3.8216662406921387,
"green": 0.15618896484375,
"red": 1.2409718036651611,
"x": 1.2409718036651611,
"y": 0.15618896484375,
"z": 3.8216662406921387
"x": -2.759028196334839,
"y": -9.34381103515625,
"z": -0.17833375930786133
},
"queryAACube": {
"scale": 0.3464101552963257,
@ -467,9 +467,9 @@
"blue": 0,
"green": 1.1583251953125,
"red": 4.971565246582031,
"x": 4.971565246582031,
"y": 1.1583251953125,
"z": 0
"x": 0.9715652465820312,
"y": -8.3416748046875,
"z": -4
},
"queryAACube": {
"scale": 11.681488037109375,
@ -509,9 +509,9 @@
"blue": 3.946338653564453,
"green": 0.2467041015625,
"red": 1.6013128757476807,
"x": 1.6013128757476807,
"y": 0.2467041015625,
"z": 3.946338653564453
"x": -2.3986871242523193,
"y": -9.2532958984375,
"z": -0.053661346435546875
},
"queryAACube": {
"scale": 2.5651814937591553,
@ -556,9 +556,9 @@
"blue": 1.3116319179534912,
"green": 0,
"red": 2.705613613128662,
"x": 2.705613613128662,
"y": 0,
"z": 1.3116319179534912
"x": -1.294386386871338,
"y": -9.5,
"z": -2.688368082046509
},
"queryAACube": {
"scale": 0.3464101552963257,
@ -605,9 +605,9 @@
"blue": 3.8216662406921387,
"green": 0.0772705078125,
"red": 1.2409718036651611,
"x": 1.2409718036651611,
"y": 0.0772705078125,
"z": 3.8216662406921387
"x": -2.759028196334839,
"y": -9.4227294921875,
"z": -0.17833375930786133
},
"queryAACube": {
"scale": 0.3464101552963257,
@ -654,9 +654,9 @@
"blue": 3.8216662406921387,
"green": 0,
"red": 1.2409718036651611,
"x": 1.2409718036651611,
"y": 0,
"z": 3.8216662406921387
"x": -2.759028196334839,
"y": -9.5,
"z": -0.17833375930786133
},
"queryAACube": {
"scale": 0.3464101552963257,
@ -703,9 +703,9 @@
"blue": 1.3116319179534912,
"green": 0.15618896484375,
"red": 2.705613613128662,
"x": 2.705613613128662,
"y": 0.15618896484375,
"z": 1.3116319179534912
"x": -1.294386386871338,
"y": -9.34381103515625,
"z": -2.688368082046509
},
"queryAACube": {
"scale": 0.3464101552963257,
@ -750,9 +750,9 @@
"blue": 5.268576622009277,
"green": 1.1588134765625,
"red": 6.100250244140625,
"x": 6.100250244140625,
"y": 1.1588134765625,
"z": 5.268576622009277
"x": 2.100250244140625,
"y": -8.3411865234375,
"z": 1.2685766220092773
},
"queryAACube": {
"scale": 11.681488037109375,
@ -844,9 +844,9 @@
"blue": 3.814434051513672,
"green": 1.44122314453125,
"red": 1.2319090366363525,
"x": 1.2319090366363525,
"y": 1.44122314453125,
"z": 3.814434051513672
"x": -2.7680909633636475,
"y": -8.05877685546875,
"z": -0.18556594848632812
},
"queryAACube": {
"scale": 4.330127239227295,
@ -894,9 +894,9 @@
"blue": 6.1806135177612305,
"green": 1.1588134765625,
"red": 1.4755167961120605,
"x": 1.4755167961120605,
"y": 1.1588134765625,
"z": 6.1806135177612305
"x": -2.5244832038879395,
"y": -8.3411865234375,
"z": 2.1806135177612305
},
"queryAACube": {
"scale": 11.681488037109375,
@ -983,9 +983,9 @@
"blue": 3.78922963142395,
"green": 0.5220947265625,
"red": 1.1928560733795166,
"x": 1.1928560733795166,
"y": 0.5220947265625,
"z": 3.78922963142395
"x": -2.8071439266204834,
"y": -8.9779052734375,
"z": -0.2107703685760498
},
"queryAACube": {
"scale": 22.932353973388672,
@ -1080,9 +1080,9 @@
"blue": 1.3553659915924072,
"green": 1.44122314453125,
"red": 2.572803497314453,
"x": 2.572803497314453,
"y": 1.44122314453125,
"z": 1.3553659915924072
"x": -1.4271965026855469,
"y": -8.05877685546875,
"z": -2.6446340084075928
},
"queryAACube": {
"scale": 4.330127239227295,
@ -1127,9 +1127,9 @@
"blue": 1.5835940837860107,
"green": 0.2467041015625,
"red": 3.0345542430877686,
"x": 3.0345542430877686,
"y": 0.2467041015625,
"z": 1.5835940837860107
"x": -0.9654457569122314,
"y": -9.2532958984375,
"z": -2.4164059162139893
},
"queryAACube": {
"scale": 2.5651814937591553,
@ -1149,6 +1149,10 @@
"userData": "{\"grabbableKey\":{\"grabbable\":false}}"
}
],
"Paths":
{
"/": "/1.46,-9,0.7/0,0.487,0,0.86663"
},
"Id": "{351e561a-ee5e-4e8b-87ab-d28677d3b374}",
"Version": 93
}

1
interface/src/Application.cpp
View file

@ -2369,7 +2369,6 @@ void Application::domainConnectionRedirect(const QString& reasonMessage, int rea
addressManager->handleLookupString(REDIRECT_HIFI_ADDRESS);
getMyAvatar()->setWorldVelocity(glm::vec3(0.0f));
// in (w, x, y, z) component-structure for the constructor
getMyAvatar()->setWorldOrientation(glm::quat(0.8775935173034668f, 0.0f, 0.4794054925441742f, 0.0f));
break;
}
default: