mirror of
https://github.com/overte-org/community-apps.git
synced 2025-04-05 14:05:05 +02:00
Add files via upload
This commit is contained in:
Keb Helion
GitHub
parent
0f1c2c07c9
commit
85337a0d74
26 changed files with 2863 additions and 1 deletions
|
|
@ -1,2 +1,2 @@
|
|||
# apps_repository
|
||||
Test for an application repository based on github.
|
||||
Applications repository for "Project Athena" based on github.
|
||||
|
|
|
|||
4
applications/directories.js
Normal file
4
applications/directories.js
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
var directories = [
|
||||
"doppelganger-mirror",
|
||||
"spectator-camera"
|
||||
];
|
||||
91
applications/doppelganger-mirror/app-doppleganger.js
Normal file
91
applications/doppelganger-mirror/app-doppleganger.js
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
//======================================
|
||||
// Version 1.1
|
||||
// Addaption to "Local" Entities (since Overlays get deprecated for "Model" type.)
|
||||
// by Alezia Kurdis on February 20202
|
||||
//======================================
|
||||
// Version 1.0
|
||||
// doppleganger-app.js
|
||||
//
|
||||
// Created by Timothy Dedischew on 04/21/2017.
|
||||
// Copyright 2017 High Fidelity, Inc.
|
||||
//
|
||||
// This Client script creates an instance of a Doppleganger that can be toggled on/off via tablet button.
|
||||
// (for more info see doppleganger.js)
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
var versioncall = Math.floor(Math.random()*50000);
|
||||
var DopplegangerClass = Script.require('./doppleganger.js?version=' + versioncall);
|
||||
|
||||
var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system'),
|
||||
button = tablet.addButton({
|
||||
icon: Script.resolvePath('./doppleganger-i.svg'),
|
||||
activeIcon: Script.resolvePath('./doppleganger-a.svg'),
|
||||
text: 'MIRROR'
|
||||
});
|
||||
|
||||
Script.scriptEnding.connect(function() {
|
||||
tablet.removeButton(button);
|
||||
button = null;
|
||||
});
|
||||
|
||||
var doppleganger = new DopplegangerClass({
|
||||
avatar: MyAvatar,
|
||||
mirrored: false,
|
||||
autoUpdate: true
|
||||
});
|
||||
|
||||
// hide the doppleganger if this client script is unloaded
|
||||
Script.scriptEnding.connect(doppleganger, 'stop');
|
||||
|
||||
// hide the doppleganger if the user switches domains (which might place them arbitrarily far away in world space)
|
||||
function onDomainChanged() {
|
||||
if (doppleganger.active) {
|
||||
doppleganger.stop('domain_changed');
|
||||
}
|
||||
}
|
||||
Window.domainChanged.connect(onDomainChanged);
|
||||
Window.domainConnectionRefused.connect(onDomainChanged);
|
||||
Script.scriptEnding.connect(function() {
|
||||
Window.domainChanged.disconnect(onDomainChanged);
|
||||
Window.domainConnectionRefused.disconnect(onDomainChanged);
|
||||
});
|
||||
|
||||
// toggle on/off via tablet button
|
||||
button.clicked.connect(doppleganger, 'toggle');
|
||||
|
||||
// highlight tablet button based on current doppleganger state
|
||||
doppleganger.activeChanged.connect(function(active, reason) {
|
||||
if (button) {
|
||||
button.editProperties({ isActive: active });
|
||||
//print('doppleganger.activeChanged', active, reason);
|
||||
}
|
||||
});
|
||||
|
||||
// alert the user if there was an error applying their skeletonModelURL
|
||||
doppleganger.addingEntity.connect(function(error, result) {
|
||||
if (doppleganger.active && error) {
|
||||
Window.alert('doppleganger | ' + error + '\n' + doppleganger.skeletonModelURL);
|
||||
}
|
||||
});
|
||||
|
||||
// add debug indicators, but only if the user has configured the settings value
|
||||
if (Settings.getValue('debug.doppleganger', false)) {
|
||||
DopplegangerClass.addDebugControls(doppleganger);
|
||||
}
|
||||
|
||||
UserActivityLogger.logAction('doppleganger_app_load');
|
||||
doppleganger.activeChanged.connect(function(active, reason) {
|
||||
if (active) {
|
||||
UserActivityLogger.logAction('doppleganger_enable');
|
||||
} else {
|
||||
if (reason === 'stop') {
|
||||
// user intentionally toggled the doppleganger
|
||||
UserActivityLogger.logAction('doppleganger_disable');
|
||||
} else {
|
||||
//print('doppleganger stopped:', reason);
|
||||
UserActivityLogger.logAction('doppleganger_autodisable', { reason: reason });
|
||||
}
|
||||
}
|
||||
});
|
||||
7
applications/doppelganger-mirror/app.json
Normal file
7
applications/doppelganger-mirror/app.json
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"name": "Doppelganger-Mirror",
|
||||
"description": "Generate an double of your avatar that only you can see. \nThis allows you to examine your avatar and see how you move.\nThe doppelganger can be grabbed and positioned like you want.",
|
||||
"jsfile": "doppelganger-mirror/app-doppleganger.js",
|
||||
"icon": "doppelganger-mirror/doppleganger-i.svg",
|
||||
"caption": "MIRROR"
|
||||
}
|
||||
94
applications/doppelganger-mirror/doppleganger-a.svg
Normal file
94
applications/doppelganger-mirror/doppleganger-a.svg
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
|
||||
<svg
|
||||
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
version="1.1"
|
||||
x="0px"
|
||||
y="0px"
|
||||
viewBox="0 0 50 50"
|
||||
style="enable-background:new 0 0 50 50;"
|
||||
xml:space="preserve"
|
||||
id="svg2"
|
||||
inkscape:version="0.91 r13725"
|
||||
sodipodi:docname="doppleganger-a.svg"><metadata
|
||||
id="metadata36"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
|
||||
id="defs34"><linearGradient
|
||||
id="linearGradient8353"
|
||||
osb:paint="solid"><stop
|
||||
style="stop-color:#000000;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop8355" /></linearGradient></defs><sodipodi:namedview
|
||||
pagecolor="#ff4900"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1004"
|
||||
id="namedview32"
|
||||
showgrid="false"
|
||||
inkscape:zoom="9.44"
|
||||
inkscape:cx="-3.2806499"
|
||||
inkscape:cy="20.640561"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="24"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="g4308" /><style
|
||||
type="text/css"
|
||||
id="style4">
|
||||
.st0{fill:#FFFFFF;}
|
||||
</style><g
|
||||
id="Layer_2" /><g
|
||||
id="Layer_1"
|
||||
style="fill:#000000;fill-opacity:1"><g
|
||||
id="g8375"
|
||||
transform="matrix(1.0667546,0,0,1.0667546,-2.1894733,-1.7818707)"><g
|
||||
id="g4308"
|
||||
transform="translate(1.0333645e-6,0)"><g
|
||||
id="g8"
|
||||
style="fill:#000000;fill-opacity:1"
|
||||
transform="matrix(1.1059001,0,0,1.1059001,-17.342989,-7.9561147)"><path
|
||||
class="st0"
|
||||
d="m 23.2,24.1 c -0.8,0.9 -1.5,1.8 -2.2,2.6 -0.1,0.2 -0.1,0.5 -0.1,0.7 0.1,1.7 0.2,3.4 0.2,5.1 0,0.8 -0.4,1.2 -1.1,1.3 -0.7,0.1 -1.3,-0.4 -1.4,-1.1 -0.2,-2.2 -0.3,-4.3 -0.5,-6.5 0,-0.3 0.1,-0.7 0.4,-1 1.1,-1.5 2.3,-3 3.4,-4.5 0.6,-0.7 1.6,-1.6 2.6,-1.6 0.3,0 1.1,0 1.4,0 0.8,-0.1 1.3,0.1 1.9,0.9 1,1.2 1.5,2.3 2.4,3.6 0.7,1.1 1.4,1.6 2.9,1.9 1.1,0.2 2.2,0.5 3.3,0.8 0.3,0.1 0.6,0.2 0.8,0.3 0.5,0.3 0.7,0.8 0.6,1.3 -0.1,0.5 -0.5,0.7 -1,0.8 -0.4,0 -0.9,0 -1.3,-0.1 -1.4,-0.3 -2.7,-0.6 -4.1,-0.9 -0.8,-0.2 -1.5,-0.6 -2.1,-1.1 -0.3,-0.3 -0.6,-0.5 -0.9,-0.8 0,0.3 0,0.5 0,0.7 0,1.2 0,2.4 0,3.6 0,0.4 -0.3,12.6 -0.1,16.8 0,0.5 -0.1,1 -0.2,1.5 -0.2,0.7 -0.6,1 -1.4,1.1 -0.8,0 -1.4,-0.3 -1.7,-1 C 24.8,48 24.7,47.4 24.6,46.9 24.2,42.3 23.7,34 23.5,33.1 23.4,32.3 23.3,32 23.2,31 c -0.1,-0.5 -0.1,-0.9 -0.1,-1.3 0.2,-1.8 0.1,-3.6 0.1,-5.6 z"
|
||||
id="path10"
|
||||
style="fill:#000000;fill-opacity:1"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
class="st0"
|
||||
d="m 28.2,14.6 c 0,1.4 -1.1,2.6 -2.6,2.6 l 0,0 C 24.2,17.2 23,16.1 23,14.6 L 23,13 c 0,-1.4 1.1,-2.6 2.6,-2.6 l 0,0 c 1.4,0 2.6,1.1 2.6,2.6 l 0,1.6 z"
|
||||
id="path12"
|
||||
style="fill:#000000;fill-opacity:1"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="g8-3"
|
||||
style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956,0.29667956;stroke-dashoffset:0;stroke-opacity:1"
|
||||
transform="matrix(-1.1059001,0,0,1.1059001,67.821392,-7.9561147)"><path
|
||||
class="st0"
|
||||
d="m 23.2,24.1 c -0.8,0.9 -1.5,1.8 -2.2,2.6 -0.1,0.2 -0.1,0.5 -0.1,0.7 0.1,1.7 0.2,3.4 0.2,5.1 0,0.8 -0.4,1.2 -1.1,1.3 -0.7,0.1 -1.3,-0.4 -1.4,-1.1 -0.2,-2.2 -0.3,-4.3 -0.5,-6.5 0,-0.3 0.1,-0.7 0.4,-1 1.1,-1.5 2.3,-3 3.4,-4.5 0.6,-0.7 1.6,-1.6 2.6,-1.6 0.3,0 1.1,0 1.4,0 0.8,-0.1 1.3,0.1 1.9,0.9 1,1.2 1.5,2.3 2.4,3.6 0.7,1.1 1.4,1.6 2.9,1.9 1.1,0.2 2.2,0.5 3.3,0.8 0.3,0.1 0.6,0.2 0.8,0.3 0.5,0.3 0.7,0.8 0.6,1.3 -0.1,0.5 -0.5,0.7 -1,0.8 -0.4,0 -0.9,0 -1.3,-0.1 -1.4,-0.3 -2.7,-0.6 -4.1,-0.9 -0.8,-0.2 -1.5,-0.6 -2.1,-1.1 -0.3,-0.3 -0.6,-0.5 -0.9,-0.8 0,0.3 0,0.5 0,0.7 0,1.2 0,2.4 0,3.6 0,0.4 -0.3,12.6 -0.1,16.8 0,0.5 -0.1,1 -0.2,1.5 -0.2,0.7 -0.6,1 -1.4,1.1 -0.8,0 -1.4,-0.3 -1.7,-1 C 24.8,48 24.7,47.4 24.6,46.9 24.2,42.3 23.7,34 23.5,33.1 23.4,32.3 23.3,32 23.2,31 c -0.1,-0.5 -0.1,-0.9 -0.1,-1.3 0.2,-1.8 0.1,-3.6 0.1,-5.6 z"
|
||||
id="path10-6"
|
||||
style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956,0.29667956;stroke-dashoffset:0;stroke-opacity:1"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
class="st0"
|
||||
d="m 28.2,14.6 c 0,1.4 -1.1,2.6 -2.6,2.6 l 0,0 C 24.2,17.2 23,16.1 23,14.6 L 23,13 c 0,-1.4 1.1,-2.6 2.6,-2.6 l 0,0 c 1.4,0 2.6,1.1 2.6,2.6 l 0,1.6 z"
|
||||
id="path12-7"
|
||||
style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956,0.29667956;stroke-dashoffset:0;stroke-opacity:1"
|
||||
inkscape:connector-curvature="0" /></g></g><rect
|
||||
style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.15729524;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.62918094, 1.25836187;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="rect4306"
|
||||
width="0.12393159"
|
||||
height="46.498554"
|
||||
x="25.227457"
|
||||
y="1.8070068"
|
||||
rx="0"
|
||||
ry="0.9407174" /></g></g></svg>
|
||||
|
After Width: | Height: | Size: 5.8 KiB |
94
applications/doppelganger-mirror/doppleganger-i.svg
Normal file
94
applications/doppelganger-mirror/doppleganger-i.svg
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
|
||||
<svg
|
||||
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
version="1.1"
|
||||
x="0px"
|
||||
y="0px"
|
||||
viewBox="0 0 50 50"
|
||||
style="enable-background:new 0 0 50 50;"
|
||||
xml:space="preserve"
|
||||
id="svg2"
|
||||
inkscape:version="0.91 r13725"
|
||||
sodipodi:docname="doppleganger-i.svg"><metadata
|
||||
id="metadata36"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
|
||||
id="defs34"><linearGradient
|
||||
id="linearGradient8353"
|
||||
osb:paint="solid"><stop
|
||||
style="stop-color:#000000;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop8355" /></linearGradient></defs><sodipodi:namedview
|
||||
pagecolor="#ff4900"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1004"
|
||||
id="namedview32"
|
||||
showgrid="false"
|
||||
inkscape:zoom="9.44"
|
||||
inkscape:cx="-3.2806499"
|
||||
inkscape:cy="20.640561"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="24"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="g4308" /><style
|
||||
type="text/css"
|
||||
id="style4">
|
||||
.st0{fill:#FFFFFF;}
|
||||
</style><g
|
||||
id="Layer_2" /><g
|
||||
id="Layer_1"
|
||||
style="fill:#000000;fill-opacity:1"><g
|
||||
id="g8375"
|
||||
transform="matrix(1.0667546,0,0,1.0667546,-2.1894733,-1.7818707)"><g
|
||||
id="g4308"
|
||||
transform="translate(1.0333645e-6,0)"><g
|
||||
id="g8"
|
||||
style="fill:#ffffff;fill-opacity:1"
|
||||
transform="matrix(1.1059001,0,0,1.1059001,-17.342989,-7.9561147)"><path
|
||||
class="st0"
|
||||
d="m 23.2,24.1 c -0.8,0.9 -1.5,1.8 -2.2,2.6 -0.1,0.2 -0.1,0.5 -0.1,0.7 0.1,1.7 0.2,3.4 0.2,5.1 0,0.8 -0.4,1.2 -1.1,1.3 -0.7,0.1 -1.3,-0.4 -1.4,-1.1 -0.2,-2.2 -0.3,-4.3 -0.5,-6.5 0,-0.3 0.1,-0.7 0.4,-1 1.1,-1.5 2.3,-3 3.4,-4.5 0.6,-0.7 1.6,-1.6 2.6,-1.6 0.3,0 1.1,0 1.4,0 0.8,-0.1 1.3,0.1 1.9,0.9 1,1.2 1.5,2.3 2.4,3.6 0.7,1.1 1.4,1.6 2.9,1.9 1.1,0.2 2.2,0.5 3.3,0.8 0.3,0.1 0.6,0.2 0.8,0.3 0.5,0.3 0.7,0.8 0.6,1.3 -0.1,0.5 -0.5,0.7 -1,0.8 -0.4,0 -0.9,0 -1.3,-0.1 -1.4,-0.3 -2.7,-0.6 -4.1,-0.9 -0.8,-0.2 -1.5,-0.6 -2.1,-1.1 -0.3,-0.3 -0.6,-0.5 -0.9,-0.8 0,0.3 0,0.5 0,0.7 0,1.2 0,2.4 0,3.6 0,0.4 -0.3,12.6 -0.1,16.8 0,0.5 -0.1,1 -0.2,1.5 -0.2,0.7 -0.6,1 -1.4,1.1 -0.8,0 -1.4,-0.3 -1.7,-1 C 24.8,48 24.7,47.4 24.6,46.9 24.2,42.3 23.7,34 23.5,33.1 23.4,32.3 23.3,32 23.2,31 c -0.1,-0.5 -0.1,-0.9 -0.1,-1.3 0.2,-1.8 0.1,-3.6 0.1,-5.6 z"
|
||||
id="path10"
|
||||
style="fill:#ffffff;fill-opacity:1"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
class="st0"
|
||||
d="m 28.2,14.6 c 0,1.4 -1.1,2.6 -2.6,2.6 l 0,0 C 24.2,17.2 23,16.1 23,14.6 L 23,13 c 0,-1.4 1.1,-2.6 2.6,-2.6 l 0,0 c 1.4,0 2.6,1.1 2.6,2.6 l 0,1.6 z"
|
||||
id="path12"
|
||||
style="fill:#ffffff;fill-opacity:1"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="g8-3"
|
||||
style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#ffffff;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956, 0.29667956000000001;stroke-dashoffset:0;stroke-opacity:1"
|
||||
transform="matrix(-1.1059001,0,0,1.1059001,67.821392,-7.9561147)"><path
|
||||
class="st0"
|
||||
d="m 23.2,24.1 c -0.8,0.9 -1.5,1.8 -2.2,2.6 -0.1,0.2 -0.1,0.5 -0.1,0.7 0.1,1.7 0.2,3.4 0.2,5.1 0,0.8 -0.4,1.2 -1.1,1.3 -0.7,0.1 -1.3,-0.4 -1.4,-1.1 -0.2,-2.2 -0.3,-4.3 -0.5,-6.5 0,-0.3 0.1,-0.7 0.4,-1 1.1,-1.5 2.3,-3 3.4,-4.5 0.6,-0.7 1.6,-1.6 2.6,-1.6 0.3,0 1.1,0 1.4,0 0.8,-0.1 1.3,0.1 1.9,0.9 1,1.2 1.5,2.3 2.4,3.6 0.7,1.1 1.4,1.6 2.9,1.9 1.1,0.2 2.2,0.5 3.3,0.8 0.3,0.1 0.6,0.2 0.8,0.3 0.5,0.3 0.7,0.8 0.6,1.3 -0.1,0.5 -0.5,0.7 -1,0.8 -0.4,0 -0.9,0 -1.3,-0.1 -1.4,-0.3 -2.7,-0.6 -4.1,-0.9 -0.8,-0.2 -1.5,-0.6 -2.1,-1.1 -0.3,-0.3 -0.6,-0.5 -0.9,-0.8 0,0.3 0,0.5 0,0.7 0,1.2 0,2.4 0,3.6 0,0.4 -0.3,12.6 -0.1,16.8 0,0.5 -0.1,1 -0.2,1.5 -0.2,0.7 -0.6,1 -1.4,1.1 -0.8,0 -1.4,-0.3 -1.7,-1 C 24.8,48 24.7,47.4 24.6,46.9 24.2,42.3 23.7,34 23.5,33.1 23.4,32.3 23.3,32 23.2,31 c -0.1,-0.5 -0.1,-0.9 -0.1,-1.3 0.2,-1.8 0.1,-3.6 0.1,-5.6 z"
|
||||
id="path10-6"
|
||||
style="fill:#808080;fill-opacity:1;stroke:#ffffff;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956, 0.29667956000000001;stroke-dashoffset:0;stroke-opacity:1"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
class="st0"
|
||||
d="m 28.2,14.6 c 0,1.4 -1.1,2.6 -2.6,2.6 l 0,0 C 24.2,17.2 23,16.1 23,14.6 L 23,13 c 0,-1.4 1.1,-2.6 2.6,-2.6 l 0,0 c 1.4,0 2.6,1.1 2.6,2.6 l 0,1.6 z"
|
||||
id="path12-7"
|
||||
style="fill:#808080;fill-opacity:1;stroke:#ffffff;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956, 0.29667956000000001;stroke-dashoffset:0;stroke-opacity:1"
|
||||
inkscape:connector-curvature="0" /></g></g><rect
|
||||
style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.15729524;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.62918094, 1.25836187000000010;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="rect4306"
|
||||
width="0.12393159"
|
||||
height="46.498554"
|
||||
x="25.227457"
|
||||
y="1.8070068"
|
||||
rx="0"
|
||||
ry="0.9407174" /></g></g></svg>
|
||||
|
After Width: | Height: | Size: 5.9 KiB |
526
applications/doppelganger-mirror/doppleganger.js
Normal file
526
applications/doppelganger-mirror/doppleganger.js
Normal file
|
|
@ -0,0 +1,526 @@
|
|||
"use strict";
|
||||
//======================================
|
||||
// Version 1.1
|
||||
// Addaption to "Local" Entities (since Overlays get deprecated for "Model" type.)
|
||||
// by Alezia Kurdis on February 20202
|
||||
//======================================
|
||||
// Version 1.0
|
||||
// doppleganger.js
|
||||
//
|
||||
// Created by Timothy Dedischew on 04/21/2017.
|
||||
// Copyright 2017 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
//
|
||||
/* global module */
|
||||
// @module doppleganger
|
||||
//
|
||||
// This module contains the `Doppleganger` class implementation for creating an inspectable replica of
|
||||
// an Avatar (as a model directly in front of and facing them). Joint positions and rotations are copied
|
||||
// over in an update thread, so that the model automatically mirrors the Avatar's joint movements.
|
||||
// An Avatar can then for example walk around "themselves" and examine from the back, etc.
|
||||
//
|
||||
// This should be helpful for inspecting your own look and debugging avatars, etc.
|
||||
//
|
||||
// The doppleganger is created as an overlay so that others do not see it -- and this also allows for the
|
||||
// highest possible update rate when keeping joint data in sync.
|
||||
|
||||
module.exports = Doppleganger;
|
||||
|
||||
// @property {bool} - when set true, Script.update will be used instead of setInterval for syncing joint data
|
||||
Doppleganger.USE_SCRIPT_UPDATE = false;
|
||||
|
||||
// @property {int} - the frame rate to target when using setInterval for joint updates
|
||||
Doppleganger.TARGET_FPS = 60;
|
||||
|
||||
// @property {int} - the maximum time in seconds to wait for the model overlay to finish loading
|
||||
Doppleganger.MAX_WAIT_SECS = 10;
|
||||
|
||||
// @function - derive mirrored joint names from a list of regular joint names
|
||||
// @param {Array} - list of joint names to mirror
|
||||
// @return {Array} - list of mirrored joint names (note: entries for non-mirrored joints will be `undefined`)
|
||||
|
||||
var Setarry;
|
||||
|
||||
Doppleganger.getMirroredJointNames = function(jointNames) {
|
||||
return jointNames.map(function(name, i) {
|
||||
if (/Left/.test(name)) {
|
||||
return name.replace('Left', 'Right');
|
||||
}
|
||||
if (/Right/.test(name)) {
|
||||
return name.replace('Right', 'Left');
|
||||
}
|
||||
return undefined;
|
||||
});
|
||||
};
|
||||
|
||||
// @class Doppleganger - Creates a new instance of a Doppleganger.
|
||||
// @param {Avatar} [options.avatar=MyAvatar] - Avatar used to retrieve position and joint data.
|
||||
// @param {bool} [options.mirrored=true] - Apply "symmetric mirroring" of Left/Right joints.
|
||||
// @param {bool} [options.autoUpdate=true] - Automatically sync joint data.
|
||||
function Doppleganger(options) {
|
||||
options = options || {};
|
||||
this.avatar = options.avatar || MyAvatar;
|
||||
this.mirrored = 'mirrored' in options ? options.mirrored : false;
|
||||
this.autoUpdate = 'autoUpdate' in options ? options.autoUpdate : true;
|
||||
|
||||
// @public
|
||||
this.active = false; // whether doppleganger is currently being displayed/updated
|
||||
this.entityID = null; // current doppleganger's Entity id
|
||||
this.frame = 0; // current joint update frame
|
||||
|
||||
// @signal - emitted when .active state changes
|
||||
this.activeChanged = signal(function(active, reason) {});
|
||||
// @signal - emitted once model overlay is either loaded or errors out
|
||||
this.addingEntity = signal(function(error, result){});
|
||||
// @signal - emitted each time the model overlay's joint data has been synchronized
|
||||
this.jointsUpdated = signal(function(entityID){});
|
||||
}
|
||||
|
||||
Doppleganger.prototype = {
|
||||
// @public @method - toggles doppleganger on/off
|
||||
toggle: function() {
|
||||
if (this.active) {
|
||||
log('toggling off');
|
||||
this.stop();
|
||||
}else{
|
||||
log('toggling on');
|
||||
this.start();
|
||||
}
|
||||
return this.active;
|
||||
},
|
||||
|
||||
// @public @method - synchronize the joint data between Avatar / doppleganger
|
||||
update: function() {
|
||||
this.frame++;
|
||||
try {
|
||||
if (!this.entityID) {
|
||||
throw new Error('!this.entityID');
|
||||
}
|
||||
|
||||
if (this.avatar.skeletonModelURL !== this.skeletonModelURL) {
|
||||
return this.stop('avatar_changed');
|
||||
}
|
||||
|
||||
var rotations = this.avatar.getJointRotations();
|
||||
var translations = this.avatar.getJointTranslations();
|
||||
var size = rotations.length;
|
||||
|
||||
|
||||
// note: this mismatch can happen when the avatar's model is actively changing
|
||||
if (size !== translations.length ||
|
||||
(this.jointStateCount && size !== this.jointStateCount)) {
|
||||
log('mismatched joint counts (avatar model likely changed)', size, translations.length, this.jointStateCount);
|
||||
this.stop('avatar_changed_joints');
|
||||
return;
|
||||
}
|
||||
this.jointStateCount = size;
|
||||
|
||||
|
||||
if (this.mirrored) {
|
||||
var mirroredIndexes = this.mirroredIndexes;
|
||||
var outRotations = new Array(size);
|
||||
var outTranslations = new Array(size);
|
||||
for (var i=0; i < size; i++) {
|
||||
var index = mirroredIndexes[i];
|
||||
if (index < 0 || index === false) {
|
||||
index = i;
|
||||
}
|
||||
var rot = rotations[index];
|
||||
var trans = translations[index];
|
||||
trans.x *= -1;
|
||||
rot.y *= -1;
|
||||
rot.z *= -1;
|
||||
outRotations[i] = rot;
|
||||
outTranslations[i] = trans;
|
||||
}
|
||||
rotations = outRotations;
|
||||
translations = outTranslations;
|
||||
}
|
||||
|
||||
|
||||
Entities.editEntity(this.entityID, {
|
||||
jointRotations: rotations,
|
||||
jointTranslations: translations,
|
||||
jointRotationsSet: Setarry,
|
||||
jointTranslationsSet: Setarry
|
||||
});
|
||||
|
||||
this.jointsUpdated(this.entityID);
|
||||
} catch (e) {
|
||||
//log('.update error: '+ e, index);
|
||||
this.stop('update_error');
|
||||
}
|
||||
},
|
||||
|
||||
// @public @method - show the doppleganger (and start the update thread, if options.autoUpdate was specified).
|
||||
// @param {vec3} [options.position=(in front of avatar)] - starting position
|
||||
// @param {quat} [options.orientation=avatar.orientation] - starting orientation
|
||||
start: function(options) {
|
||||
|
||||
|
||||
options = options || {};
|
||||
if (this.entityID) {
|
||||
//log('start() called but entity model already exists', this.entityID);
|
||||
return;
|
||||
}
|
||||
var avatar = this.avatar;
|
||||
if (!avatar.jointNames.length) {
|
||||
return this.stop('joints_unavailable');
|
||||
}
|
||||
|
||||
this.frame = 0;
|
||||
this.position = options.position || Vec3.sum(avatar.position, Quat.getForward(avatar.orientation));
|
||||
this.orientation = options.orientation || avatar.orientation;
|
||||
this.skeletonModelURL = avatar.skeletonModelURL;
|
||||
this.jointStateCount = 0;
|
||||
this.jointNames = avatar.jointNames;
|
||||
this.mirroredNames = Doppleganger.getMirroredJointNames(this.jointNames);
|
||||
//log(this.mirroredNames);
|
||||
this.mirroredIndexes = this.mirroredNames.map(function(name) {
|
||||
return name ? avatar.getJointIndex(name) : false;
|
||||
});
|
||||
//log(this.mirroredIndexes);
|
||||
var prop = {
|
||||
type: "Model",
|
||||
name: 'Doppelganger', //added
|
||||
visible: false, // normally false
|
||||
modelURL: this.skeletonModelURL, //was field: url
|
||||
position: this.position,
|
||||
rotation: this.orientation
|
||||
};
|
||||
|
||||
this.entityID = Entities.addEntity(prop, "local");
|
||||
|
||||
var allJoints = avatar.getJointRotations();
|
||||
var nbrJoints = allJoints.length;
|
||||
Setarry = Array(nbrJoints);
|
||||
for (var i=0; i < nbrJoints; i++) {
|
||||
Setarry[i] = true;
|
||||
}
|
||||
|
||||
this.onAddingEntity = function(error, result) {
|
||||
|
||||
if (error) {
|
||||
return this.stop(error);
|
||||
}
|
||||
log('ModelEntity is ready; # joints == ' + result.jointNames.length);
|
||||
Entities.editEntity(this.entityID, { visible: true });
|
||||
if (!options.position) {
|
||||
this.syncVerticalPosition();
|
||||
}
|
||||
if (this.autoUpdate) {
|
||||
this._createUpdateThread();
|
||||
}
|
||||
};
|
||||
this.addingEntity.connect(this, 'onAddingEntity');
|
||||
|
||||
log('doppleganger created; entityID =', this.entityID);
|
||||
|
||||
// trigger clean up (and stop updates) if the overlay gets deleted
|
||||
this.onDeletedEntity = function(uuid) {
|
||||
if (uuid === this.entityID) {
|
||||
log('onDeletedEntity', uuid);
|
||||
this.stop('entity_deleted');
|
||||
}
|
||||
};
|
||||
Entities.deletingEntity.connect(this, 'onDeletedEntity');
|
||||
|
||||
if ('onLoadComplete' in avatar) {
|
||||
// stop the current doppleganger if Avatar loads a different model URL
|
||||
this.onLoadComplete = function() {
|
||||
if (avatar.skeletonModelURL !== this.skeletonModelURL) {
|
||||
this.stop('avatar_changed_load');
|
||||
}
|
||||
};
|
||||
avatar.onLoadComplete.connect(this, 'onLoadComplete');
|
||||
}
|
||||
|
||||
this.activeChanged(this.active = true, 'start');
|
||||
this._waitForModel(ModelCache.prefetch(this.skeletonModelURL));
|
||||
},
|
||||
|
||||
// @public @method - hide the doppleganger
|
||||
// @param {String} [reason=stop] - the reason stop was called
|
||||
stop: function(reason) {
|
||||
reason = reason || 'stop';
|
||||
if (this.onUpdate) {
|
||||
Script.update.disconnect(this, 'onUpdate');
|
||||
delete this.onUpdate;
|
||||
}
|
||||
if (this._interval) {
|
||||
Script.clearInterval(this._interval);
|
||||
this._interval = undefined;
|
||||
}
|
||||
if (this.onDeletedEntity) {
|
||||
Entities.deletingEntity.disconnect(this, 'onDeletedEntity');
|
||||
delete this.onDeletedEntity;
|
||||
}
|
||||
if (this.onLoadComplete) {
|
||||
this.avatar.onLoadComplete.disconnect(this, 'onLoadComplete');
|
||||
delete this.onLoadComplete;
|
||||
}
|
||||
if (this.onAddingEntity) {
|
||||
this.addingEntity.disconnect(this, 'onAddingEntity');
|
||||
}
|
||||
if (this.entityID) {
|
||||
Entities.deleteEntity(this.entityID);
|
||||
this.entityID = undefined;
|
||||
}
|
||||
if (this.active) {
|
||||
this.activeChanged(this.active = false, reason);
|
||||
} else if (reason) {
|
||||
log('already stopped so not triggering another activeChanged; latest reason was:', reason);
|
||||
}
|
||||
},
|
||||
|
||||
// @public @method - Reposition the doppleganger so it sees "eye to eye" with the Avatar.
|
||||
// @param {String} [byJointName=Hips] - the reference joint used to align the Doppleganger and Avatar
|
||||
syncVerticalPosition: function(byJointName) {
|
||||
byJointName = byJointName || 'Hips';
|
||||
|
||||
var dopplePosition = Entities.getEntityProperties(this.entityID, ["position"]);
|
||||
var doppleJointIndex = Entities.getJointIndex( this.entityID, byJointName );
|
||||
var doppleJointPosition = Vec3.sum(Entities.getAbsoluteJointTranslationInObjectFrame( this.entityID, doppleJointIndex ), dopplePosition);
|
||||
|
||||
//log("Joint Pos = " + JSON.stringify(doppleJointPosition));
|
||||
|
||||
var avatarPosition = this.avatar.position;
|
||||
var avatarJointIndex = this.avatar.getJointIndex(byJointName);
|
||||
var avatarJointPosition = Vec3.sum(this.avatar.getAbsoluteJointTranslationInObjectFrame(avatarJointIndex), avatarPosition);
|
||||
|
||||
//log("AV Joint Pos = " + JSON.stringify(avatarJointPosition));
|
||||
|
||||
dopplePosition.position.y = avatarJointPosition.y - doppleJointPosition.y;
|
||||
this.position = dopplePosition.position;
|
||||
Entities.editEntity(this.entityID, { position: this.position });
|
||||
},
|
||||
|
||||
// @private @method - creates the update thread to synchronize joint data
|
||||
_createUpdateThread: function() {
|
||||
if (Doppleganger.USE_SCRIPT_UPDATE) {
|
||||
log('creating Script.update thread');
|
||||
this.onUpdate = this.update;
|
||||
Script.update.connect(this, 'onUpdate');
|
||||
} else {
|
||||
log('creating Script.setInterval thread @ ~', Doppleganger.TARGET_FPS +'fps');
|
||||
var timeout = 1000 / Doppleganger.TARGET_FPS;
|
||||
this._interval = Script.setInterval(bind(this, 'update'), timeout);
|
||||
}
|
||||
},
|
||||
|
||||
// @private @method - waits for model to load and handles timeouts
|
||||
// @param {ModelResource} resource - a prefetched resource to monitor loading state against
|
||||
_waitForModel: function(resource) {
|
||||
var RECHECK_MS = 50;
|
||||
var id = this.entityID,
|
||||
watchdogTimer = null;
|
||||
|
||||
function waitForJointNames() {
|
||||
var error = null, result = null;
|
||||
if (!watchdogTimer) {
|
||||
error = 'joints_unavailable';
|
||||
} else if (resource.state === Resource.State.FAILED) {
|
||||
error = 'prefetch_failed';
|
||||
} else if (resource.state === Resource.State.FINISHED) {
|
||||
var names = Entities.getJointNames(id);
|
||||
if (Array.isArray(names) && names.length) {
|
||||
result = { entityID: id, jointNames: names };
|
||||
}
|
||||
}
|
||||
if (error || result !== null) {
|
||||
Script.clearInterval(this._interval);
|
||||
this._interval = null;
|
||||
if (watchdogTimer) {
|
||||
Script.clearTimeout(watchdogTimer);
|
||||
}
|
||||
this.addingEntity(error, result);
|
||||
}
|
||||
}
|
||||
watchdogTimer = Script.setTimeout(function() {
|
||||
watchdogTimer = null;
|
||||
}, Doppleganger.MAX_WAIT_SECS * 1000);
|
||||
this._interval = Script.setInterval(bind(this, waitForJointNames), RECHECK_MS);
|
||||
}
|
||||
};
|
||||
|
||||
// @function - bind a function to a `this` context
|
||||
// @param {Object} - the `this` context
|
||||
// @param {Function|String} - function or method name
|
||||
function bind(thiz, method) {
|
||||
method = thiz[method] || method;
|
||||
return function() {
|
||||
return method.apply(thiz, arguments);
|
||||
};
|
||||
}
|
||||
|
||||
// @function - Qt signal polyfill
|
||||
function signal(template) {
|
||||
var callbacks = [];
|
||||
return Object.defineProperties(function() {
|
||||
var args = [].slice.call(arguments);
|
||||
callbacks.forEach(function(obj) {
|
||||
obj.handler.apply(obj.scope, args);
|
||||
});
|
||||
}, {
|
||||
connect: { value: function(scope, handler) {
|
||||
callbacks.push({scope: scope, handler: scope[handler] || handler || scope});
|
||||
}},
|
||||
disconnect: { value: function(scope, handler) {
|
||||
var match = {scope: scope, handler: scope[handler] || handler || scope};
|
||||
callbacks = callbacks.filter(function(obj) {
|
||||
return !(obj.scope === match.scope && obj.handler === match.handler);
|
||||
});
|
||||
}}
|
||||
});
|
||||
}
|
||||
|
||||
// @function - debug logging
|
||||
function log() {
|
||||
//print('doppleganger | ' + [].slice.call(arguments).join(' '));
|
||||
}
|
||||
|
||||
// -- ADVANCED DEBUGGING --
|
||||
// @function - Add debug joint indicators / extra debugging info.
|
||||
// @param {Doppleganger} - existing Doppleganger instance to add controls to
|
||||
//
|
||||
// @note:
|
||||
// * rightclick toggles mirror mode on/off
|
||||
// * shift-rightclick toggles the debug indicators on/off
|
||||
// * clicking on an indicator displays the joint name and mirrored joint name in the debug log.
|
||||
//
|
||||
// Example use:
|
||||
// var doppleganger = new Doppleganger();
|
||||
// Doppleganger.addDebugControls(doppleganger);
|
||||
Doppleganger.addDebugControls = function(doppleganger) {
|
||||
DebugControls.COLOR_DEFAULT = { red: 255, blue: 255, green: 255 };
|
||||
DebugControls.COLOR_SELECTED = { red: 0, blue: 255, green: 0 };
|
||||
|
||||
function DebugControls() {
|
||||
this.enableIndicators = true;
|
||||
this.selectedJointName = null;
|
||||
this.debugEntityIDs = undefined;
|
||||
this.jointSelected = signal(function(result) {});
|
||||
}
|
||||
DebugControls.prototype = {
|
||||
start: function() {
|
||||
if (!this.onMousePressEvent) {
|
||||
this.onMousePressEvent = this._onMousePressEvent;
|
||||
Controller.mousePressEvent.connect(this, 'onMousePressEvent');
|
||||
}
|
||||
},
|
||||
|
||||
stop: function() {
|
||||
this.removeIndicators();
|
||||
if (this.onMousePressEvent) {
|
||||
Controller.mousePressEvent.disconnect(this, 'onMousePressEvent');
|
||||
delete this.onMousePressEvent;
|
||||
}
|
||||
},
|
||||
|
||||
createIndicators: function(jointNames) {
|
||||
this.jointNames = jointNames;
|
||||
return jointNames.map(function(name, i) {
|
||||
return Entities.addEntity({
|
||||
type: "Shape",
|
||||
shape: 'Icosahedron',
|
||||
scale: 0.1,
|
||||
solid: false,
|
||||
alpha: 0.5
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
removeIndicators: function() {
|
||||
if (this.debugEntityIDs) {
|
||||
this.debugEntityIDs.forEach(Entities.deleteEntity);
|
||||
this.debugEntityIDs = undefined;
|
||||
}
|
||||
},
|
||||
|
||||
onJointsUpdated: function(entityID) {
|
||||
if (!this.enableIndicators) {
|
||||
return;
|
||||
}
|
||||
var jointNames = Entities.getJointNames(entityID),
|
||||
jointOrientations = Entities.getEntityProperties(entityID, ['jointRotations']), //was jointOrientations
|
||||
jointPositions = Entities.getEntityProperties(entityID, ['jointTranslations']), //was jointPositions
|
||||
//selectedIndex = jointNames.indexOf(this.selectedJointName);
|
||||
selectedIndex = Entities.getJointIndex( entityID, this.selectedJointName );
|
||||
|
||||
if (!this.debugEntityIDs) {
|
||||
this.debugEntityIDs = this.createIndicators(jointNames);
|
||||
}
|
||||
|
||||
// batch all updates into a single call (using the editOverlays({ id: {props...}, ... }) API)
|
||||
var updatedOverlays = this.debugEntityIDs.reduce(function(updates, id, i) {
|
||||
updates[id] = {
|
||||
position: jointPositions.jointTranslations[i],
|
||||
rotation: jointOrientations.jointRotations[i],
|
||||
color: i === selectedIndex ? DebugControls.COLOR_SELECTED : DebugControls.COLOR_DEFAULT,
|
||||
solid: i === selectedIndex
|
||||
};
|
||||
return updates;
|
||||
}, {});
|
||||
//Entities.editOverlays(updatedOverlays);
|
||||
},
|
||||
|
||||
_onMousePressEvent: function(evt) {
|
||||
if (!evt.isLeftButton || !this.enableIndicators || !this.debugEntityIDs) {
|
||||
return;
|
||||
}
|
||||
var ray = Camera.computePickRay(evt.x, evt.y),
|
||||
hit = Entities.findRayIntersection(ray, true, this.debugEntityIDs);
|
||||
|
||||
hit.jointIndex = this.debugEntityIDs.indexOf(hit.entityID);
|
||||
hit.jointName = this.jointNames[hit.jointIndex];
|
||||
this.jointSelected(hit);
|
||||
}
|
||||
};
|
||||
|
||||
if ('$debugControls' in doppleganger) {
|
||||
throw new Error('only one set of debug controls can be added per doppleganger');
|
||||
}
|
||||
var debugControls = new DebugControls();
|
||||
doppleganger.$debugControls = debugControls;
|
||||
|
||||
function onMousePressEvent(evt) {
|
||||
if (evt.isRightButton) {
|
||||
if (evt.isShifted) {
|
||||
debugControls.enableIndicators = !debugControls.enableIndicators;
|
||||
if (!debugControls.enableIndicators) {
|
||||
debugControls.removeIndicators();
|
||||
}
|
||||
} else {
|
||||
doppleganger.mirrored = !doppleganger.mirrored;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
doppleganger.activeChanged.connect(function(active) {
|
||||
if (active) {
|
||||
debugControls.start();
|
||||
doppleganger.jointsUpdated.connect(debugControls, 'onJointsUpdated');
|
||||
Controller.mousePressEvent.connect(onMousePressEvent);
|
||||
} else {
|
||||
Controller.mousePressEvent.disconnect(onMousePressEvent);
|
||||
doppleganger.jointsUpdated.disconnect(debugControls, 'onJointsUpdated');
|
||||
debugControls.stop();
|
||||
}
|
||||
});
|
||||
|
||||
debugControls.jointSelected.connect(function(hit) {
|
||||
debugControls.selectedJointName = hit.jointName;
|
||||
if (hit.jointIndex < 0) {
|
||||
return;
|
||||
}
|
||||
hit.mirroredJointName = Doppleganger.getMirroredJointNames([hit.jointName])[0];
|
||||
log('selected joint:', JSON.stringify(hit, 0, 2));
|
||||
});
|
||||
|
||||
Script.scriptEnding.connect(debugControls, 'removeIndicators');
|
||||
|
||||
return doppleganger;
|
||||
};
|
||||
672
applications/spectator-camera/SpectatorCamera.qml
Normal file
672
applications/spectator-camera/SpectatorCamera.qml
Normal file
|
|
@ -0,0 +1,672 @@
|
|||
//
|
||||
// SpectatorCamera.qml
|
||||
// qml/hifi
|
||||
//
|
||||
// Spectator Camera v2.5
|
||||
//
|
||||
// Created by Zach Fox on 2018-12-12
|
||||
// Copyright 2018 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
import Hifi 1.0 as Hifi
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 2.2
|
||||
import QtGraphicalEffects 1.0
|
||||
|
||||
import "qrc:////qml//styles-uit" as HifiStylesUit
|
||||
import "qrc:////qml//controls-uit" as HifiControlsUit
|
||||
import "qrc:////qml//controls" as HifiControls
|
||||
import "qrc:////qml//hifi" as Hifi
|
||||
|
||||
Rectangle {
|
||||
HifiStylesUit.HifiConstants { id: hifi; }
|
||||
|
||||
id: root;
|
||||
property bool uiReady: false;
|
||||
property bool processingStillSnapshot: false;
|
||||
property bool processing360Snapshot: false;
|
||||
// Style
|
||||
color: "#404040";
|
||||
|
||||
// The letterbox used for popup messages
|
||||
Hifi.LetterboxMessage {
|
||||
id: letterboxMessage;
|
||||
z: 998; // Force the popup on top of everything else
|
||||
}
|
||||
function letterbox(headerGlyph, headerText, message) {
|
||||
letterboxMessage.headerGlyph = headerGlyph;
|
||||
letterboxMessage.headerText = headerText;
|
||||
letterboxMessage.text = message;
|
||||
letterboxMessage.visible = true;
|
||||
letterboxMessage.popupRadius = 0;
|
||||
}
|
||||
|
||||
//
|
||||
// TITLE BAR START
|
||||
//
|
||||
Rectangle {
|
||||
id: titleBarContainer;
|
||||
// Size
|
||||
width: root.width;
|
||||
height: 60;
|
||||
// Anchors
|
||||
anchors.left: parent.left;
|
||||
anchors.top: parent.top;
|
||||
color: "#121212";
|
||||
|
||||
// "Spectator" text
|
||||
HifiStylesUit.RalewaySemiBold {
|
||||
id: titleBarText;
|
||||
text: "Spectator Camera 2.5";
|
||||
// Anchors
|
||||
anchors.left: parent.left;
|
||||
anchors.leftMargin: 30;
|
||||
width: paintedWidth;
|
||||
height: parent.height;
|
||||
size: 22;
|
||||
// Style
|
||||
color: hifi.colors.white;
|
||||
// Alignment
|
||||
horizontalAlignment: Text.AlignHLeft;
|
||||
verticalAlignment: Text.AlignVCenter;
|
||||
}
|
||||
|
||||
Switch {
|
||||
id: masterSwitch;
|
||||
focusPolicy: Qt.ClickFocus;
|
||||
width: 65;
|
||||
height: 30;
|
||||
anchors.verticalCenter: parent.verticalCenter;
|
||||
anchors.right: parent.right;
|
||||
anchors.rightMargin: 30;
|
||||
hoverEnabled: true;
|
||||
|
||||
onHoveredChanged: {
|
||||
if (hovered) {
|
||||
switchHandle.color = hifi.colors.blueHighlight;
|
||||
} else {
|
||||
switchHandle.color = hifi.colors.lightGray;
|
||||
}
|
||||
}
|
||||
|
||||
onClicked: {
|
||||
if (!checked) {
|
||||
flashCheckBox.checked = false;
|
||||
}
|
||||
sendToScript({method: (checked ? 'spectatorCameraOn' : 'spectatorCameraOff')});
|
||||
sendToScript({method: 'updateCameravFoV', vFoV: fieldOfViewSlider.value});
|
||||
}
|
||||
|
||||
background: Rectangle {
|
||||
color: parent.checked ? "#1FC6A6" : hifi.colors.white;
|
||||
implicitWidth: masterSwitch.width;
|
||||
implicitHeight: masterSwitch.height;
|
||||
radius: height/2;
|
||||
}
|
||||
|
||||
indicator: Rectangle {
|
||||
id: switchHandle;
|
||||
implicitWidth: masterSwitch.height - 4;
|
||||
implicitHeight: implicitWidth;
|
||||
radius: implicitWidth/2;
|
||||
border.color: "#E3E3E3";
|
||||
color: "#404040";
|
||||
x: Math.max(4, Math.min(parent.width - width - 4, parent.visualPosition * parent.width - (width / 2) - 4))
|
||||
y: parent.height / 2 - height / 2;
|
||||
Behavior on x {
|
||||
enabled: !masterSwitch.down
|
||||
SmoothedAnimation { velocity: 200 }
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
//
|
||||
// TITLE BAR END
|
||||
//
|
||||
|
||||
Rectangle {
|
||||
z: 999;
|
||||
id: processingSnapshot;
|
||||
anchors.fill: parent;
|
||||
visible: root.processing360Snapshot || !root.uiReady;
|
||||
color: Qt.rgba(0.0, 0.0, 0.0, 0.85);
|
||||
|
||||
// This object is always used in a popup.
|
||||
// This MouseArea is used to prevent a user from being
|
||||
// able to click on a button/mouseArea underneath the popup/section.
|
||||
MouseArea {
|
||||
anchors.fill: parent;
|
||||
hoverEnabled: true;
|
||||
propagateComposedEvents: false;
|
||||
}
|
||||
|
||||
AnimatedImage {
|
||||
id: processingImage;
|
||||
source: "processing.gif"
|
||||
width: 74;
|
||||
height: width;
|
||||
anchors.verticalCenter: parent.verticalCenter;
|
||||
anchors.horizontalCenter: parent.horizontalCenter;
|
||||
}
|
||||
|
||||
HifiStylesUit.RalewaySemiBold {
|
||||
text: root.uiReady ? "Processing..." : "";
|
||||
// Anchors
|
||||
anchors.top: processingImage.bottom;
|
||||
anchors.topMargin: 4;
|
||||
anchors.horizontalCenter: parent.horizontalCenter;
|
||||
width: paintedWidth;
|
||||
// Text size
|
||||
size: 26;
|
||||
// Style
|
||||
color: hifi.colors.white;
|
||||
verticalAlignment: Text.AlignVCenter;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// SPECTATOR CONTROLS START
|
||||
//
|
||||
Item {
|
||||
id: spectatorControlsContainer;
|
||||
// Anchors
|
||||
anchors.top: titleBarContainer.bottom;
|
||||
anchors.left: parent.left;
|
||||
anchors.right: parent.right;
|
||||
anchors.bottom: parent.bottom;
|
||||
|
||||
// Instructions or Preview
|
||||
Rectangle {
|
||||
id: spectatorCameraImageContainer;
|
||||
anchors.left: parent.left;
|
||||
anchors.top: parent.top;
|
||||
anchors.right: parent.right;
|
||||
height: 250;
|
||||
color: masterSwitch.checked ? "transparent" : "black";
|
||||
|
||||
AnimatedImage {
|
||||
source: "static.gif"
|
||||
visible: !masterSwitch.checked;
|
||||
anchors.fill: parent;
|
||||
opacity: 0.15;
|
||||
}
|
||||
|
||||
// Instructions (visible when display texture isn't set)
|
||||
HifiStylesUit.FiraSansRegular {
|
||||
id: spectatorCameraInstructions;
|
||||
text: "Turn on Spectator Camera for a preview\nof " + (HMD.active ? "what your monitor shows." : "the camera's view.");
|
||||
size: 16;
|
||||
color: hifi.colors.white;
|
||||
visible: !masterSwitch.checked;
|
||||
anchors.fill: parent;
|
||||
horizontalAlignment: Text.AlignHCenter;
|
||||
verticalAlignment: Text.AlignVCenter;
|
||||
}
|
||||
|
||||
HifiStylesUit.FiraSansRegular {
|
||||
text: ":)";
|
||||
size: 28;
|
||||
color: hifi.colors.white;
|
||||
visible: root.processing360Snapshot || root.processingStillSnapshot;
|
||||
anchors.fill: parent;
|
||||
horizontalAlignment: Text.AlignHCenter;
|
||||
verticalAlignment: Text.AlignVCenter;
|
||||
}
|
||||
|
||||
// Spectator Camera Preview
|
||||
Hifi.ResourceImageItem {
|
||||
id: spectatorCameraPreview;
|
||||
visible: masterSwitch.checked && !root.processing360Snapshot && !root.processingStillSnapshot;
|
||||
url: showCameraView.checked || !HMD.active ? "resource://spectatorCameraFrame" : "resource://hmdPreviewFrame";
|
||||
ready: masterSwitch.checked;
|
||||
mirrorVertically: true;
|
||||
anchors.fill: parent;
|
||||
onVisibleChanged: {
|
||||
ready = masterSwitch.checked;
|
||||
update();
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
visible: HMD.active;
|
||||
anchors.top: parent.top;
|
||||
anchors.left: parent.left;
|
||||
anchors.right: parent.right;
|
||||
height: 40;
|
||||
|
||||
LinearGradient {
|
||||
anchors.fill: parent;
|
||||
start: Qt.point(0, 0);
|
||||
end: Qt.point(0, height);
|
||||
gradient: Gradient {
|
||||
GradientStop { position: 0.0; color: hifi.colors.black }
|
||||
GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0) }
|
||||
}
|
||||
}
|
||||
|
||||
HifiStylesUit.HiFiGlyphs {
|
||||
id: monitorShowsSwitchLabelGlyph;
|
||||
text: hifi.glyphs.screen;
|
||||
size: 32;
|
||||
color: hifi.colors.white;
|
||||
anchors.top: parent.top;
|
||||
anchors.bottom: parent.bottom;
|
||||
anchors.left: parent.left;
|
||||
anchors.leftMargin: 16;
|
||||
}
|
||||
HifiStylesUit.RalewayLight {
|
||||
id: monitorShowsSwitchLabel;
|
||||
text: "Monitor View:";
|
||||
anchors.top: parent.top;
|
||||
anchors.bottom: parent.bottom;
|
||||
anchors.left: monitorShowsSwitchLabelGlyph.right;
|
||||
anchors.leftMargin: 8;
|
||||
size: 20;
|
||||
width: paintedWidth;
|
||||
height: parent.height;
|
||||
color: hifi.colors.white;
|
||||
verticalAlignment: Text.AlignVCenter;
|
||||
}
|
||||
Item {
|
||||
anchors.left: monitorShowsSwitchLabel.right;
|
||||
anchors.leftMargin: 14;
|
||||
anchors.right: parent.right;
|
||||
anchors.rightMargin: 10;
|
||||
anchors.top: parent.top;
|
||||
anchors.bottom: parent.bottom;
|
||||
|
||||
HifiControlsUit.RadioButton {
|
||||
id: showCameraView;
|
||||
text: "Camera View";
|
||||
width: 125;
|
||||
anchors.left: parent.left;
|
||||
anchors.leftMargin: 10;
|
||||
anchors.verticalCenter: parent.verticalCenter;
|
||||
colorScheme: hifi.colorSchemes.dark;
|
||||
onClicked: {
|
||||
if (showHmdPreview.checked) {
|
||||
showHmdPreview.checked = false;
|
||||
}
|
||||
if (!showCameraView.checked && !showHmdPreview.checked) {
|
||||
showCameraView.checked = true;
|
||||
}
|
||||
}
|
||||
onCheckedChanged: {
|
||||
if (checked) {
|
||||
sendToScript({method: 'setMonitorShowsCameraView', params: true});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HifiControlsUit.RadioButton {
|
||||
id: showHmdPreview;
|
||||
text: "VR Preview";
|
||||
anchors.left: showCameraView.right;
|
||||
anchors.leftMargin: 10;
|
||||
width: 125;
|
||||
anchors.verticalCenter: parent.verticalCenter;
|
||||
colorScheme: hifi.colorSchemes.dark;
|
||||
onClicked: {
|
||||
if (showCameraView.checked) {
|
||||
showCameraView.checked = false;
|
||||
}
|
||||
if (!showCameraView.checked && !showHmdPreview.checked) {
|
||||
showHmdPreview.checked = true;
|
||||
}
|
||||
}
|
||||
onCheckedChanged: {
|
||||
if (checked) {
|
||||
sendToScript({method: 'setMonitorShowsCameraView', params: false});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HifiStylesUit.HiFiGlyphs {
|
||||
id: flashGlyph;
|
||||
visible: flashCheckBox.visible;
|
||||
text: hifi.glyphs.lightning;
|
||||
size: 26;
|
||||
color: hifi.colors.white;
|
||||
anchors.verticalCenter: flashCheckBox.verticalCenter;
|
||||
anchors.right: flashCheckBox.left;
|
||||
anchors.rightMargin: -2;
|
||||
}
|
||||
HifiControlsUit.CheckBox {
|
||||
id: flashCheckBox;
|
||||
visible: masterSwitch.checked;
|
||||
color: hifi.colors.white;
|
||||
colorScheme: hifi.colorSchemes.dark;
|
||||
anchors.right: takeSnapshotButton.left;
|
||||
anchors.rightMargin: -8;
|
||||
anchors.verticalCenter: takeSnapshotButton.verticalCenter;
|
||||
boxSize: 22;
|
||||
onClicked: {
|
||||
sendToScript({method: 'setFlashStatus', enabled: checked});
|
||||
}
|
||||
}
|
||||
HifiControlsUit.Button {
|
||||
id: takeSnapshotButton;
|
||||
enabled: masterSwitch.checked;
|
||||
text: "SNAP PICTURE";
|
||||
colorScheme: hifi.colorSchemes.light;
|
||||
color: hifi.buttons.white;
|
||||
anchors.bottom: parent.bottom;
|
||||
anchors.bottomMargin: 8;
|
||||
anchors.right: take360SnapshotButton.left;
|
||||
anchors.rightMargin: 12;
|
||||
width: 135;
|
||||
height: 35;
|
||||
onClicked: {
|
||||
root.processingStillSnapshot = true;
|
||||
sendToScript({method: 'takeSecondaryCameraSnapshot'});
|
||||
}
|
||||
}
|
||||
HifiControlsUit.Button {
|
||||
id: take360SnapshotButton;
|
||||
enabled: masterSwitch.checked;
|
||||
text: "SNAP 360";
|
||||
colorScheme: hifi.colorSchemes.light;
|
||||
color: hifi.buttons.white;
|
||||
anchors.bottom: parent.bottom;
|
||||
anchors.bottomMargin: 8;
|
||||
anchors.right: parent.right;
|
||||
anchors.rightMargin: 12;
|
||||
width: 135;
|
||||
height: 35;
|
||||
onClicked: {
|
||||
root.processing360Snapshot = true;
|
||||
sendToScript({method: 'takeSecondaryCamera360Snapshot'});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
anchors.top: spectatorCameraImageContainer.bottom;
|
||||
anchors.topMargin: 8;
|
||||
anchors.left: parent.left;
|
||||
anchors.leftMargin: 26;
|
||||
anchors.right: parent.right;
|
||||
anchors.rightMargin: 26;
|
||||
anchors.bottom: parent.bottom;
|
||||
|
||||
Item {
|
||||
id: fieldOfView;
|
||||
visible: masterSwitch.checked;
|
||||
anchors.top: parent.top;
|
||||
anchors.left: parent.left;
|
||||
anchors.right: parent.right;
|
||||
height: 35;
|
||||
|
||||
HifiStylesUit.RalewaySemiBold {
|
||||
id: fieldOfViewLabel;
|
||||
text: "Field of View (" + fieldOfViewSlider.value + "\u00B0): ";
|
||||
size: 20;
|
||||
color: hifi.colors.white;
|
||||
anchors.left: parent.left;
|
||||
anchors.top: parent.top;
|
||||
anchors.bottom: parent.bottom;
|
||||
width: 172;
|
||||
horizontalAlignment: Text.AlignLeft;
|
||||
verticalAlignment: Text.AlignVCenter;
|
||||
}
|
||||
|
||||
HifiControlsUit.Slider {
|
||||
id: fieldOfViewSlider;
|
||||
anchors.top: parent.top;
|
||||
anchors.bottom: parent.bottom;
|
||||
anchors.right: resetvFoV.left;
|
||||
anchors.rightMargin: 8;
|
||||
anchors.left: fieldOfViewLabel.right;
|
||||
anchors.leftMargin: 8;
|
||||
colorScheme: hifi.colorSchemes.dark;
|
||||
from: 10.0;
|
||||
to: 120.0;
|
||||
value: 45.0;
|
||||
stepSize: 1;
|
||||
|
||||
onValueChanged: {
|
||||
sendToScript({method: 'updateCameravFoV', vFoV: value});
|
||||
}
|
||||
onPressedChanged: {
|
||||
if (!pressed) {
|
||||
sendToScript({method: 'updateCameravFoV', vFoV: value});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HifiControlsUit.GlyphButton {
|
||||
id: resetvFoV;
|
||||
anchors.verticalCenter: parent.verticalCenter;
|
||||
anchors.right: parent.right;
|
||||
anchors.rightMargin: -8;
|
||||
height: parent.height - 8;
|
||||
width: height;
|
||||
glyph: hifi.glyphs.reload;
|
||||
onClicked: {
|
||||
fieldOfViewSlider.value = 45.0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
visible: HMD.active;
|
||||
anchors.top: fieldOfView.bottom;
|
||||
anchors.topMargin: 18;
|
||||
anchors.left: parent.left;
|
||||
anchors.right: parent.right;
|
||||
height: childrenRect.height;
|
||||
|
||||
HifiStylesUit.RalewaySemiBold {
|
||||
id: shortcutsHeaderText;
|
||||
anchors.top: parent.top;
|
||||
anchors.left: parent.left;
|
||||
anchors.right: parent.right;
|
||||
height: paintedHeight;
|
||||
text: "Shortcuts";
|
||||
size: 20;
|
||||
color: hifi.colors.white;
|
||||
}
|
||||
|
||||
// "Switch View From Controller" Checkbox
|
||||
HifiControlsUit.CheckBox {
|
||||
id: switchViewFromControllerCheckBox;
|
||||
color: hifi.colors.white;
|
||||
colorScheme: hifi.colorSchemes.dark;
|
||||
anchors.left: parent.left;
|
||||
anchors.top: shortcutsHeaderText.bottom;
|
||||
anchors.topMargin: 8;
|
||||
text: "";
|
||||
labelFontSize: 20;
|
||||
labelFontWeight: Font.Normal;
|
||||
boxSize: 24;
|
||||
onClicked: {
|
||||
sendToScript({method: 'changeSwitchViewFromControllerPreference', params: checked});
|
||||
}
|
||||
}
|
||||
|
||||
// "Take Snapshot" Checkbox
|
||||
HifiControlsUit.CheckBox {
|
||||
id: takeSnapshotFromControllerCheckBox;
|
||||
color: hifi.colors.white;
|
||||
colorScheme: hifi.colorSchemes.dark;
|
||||
anchors.left: parent.left;
|
||||
anchors.top: switchViewFromControllerCheckBox.bottom;
|
||||
anchors.topMargin: 4;
|
||||
text: "";
|
||||
labelFontSize: 20;
|
||||
labelFontWeight: Font.Normal;
|
||||
boxSize: 24;
|
||||
onClicked: {
|
||||
sendToScript({method: 'changeTakeSnapshotFromControllerPreference', params: checked});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HifiControlsUit.Button {
|
||||
text: "Change Snapshot Location";
|
||||
colorScheme: hifi.colorSchemes.dark;
|
||||
color: hifi.buttons.none;
|
||||
anchors.bottom: spectatorDescriptionContainer.top;
|
||||
anchors.bottomMargin: 16;
|
||||
anchors.left: parent.left;
|
||||
anchors.right: parent.right;
|
||||
height: 35;
|
||||
onClicked: {
|
||||
sendToScript({method: 'openSettings'});
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
id: spectatorDescriptionContainer;
|
||||
// Size
|
||||
height: childrenRect.height;
|
||||
// Anchors
|
||||
anchors.left: parent.left;
|
||||
anchors.right: parent.right;
|
||||
anchors.bottom: parent.bottom;
|
||||
anchors.bottomMargin: 20;
|
||||
|
||||
// "Spectator" app description text
|
||||
HifiStylesUit.RalewayRegular {
|
||||
id: spectatorDescriptionText;
|
||||
text: "While you're using a VR headset, you can use this app to change what your monitor shows. " +
|
||||
"Try it when streaming or recording video.";
|
||||
// Text size
|
||||
size: 20;
|
||||
// Size
|
||||
height: paintedHeight;
|
||||
// Anchors
|
||||
anchors.left: parent.left;
|
||||
anchors.right: parent.right;
|
||||
anchors.top: parent.top;
|
||||
// Style
|
||||
color: hifi.colors.white;
|
||||
wrapMode: Text.Wrap;
|
||||
// Alignment
|
||||
horizontalAlignment: Text.AlignHLeft;
|
||||
verticalAlignment: Text.AlignVCenter;
|
||||
}
|
||||
|
||||
// "Learn More" text
|
||||
HifiStylesUit.RalewayRegular {
|
||||
id: spectatorLearnMoreText;
|
||||
text: "Learn More About Spectator";
|
||||
// Text size
|
||||
size: 20;
|
||||
// Size
|
||||
width: paintedWidth;
|
||||
height: paintedHeight;
|
||||
// Anchors
|
||||
anchors.top: spectatorDescriptionText.bottom;
|
||||
anchors.topMargin: 10;
|
||||
anchors.left: parent.left;
|
||||
anchors.right: parent.right;
|
||||
// Style
|
||||
color: hifi.colors.blueAccent;
|
||||
wrapMode: Text.WordWrap;
|
||||
font.underline: true;
|
||||
// Alignment
|
||||
horizontalAlignment: Text.AlignHLeft;
|
||||
verticalAlignment: Text.AlignVCenter;
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent;
|
||||
hoverEnabled: enabled;
|
||||
onClicked: {
|
||||
letterbox(hifi.glyphs.question,
|
||||
"Spectator Camera",
|
||||
"By default, your monitor shows a preview of what you're seeing in VR. " +
|
||||
"Using the Spectator Camera app, your monitor can display the view " +
|
||||
"from a virtual hand-held camera - perfect for taking selfies or filming " +
|
||||
"your friends!<br>" +
|
||||
"<h3>Streaming and Recording</h3>" +
|
||||
"We recommend OBS for streaming and recording the contents of your monitor to services like " +
|
||||
"Twitch, YouTube Live, and Facebook Live.<br><br>" +
|
||||
"To get started using OBS, click this link now. The page will open in an external browser:<br>" +
|
||||
'<font size="4"><a href="https://obsproject.com/forum/threads/official-overview-guide.402/">OBS Official Overview Guide</a></font><br><br>' +
|
||||
'<b>Snapshots</b> taken using Spectator Camera will be saved in your Snapshots Directory - change via Settings -> General.');
|
||||
}
|
||||
onEntered: parent.color = hifi.colors.blueHighlight;
|
||||
onExited: parent.color = hifi.colors.blueAccent;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//
|
||||
// SPECTATOR CONTROLS END
|
||||
//
|
||||
|
||||
//
|
||||
// FUNCTION DEFINITIONS START
|
||||
//
|
||||
//
|
||||
// Function Name: fromScript()
|
||||
//
|
||||
// Relevant Variables:
|
||||
// None
|
||||
//
|
||||
// Arguments:
|
||||
// message: The message sent from the SpectatorCamera JavaScript.
|
||||
// Messages are in format "{method, params}", like json-rpc.
|
||||
//
|
||||
// Description:
|
||||
// Called when a message is received from spectatorCamera.js.
|
||||
//
|
||||
function fromScript(message) {
|
||||
switch (message.method) {
|
||||
case 'initializeUI':
|
||||
masterSwitch.checked = message.masterSwitchOn;
|
||||
flashCheckBox.checked = message.flashCheckboxChecked;
|
||||
showCameraView.checked = message.monitorShowsCamView;
|
||||
showHmdPreview.checked = !message.monitorShowsCamView;
|
||||
root.uiReady = true;
|
||||
break;
|
||||
case 'updateMonitorShowsSwitch':
|
||||
showCameraView.checked = message.params;
|
||||
showHmdPreview.checked = !message.params;
|
||||
break;
|
||||
case 'updateControllerMappingCheckbox':
|
||||
switchViewFromControllerCheckBox.checked = message.switchViewSetting;
|
||||
switchViewFromControllerCheckBox.enabled = true;
|
||||
takeSnapshotFromControllerCheckBox.checked = message.takeSnapshotSetting;
|
||||
takeSnapshotFromControllerCheckBox.enabled = true;
|
||||
|
||||
if (message.controller === "OculusTouch") {
|
||||
switchViewFromControllerCheckBox.text = "Left Thumbstick: Switch Monitor View";
|
||||
takeSnapshotFromControllerCheckBox.text = "Right Thumbstick: Take Snapshot";
|
||||
} else if (message.controller === "Vive") {
|
||||
switchViewFromControllerCheckBox.text = "Left Thumb Pad: Switch Monitor View";
|
||||
takeSnapshotFromControllerCheckBox.text = "Right Thumb Pad: Take Snapshot";
|
||||
} else {
|
||||
switchViewFromControllerCheckBox.text = "Pressing Ctrl+0 Switches Monitor View";
|
||||
switchViewFromControllerCheckBox.checked = true;
|
||||
switchViewFromControllerCheckBox.enabled = false;
|
||||
takeSnapshotFromControllerCheckBox.visible = false;
|
||||
}
|
||||
break;
|
||||
case 'finishedProcessing360Snapshot':
|
||||
root.processing360Snapshot = false;
|
||||
break;
|
||||
case 'startedProcessingStillSnapshot':
|
||||
root.processingStillSnapshot = true;
|
||||
break;
|
||||
case 'finishedProcessingStillSnapshot':
|
||||
root.processingStillSnapshot = false;
|
||||
break;
|
||||
default:
|
||||
console.log('Unrecognized message from spectatorCamera.js:', JSON.stringify(message));
|
||||
}
|
||||
}
|
||||
signal sendToScript(var message);
|
||||
|
||||
//
|
||||
// FUNCTION DEFINITIONS END
|
||||
//
|
||||
}
|
||||
7
applications/spectator-camera/app.json
Normal file
7
applications/spectator-camera/app.json
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"name": "Spectator Camera v2.5",
|
||||
"description": "Give you a video camera that can display its image on your monitor screen for video capture. It can capture from the camera or from the VR Headset. It can also take classic and spherical 360 snapshots (equirectangular format). Definitely a must.",
|
||||
"jsfile": "spectator-camera/spectatorCamera.js",
|
||||
"icon": "spectator-camera/spectator-i.svg",
|
||||
"caption": "SPECTATOR"
|
||||
}
|
||||
BIN
applications/spectator-camera/cameraOn.wav
Normal file
BIN
applications/spectator-camera/cameraOn.wav
Normal file
Binary file not shown.
BIN
applications/spectator-camera/flashOff.wav
Normal file
BIN
applications/spectator-camera/flashOff.wav
Normal file
Binary file not shown.
BIN
applications/spectator-camera/flashOn.wav
Normal file
BIN
applications/spectator-camera/flashOn.wav
Normal file
Binary file not shown.
BIN
applications/spectator-camera/processing.gif
Normal file
BIN
applications/spectator-camera/processing.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 58 KiB |
BIN
applications/spectator-camera/snap.wav
Normal file
BIN
applications/spectator-camera/snap.wav
Normal file
Binary file not shown.
BIN
applications/spectator-camera/spectator-camera.fbx
Normal file
BIN
applications/spectator-camera/spectator-camera.fbx
Normal file
Binary file not shown.
22
applications/spectator-camera/spectator-i.svg
Normal file
22
applications/spectator-camera/spectator-i.svg
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 21.1.0, 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 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#FFFFFF;}
|
||||
</style>
|
||||
<path class="st0" d="M43.9,13.3c-1.3-0.6-2.4-0.3-3.5,0.4c-1.6,1.2-3.3,2.4-5,3.5c-1.4-3.4-3.3-5-6.3-5c-5.9-0.1-11.9-0.1-17.9,0
|
||||
c-3.8,0.1-6.4,3.1-6.4,7.3c0,3.7-0.1,7.6,0,11.4c0,1.1,0.2,2.1,0.6,3.1c1.2,2.7,3.3,3.8,6,3.8c5.6,0,11-0.1,16.5,0
|
||||
c3.5,0.1,6-1.5,7.4-5.1c1.7,1.2,3.4,2.4,5.1,3.5c1.1,0.7,2.2,1.1,3.5,0.3c1.2-0.7,1.6-1.9,1.6-3.3c0-5.6,0-11,0-16.6
|
||||
C45.5,15.3,45.2,14.1,43.9,13.3z M32.2,30.5c0,2.5-1,3.6-3.4,3.6c-2.9,0-5.8,0-8.7,0s-5.6,0-8.5,0.1c-2.4-0.1-3.4-1.2-3.4-3.7
|
||||
c0-3.7,0-7.5,0-11.2c0-2.2,1.1-3.4,3.1-3.4c5.9,0,11.9,0,17.8,0c2,0,3.1,1.2,3.1,3.4C32.2,23,32.2,26.8,32.2,30.5z M41.9,32.8
|
||||
c-2.1-1.4-4.2-2.9-6.3-4.3c-0.1-0.1-0.2-0.4-0.2-0.7c0-1.9,0-3.7,0-5.5c0-0.3,0.1-0.7,0.3-0.8c2-1.4,4-2.8,6.2-4.3
|
||||
C41.9,22.3,41.9,27.4,41.9,32.8z"/>
|
||||
<path class="st0" d="M27.4,25C27.4,24.7,27.4,25.2,27.4,25c0-1.1-0.1-2-0.2-2.7c-0.2-1.4-0.7-2.7-1.6-4c-0.2-0.3-0.5-0.5-1-0.6
|
||||
c-0.4-0.1-0.9,0-1.3,0.2c-0.5,0.3-0.7,1.3-0.3,1.8c1.2,1.6,1.4,3,1.4,4.8c0.1,2.1-0.2,3.4-1.5,5.2c-0.2,0.3-0.2,1.1,0.1,1.6
|
||||
c0.1,0.2,0.3,0.4,0.6,0.6c0.2,0.1,0.3,0.1,0.5,0.1c0.5,0,1-0.3,1.3-0.9C27,29.3,27.3,27.3,27.4,25L27.4,25z"/>
|
||||
<ellipse class="st0" cx="15.2" cy="24.7" rx="2.1" ry="2.4"/>
|
||||
<path class="st0" d="M22.3,24.8C22.3,24.7,22.3,25,22.3,24.8c0-0.7-0.1-1.5-0.1-1.9c-0.2-1-0.6-2.1-1.3-3c-0.1-0.2-0.4-0.5-0.9-0.5
|
||||
c-0.7,0-0.9,0.2-1.2,0.4c-0.4,0.2-0.5,0.9-0.2,1.3c0.9,1.2,1,2.1,1.1,3.5c0,1.6-0.2,2.5-1.1,3.8c-0.1,0.2-0.1,0.7,0,1.2
|
||||
c0.1,0.2,0.2,0.3,0.5,0.4c0.1,0,0.2,0.1,0.3,0.1c0.5,0.2,1.2,0.1,1.5-0.5C21.7,28,22.2,26.5,22.3,24.8L22.3,24.8z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.9 KiB |
748
applications/spectator-camera/spectatorCamera.js
Normal file
748
applications/spectator-camera/spectatorCamera.js
Normal file
|
|
@ -0,0 +1,748 @@
|
|||
"use strict";
|
||||
/*jslint vars:true, plusplus:true, forin:true*/
|
||||
/*global Tablet, Script, */
|
||||
/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
|
||||
//
|
||||
// spectatorCamera.js
|
||||
//
|
||||
// Created by Zach Fox on 2017-06-05
|
||||
// Copyright 2017 High Fidelity, Inc
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
(function () { // BEGIN LOCAL_SCOPE
|
||||
|
||||
// FUNCTION VAR DECLARATIONS
|
||||
var sendToQml, addOrRemoveButton, onTabletScreenChanged, fromQml,
|
||||
onTabletButtonClicked, wireEventBridge, startup, shutdown, registerButtonMappings;
|
||||
|
||||
// Function Name: inFrontOf()
|
||||
//
|
||||
// Description:
|
||||
// -Returns the position in front of the given "position" argument, where the forward vector is based off
|
||||
// the "orientation" argument and the amount in front is based off the "distance" argument.
|
||||
function inFrontOf(distance, position, orientation) {
|
||||
return Vec3.sum(position || MyAvatar.position,
|
||||
Vec3.multiply(distance, Quat.getForward(orientation || MyAvatar.orientation)));
|
||||
}
|
||||
|
||||
// Function Name: spectatorCameraOn()
|
||||
//
|
||||
// Description:
|
||||
// -Call this function to set up the spectator camera and
|
||||
// spawn the camera entity.
|
||||
//
|
||||
// Relevant Variables:
|
||||
// -spectatorCameraConfig: The render configuration of the spectator camera
|
||||
// render job. It controls various attributes of the Secondary Camera, such as:
|
||||
// -The entity ID to follow
|
||||
// -Position
|
||||
// -Orientation
|
||||
// -Rendered texture size
|
||||
// -Vertical field of view
|
||||
// -Near clip plane distance
|
||||
// -Far clip plane distance
|
||||
// -viewFinderOverlay: The in-world overlay that displays the spectator camera's view.
|
||||
// -camera: The in-world entity that corresponds to the spectator camera.
|
||||
// -cameraRotation: The rotation of the spectator camera.
|
||||
// -cameraPosition: The position of the spectator camera.
|
||||
// -glassPaneWidth: The width of the glass pane above the spectator camera that holds the viewFinderOverlay.
|
||||
// -viewFinderOverlayDim: The x, y, and z dimensions of the viewFinderOverlay.
|
||||
// -camera: The camera model which is grabbable.
|
||||
// -viewFinderOverlay: The preview of what the spectator camera is viewing, placed inside the glass pane.
|
||||
var spectatorCameraConfig = Render.getConfig("SecondaryCamera");
|
||||
var viewFinderOverlay = false;
|
||||
var camera = false;
|
||||
var cameraRotation;
|
||||
var cameraPosition;
|
||||
var glassPaneWidth = 0.16;
|
||||
// The negative y dimension for viewFinderOverlay is necessary for now due to the way Image3DOverlay
|
||||
// draws textures, but should be looked into at some point. Also the z dimension shouldn't affect
|
||||
// the overlay since it is an Image3DOverlay so it is set to 0.
|
||||
var viewFinderOverlayDim = { x: glassPaneWidth, y: -glassPaneWidth, z: 0 };
|
||||
function spectatorCameraOn() {
|
||||
// Sets the special texture size based on the window it is displayed in, which doesn't include the menu bar
|
||||
spectatorCameraConfig.enableSecondaryCameraRenderConfigs(true);
|
||||
spectatorCameraConfig.resetSizeSpectatorCamera(Window.innerWidth, Window.innerHeight);
|
||||
cameraRotation = Quat.multiply(MyAvatar.orientation, Quat.fromPitchYawRollDegrees(15, -155, 0)), cameraPosition = inFrontOf(0.85, Vec3.sum(MyAvatar.position, { x: 0, y: 0.28, z: 0 }));
|
||||
camera = Entities.addEntity({
|
||||
"angularDamping": 0.95,
|
||||
"damping": 0.95,
|
||||
"collidesWith": "static,dynamic,kinematic,",
|
||||
"collisionMask": 7,
|
||||
"dynamic": false,
|
||||
"modelURL": Script.resolvePath("spectator-camera.fbx"),
|
||||
"name": "Spectator Camera",
|
||||
"registrationPoint": {
|
||||
"x": 0.56,
|
||||
"y": 0.545,
|
||||
"z": 0.23
|
||||
},
|
||||
"rotation": cameraRotation,
|
||||
"position": cameraPosition,
|
||||
"shapeType": "simple-compound",
|
||||
"type": "Model",
|
||||
"userData": "{\"grabbableKey\":{\"grabbable\":true}}",
|
||||
"isVisibleInSecondaryCamera": false
|
||||
}, true);
|
||||
spectatorCameraConfig.attachedEntityId = camera;
|
||||
updateOverlay();
|
||||
if (!HMD.active) {
|
||||
setMonitorShowsCameraView(false);
|
||||
} else {
|
||||
setDisplay(monitorShowsCameraView);
|
||||
}
|
||||
// Change button to active when window is first opened OR if the camera is on, false otherwise.
|
||||
if (button) {
|
||||
button.editProperties({ isActive: onSpectatorCameraScreen || camera });
|
||||
}
|
||||
Audio.playSound(SOUND_CAMERA_ON, {
|
||||
volume: 0.15,
|
||||
position: cameraPosition,
|
||||
localOnly: true
|
||||
});
|
||||
|
||||
// Remove the existing camera model from the domain if one exists.
|
||||
// It's easy for this to happen if the user crashes while the Spectator Camera is on.
|
||||
// We do this down here (after the new one is rezzed) so that we don't accidentally delete
|
||||
// the newly-rezzed model.
|
||||
var entityIDs = Entities.findEntitiesByName("Spectator Camera", MyAvatar.position, 100, false);
|
||||
entityIDs.forEach(function (currentEntityID) {
|
||||
var currentEntityOwner = Entities.getEntityProperties(currentEntityID, ['owningAvatarID']).owningAvatarID;
|
||||
if (currentEntityOwner === MyAvatar.sessionUUID && currentEntityID !== camera) {
|
||||
Entities.deleteEntity(currentEntityID);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Function Name: spectatorCameraOff()
|
||||
//
|
||||
// Description:
|
||||
// -Call this function to shut down the spectator camera and
|
||||
// destroy the camera entity. "isChangingDomains" is true when this function is called
|
||||
// from the "Window.domainChanged()" signal.
|
||||
var WAIT_AFTER_DOMAIN_SWITCH_BEFORE_CAMERA_DELETE_MS = 1 * 1000;
|
||||
function spectatorCameraOff(isChangingDomains) {
|
||||
function deleteCamera() {
|
||||
if (flash) {
|
||||
Entities.deleteEntity(flash);
|
||||
flash = false;
|
||||
}
|
||||
if (camera) {
|
||||
Entities.deleteEntity(camera);
|
||||
camera = false;
|
||||
}
|
||||
if (button) {
|
||||
// Change button to active when window is first openend OR if the camera is on, false otherwise.
|
||||
button.editProperties({ isActive: onSpectatorCameraScreen || camera });
|
||||
}
|
||||
}
|
||||
|
||||
spectatorCameraConfig.attachedEntityId = false;
|
||||
spectatorCameraConfig.enableSecondaryCameraRenderConfigs(false);
|
||||
if (camera) {
|
||||
// Workaround for Avatar Entities not immediately having properties after
|
||||
// the "Window.domainChanged()" signal is emitted.
|
||||
// Should be removed after FB6155 is fixed.
|
||||
if (isChangingDomains) {
|
||||
Script.setTimeout(function () {
|
||||
deleteCamera();
|
||||
spectatorCameraOn();
|
||||
}, WAIT_AFTER_DOMAIN_SWITCH_BEFORE_CAMERA_DELETE_MS);
|
||||
} else {
|
||||
deleteCamera();
|
||||
}
|
||||
}
|
||||
if (viewFinderOverlay) {
|
||||
Overlays.deleteOverlay(viewFinderOverlay);
|
||||
}
|
||||
viewFinderOverlay = false;
|
||||
setDisplay(monitorShowsCameraView);
|
||||
}
|
||||
|
||||
// Function Name: addOrRemoveButton()
|
||||
//
|
||||
// Description:
|
||||
// -Used to add or remove the "SPECTATOR" app button from the HUD/tablet. Set the "isShuttingDown" argument
|
||||
// to true if you're calling this function upon script shutdown. Set the "isHMDmode" to true if the user is
|
||||
// in HMD; otherwise set to false.
|
||||
//
|
||||
// Relevant Variables:
|
||||
// -button: The tablet button.
|
||||
// -buttonName: The name of the button.
|
||||
var button = false;
|
||||
var buttonName = "SPECTATOR";
|
||||
function addOrRemoveButton(isShuttingDown) {
|
||||
if (!tablet) {
|
||||
print("Warning in addOrRemoveButton(): 'tablet' undefined!");
|
||||
return;
|
||||
}
|
||||
if (!button) {
|
||||
if (!isShuttingDown) {
|
||||
button = tablet.addButton({
|
||||
text: buttonName,
|
||||
icon: "icons/tablet-icons/spectator-i.svg",
|
||||
activeIcon: "icons/tablet-icons/spectator-a.svg"
|
||||
});
|
||||
button.clicked.connect(onTabletButtonClicked);
|
||||
}
|
||||
} else if (button) {
|
||||
if (isShuttingDown) {
|
||||
button.clicked.disconnect(onTabletButtonClicked);
|
||||
tablet.removeButton(button);
|
||||
button = false;
|
||||
}
|
||||
} else {
|
||||
print("ERROR adding/removing Spectator button!");
|
||||
}
|
||||
}
|
||||
|
||||
// Function Name: startup()
|
||||
//
|
||||
// Description:
|
||||
// -startup() will be called when the script is loaded.
|
||||
//
|
||||
// Relevant Variables:
|
||||
// -tablet: The tablet instance to be modified.
|
||||
var tablet = null;
|
||||
function startup() {
|
||||
tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
|
||||
addOrRemoveButton(false);
|
||||
tablet.screenChanged.connect(onTabletScreenChanged);
|
||||
Window.domainChanged.connect(onDomainChanged);
|
||||
Window.geometryChanged.connect(resizeViewFinderOverlay);
|
||||
Controller.keyPressEvent.connect(keyPressEvent);
|
||||
HMD.displayModeChanged.connect(onHMDChanged);
|
||||
viewFinderOverlay = false;
|
||||
camera = false;
|
||||
registerButtonMappings();
|
||||
}
|
||||
|
||||
// Function Name: wireEventBridge()
|
||||
//
|
||||
// Description:
|
||||
// -Used to connect/disconnect the script's response to the tablet's "fromQml" signal. Set the "on" argument to enable or
|
||||
// disable to event bridge.
|
||||
//
|
||||
// Relevant Variables:
|
||||
// -hasEventBridge: true/false depending on whether we've already connected the event bridge.
|
||||
var hasEventBridge = false;
|
||||
function wireEventBridge(on) {
|
||||
if (!tablet) {
|
||||
print("Warning in wireEventBridge(): 'tablet' undefined!");
|
||||
return;
|
||||
}
|
||||
if (on) {
|
||||
if (!hasEventBridge) {
|
||||
tablet.fromQml.connect(fromQml);
|
||||
hasEventBridge = true;
|
||||
}
|
||||
} else {
|
||||
if (hasEventBridge) {
|
||||
tablet.fromQml.disconnect(fromQml);
|
||||
hasEventBridge = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Function Name: setDisplay()
|
||||
//
|
||||
// Description:
|
||||
// -There are two bool variables that determine what the "url" argument to "setDisplayTexture(url)" should be:
|
||||
// Camera on/off switch, and the "Monitor Shows" on/off switch.
|
||||
// This results in four possible cases for the argument. Those four cases are:
|
||||
// 1. Camera is off; "Monitor Shows" is "HMD Preview": "url" is ""
|
||||
// 2. Camera is off; "Monitor Shows" is "Camera View": "url" is ""
|
||||
// 3. Camera is on; "Monitor Shows" is "HMD Preview": "url" is ""
|
||||
// 4. Camera is on; "Monitor Shows" is "Camera View": "url" is "resource://spectatorCameraFrame"
|
||||
function setDisplay(showCameraView) {
|
||||
var url = (camera) ? (showCameraView ? "resource://spectatorCameraFrame" : "resource://hmdPreviewFrame") : "";
|
||||
|
||||
// FIXME: temporary hack to avoid setting the display texture to hmdPreviewFrame
|
||||
// until it is the correct mono.
|
||||
if (url === "resource://hmdPreviewFrame") {
|
||||
Window.setDisplayTexture("");
|
||||
} else {
|
||||
Window.setDisplayTexture(url);
|
||||
}
|
||||
}
|
||||
const MONITOR_SHOWS_CAMERA_VIEW_DEFAULT = false;
|
||||
var monitorShowsCameraView = !!Settings.getValue('spectatorCamera/monitorShowsCameraView', MONITOR_SHOWS_CAMERA_VIEW_DEFAULT);
|
||||
function setMonitorShowsCameraView(showCameraView) {
|
||||
setDisplay(showCameraView);
|
||||
monitorShowsCameraView = showCameraView;
|
||||
Settings.setValue('spectatorCamera/monitorShowsCameraView', showCameraView);
|
||||
}
|
||||
function setMonitorShowsCameraViewAndSendToQml(showCameraView) {
|
||||
setMonitorShowsCameraView(showCameraView);
|
||||
sendToQml({ method: 'updateMonitorShowsSwitch', params: showCameraView });
|
||||
}
|
||||
function keyPressEvent(event) {
|
||||
if ((event.text === "0") && !event.isAutoRepeat && !event.isShifted && !event.isMeta && event.isControl && !event.isAlt) {
|
||||
setMonitorShowsCameraViewAndSendToQml(!monitorShowsCameraView);
|
||||
}
|
||||
}
|
||||
function updateOverlay() {
|
||||
// The only way I found to update the viewFinderOverlay without turning the spectator camera on and off is to delete and recreate the
|
||||
// overlay, which is inefficient but resizing the window shouldn't be performed often
|
||||
if (viewFinderOverlay) {
|
||||
Overlays.deleteOverlay(viewFinderOverlay);
|
||||
}
|
||||
viewFinderOverlay = Overlays.addOverlay("image3d", {
|
||||
url: "resource://spectatorCameraFrame",
|
||||
emissive: true,
|
||||
parentID: camera,
|
||||
alpha: 1,
|
||||
localRotation: { w: 1, x: 0, y: 0, z: 0 },
|
||||
localPosition: { x: 0, y: 0.13, z: 0.126 },
|
||||
dimensions: viewFinderOverlayDim
|
||||
});
|
||||
}
|
||||
|
||||
// Function Name: resizeViewFinderOverlay()
|
||||
//
|
||||
// Description:
|
||||
// -A function called when the window is moved/resized, which changes the viewFinderOverlay's texture and dimensions to be
|
||||
// appropriately altered to fit inside the glass pane while not distorting the texture. The "geometryChanged" argument gives information
|
||||
// on how the window changed, including x, y, width, and height.
|
||||
//
|
||||
// Relevant Variables:
|
||||
// -glassPaneRatio: The aspect ratio of the glass pane, currently set as a 16:9 aspect ratio (change if model changes).
|
||||
// -verticalScale: The amount the viewFinderOverlay should be scaled if the window size is vertical.
|
||||
// -squareScale: The amount the viewFinderOverlay should be scaled if the window size is not vertical but is more square than the
|
||||
// glass pane's aspect ratio.
|
||||
function resizeViewFinderOverlay(geometryChanged) {
|
||||
var glassPaneRatio = 16 / 9;
|
||||
var verticalScale = 1 / glassPaneRatio;
|
||||
var squareScale = verticalScale * (1 + (1 - (1 / (geometryChanged.width / geometryChanged.height))));
|
||||
|
||||
if (geometryChanged.height > geometryChanged.width) { //vertical window size
|
||||
viewFinderOverlayDim = { x: (glassPaneWidth * verticalScale), y: (-glassPaneWidth * verticalScale), z: 0 };
|
||||
} else if ((geometryChanged.width / geometryChanged.height) < glassPaneRatio) { //square-ish window size, in-between vertical and horizontal
|
||||
viewFinderOverlayDim = { x: (glassPaneWidth * squareScale), y: (-glassPaneWidth * squareScale), z: 0 };
|
||||
} else { //horizontal window size
|
||||
viewFinderOverlayDim = { x: glassPaneWidth, y: -glassPaneWidth, z: 0 };
|
||||
}
|
||||
updateOverlay();
|
||||
// if secondary camera is currently being used for mirror projection then don't update it's aspect ratio (will be done in spectatorCameraOn)
|
||||
if (!spectatorCameraConfig.mirrorProjection) {
|
||||
spectatorCameraConfig.resetSizeSpectatorCamera(geometryChanged.width, geometryChanged.height);
|
||||
}
|
||||
setDisplay(monitorShowsCameraView);
|
||||
}
|
||||
|
||||
const SWITCH_VIEW_FROM_CONTROLLER_DEFAULT = false;
|
||||
var switchViewFromController = !!Settings.getValue('spectatorCamera/switchViewFromController', SWITCH_VIEW_FROM_CONTROLLER_DEFAULT);
|
||||
function setSwitchViewControllerMappingStatus(status) {
|
||||
if (!switchViewControllerMapping) {
|
||||
return;
|
||||
}
|
||||
if (status) {
|
||||
switchViewControllerMapping.enable();
|
||||
} else {
|
||||
switchViewControllerMapping.disable();
|
||||
}
|
||||
}
|
||||
function setSwitchViewFromController(setting) {
|
||||
if (setting === switchViewFromController) {
|
||||
return;
|
||||
}
|
||||
switchViewFromController = setting;
|
||||
setSwitchViewControllerMappingStatus(switchViewFromController);
|
||||
Settings.setValue('spectatorCamera/switchViewFromController', setting);
|
||||
}
|
||||
|
||||
const TAKE_SNAPSHOT_FROM_CONTROLLER_DEFAULT = false;
|
||||
var takeSnapshotFromController = !!Settings.getValue('spectatorCamera/takeSnapshotFromController', TAKE_SNAPSHOT_FROM_CONTROLLER_DEFAULT);
|
||||
function setTakeSnapshotControllerMappingStatus(status) {
|
||||
if (!takeSnapshotControllerMapping) {
|
||||
return;
|
||||
}
|
||||
if (status) {
|
||||
takeSnapshotControllerMapping.enable();
|
||||
} else {
|
||||
takeSnapshotControllerMapping.disable();
|
||||
}
|
||||
}
|
||||
function setTakeSnapshotFromController(setting) {
|
||||
if (setting === takeSnapshotFromController) {
|
||||
return;
|
||||
}
|
||||
takeSnapshotFromController = setting;
|
||||
setTakeSnapshotControllerMappingStatus(takeSnapshotFromController);
|
||||
Settings.setValue('spectatorCamera/takeSnapshotFromController', setting);
|
||||
}
|
||||
|
||||
// Function Name: registerButtonMappings()
|
||||
//
|
||||
// Description:
|
||||
// -Updates controller button mappings for Spectator Camera.
|
||||
//
|
||||
// Relevant Variables:
|
||||
// -switchViewControllerMappingName: The name of the controller mapping.
|
||||
// -switchViewControllerMapping: The controller mapping itself.
|
||||
// -takeSnapshotControllerMappingName: The name of the controller mapping.
|
||||
// -takeSnapshotControllerMapping: The controller mapping itself.
|
||||
// -controllerType: "OculusTouch", "Vive", "Other".
|
||||
var switchViewControllerMapping;
|
||||
var switchViewControllerMappingName = 'Hifi-SpectatorCamera-Mapping-SwitchView';
|
||||
function registerSwitchViewControllerMapping() {
|
||||
switchViewControllerMapping = Controller.newMapping(switchViewControllerMappingName);
|
||||
if (controllerType === "OculusTouch") {
|
||||
switchViewControllerMapping.from(Controller.Standard.LS).to(function (value) {
|
||||
if (value === 1.0) {
|
||||
setMonitorShowsCameraViewAndSendToQml(!monitorShowsCameraView);
|
||||
}
|
||||
return;
|
||||
});
|
||||
} else if (controllerType === "Vive") {
|
||||
switchViewControllerMapping.from(Controller.Standard.LeftPrimaryThumb).to(function (value) {
|
||||
if (value === 1.0) {
|
||||
setMonitorShowsCameraViewAndSendToQml(!monitorShowsCameraView);
|
||||
}
|
||||
return;
|
||||
});
|
||||
}
|
||||
}
|
||||
var takeSnapshotControllerMapping;
|
||||
var takeSnapshotControllerMappingName = 'Hifi-SpectatorCamera-Mapping-TakeSnapshot';
|
||||
|
||||
var flash = false;
|
||||
function setFlashStatus(enabled) {
|
||||
var cameraPosition = Entities.getEntityProperties(camera, ["positon"]).position;
|
||||
if (enabled) {
|
||||
if (camera) {
|
||||
Audio.playSound(SOUND_FLASH_ON, {
|
||||
position: cameraPosition,
|
||||
localOnly: true,
|
||||
volume: 0.8
|
||||
});
|
||||
flash = Entities.addEntity({
|
||||
"collidesWith": "",
|
||||
"collisionMask": 0,
|
||||
"color": {
|
||||
"blue": 173,
|
||||
"green": 252,
|
||||
"red": 255
|
||||
},
|
||||
"cutoff": 90,
|
||||
"dimensions": {
|
||||
"x": 4,
|
||||
"y": 4,
|
||||
"z": 4
|
||||
},
|
||||
"dynamic": false,
|
||||
"falloffRadius": 0.20000000298023224,
|
||||
"intensity": 37,
|
||||
"isSpotlight": true,
|
||||
"localRotation": { w: 1, x: 0, y: 0, z: 0 },
|
||||
"localPosition": { x: 0, y: -0.005, z: -0.08 },
|
||||
"name": "Camera Flash",
|
||||
"type": "Light",
|
||||
"parentID": camera,
|
||||
}, true);
|
||||
}
|
||||
} else {
|
||||
if (flash) {
|
||||
Audio.playSound(SOUND_FLASH_OFF, {
|
||||
position: cameraPosition,
|
||||
localOnly: true,
|
||||
volume: 0.8
|
||||
});
|
||||
Entities.deleteEntity(flash);
|
||||
flash = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function onStillSnapshotTaken() {
|
||||
Render.getConfig("SecondaryCameraJob.ToneMapping").curve = 1;
|
||||
sendToQml({
|
||||
method: 'finishedProcessingStillSnapshot'
|
||||
});
|
||||
}
|
||||
function maybeTakeSnapshot() {
|
||||
if (camera) {
|
||||
sendToQml({
|
||||
method: 'startedProcessingStillSnapshot'
|
||||
});
|
||||
|
||||
Render.getConfig("SecondaryCameraJob.ToneMapping").curve = 0;
|
||||
// Wait a moment before taking the snapshot for the tonemapping curve to update
|
||||
Script.setTimeout(function () {
|
||||
Audio.playSound(SOUND_SNAPSHOT, {
|
||||
position: { x: MyAvatar.position.x, y: MyAvatar.position.y, z: MyAvatar.position.z },
|
||||
localOnly: true,
|
||||
volume: 1.0
|
||||
});
|
||||
Window.takeSecondaryCameraSnapshot();
|
||||
}, 250);
|
||||
} else {
|
||||
sendToQml({
|
||||
method: 'finishedProcessingStillSnapshot'
|
||||
});
|
||||
}
|
||||
}
|
||||
function on360SnapshotTaken() {
|
||||
if (monitorShowsCameraView) {
|
||||
setDisplay(true);
|
||||
}
|
||||
sendToQml({
|
||||
method: 'finishedProcessing360Snapshot'
|
||||
});
|
||||
}
|
||||
function maybeTake360Snapshot() {
|
||||
if (camera) {
|
||||
Audio.playSound(SOUND_SNAPSHOT, {
|
||||
position: { x: MyAvatar.position.x, y: MyAvatar.position.y, z: MyAvatar.position.z },
|
||||
localOnly: true,
|
||||
volume: 1.0
|
||||
});
|
||||
if (HMD.active && monitorShowsCameraView) {
|
||||
setDisplay(false);
|
||||
}
|
||||
Window.takeSecondaryCamera360Snapshot(Entities.getEntityProperties(camera, ["positon"]).position);
|
||||
}
|
||||
}
|
||||
function registerTakeSnapshotControllerMapping() {
|
||||
takeSnapshotControllerMapping = Controller.newMapping(takeSnapshotControllerMappingName);
|
||||
if (controllerType === "OculusTouch") {
|
||||
takeSnapshotControllerMapping.from(Controller.Standard.RS).to(function (value) {
|
||||
if (value === 1.0) {
|
||||
maybeTakeSnapshot();
|
||||
}
|
||||
return;
|
||||
});
|
||||
} else if (controllerType === "Vive") {
|
||||
takeSnapshotControllerMapping.from(Controller.Standard.RightPrimaryThumb).to(function (value) {
|
||||
if (value === 1.0) {
|
||||
maybeTakeSnapshot();
|
||||
}
|
||||
return;
|
||||
});
|
||||
}
|
||||
}
|
||||
var controllerType = "Other";
|
||||
function registerButtonMappings() {
|
||||
var VRDevices = Controller.getDeviceNames().toString();
|
||||
if (VRDevices) {
|
||||
if (VRDevices.indexOf("Vive") !== -1) {
|
||||
controllerType = "Vive";
|
||||
} else if (VRDevices.indexOf("OculusTouch") !== -1) {
|
||||
controllerType = "OculusTouch";
|
||||
} else {
|
||||
sendToQml({
|
||||
method: 'updateControllerMappingCheckbox',
|
||||
switchViewSetting: switchViewFromController,
|
||||
takeSnapshotSetting: takeSnapshotFromController,
|
||||
controller: controllerType
|
||||
});
|
||||
return; // Neither Vive nor Touch detected
|
||||
}
|
||||
}
|
||||
|
||||
if (!switchViewControllerMapping) {
|
||||
registerSwitchViewControllerMapping();
|
||||
}
|
||||
setSwitchViewControllerMappingStatus(switchViewFromController);
|
||||
|
||||
if (!takeSnapshotControllerMapping) {
|
||||
registerTakeSnapshotControllerMapping();
|
||||
}
|
||||
setTakeSnapshotControllerMappingStatus(switchViewFromController);
|
||||
|
||||
sendToQml({
|
||||
method: 'updateControllerMappingCheckbox',
|
||||
switchViewSetting: switchViewFromController,
|
||||
takeSnapshotSetting: takeSnapshotFromController,
|
||||
controller: controllerType
|
||||
});
|
||||
}
|
||||
|
||||
// Function Name: onTabletButtonClicked()
|
||||
//
|
||||
// Description:
|
||||
// -Fired when the Spectator Camera app button is pressed.
|
||||
//
|
||||
// Relevant Variables:
|
||||
// -SPECTATOR_CAMERA_QML_SOURCE: The path to the SpectatorCamera QML
|
||||
// -onSpectatorCameraScreen: true/false depending on whether we're looking at the spectator camera app.
|
||||
var SPECTATOR_CAMERA_QML_SOURCE = Script.resolvePath("SpectatorCamera.qml");
|
||||
var onSpectatorCameraScreen = false;
|
||||
function onTabletButtonClicked() {
|
||||
if (!tablet) {
|
||||
print("Warning in onTabletButtonClicked(): 'tablet' undefined!");
|
||||
return;
|
||||
}
|
||||
if (onSpectatorCameraScreen) {
|
||||
// for toolbar-mode: go back to home screen, this will close the window.
|
||||
tablet.gotoHomeScreen();
|
||||
} else {
|
||||
tablet.loadQMLSource(SPECTATOR_CAMERA_QML_SOURCE);
|
||||
}
|
||||
}
|
||||
|
||||
function updateSpectatorCameraQML() {
|
||||
sendToQml({ method: 'initializeUI', masterSwitchOn: !!camera, flashCheckboxChecked: !!flash, monitorShowsCamView: monitorShowsCameraView });
|
||||
registerButtonMappings();
|
||||
Menu.setIsOptionChecked("Disable Preview", false);
|
||||
Menu.setIsOptionChecked("Mono Preview", true);
|
||||
}
|
||||
|
||||
var signalsWired = false;
|
||||
function wireSignals(shouldWire) {
|
||||
if (signalsWired === shouldWire) {
|
||||
return;
|
||||
}
|
||||
|
||||
signalsWired = shouldWire;
|
||||
|
||||
if (shouldWire) {
|
||||
Window.stillSnapshotTaken.connect(onStillSnapshotTaken);
|
||||
Window.snapshot360Taken.connect(on360SnapshotTaken);
|
||||
} else {
|
||||
Window.stillSnapshotTaken.disconnect(onStillSnapshotTaken);
|
||||
Window.snapshot360Taken.disconnect(on360SnapshotTaken);
|
||||
}
|
||||
}
|
||||
|
||||
// Function Name: onTabletScreenChanged()
|
||||
//
|
||||
// Description:
|
||||
// -Called when the TabletScriptingInterface::screenChanged() signal is emitted. The "type" argument can be either the string
|
||||
// value of "Home", "Web", "Menu", "QML", or "Closed". The "url" argument is only valid for Web and QML.
|
||||
function onTabletScreenChanged(type, url) {
|
||||
onSpectatorCameraScreen = (type === "QML" && url === SPECTATOR_CAMERA_QML_SOURCE);
|
||||
wireEventBridge(onSpectatorCameraScreen);
|
||||
// Change button to active when window is first openend OR if the camera is on, false otherwise.
|
||||
if (button) {
|
||||
button.editProperties({ isActive: onSpectatorCameraScreen || camera });
|
||||
}
|
||||
|
||||
// In the case of a remote QML app, it takes a bit of time
|
||||
// for the event bridge to actually connect, so we have to wait...
|
||||
Script.setTimeout(function () {
|
||||
if (onSpectatorCameraScreen) {
|
||||
updateSpectatorCameraQML();
|
||||
}
|
||||
}, 700);
|
||||
|
||||
wireSignals(onSpectatorCameraScreen);
|
||||
}
|
||||
|
||||
// Function Name: sendToQml()
|
||||
//
|
||||
// Description:
|
||||
// -Use this function to send a message to the QML (i.e. to change appearances). The "message" argument is what is sent to
|
||||
// SpectatorCamera QML in the format "{method, params}", like json-rpc. See also fromQml().
|
||||
function sendToQml(message) {
|
||||
if (onSpectatorCameraScreen) {
|
||||
tablet.sendToQml(message);
|
||||
}
|
||||
}
|
||||
|
||||
// Function Name: fromQml()
|
||||
//
|
||||
// Description:
|
||||
// -Called when a message is received from SpectatorCamera.qml. The "message" argument is what is sent from the SpectatorCamera QML
|
||||
// in the format "{method, params}", like json-rpc. See also sendToQml().
|
||||
function fromQml(message) {
|
||||
switch (message.method) {
|
||||
case 'spectatorCameraOn':
|
||||
spectatorCameraOn();
|
||||
break;
|
||||
case 'spectatorCameraOff':
|
||||
spectatorCameraOff();
|
||||
break;
|
||||
case 'setMonitorShowsCameraView':
|
||||
setMonitorShowsCameraView(message.params);
|
||||
break;
|
||||
case 'changeSwitchViewFromControllerPreference':
|
||||
setSwitchViewFromController(message.params);
|
||||
break;
|
||||
case 'changeTakeSnapshotFromControllerPreference':
|
||||
setTakeSnapshotFromController(message.params);
|
||||
break;
|
||||
case 'updateCameravFoV':
|
||||
spectatorCameraConfig.vFoV = message.vFoV;
|
||||
break;
|
||||
case 'setFlashStatus':
|
||||
setFlashStatus(message.enabled);
|
||||
break;
|
||||
case 'takeSecondaryCameraSnapshot':
|
||||
maybeTakeSnapshot();
|
||||
break;
|
||||
case 'takeSecondaryCamera360Snapshot':
|
||||
maybeTake360Snapshot();
|
||||
break;
|
||||
case 'openSettings':
|
||||
if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
|
||||
|| (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
|
||||
Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "GeneralPreferencesDialog");
|
||||
} else {
|
||||
tablet.pushOntoStack("hifi/tablet/TabletGeneralPreferences.qml");
|
||||
}
|
||||
break;
|
||||
default:
|
||||
print('Unrecognized message from SpectatorCamera.qml:', JSON.stringify(message));
|
||||
}
|
||||
}
|
||||
|
||||
// Function Name: onHMDChanged()
|
||||
//
|
||||
// Description:
|
||||
// -Called from C++ when HMD mode is changed. The argument "isHMDMode" is true if HMD is on; false otherwise.
|
||||
function onHMDChanged(isHMDMode) {
|
||||
registerButtonMappings();
|
||||
if (!isHMDMode) {
|
||||
setMonitorShowsCameraView(false);
|
||||
} else {
|
||||
setDisplay(monitorShowsCameraView);
|
||||
}
|
||||
}
|
||||
|
||||
// Function Name: shutdown()
|
||||
//
|
||||
// Description:
|
||||
// -shutdown() will be called when the script ends (i.e. is stopped).
|
||||
function shutdown() {
|
||||
spectatorCameraOff();
|
||||
Window.domainChanged.disconnect(onDomainChanged);
|
||||
Window.geometryChanged.disconnect(resizeViewFinderOverlay);
|
||||
wireSignals(false);
|
||||
addOrRemoveButton(true);
|
||||
if (tablet) {
|
||||
tablet.screenChanged.disconnect(onTabletScreenChanged);
|
||||
if (onSpectatorCameraScreen) {
|
||||
tablet.gotoHomeScreen();
|
||||
}
|
||||
}
|
||||
HMD.displayModeChanged.disconnect(onHMDChanged);
|
||||
Controller.keyPressEvent.disconnect(keyPressEvent);
|
||||
if (switchViewControllerMapping) {
|
||||
switchViewControllerMapping.disable();
|
||||
}
|
||||
if (takeSnapshotControllerMapping) {
|
||||
takeSnapshotControllerMapping.disable();
|
||||
}
|
||||
}
|
||||
|
||||
// Function Name: onDomainChanged()
|
||||
//
|
||||
// Description:
|
||||
// -A small utility function used when the Window.domainChanged() signal is fired.
|
||||
function onDomainChanged() {
|
||||
spectatorCameraOff(true);
|
||||
}
|
||||
|
||||
// These functions will be called when the script is loaded.
|
||||
var SOUND_CAMERA_ON = SoundCache.getSound(Script.resolvePath("cameraOn.wav"));
|
||||
var SOUND_SNAPSHOT = SoundCache.getSound(Script.resolvePath("snap.wav"));
|
||||
var SOUND_FLASH_ON = SoundCache.getSound(Script.resolvePath("flashOn.wav"));
|
||||
var SOUND_FLASH_OFF = SoundCache.getSound(Script.resolvePath("flashOff.wav"));
|
||||
startup();
|
||||
Script.scriptEnding.connect(shutdown);
|
||||
|
||||
}()); // END LOCAL_SCOPE
|
||||
BIN
applications/spectator-camera/static.gif
Normal file
BIN
applications/spectator-camera/static.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 899 KiB |
8
index.html
Normal file
8
index.html
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Refresh" content="0; url=web/index.html" />
|
||||
</head>
|
||||
<body>
|
||||
</body>
|
||||
</html>
|
||||
116
more/app-more.js
Normal file
116
more/app-more.js
Normal file
|
|
@ -0,0 +1,116 @@
|
|||
// app-more.js
|
||||
// VERSION 1.0
|
||||
//
|
||||
// Created by Keb Helion, February 2020.
|
||||
// Copyright "Project Athena" 2020.
|
||||
//
|
||||
// This script adds a "More Apps" selector to Project Athena to allow the user to add optional functionalities to the tablet.
|
||||
// There is already a certain quantity of scripts provided with "interface" but they can't be all be part of the default script.
|
||||
// The current way to figure them in "Edit > Running Script" is not enough descriptive.
|
||||
// In the first Phase, this will expose a choice of optional built-in tools. (Version 1.X)
|
||||
// In a second phase, It could be extended to an external repository. (Version 2.X)
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
(function() {
|
||||
var ROOT = Script.resolvePath('').split("app-more.js")[0];
|
||||
var APP_NAME = "MORE...";
|
||||
var APP_URL = ROOT + "more.html";
|
||||
var APP_ICON_INACTIVE = ROOT + "appicon_i.png";
|
||||
var APP_ICON_ACTIVE = ROOT + "appicon_a.png";
|
||||
var Appstatus = false;
|
||||
var currentlyRunningScripts;
|
||||
|
||||
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
|
||||
var button = tablet.addButton({
|
||||
text: APP_NAME,
|
||||
icon: APP_ICON_INACTIVE,
|
||||
activeIcon: APP_ICON_ACTIVE
|
||||
});
|
||||
|
||||
|
||||
function clicked(){
|
||||
if (Appstatus == true){
|
||||
//print("turn off");
|
||||
tablet.webEventReceived.disconnect(onMoreAppWebEventReceived);
|
||||
tablet.gotoHomeScreen();
|
||||
tablet.screenChanged.disconnect(onMoreAppScreenChanged);
|
||||
}else{
|
||||
//print("turn on");
|
||||
currentlyRunningScripts = ScriptDiscoveryService.getRunning();
|
||||
//print(JSON.stringify(currentlyRunningScripts));
|
||||
|
||||
tablet.gotoWebScreen(APP_URL + "?version=" + Math.floor(Math.random()*50000));
|
||||
|
||||
tablet.webEventReceived.connect(onMoreAppWebEventReceived);
|
||||
tablet.screenChanged.connect(onMoreAppScreenChanged);
|
||||
|
||||
Script.setTimeout(function() {
|
||||
tablet.emitScriptEvent(currentlyRunningScripts);
|
||||
}, 2000);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
Appstatus = !Appstatus;
|
||||
button.editProperties({
|
||||
isActive: Appstatus
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
button.clicked.connect(clicked);
|
||||
|
||||
function onMoreAppWebEventReceived(eventz){
|
||||
|
||||
if(typeof eventz === "string"){
|
||||
eventzget = JSON.parse(eventz);
|
||||
|
||||
|
||||
if(eventzget.type === "MORE_INSTALL"){
|
||||
/*
|
||||
var myVec = {
|
||||
x: parseFloat(eventzget.x),
|
||||
y: parseFloat(eventzget.y),
|
||||
z: parseFloat(eventzget.z)
|
||||
};
|
||||
*/
|
||||
}
|
||||
|
||||
if(eventzget.type === "MORE_UNINSTALL"){
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
function onMoreAppScreenChanged(type, url) {
|
||||
if ((type === "Web")) {
|
||||
Appstatus = true;
|
||||
}else{
|
||||
Appstatus = false;
|
||||
button.editProperties({
|
||||
isActive: Appstatus
|
||||
});
|
||||
tablet.webEventReceived.disconnect(onMoreAppWebEventReceived);
|
||||
tablet.screenChanged.disconnect(onMoreAppScreenChanged);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
tablet.webEventReceived.connect(onMoreAppWebEventReceived);
|
||||
|
||||
|
||||
function cleanup() {
|
||||
tablet.webEventReceived.disconnect(onMoreAppWebEventReceived);
|
||||
tablet.removeButton(button);
|
||||
}
|
||||
|
||||
Script.scriptEnding.connect(cleanup);
|
||||
}());
|
||||
BIN
more/appicon_a.png
Normal file
BIN
more/appicon_a.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 521 B |
BIN
more/appicon_i.png
Normal file
BIN
more/appicon_i.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 511 B |
20
more/local_apps.js
Normal file
20
more/local_apps.js
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
var localApps = {
|
||||
"applications": [
|
||||
{
|
||||
"name": "Doppelganger-Mirror",
|
||||
"description": "Generate an double of your avatar that only you can see. \nThis allows you to examine your avatar and see how you move.\nThe doppelganger can be grabbed and positioned like you want.",
|
||||
"jsfile": "../doppelganger-mirror/app-doppleganger.js",
|
||||
"icon": "../doppelganger-mirror/doppleganger-i.svg",
|
||||
"caption": "MIRROR",
|
||||
"category": "FUNCTIONALITIES"
|
||||
},
|
||||
{
|
||||
"name": "Spectator Camera v2.5",
|
||||
"description": "Give you a video camera that can display its image on your monitor screen for video capture. It can capture from the camera or from the VR Headset. It can also take classic and spherical 360 snapshots (equirectangular format). Definitely a must.",
|
||||
"jsfile": "../spectator-camera/spectatorCamera.js",
|
||||
"icon": "../spectator-camera/spectator-i.svg",
|
||||
"caption": "SPECTATOR",
|
||||
"category": "FUNCTIONALITIES"
|
||||
}
|
||||
]
|
||||
};
|
||||
217
more/more.html
Normal file
217
more/more.html
Normal file
|
|
@ -0,0 +1,217 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<script type="text/javascript" src="../applications/directories.js"></script>
|
||||
<script>
|
||||
function findGetParameter(parameterName) {
|
||||
var result = null,
|
||||
tmp = [];
|
||||
var items = location.search.substr(1).split("&");
|
||||
for (var index = 0; index < items.length; index++) {
|
||||
tmp = items[index].split("=");
|
||||
if (tmp[0] === parameterName) result = decodeURIComponent(tmp[1]);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
//Parameters
|
||||
var offset = findGetParameter("offset");
|
||||
if(offset === null){offset = 0;}
|
||||
|
||||
var perpage = findGetParameter("perpage");
|
||||
if(perpage === null){perpage = 15;}
|
||||
|
||||
var search = findGetParameter("search");
|
||||
if(search === null){search = "";}
|
||||
|
||||
var sort = findGetParameter("sort");
|
||||
if( sort === null){ sort = "asc";}
|
||||
directories.sort();
|
||||
if (sort == "desc"){
|
||||
directories.reverse();
|
||||
}
|
||||
|
||||
var currentPath = window.location.protocol + "//" + window.location.host + "/" + window.location.pathname;
|
||||
var rootPath = currentPath.replace("more/more.html", "applications/");
|
||||
|
||||
|
||||
var currentlyRunningScripts;
|
||||
|
||||
EventBridge.scriptEventReceived.connect(function(message){
|
||||
currentlyRunningScripts = message;
|
||||
});
|
||||
|
||||
function httpGet(theUrl){
|
||||
var xmlHttp = new XMLHttpRequest();
|
||||
xmlHttp.open( "GET", theUrl, false ); // false for synchronous request
|
||||
xmlHttp.send( null );
|
||||
return xmlHttp.responseText;
|
||||
}
|
||||
|
||||
function CheckRunning(scriptName){
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//Fetch the data
|
||||
var counterDir = 0;
|
||||
|
||||
var dataPage = { "applications": [] };
|
||||
|
||||
function ProcessDirectory(item, index){
|
||||
var lowItem = item.toLowerCase();
|
||||
if (lowItem.indexOf(search.toLowerCase()) != -1){
|
||||
counterDir = counterDir + 1;
|
||||
if ((counterDir >= offset) && (counterDir < (offset + perpage))){
|
||||
var appUrl = rootPath + item + "/app.json";
|
||||
var appData = JSON.parse(httpGet(appUrl));
|
||||
dataPage.applications.push(appData);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
directories.forEach(ProcessDirectory);
|
||||
|
||||
|
||||
</script>
|
||||
<style>
|
||||
|
||||
body {
|
||||
background: #73758c;
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 12px;
|
||||
color: #FFFFFF;
|
||||
font-weight: 600;
|
||||
text-decoration: none;
|
||||
font-style: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 28px;
|
||||
color: #ffffff;
|
||||
font-weight: 800;
|
||||
text-decoration: none;
|
||||
font-style: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
text-shadow: 3px 3px 3px rgba(63,64,76,1);
|
||||
}
|
||||
|
||||
font.appname {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 18px;
|
||||
color: #CFB538;
|
||||
font-weight: 800;
|
||||
text-decoration: none;
|
||||
font-style: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
font.appdesc {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 14px;
|
||||
color: #ffffff;
|
||||
font-weight: 500;
|
||||
text-decoration: none;
|
||||
font-style: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
font.caption {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 12px;
|
||||
color: #ffffff;
|
||||
font-weight: 600;
|
||||
text-decoration: none;
|
||||
font-style: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
div.iconContainer{
|
||||
border-radius: 15px;
|
||||
background: #000000;
|
||||
padding: 5px;
|
||||
width: 70px;
|
||||
height: 70px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
table.item {
|
||||
background: #3E415E;
|
||||
}
|
||||
|
||||
td {
|
||||
vertical-align: top;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
button.install {
|
||||
background-color: #008CBA;
|
||||
font-size: 16px;
|
||||
color: #ffffff;
|
||||
font-weight: 600;
|
||||
border-radius: 6px;
|
||||
border: 2px solid #008CBA;
|
||||
transition-duration: 0.3s;
|
||||
}
|
||||
|
||||
button.install:hover {
|
||||
background-color: #10afe3;
|
||||
border: 2px solid #10afe3;
|
||||
}
|
||||
|
||||
button.uninstall {
|
||||
background-color: #b34700;
|
||||
font-size: 16px;
|
||||
color: #ffffff;
|
||||
font-weight: 600;
|
||||
border-radius: 6px;
|
||||
border: 2px solid #b34700;
|
||||
transition-duration: 0.3s;
|
||||
}
|
||||
|
||||
button.uninstall:hover {
|
||||
background-color: #e34c22;
|
||||
border: 2px solid #e34c22;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Add more functionalities...</h1>
|
||||
<script>
|
||||
|
||||
function DisplayApp(item, index) {
|
||||
document.write("<a name = '" + window.btoa(item.name) + "'><table class='item'><tr>");
|
||||
document.write("<td><div class='iconContainer'><img src='" + rootPath + item.icon + "' style='width:50px;'><br><font class = 'caption'>" + item.caption + "</font></div></td>");
|
||||
var btn = "";
|
||||
var absoluteJsFile = rootPath + item.jsfile;
|
||||
if(CheckRunning(absoluteJsFile) != false){
|
||||
//Means already running
|
||||
btn = "<button class='uninstall'>Uninstall</button>";
|
||||
}else{
|
||||
//Means not already installed
|
||||
btn = "<button class='install'>Install</button>";
|
||||
}
|
||||
|
||||
|
||||
document.write("<td><font class='appname'>" + item.name + "<br></font><font class = 'appdesc'>" + item.description + "<br></font><div align='right'>" + btn + "</div></td>");
|
||||
document.write("</tr></table><br><br>");
|
||||
}
|
||||
|
||||
|
||||
|
||||
dataPage.applications.forEach(DisplayApp);
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
1
web/index.html
Normal file
1
web/index.html
Normal file
|
|
@ -0,0 +1 @@
|
|||
<b>Add you application to the repository... instructions</b>
|
||||
235
web/metadata_generator.html
Normal file
235
web/metadata_generator.html
Normal file
|
|
@ -0,0 +1,235 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Application Metadata Generator ("app.json" and "directories.js")</title>
|
||||
</head>
|
||||
<script type="text/javascript" src="../applications/directories.js"></script>
|
||||
<style>
|
||||
h1 {
|
||||
font-size: 24px;
|
||||
color: #CFB538;
|
||||
font-weight: 800;
|
||||
text-decoration: none;
|
||||
font-style: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
font.error {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 16px;
|
||||
color: #FF0000;
|
||||
font-weight: 700;
|
||||
text-decoration: none;
|
||||
font-style: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
input {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 12px;
|
||||
color: #000000;
|
||||
font-weight: 500;
|
||||
text-decoration: none;
|
||||
font-style: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
textarea {
|
||||
width: 100%;
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 12px;
|
||||
color: #000000;
|
||||
font-weight: 500;
|
||||
text-decoration: none;
|
||||
font-style: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
textarea.output {
|
||||
background: #ffff66;
|
||||
width: 100%;
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 12px;
|
||||
color: #000000;
|
||||
font-weight: 700;
|
||||
text-decoration: none;
|
||||
font-style: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
|
||||
body {
|
||||
background: #3E415E;
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 12px;
|
||||
color: #FFFFFF;
|
||||
font-weight: 600;
|
||||
text-decoration: none;
|
||||
font-style: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
input[type="button"]:disabled {
|
||||
color: #bbbbbb;
|
||||
}
|
||||
|
||||
</style>
|
||||
<body>
|
||||
<h1>Application Metadata Generator ("app.json" and "directories.js")</h1>
|
||||
<form name = 'gen'>
|
||||
Directory name: <input type = 'text' size = '60' maxlength="50" name='directory'> (without any path.)<br><br><br>
|
||||
|
||||
|
||||
|
||||
Application Name: <input type = 'text' size = '60' maxlength="50" name='name'><br><br>
|
||||
|
||||
|
||||
Application Description: <br><textarea name ='description' rows = '6' maxlength="1000"></textarea><br><br><br>
|
||||
|
||||
|
||||
Main javascript file name: <input type = 'text' size = '60' maxlength="60" name='jsfilename'> (without any path.)<br><br><br>
|
||||
|
||||
Icon file name: <input type = 'text' size = '60' maxlength="60" name='icon'> (without any path.)<br>
|
||||
Caption: <input type = 'text' size = '30' maxlength="12" name='caption'><br><br><br>
|
||||
|
||||
|
||||
|
||||
<input name = 'generate' type = 'button' onclick = 'genCode();' value ='Generate'><br><br>
|
||||
<div id = 'errormessage'><font class = 'error'> </font></div><br><br>
|
||||
<hr><br>INSTRUCTIONS:<br><br>
|
||||
1- You must include the generated "app.json" file to your application folder.<br><br>
|
||||
2- The file "directories.js" must replace the current one in the "applications" folder. (The one where all the application's folders are stored)<br><br><br>
|
||||
<div style='text-align: center; width:100%;'>
|
||||
<input name = 'dlapp' type = 'button' onclick = 'downloadFile(document.gen.appCode.value, "app.json", "application/json");' style='width:40%;' value ='Download app.json'>
|
||||
|
||||
<input name = 'dldir' type = 'button' onclick = 'downloadFile(document.gen.dirCode.value, "directories.js", "application/javascript");' style='width:40%;' value ='Download directories.js'><br><br>
|
||||
<textarea class = 'output' name ='appCode' rows = '12' style='width:40%;' readonly></textarea>
|
||||
|
||||
<textarea class = 'output' name ='dirCode' rows = '12' style='width:40%;' readonly></textarea>
|
||||
|
||||
|
||||
</form>
|
||||
<script>
|
||||
|
||||
String.prototype.escapeJSON = function() {
|
||||
var result = "";
|
||||
for (var i = 0; i < this.length; i++)
|
||||
{
|
||||
var ch = this[i];
|
||||
switch (ch)
|
||||
{
|
||||
case "\\": ch = "\\\\"; break;
|
||||
case "\'": ch = "\\'"; break;
|
||||
case "\"": ch = '\\"'; break;
|
||||
case "\&": ch = "\\&"; break;
|
||||
case "\t": ch = "\\t"; break;
|
||||
case "\n": ch = "\\n"; break;
|
||||
case "\r": ch = "\\r"; break;
|
||||
case "\b": ch = "\\b"; break;
|
||||
case "\f": ch = "\\f"; break;
|
||||
case "\v": ch = "\\v"; break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
result += ch;
|
||||
}
|
||||
|
||||
return result;
|
||||
};
|
||||
|
||||
function CheckAllowedChar(str){
|
||||
var allowed = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-";
|
||||
var ii;
|
||||
for(ii = 0; ii < str.length; ii = ii + 1 ){
|
||||
if(allowed.indexOf(str.charAt(ii)) == -1){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function downloadFile(theContent, filename, type) {
|
||||
var element = document.createElement('a');
|
||||
element.href = window.URL.createObjectURL(new Blob([theContent], {type: '' + type }));
|
||||
element.download = filename;
|
||||
// Append anchor to body.
|
||||
document.body.appendChild(element);
|
||||
element.click();
|
||||
|
||||
// Remove anchor from body
|
||||
document.body.removeChild(element);
|
||||
}
|
||||
|
||||
|
||||
document.gen.dlapp.disabled = true;
|
||||
document.gen.dldir.disabled = true;
|
||||
|
||||
function genCode(){
|
||||
var errormessage = " ";
|
||||
var name = document.gen.name.value;
|
||||
var description = document.gen.description.value;
|
||||
var jsfilename = document.gen.jsfilename.value;
|
||||
var icon = document.gen.icon.value;
|
||||
var caption = document.gen.caption.value;
|
||||
var directory = document.gen.directory.value;
|
||||
var appJsonCode = "";
|
||||
var dirJsCode = "";
|
||||
|
||||
document.gen.dlapp.disabled = true;
|
||||
document.gen.dldir.disabled = true;
|
||||
|
||||
caption = caption.toUpperCase();
|
||||
|
||||
if (directory == "" || name == "" || description == "" || jsfilename == "" || icon == "" || caption == ""){
|
||||
errormessage = "Error: Something is missing. All the fields are mandatory.";
|
||||
}else{
|
||||
if (CheckAllowedChar(directory) == false){
|
||||
errormessage = "Error: The directory name must not contain spce or special characters. (Allowed: a-z, A-Z, 0-9, -, _ )";
|
||||
}else{
|
||||
appJsonCode = '{\n';
|
||||
appJsonCode = appJsonCode + ' "name": "' + name.escapeJSON() + '",\n';
|
||||
appJsonCode = appJsonCode + ' "description": "' + description.escapeJSON() + '",\n';
|
||||
appJsonCode = appJsonCode + ' "jsfile": "' + directory + "/" + jsfilename + '",\n';
|
||||
appJsonCode = appJsonCode + ' "icon": "' + directory + "/" + icon + '",\n';
|
||||
appJsonCode = appJsonCode + ' "caption": "' + caption.escapeJSON() + '"\n';
|
||||
appJsonCode = appJsonCode + '}';
|
||||
|
||||
|
||||
}
|
||||
|
||||
//add directory to directories
|
||||
var newDirectories = directories;
|
||||
newDirectories.push(directory);
|
||||
|
||||
dirJsCode = "var directories = [\n";
|
||||
newDirectories.forEach(function (item, index) {
|
||||
dirJsCode = dirJsCode + ' "' + item + '"';
|
||||
if (index == (newDirectories.length - 1)){
|
||||
dirJsCode = dirJsCode + "\n";
|
||||
}else{
|
||||
dirJsCode = dirJsCode + ",\n";
|
||||
}
|
||||
});
|
||||
dirJsCode = dirJsCode + "];";
|
||||
|
||||
document.gen.dlapp.disabled = false;
|
||||
document.gen.dldir.disabled = false;
|
||||
|
||||
}
|
||||
document.gen.appCode.value = appJsonCode;
|
||||
document.gen.dirCode.value = dirJsCode;
|
||||
|
||||
document.getElementById("errormessage").innerHTML = "<font class = 'error'>" + errormessage + "</font>";
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in a new issue