mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 08:21:24 +02:00
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
This commit is contained in:
ZappoMan
commit
3a967ca895
19 changed files with 271 additions and 77 deletions
|
|
@ -1,3 +1,17 @@
|
||||||
|
/* cairo-regular - latin */
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Cairo';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 400;
|
||||||
|
src: url('/fonts/cairo-v2-latin-regular.eot'); /* IE9 Compat Modes */
|
||||||
|
src: local('Cairo'), local('Cairo-Regular'),
|
||||||
|
url('/fonts/cairo-v2-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
|
||||||
|
url('/fonts/cairo-v2-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
|
||||||
|
url('/fonts/cairo-v2-latin-regular.woff') format('woff'), /* Modern Browsers */
|
||||||
|
url('/fonts/cairo-v2-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
|
||||||
|
url('/fonts/cairo-v2-latin-regular.svg#Cairo') format('svg'); /* Legacy iOS */
|
||||||
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
position: relative;
|
position: relative;
|
||||||
padding-bottom: 30px;
|
padding-bottom: 30px;
|
||||||
|
|
@ -324,7 +338,7 @@ table .headers + .headers td {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
text-decoration-line: underline;
|
text-decoration-line: underline;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
color: #2F80ED;
|
color: #00B3F8;
|
||||||
}
|
}
|
||||||
|
|
||||||
#manage-cloud-domains-link {
|
#manage-cloud-domains-link {
|
||||||
|
|
|
||||||
BIN
domain-server/resources/web/fonts/cairo-v2-latin-regular.eot
Normal file
BIN
domain-server/resources/web/fonts/cairo-v2-latin-regular.eot
Normal file
Binary file not shown.
|
|
@ -0,0 +1 @@
|
||||||
|
<!DOCTYPE html><html lang=en><meta charset=utf-8><meta name=viewport content="initial-scale=1, minimum-scale=1, width=device-width"><title>Error 500 (Server Error)!!1</title><style>*{margin:0;padding:0}html,code{font:15px/22px arial,sans-serif}html{background:#fff;color:#222;padding:15px}body{color:#222;text-align:unset;margin:7% auto 0;max-width:390px;min-height:180px;padding:30px 0 15px;}* > body{background:url(//www.google.com/images/errors/robot.png) 100% 5px no-repeat;padding-right:205px}p{margin:11px 0 22px;overflow:hidden}pre{white-space:pre-wrap;}ins{color:#777;text-decoration:none}a img{border:0}@media screen and (max-width:772px){body{background:none;margin-top:0;max-width:none;padding-right:0}}#logo{background:url(//www.google.com/images/branding/googlelogo/1x/googlelogo_color_150x54dp.png) no-repeat;margin-left:-5px}@media only screen and (min-resolution:192dpi){#logo{background:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) no-repeat 0% 0%/100% 100%;-moz-border-image:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) 0}}@media only screen and (-webkit-min-device-pixel-ratio:2){#logo{background:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) no-repeat;-webkit-background-size:100% 100%}}#logo{display:inline-block;height:54px;width:150px}</style><div id="af-error-container"><a href=//www.google.com><span id=logo aria-label=Google></span></a><p><b>500.</b> <ins>That’s an error.</ins><p>There was an error. Please try again later. <ins>That’s all we know.</ins></div>
|
||||||
BIN
domain-server/resources/web/fonts/cairo-v2-latin-regular.ttf
Normal file
BIN
domain-server/resources/web/fonts/cairo-v2-latin-regular.ttf
Normal file
Binary file not shown.
BIN
domain-server/resources/web/fonts/cairo-v2-latin-regular.woff
Normal file
BIN
domain-server/resources/web/fonts/cairo-v2-latin-regular.woff
Normal file
Binary file not shown.
BIN
domain-server/resources/web/fonts/cairo-v2-latin-regular.woff2
Normal file
BIN
domain-server/resources/web/fonts/cairo-v2-latin-regular.woff2
Normal file
Binary file not shown.
|
|
@ -1,25 +0,0 @@
|
||||||
<svg width="676" height="676" viewBox="0 0 676 676" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
|
||||||
<title>CongratulationImage</title>
|
|
||||||
<desc>Created using Figma</desc>
|
|
||||||
<g id="Canvas" transform="matrix(4 0 0 4 -21208 -17980)">
|
|
||||||
<g id="CongratulationImage">
|
|
||||||
<g id="Ellipse">
|
|
||||||
<use xlink:href="#path0_fill" transform="translate(5302 4495)" fill="#FFFFFF"/>
|
|
||||||
<mask id="mask0_outline_ins">
|
|
||||||
<use xlink:href="#path0_fill" fill="white" transform="translate(5302 4495)"/>
|
|
||||||
</mask>
|
|
||||||
<g mask="url(#mask0_outline_ins)">
|
|
||||||
<use xlink:href="#path1_stroke_2x" transform="translate(5302 4495)" fill="#219653"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<g id="Vector 2">
|
|
||||||
<use xlink:href="#path2_stroke" transform="translate(5355 4559)" fill="#219653"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<defs>
|
|
||||||
<path id="path0_fill" d="M 169 84.5C 169 131.168 131.168 169 84.5 169C 37.8319 169 0 131.168 0 84.5C 0 37.8319 37.8319 0 84.5 0C 131.168 0 169 37.8319 169 84.5Z"/>
|
|
||||||
<path id="path1_stroke_2x" d="M 154 84.5C 154 122.884 122.884 154 84.5 154L 84.5 184C 139.452 184 184 139.452 184 84.5L 154 84.5ZM 84.5 154C 46.1162 154 15 122.884 15 84.5L -15 84.5C -15 139.452 29.5477 184 84.5 184L 84.5 154ZM 15 84.5C 15 46.1162 46.1162 15 84.5 15L 84.5 -15C 29.5477 -15 -15 29.5477 -15 84.5L 15 84.5ZM 84.5 15C 122.884 15 154 46.1162 154 84.5L 184 84.5C 184 29.5477 139.452 -15 84.5 -15L 84.5 15Z"/>
|
|
||||||
<path id="path2_stroke" d="M 5.18747 19.8031C 2.19593 16.9382 -2.5517 17.0408 -5.41666 20.0323C -8.28162 23.0238 -8.17901 27.7715 -5.18747 30.6364L 5.18747 19.8031ZM 20.6541 45L 15.4667 50.4167C 18.3816 53.2083 22.9831 53.1924 25.8787 50.3809L 20.6541 45ZM 72.2246 5.38085C 75.1964 2.49539 75.2663 -2.25283 72.3809 -5.2246C 69.4954 -8.19636 64.7472 -8.26632 61.7754 -5.38085L 72.2246 5.38085ZM -5.18747 30.6364L 15.4667 50.4167L 25.8416 39.5833L 5.18747 19.8031L -5.18747 30.6364ZM 25.8787 50.3809L 72.2246 5.38085L 61.7754 -5.38085L 15.4295 39.6191L 25.8787 50.3809Z"/>
|
|
||||||
</defs>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.9 KiB |
17
domain-server/resources/web/images/copy-icon.svg
Normal file
17
domain-server/resources/web/images/copy-icon.svg
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
viewBox="0 0 576 576" style="enable-background:new 0 0 576 576;" xml:space="preserve">
|
||||||
|
<path d="M329.7,410.7H127.8c-42.1,0-76.4-34.3-76.4-76.4V132.4c0-42.1,34.3-76.4,76.4-76.4h201.9c42.1,0,76.4,34.3,76.4,76.4v201.9
|
||||||
|
C406.1,376.4,371.8,410.7,329.7,410.7z M127.8,98.9c-18.5,0-33.5,15-33.5,33.5v201.9c0,18.5,15,33.5,33.5,33.5h201.9
|
||||||
|
c18.5,0,33.5-15,33.5-33.5V132.4c0-18.5-15-33.5-33.5-33.5H127.8z"/>
|
||||||
|
<path d="M449.4,519H407c-11.9,0-21.5-9.6-21.5-21.5s9.6-21.5,21.5-21.5h42.4c11.9,0,21.5,9.6,21.5,21.5S461.3,519,449.4,519z
|
||||||
|
M305.1,519H263c-11.9,0-21.5-9.6-21.5-21.5s9.6-21.5,21.5-21.5h42.2c11.9,0,21.5,9.6,21.5,21.5S317,519,305.1,519z M192.4,464.1
|
||||||
|
c-11.9,0-21.5-9.6-21.5-21.4v-42.2c0-11.9,9.6-21.5,21.5-21.5c11.9,0,21.5,9.6,21.5,21.5v42.1C213.8,454.5,204.2,464.1,192.4,464.1z
|
||||||
|
M504.1,448.2c-11.9,0-21.5-9.6-21.5-21.5v-42.2c0-11.9,9.6-21.5,21.5-21.5c11.9,0,21.5,9.6,21.5,21.5v42.2
|
||||||
|
C525.6,438.6,516,448.2,504.1,448.2z M192.4,320.1c-11.9,0-21.5-9.6-21.5-21.5v-42.2c0-11.9,9.6-21.5,21.5-21.5
|
||||||
|
c11.9,0,21.5,9.6,21.5,21.5v42.2C213.8,310.5,204.2,320.1,192.4,320.1z M504.1,304.1c-11.9,0-21.5-9.6-21.5-21.5v-42
|
||||||
|
c0-11.9,9.6-21.6,21.5-21.6c11.9,0,21.5,9.5,21.5,21.4v42.2C525.6,294.5,516,304.1,504.1,304.1z M433.4,207.2h-42.2
|
||||||
|
c-11.9,0-21.5-9.6-21.5-21.5s9.6-21.5,21.5-21.5h42.2c11.9,0,21.5,9.6,21.5,21.5S445.3,207.2,433.4,207.2z M289.3,207.2h-42.1
|
||||||
|
c-11.9,0-21.5-9.6-21.5-21.5s9.6-21.5,21.4-21.5h42.2c11.9,0,21.5,9.6,21.5,21.5S301.2,207.2,289.3,207.2z"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 137 KiB |
|
|
@ -83,21 +83,80 @@ label {
|
||||||
margin-bottom: 33px;
|
margin-bottom: 33px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#checkmark-image {
|
.btn.btn-square {
|
||||||
margin-top: 66px;
|
border-radius: 0;
|
||||||
margin-bottom: 59px;
|
|
||||||
width: 169px;
|
|
||||||
height: 169px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#congratulation-text {
|
.header {
|
||||||
margin-bottom: 59px;
|
position: absolute;
|
||||||
|
top: -20px;
|
||||||
|
left: 50%;
|
||||||
|
margin-left: -720px; /* Half of the width */
|
||||||
|
min-width: 1440px;
|
||||||
|
z-index: -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#visit-domain-checkbox {
|
.title {
|
||||||
margin-bottom: 23px;
|
font-family: 'Cairo';
|
||||||
|
color: white;
|
||||||
|
margin-top: 260px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#visit-domain-checkbox label {
|
#main-description {
|
||||||
margin: 0 0;
|
margin-top: 32px;
|
||||||
|
margin-bottom: 35px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#share-box {
|
||||||
|
background-color: rgb(240, 240, 240);
|
||||||
|
padding: 20px 20px;
|
||||||
|
margin-top: 15px;
|
||||||
|
margin-bottom: 70px;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
#share-box > span {
|
||||||
|
vertical-align: middle;
|
||||||
|
display: table-cell;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
#share-box button {
|
||||||
|
border-color: rgb(225, 225, 225);
|
||||||
|
font-size: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#share-box img {
|
||||||
|
padding-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#share-text {
|
||||||
|
font-size: 22px;
|
||||||
|
padding-right: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#share-field {
|
||||||
|
background-color: rgb(255, 255, 255);
|
||||||
|
padding: 0 10px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
#share-link {
|
||||||
|
font-size: 28px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#congrats-list > div > div {
|
||||||
|
margin-bottom: 30px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#congrats-list ul {
|
||||||
|
padding-left: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#congrats-list {
|
||||||
|
margin-bottom: 60px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#open-settings {
|
||||||
|
border-color: black;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -191,29 +191,70 @@
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="wizard-step cloud-only col-xs-12 col-sm-12 col-md-9 col-lg-7 col-centered" style="display: none;">
|
<div id="congratulation-step" class="wizard-step cloud-only col-xs-12 col-centered" style="display: none;">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12" align="center">
|
<div class="col-xs-10 col-xs-offset-1">
|
||||||
<img id="checkmark-image" src="../images/checkmark.svg">
|
<img class="header" src="/images/wizard-congratulation-header.jpg" alt="Header" width="1440" height="339">
|
||||||
|
<h1 class="title">Congratulations!</h1>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="congratulation-text" class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-10 col-xs-offset-1">
|
||||||
<p class="step-info">Congratulations! You have successfully setup and configured your cloud hosted domain.</p>
|
<p id="main-description" class="step-info">You have successfully setup and configured your cloud hosted domain.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<dl class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-10 col-xs-offset-1">
|
||||||
<div class="pull-right">
|
<div class="step-info">
|
||||||
<div id="visit-domain-checkbox">
|
<b>Invite people in!</b>
|
||||||
<label><input id="go-to-domain" class="form-check-input" type="checkbox"> Visit domain in VR now</label>
|
</div>
|
||||||
</div>
|
<div id="share-box">
|
||||||
<button id="explore-settings" type="button" class="btn btn-md btn-primary">Explore all domain server settings</button>
|
<span id="share-text" class="step-info">Share your domain:</span>
|
||||||
|
<span id="share-field">
|
||||||
|
<a id="share-link" class="blue-link" target="_blank"></a>
|
||||||
|
</span>
|
||||||
|
<span>
|
||||||
|
<button type="button" class="btn btn-md btn-default btn-square" onclick="copyToClipboard('#share-link')">
|
||||||
|
<img src="/images/copy-icon.svg" alt="cpy icon" height="30" width="30">copy
|
||||||
|
</button>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</dl>
|
</div>
|
||||||
|
|
||||||
|
<div id="congrats-list" class="row">
|
||||||
|
<div class="col-xs-4 col-xs-offset-1">
|
||||||
|
<div class="step-info">
|
||||||
|
<b>Go to your Domain:</b>
|
||||||
|
</div>
|
||||||
|
<ul>
|
||||||
|
<li class="step-info">Browse environments in the Marketplace to select the perfect content set for your VR world.</li>
|
||||||
|
<li class="step-info">Invite people to your domain right now.</li>
|
||||||
|
<li class="step-info">Meet new people and explore other domains.</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-3 col-xs-offset-1">
|
||||||
|
<div class="step-info">
|
||||||
|
<b>Continue to Domain settings:</b>
|
||||||
|
</div>
|
||||||
|
<ul>
|
||||||
|
<li class="step-info">Set additional permissions for who can visit and make changes.</li>
|
||||||
|
<li class="step-info">Adjust audio settings.</li>
|
||||||
|
<li class="step-info">Back up your domain's content.</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-xs-4 col-xs-offset-1">
|
||||||
|
<button id="visit-domain" type="button" class="btn btn-md btn-primary btn-square">Visit Your VR World</button>
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-3 col-xs-offset-1">
|
||||||
|
<button id="open-settings" type="button" class="btn btn-md btn-default btn-square next-button">Open Domain Settings</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--#include virtual="footer.html"-->
|
<!--#include virtual="footer.html"-->
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ $(document).ready(function(){
|
||||||
$('#connect-account-btn').attr('href', URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true");
|
$('#connect-account-btn').attr('href', URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true");
|
||||||
|
|
||||||
$('[data-toggle="tooltip"]').tooltip();
|
$('[data-toggle="tooltip"]').tooltip();
|
||||||
|
|
||||||
$('.perms-link').on('click', function() {
|
$('.perms-link').on('click', function() {
|
||||||
var modal_body = '<div>';
|
var modal_body = '<div>';
|
||||||
modal_body += '<b>None</b> - No one will have permissions. Only you and the users your have given administrator privileges to will have permissions.</br></br>';
|
modal_body += '<b>None</b> - No one will have permissions. Only you and the users your have given administrator privileges to will have permissions.</br></br>';
|
||||||
|
|
@ -70,8 +70,8 @@ $(document).ready(function(){
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
$('body').on('click', '#explore-settings', function() {
|
$('body').on('click', '#visit-domain', function() {
|
||||||
exploreSettings();
|
$('#share-link')[0].click();
|
||||||
});
|
});
|
||||||
|
|
||||||
$('input[type=radio][name=connect-radio]').change(function() {
|
$('input[type=radio][name=connect-radio]').change(function() {
|
||||||
|
|
@ -120,6 +120,14 @@ $(document).ready(function(){
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function copyToClipboard(element) {
|
||||||
|
var $temp = $("<input>");
|
||||||
|
$("body").append($temp);
|
||||||
|
$temp.val($(element).text()).select();
|
||||||
|
document.execCommand("copy");
|
||||||
|
$temp.remove();
|
||||||
|
}
|
||||||
|
|
||||||
function setupWizardSteps() {
|
function setupWizardSteps() {
|
||||||
currentStepNumber = Settings.data.values.wizard.steps_completed;
|
currentStepNumber = Settings.data.values.wizard.steps_completed;
|
||||||
var steps = null;
|
var steps = null;
|
||||||
|
|
@ -155,7 +163,9 @@ function setupWizardSteps() {
|
||||||
|
|
||||||
function updatePlaceNameLink(address) {
|
function updatePlaceNameLink(address) {
|
||||||
if (address) {
|
if (address) {
|
||||||
$('#place-name-link').html('Your domain is reachable at: <a target="_blank" href="' + URLs.PLACE_URL + '/' + address + '">' + address + '</a>');
|
var url = URLs.PLACE_URL + '/' + address;
|
||||||
|
$('#place-name-link').html('Your domain is reachable at: <a target="_blank" href="' + url + '">' + address + '</a>');
|
||||||
|
$('#share-field a').attr('href', url).text(url);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -507,14 +517,3 @@ function saveUsernamePassword() {
|
||||||
location.reload();
|
location.reload();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function exploreSettings() {
|
|
||||||
if ($('#go-to-domain').is(":checked")) {
|
|
||||||
var link = $('#place-name-link a:first');
|
|
||||||
if (link.length > 0) {
|
|
||||||
window.open(link.attr("href"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
goToNextStep();
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1185,6 +1185,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
|
||||||
_entityEditSender.setServerJurisdictions(&_entityServerJurisdictions);
|
_entityEditSender.setServerJurisdictions(&_entityServerJurisdictions);
|
||||||
_entityEditSender.setMyAvatar(myAvatar.get());
|
_entityEditSender.setMyAvatar(myAvatar.get());
|
||||||
|
|
||||||
|
// The entity octree will have to know about MyAvatar for the parentJointName import
|
||||||
|
getEntities()->getTree()->setMyAvatar(myAvatar);
|
||||||
|
_entityClipboard->setMyAvatar(myAvatar);
|
||||||
|
|
||||||
// For now we're going to set the PPS for outbound packets to be super high, this is
|
// For now we're going to set the PPS for outbound packets to be super high, this is
|
||||||
// probably not the right long term solution. But for now, we're going to do this to
|
// probably not the right long term solution. But for now, we're going to do this to
|
||||||
// allow you to move an entity around in your hand
|
// allow you to move an entity around in your hand
|
||||||
|
|
@ -3999,6 +4003,7 @@ bool Application::exportEntities(const QString& filename,
|
||||||
|
|
||||||
auto entityTree = getEntities()->getTree();
|
auto entityTree = getEntities()->getTree();
|
||||||
auto exportTree = std::make_shared<EntityTree>();
|
auto exportTree = std::make_shared<EntityTree>();
|
||||||
|
exportTree->setMyAvatar(getMyAvatar());
|
||||||
exportTree->createRootElement();
|
exportTree->createRootElement();
|
||||||
glm::vec3 root(TREE_SCALE, TREE_SCALE, TREE_SCALE);
|
glm::vec3 root(TREE_SCALE, TREE_SCALE, TREE_SCALE);
|
||||||
bool success = true;
|
bool success = true;
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
#include <TextureCache.h>
|
#include <TextureCache.h>
|
||||||
#include <gpu/Context.h>
|
#include <gpu/Context.h>
|
||||||
#include <EntityScriptingInterface.h>
|
#include <EntityScriptingInterface.h>
|
||||||
|
#include <glm/gtx/transform.hpp>
|
||||||
|
|
||||||
using RenderArgsPointer = std::shared_ptr<RenderArgs>;
|
using RenderArgsPointer = std::shared_ptr<RenderArgs>;
|
||||||
|
|
||||||
|
|
@ -48,6 +49,47 @@ public:
|
||||||
_farClipPlaneDistance = config.farClipPlaneDistance;
|
_farClipPlaneDistance = config.farClipPlaneDistance;
|
||||||
_textureWidth = config.textureWidth;
|
_textureWidth = config.textureWidth;
|
||||||
_textureHeight = config.textureHeight;
|
_textureHeight = config.textureHeight;
|
||||||
|
_mirrorProjection = config.mirrorProjection;
|
||||||
|
}
|
||||||
|
|
||||||
|
void setMirrorProjection(ViewFrustum& srcViewFrustum) {
|
||||||
|
if (_attachedEntityId.isNull()) {
|
||||||
|
qWarning() << "ERROR: Cannot set mirror projection for SecondaryCamera without an attachedEntityId set.";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(_attachedEntityId,
|
||||||
|
_attachedEntityPropertyFlags);
|
||||||
|
glm::vec3 mirrorPropertiesPosition = entityProperties.getPosition();
|
||||||
|
glm::quat mirrorPropertiesRotation = entityProperties.getRotation();
|
||||||
|
glm::vec3 mirrorPropertiesDimensions = entityProperties.getDimensions();
|
||||||
|
glm::vec3 halfMirrorPropertiesDimensions = 0.5f * mirrorPropertiesDimensions;
|
||||||
|
|
||||||
|
// setup mirror from world as inverse of world from mirror transformation using inverted x and z for mirrored image
|
||||||
|
// TODO: we are assuming here that UP is world y-axis
|
||||||
|
glm::mat4 worldFromMirrorRotation = glm::mat4_cast(mirrorPropertiesRotation) * glm::scale(vec3(-1.0f, 1.0f, -1.0f));
|
||||||
|
glm::mat4 worldFromMirrorTranslation = glm::translate(mirrorPropertiesPosition);
|
||||||
|
glm::mat4 worldFromMirror = worldFromMirrorTranslation * worldFromMirrorRotation;
|
||||||
|
glm::mat4 mirrorFromWorld = glm::inverse(worldFromMirror);
|
||||||
|
|
||||||
|
// get mirror camera position by reflecting main camera position's z coordinate in mirror space
|
||||||
|
glm::vec3 mainCameraPositionWorld = qApp->getCamera().getPosition();
|
||||||
|
glm::vec3 mainCameraPositionMirror = vec3(mirrorFromWorld * vec4(mainCameraPositionWorld, 1.0f));
|
||||||
|
glm::vec3 mirrorCameraPositionMirror = vec3(mainCameraPositionMirror.x, mainCameraPositionMirror.y,
|
||||||
|
-mainCameraPositionMirror.z);
|
||||||
|
glm::vec3 mirrorCameraPositionWorld = vec3(worldFromMirror * vec4(mirrorCameraPositionMirror, 1.0f));
|
||||||
|
|
||||||
|
// set frustum position to be mirrored camera and set orientation to mirror's adjusted rotation
|
||||||
|
glm::quat mirrorCameraOrientation = glm::quat_cast(worldFromMirrorRotation);
|
||||||
|
srcViewFrustum.setPosition(mirrorCameraPositionWorld);
|
||||||
|
srcViewFrustum.setOrientation(mirrorCameraOrientation);
|
||||||
|
|
||||||
|
// build frustum using mirror space translation of mirrored camera
|
||||||
|
float nearClip = mirrorCameraPositionMirror.z + mirrorPropertiesDimensions.z * 2.0f;
|
||||||
|
glm::vec3 upperRight = halfMirrorPropertiesDimensions - mirrorCameraPositionMirror;
|
||||||
|
glm::vec3 bottomLeft = -halfMirrorPropertiesDimensions - mirrorCameraPositionMirror;
|
||||||
|
glm::mat4 frustum = glm::frustum(bottomLeft.x, upperRight.x, bottomLeft.y, upperRight.y, nearClip, _farClipPlaneDistance);
|
||||||
|
srcViewFrustum.setProjection(frustum);
|
||||||
}
|
}
|
||||||
|
|
||||||
void run(const render::RenderContextPointer& renderContext, RenderArgsPointer& cachedArgs) {
|
void run(const render::RenderContextPointer& renderContext, RenderArgsPointer& cachedArgs) {
|
||||||
|
|
@ -71,15 +113,22 @@ public:
|
||||||
});
|
});
|
||||||
|
|
||||||
auto srcViewFrustum = args->getViewFrustum();
|
auto srcViewFrustum = args->getViewFrustum();
|
||||||
if (!_attachedEntityId.isNull()) {
|
if (_mirrorProjection) {
|
||||||
EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(_attachedEntityId, _attachedEntityPropertyFlags);
|
setMirrorProjection(srcViewFrustum);
|
||||||
srcViewFrustum.setPosition(entityProperties.getPosition());
|
|
||||||
srcViewFrustum.setOrientation(entityProperties.getRotation());
|
|
||||||
} else {
|
} else {
|
||||||
srcViewFrustum.setPosition(_position);
|
if (!_attachedEntityId.isNull()) {
|
||||||
srcViewFrustum.setOrientation(_orientation);
|
EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(_attachedEntityId,
|
||||||
|
_attachedEntityPropertyFlags);
|
||||||
|
srcViewFrustum.setPosition(entityProperties.getPosition());
|
||||||
|
srcViewFrustum.setOrientation(entityProperties.getRotation());
|
||||||
|
} else {
|
||||||
|
srcViewFrustum.setPosition(_position);
|
||||||
|
srcViewFrustum.setOrientation(_orientation);
|
||||||
|
}
|
||||||
|
srcViewFrustum.setProjection(glm::perspective(glm::radians(_vFoV),
|
||||||
|
((float)args->_viewport.z / (float)args->_viewport.w),
|
||||||
|
_nearClipPlaneDistance, _farClipPlaneDistance));
|
||||||
}
|
}
|
||||||
srcViewFrustum.setProjection(glm::perspective(glm::radians(_vFoV), ((float)args->_viewport.z / (float)args->_viewport.w), _nearClipPlaneDistance, _farClipPlaneDistance));
|
|
||||||
// Without calculating the bound planes, the secondary camera will use the same culling frustum as the main camera,
|
// Without calculating the bound planes, the secondary camera will use the same culling frustum as the main camera,
|
||||||
// which is not what we want here.
|
// which is not what we want here.
|
||||||
srcViewFrustum.calculate();
|
srcViewFrustum.calculate();
|
||||||
|
|
@ -101,6 +150,7 @@ private:
|
||||||
float _farClipPlaneDistance;
|
float _farClipPlaneDistance;
|
||||||
int _textureWidth;
|
int _textureWidth;
|
||||||
int _textureHeight;
|
int _textureHeight;
|
||||||
|
bool _mirrorProjection;
|
||||||
EntityPropertyFlags _attachedEntityPropertyFlags;
|
EntityPropertyFlags _attachedEntityPropertyFlags;
|
||||||
QSharedPointer<EntityScriptingInterface> _entityScriptingInterface;
|
QSharedPointer<EntityScriptingInterface> _entityScriptingInterface;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@ class SecondaryCameraJobConfig : public render::Task::Config { // Exposes second
|
||||||
Q_PROPERTY(float vFoV MEMBER vFoV NOTIFY dirty) // Secondary camera's vertical field of view. In degrees.
|
Q_PROPERTY(float vFoV MEMBER vFoV NOTIFY dirty) // Secondary camera's vertical field of view. In degrees.
|
||||||
Q_PROPERTY(float nearClipPlaneDistance MEMBER nearClipPlaneDistance NOTIFY dirty) // Secondary camera's near clip plane distance. In meters.
|
Q_PROPERTY(float nearClipPlaneDistance MEMBER nearClipPlaneDistance NOTIFY dirty) // Secondary camera's near clip plane distance. In meters.
|
||||||
Q_PROPERTY(float farClipPlaneDistance MEMBER farClipPlaneDistance NOTIFY dirty) // Secondary camera's far clip plane distance. In meters.
|
Q_PROPERTY(float farClipPlaneDistance MEMBER farClipPlaneDistance NOTIFY dirty) // Secondary camera's far clip plane distance. In meters.
|
||||||
|
Q_PROPERTY(bool mirrorProjection MEMBER mirrorProjection NOTIFY dirty) // Flag to use attached mirror entity to build frustum for the mirror and set mirrored camera position/orientation.
|
||||||
public:
|
public:
|
||||||
QUuid attachedEntityId;
|
QUuid attachedEntityId;
|
||||||
glm::vec3 position;
|
glm::vec3 position;
|
||||||
|
|
@ -44,6 +45,7 @@ public:
|
||||||
float farClipPlaneDistance { DEFAULT_FAR_CLIP };
|
float farClipPlaneDistance { DEFAULT_FAR_CLIP };
|
||||||
int textureWidth { TextureCache::DEFAULT_SPECTATOR_CAM_WIDTH };
|
int textureWidth { TextureCache::DEFAULT_SPECTATOR_CAM_WIDTH };
|
||||||
int textureHeight { TextureCache::DEFAULT_SPECTATOR_CAM_HEIGHT };
|
int textureHeight { TextureCache::DEFAULT_SPECTATOR_CAM_HEIGHT };
|
||||||
|
bool mirrorProjection { false };
|
||||||
|
|
||||||
SecondaryCameraJobConfig() : render::Task::Config(false) {}
|
SecondaryCameraJobConfig() : render::Task::Config(false) {}
|
||||||
signals:
|
signals:
|
||||||
|
|
|
||||||
|
|
@ -2254,7 +2254,8 @@ bool EntityTree::writeToMap(QVariantMap& entityDescription, OctreeElementPointer
|
||||||
entityDescription["Entities"] = QVariantList();
|
entityDescription["Entities"] = QVariantList();
|
||||||
}
|
}
|
||||||
QScriptEngine scriptEngine;
|
QScriptEngine scriptEngine;
|
||||||
RecurseOctreeToMapOperator theOperator(entityDescription, element, &scriptEngine, skipDefaultValues, skipThoseWithBadParents);
|
RecurseOctreeToMapOperator theOperator(entityDescription, element, &scriptEngine, skipDefaultValues,
|
||||||
|
skipThoseWithBadParents, _myAvatar);
|
||||||
recurseTreeWithOperator(&theOperator);
|
recurseTreeWithOperator(&theOperator);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -2276,6 +2277,17 @@ bool EntityTree::readFromMap(QVariantMap& map) {
|
||||||
foreach (QVariant entityVariant, entitiesQList) {
|
foreach (QVariant entityVariant, entitiesQList) {
|
||||||
// QVariantMap --> QScriptValue --> EntityItemProperties --> Entity
|
// QVariantMap --> QScriptValue --> EntityItemProperties --> Entity
|
||||||
QVariantMap entityMap = entityVariant.toMap();
|
QVariantMap entityMap = entityVariant.toMap();
|
||||||
|
|
||||||
|
// handle parentJointName for wearables
|
||||||
|
if (_myAvatar && entityMap.contains("parentJointName") && entityMap.contains("parentID") &&
|
||||||
|
QUuid(entityMap["parentID"].toString()) == AVATAR_SELF_ID) {
|
||||||
|
|
||||||
|
entityMap["parentJointIndex"] = _myAvatar->getJointIndex(entityMap["parentJointName"].toString());
|
||||||
|
|
||||||
|
qCDebug(entities) << "Found parentJointName " << entityMap["parentJointName"].toString() <<
|
||||||
|
" mapped it to parentJointIndex " << entityMap["parentJointIndex"].toInt();
|
||||||
|
}
|
||||||
|
|
||||||
QScriptValue entityScriptValue = variantMapToScriptValue(entityMap, scriptEngine);
|
QScriptValue entityScriptValue = variantMapToScriptValue(entityMap, scriptEngine);
|
||||||
EntityItemProperties properties;
|
EntityItemProperties properties;
|
||||||
EntityItemPropertiesFromScriptValueIgnoreReadOnly(entityScriptValue, properties);
|
EntityItemPropertiesFromScriptValueIgnoreReadOnly(entityScriptValue, properties);
|
||||||
|
|
|
||||||
|
|
@ -278,6 +278,8 @@ public:
|
||||||
QByteArray computeEncryptedNonce(const QString& certID, const QString ownerKey);
|
QByteArray computeEncryptedNonce(const QString& certID, const QString ownerKey);
|
||||||
bool verifyDecryptedNonce(const QString& certID, const QString& decryptedNonce, EntityItemID& id);
|
bool verifyDecryptedNonce(const QString& certID, const QString& decryptedNonce, EntityItemID& id);
|
||||||
|
|
||||||
|
void setMyAvatar(std::shared_ptr<AvatarData> myAvatar) { _myAvatar = myAvatar; }
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void deletingEntity(const EntityItemID& entityID);
|
void deletingEntity(const EntityItemID& entityID);
|
||||||
void deletingEntityPointer(EntityItem* entityID);
|
void deletingEntityPointer(EntityItem* entityID);
|
||||||
|
|
@ -383,6 +385,8 @@ private:
|
||||||
void sendChallengeOwnershipPacket(const QString& certID, const QString& ownerKey, const EntityItemID& entityItemID, const SharedNodePointer& senderNode);
|
void sendChallengeOwnershipPacket(const QString& certID, const QString& ownerKey, const EntityItemID& entityItemID, const SharedNodePointer& senderNode);
|
||||||
void sendChallengeOwnershipRequestPacket(const QByteArray& certID, const QByteArray& encryptedText, const QByteArray& nodeToChallenge, const SharedNodePointer& senderNode);
|
void sendChallengeOwnershipRequestPacket(const QByteArray& certID, const QByteArray& encryptedText, const QByteArray& nodeToChallenge, const SharedNodePointer& senderNode);
|
||||||
void validatePop(const QString& certID, const EntityItemID& entityItemID, const SharedNodePointer& senderNode, bool isRetryingValidation);
|
void validatePop(const QString& certID, const EntityItemID& entityItemID, const SharedNodePointer& senderNode, bool isRetryingValidation);
|
||||||
|
|
||||||
|
std::shared_ptr<AvatarData> _myAvatar{ nullptr };
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // hifi_EntityTree_h
|
#endif // hifi_EntityTree_h
|
||||||
|
|
|
||||||
|
|
@ -17,13 +17,15 @@ RecurseOctreeToMapOperator::RecurseOctreeToMapOperator(QVariantMap& map,
|
||||||
const OctreeElementPointer& top,
|
const OctreeElementPointer& top,
|
||||||
QScriptEngine* engine,
|
QScriptEngine* engine,
|
||||||
bool skipDefaultValues,
|
bool skipDefaultValues,
|
||||||
bool skipThoseWithBadParents) :
|
bool skipThoseWithBadParents,
|
||||||
|
std::shared_ptr<AvatarData> myAvatar) :
|
||||||
RecurseOctreeOperator(),
|
RecurseOctreeOperator(),
|
||||||
_map(map),
|
_map(map),
|
||||||
_top(top),
|
_top(top),
|
||||||
_engine(engine),
|
_engine(engine),
|
||||||
_skipDefaultValues(skipDefaultValues),
|
_skipDefaultValues(skipDefaultValues),
|
||||||
_skipThoseWithBadParents(skipThoseWithBadParents)
|
_skipThoseWithBadParents(skipThoseWithBadParents),
|
||||||
|
_myAvatar(myAvatar)
|
||||||
{
|
{
|
||||||
// if some element "top" was given, only save information for that element and its children.
|
// if some element "top" was given, only save information for that element and its children.
|
||||||
if (_top) {
|
if (_top) {
|
||||||
|
|
@ -60,6 +62,18 @@ bool RecurseOctreeToMapOperator::postRecursion(const OctreeElementPointer& eleme
|
||||||
} else {
|
} else {
|
||||||
qScriptValues = EntityItemPropertiesToScriptValue(_engine, properties);
|
qScriptValues = EntityItemPropertiesToScriptValue(_engine, properties);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// handle parentJointName for wearables
|
||||||
|
if (_myAvatar && entityItem->getParentID() == AVATAR_SELF_ID &&
|
||||||
|
entityItem->getParentJointIndex() != INVALID_JOINT_INDEX) {
|
||||||
|
|
||||||
|
auto jointNames = _myAvatar->getJointNames();
|
||||||
|
auto parentJointIndex = entityItem->getParentJointIndex();
|
||||||
|
if (parentJointIndex < jointNames.count()) {
|
||||||
|
qScriptValues.setProperty("parentJointName", jointNames.at(parentJointIndex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
entitiesQList << qScriptValues.toVariant();
|
entitiesQList << qScriptValues.toVariant();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
class RecurseOctreeToMapOperator : public RecurseOctreeOperator {
|
class RecurseOctreeToMapOperator : public RecurseOctreeOperator {
|
||||||
public:
|
public:
|
||||||
RecurseOctreeToMapOperator(QVariantMap& map, const OctreeElementPointer& top, QScriptEngine* engine, bool skipDefaultValues,
|
RecurseOctreeToMapOperator(QVariantMap& map, const OctreeElementPointer& top, QScriptEngine* engine, bool skipDefaultValues,
|
||||||
bool skipThoseWithBadParents);
|
bool skipThoseWithBadParents, std::shared_ptr<AvatarData> myAvatar);
|
||||||
bool preRecursion(const OctreeElementPointer& element) override;
|
bool preRecursion(const OctreeElementPointer& element) override;
|
||||||
bool postRecursion(const OctreeElementPointer& element) override;
|
bool postRecursion(const OctreeElementPointer& element) override;
|
||||||
private:
|
private:
|
||||||
|
|
@ -24,4 +24,5 @@ public:
|
||||||
bool _withinTop;
|
bool _withinTop;
|
||||||
bool _skipDefaultValues;
|
bool _skipDefaultValues;
|
||||||
bool _skipThoseWithBadParents;
|
bool _skipThoseWithBadParents;
|
||||||
|
std::shared_ptr<AvatarData> _myAvatar;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue