Compare commits
No commits in common. "677dab8abde3737087f25dfd53fc979a71f1127b" and "9379e8ab46a6cb4e18b83f9dfcf6e54af448ccb6" have entirely different histories.
677dab8abd
...
9379e8ab46
78 changed files with 221 additions and 5273 deletions
|
|
@ -53,7 +53,7 @@ $ docker run -t xrforge docker.io/coderofsalvation/xrforge:latest -v ./config:/c
|
|||
| `APPNAME` | `XRForge` | manyfold instance name |
|
||||
| `HOMEPAGE` | `/models` | show '/models' URL as homepage (use `/` for manyfold default) |
|
||||
| `THEME` | `default` | bootstrap theme |
|
||||
| 'IMPORT_INSTANCES' | `1` | integrate cherrypicked content from other JanusXR instances (see [manyfold/root/instances](root/instances) |
|
||||
| 'JANUSXR' | `` | run local JanusXR stack (janus-server, janus-gateway, janusweb) |
|
||||
| `AFRAME_VERSION` | `1.7.0` | AFRAME version |
|
||||
| `GODOT_VERSION` | `4.4.1-stable`| godot editor version |
|
||||
| `GODOT_TEMPLATE_ZIP` | `` | godot template zip URL or file (default is empty godot project) |
|
||||
|
|
@ -74,8 +74,6 @@ $ docker run -t xrforge docker.io/coderofsalvation/xrforge:latest -v ./config:/c
|
|||
| `FEDERATE_DRIVE_CACHE`| `1m0s` | specify interval to re-check all models/directories |
|
||||
| `FEDERATE_DRIVE_KEY` | `` | specify path to TLS PEM private key file (`-v ./key.pem:/key.pem -e FEDERATE_DRIVE_KEY=/key.pem` dockerflag e.g.) |
|
||||
| `FEDERATE_DRIVE_CERT` | `` | specify path to TLS PEM public key certificate/CA/intermediate file (`-v ./cert.pem:/cert.pem -e FEDERATE_DRIVE_KEY=/cert.pem` dockerflag e.g.) |
|
||||
| `SERVER_CORS` | `http://localhost:5577`| CORS-ANYWHERE server for JanusWeb |
|
||||
| `SERVER_JANUS` | `http://localhost:5566`| JANUS presence server for JanusWeb |
|
||||
|
||||
> NOTE: if you have nix installed, you can easily try out environment-flags by running: `docker load < $(nix-build nix/docker.nix) && manyfold/cli/manyfold run -e RUNTESTS=1` e.g.
|
||||
|
||||
|
|
@ -137,9 +135,8 @@ The quickest way is:
|
|||
* TIP2: use env-var `RCLONE_REMOTE` to mount only one specific remote (in case of a [combined](https://rclone.org/combine/) or [union](https://rclone.org/union/) rclone remote e.g.).
|
||||
* TIP2: use **alphanumeric** names for rclone remotes (manyfold libraries choke on dot- or other special-characters)
|
||||
|
||||
By default environment-flag `FEDERATE_DRIVE_PATH` will share path `/mnt/experiences` as an open web directory.<br>
|
||||
Make sure that the URL (and credentials if configure) of step 3 are setup properly, so it matches your reverse proxy/ or SSL configuration (via `FEDERATE_DRIVE_CERT` and `FEDERATE_DRIVE_KEY` flags).<br>
|
||||
For more info see the SSL section below.
|
||||
By default environment-flag `FEDERATE_DRIVE_PATH` will share path `/mnt/experiences` as an open web directory.
|
||||
Make sure that the URL (and credentials if configure) of step 3 are setup properly, so it matches your reverse proxy/ or SSL configuration (via `FEDERATE_DRIVE_CERT` and `FEDERATE_DRIVE_KEY` flags)
|
||||
|
||||
# Git libraries
|
||||
|
||||
|
|
@ -195,46 +192,29 @@ $ manyfold/cli/manyfold.sh run -e DEV=1
|
|||
|
||||
# JanusXR
|
||||
|
||||
By default the xrforge docker will run an opensource [JanusXR](https://janusxr.org) stack in the background:
|
||||
When running xrforge with the `JANUSXR=1` env-flag, the opensource [JanusXR](https://janusxr.org) stack will be installed and started:
|
||||
|
||||
* [janus-server](https://github.com/janusvr/janus-server) for chat + syncing avatar positions
|
||||
* [janus-gateway](https://github.com/meetecho/janus-gateway) for video/audio
|
||||
* [janusweb](https://github.com/meetecho/janus-gateway) the viewer using the above services
|
||||
* [janus-server](https://github.com/janusvr/janus-server) at port `5566`, for chat + syncing avatar positions
|
||||
* [cors-anywhere](https://github.com/Rob--W/cors-anywhere) at port `5577`for a hasslefree deep immersive web
|
||||
* TODO: [janus-gateway](https://github.com/meetecho/janus-gateway) for video/audio
|
||||
|
||||
For SSL, you need to configure your reverse proxy as following:
|
||||
> NOTE: consider this a fingers-crossed 'rolling release' installation, as this is not officially part of XRForge (just a helper for intranets).
|
||||
|
||||
* wss://presence.foo.bar.com => localhost:5566
|
||||
* https://cors.foo.bar.com > localhost:5577
|
||||
Note that janus-server exposes a http websocket at port 5566, so you need to configure your reverse proxy as following:
|
||||
|
||||
> This assumes environment-var `FEDERATE_DRIVE_HOST` is set to `https://foo.bar.com` (`presence` / `cors` subdomain is automatically prefixed when running xrforge over https)
|
||||
* https://presence.foo.bar.com => 5566
|
||||
|
||||
# Developing
|
||||
> This assumes environment-var `FEDERATE_DRIVE_HOST` is set to `https://foo.bar.com` (`presence` subdomain is automatically prefixed by the installer)
|
||||
|
||||
#### persist JanusXR stack
|
||||
|
||||
When running the container run the following cmds to speed up the boot-time:
|
||||
|
||||
```
|
||||
$ podman load < $(nix-build nix/docker.nix) # build xrforge-overlay on manyfold-image
|
||||
$ $(./manyfold/cli/manyfold.sh run -e DEV=1) # start docker
|
||||
$ docker cp xrforge:/mnt/janusweb .
|
||||
$ docker cp xrforge:/root/janus-server .
|
||||
```
|
||||
|
||||
> Profit! now point your browser to 'https://localhost:8080'
|
||||
then add the following flags to your docker cmd: `-v ./janusweb:/mnt/janusweb -v ./janus-server:/root/janus-server`
|
||||
|
||||
### With SSL (for WebXR/JanusXR testing)
|
||||
|
||||
> NOTE: WebXR requires SSL, so we need ngrok or [caddy](https://caddyserver.com) to run the docker over SSL:
|
||||
|
||||
```
|
||||
$ $(CADDY=10.171.13.61 ./manyfold/cli/manyfold.sh run -e DEV=1)
|
||||
```
|
||||
|
||||
make sure you have caddy installed before running this as root:
|
||||
|
||||
```
|
||||
# /manyfold/cli/manyfold caddy 10.171.13.61
|
||||
```
|
||||
|
||||
> Profit! now point your browser to `https://<external_ip>`
|
||||
|
||||
you can edit/copy files via:
|
||||
|
||||
* `podman exec -it xrforge vim /manyfold/cli/manyfold.sh` e.g.
|
||||
* `podman cp xrforge:/foo .` and vice versa `podman cp foo xrforge:/.` e.g.
|
||||
> That way JanusXR does not have to be installed every time during boot
|
||||
|
|
|
|||
|
|
@ -6,16 +6,7 @@ test -n "$UPLOAD_PATH" || export UPLOAD_PATH=/mnt/experiences
|
|||
test -n "$THEME" || export THEME=slate
|
||||
test -n "$HOMEPAGE" || export HOMEPAGE=/models
|
||||
test -n "$GODOT_VERSION" || export GODOT_VERSION=4.4.1-stable
|
||||
test -n "$IMPORT_INSTANCES" || export IMPORT_INSTANCES=1
|
||||
test -n "$SERVER_CORS" || export SERVER_CORS=http://localhost:5577
|
||||
test -n "$SERVER_JANUS" || export SERVER_JANUS=http://localhost:5566
|
||||
test -n "$HTTPS_ONLY" || export HTTPS_ONLY=disabled
|
||||
test -n "$CADDY" && {
|
||||
export HTTPS_ONLY=enabled
|
||||
export SERVER_CORS=https://$CADDY:5577
|
||||
export SERVER_JANUS=https://$CADDY:5566
|
||||
export PUBLIC_HOSTNAME=localhost
|
||||
}
|
||||
test -n "$CORS_PROXY" || export CORS_PROXY=1
|
||||
db=/config/manyfold.sqlite3
|
||||
|
||||
# utility funcs
|
||||
|
|
@ -38,25 +29,15 @@ run(){
|
|||
#-e PUBLIC_HOSTNAME=localhost \
|
||||
#-e PUBLIC_PORT=80 \
|
||||
#-e JANUSXR=1 \
|
||||
ports="-p 8080:3214 -p 8081:8081 -p 5566:5566 -p 5577:5577"
|
||||
# shift ports with 1000 if caddy is used as SSL reverse proxy
|
||||
test -n "$CADDY" && {
|
||||
ports='-p 8080:3214 -p 9081:8081 -p 6566:5566 -p 6577:5577'
|
||||
}
|
||||
|
||||
echo ${oci} run "$@" ${ports} --name xrforge \
|
||||
echo ${oci} run "$@" -p 8790:3214 -p 8791:3215 -p 5566:5566 -p 5577:5577 --name xrforge \
|
||||
-e SECRET_KEY_BASE=lkjwljlkwejrlkjek34k234l \
|
||||
-e DATABASE_ADAPTER=sqlite3 \
|
||||
-e FEDERATE_DRIVE_HOST=http://localhost:8081 \
|
||||
-e PUBLIC_HOSTNAME=$PUBLIC_HOSTNAME \
|
||||
-e SERVER_JANUS=$SERVER_JANUS \
|
||||
-e SERVER_CORS=$SERVER_CORS \
|
||||
-e FEDERATE_DRIVE_HOST=http://localhost:8791 \
|
||||
-e SUDO_RUN_UNSAFELY=enabled \
|
||||
-e MULTIUSER=enabled \
|
||||
-e FEDERATION=enabled \
|
||||
-e THEME=$THEME \
|
||||
-e HOMEPAGE=$HOMEPAGE \
|
||||
-e UPLOAD_PATH=$UPLOAD_PATH \
|
||||
-e GODOT_VERSION=4.4.1-stable \
|
||||
-e FEDERATE_DRIVE_CACHE=5s \
|
||||
--cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse \
|
||||
|
|
@ -67,13 +48,8 @@ run(){
|
|||
overlayfs(){
|
||||
test -d /manyfold || return 0; # nothing to override
|
||||
echocolor "[$APPNAME]" "applying filesystem overlay"
|
||||
# compose overlays
|
||||
cd /
|
||||
mkdir /usr/src/app/public/view || true
|
||||
rsync -ravuzi /nix/store/*-janus/janusweb/* /usr/src/app/public/view/.
|
||||
cd /manyfold
|
||||
rsync -rvziL * /.
|
||||
ln -fs /usr/src/app/public/view /mnt/view # /mnt is one big zippable runnable backup
|
||||
rsync -rvzi * /.
|
||||
#apply_patches
|
||||
}
|
||||
|
||||
|
|
@ -103,7 +79,7 @@ hook(){
|
|||
test -d ~/hook.d/$cmd && {
|
||||
find -L ~/hook.d/$cmd/ -type f -executable -maxdepth 1 | sort -V | while read hook; do
|
||||
logger " |+ hook $hook $*"
|
||||
{ $hook "$@" 2>&1 || true; } | awk '{ gsub(/\/root\/\//,"",$1); $1 = sprintf("%-40s", $1)} 1' | logger
|
||||
{ $hook "$@" || true; } 2>&1 | awk '{ gsub(/\/root\/\//,"",$1); $1 = sprintf("%-40s", $1)} 1' | logger
|
||||
done
|
||||
}
|
||||
}
|
||||
|
|
@ -166,13 +142,14 @@ set_upload_path(){
|
|||
echocolor "[$APPNAME]" "configuring upload library"
|
||||
test -d $UPLOAD_PATH || mkdir $UPLOAD_PATH
|
||||
add_lib_to_db $UPLOAD_PATH
|
||||
|
||||
id=$(sqlite3 $db "select id from libraries where path = '$UPLOAD_PATH';")
|
||||
set_global default_library "replace('--- $id\\n','\\n',char(10))"
|
||||
set_global model_path_template "replace('--- \"{creator}/{modelId} \"\\n','\\n',char(10))"
|
||||
sqlite3 $db "INSERT INTO settings VALUES(6,'default_library',$id);
|
||||
INSERT INTO sqlite_sequence VALUES('settings',6);"
|
||||
}
|
||||
|
||||
mount_dir(){
|
||||
find /mnt -type d -mindepth 1 -maxdepth 1 | grep -vE '(janusweb|view)' | while read dir; do
|
||||
find /mnt -type d -mindepth 1 -maxdepth 1 | grep -v janusweb | while read dir; do
|
||||
echocolor "[$APPNAME]" "mounting $dir as library"
|
||||
add_lib_to_db "$dir"
|
||||
done
|
||||
|
|
@ -237,25 +214,8 @@ rename_app(){
|
|||
echocolor "[$APPNAME]" "renaming manyfold to $APPNAME"
|
||||
sed -i 's/title: Manyfold/title: '$APPNAME'/g' /usr/src/app/config/locales/*.yml
|
||||
sed -i 's|powered_by_html:.*|powered_by_html: Radically opensource-powered by <a href="https://manifold.app" target="_blank">Manyfold</a>, <a href="https://xrfragment.org">XR Fragments</a>, <a href="https://github.com/jbaicoianu/janusweb" target="_blank">JanusWeb</a> and <a href="https://nixos.org" target="_blank">NIX</a>|g' /usr/src/app/config/locales/*.yml
|
||||
echocolor "[$APPNAME]" "renaming 'model' to 'experience'"
|
||||
for dir in /usr/src/app/config/locales/*.yml /usr/src/app/config/locales/*/*.yml; do
|
||||
sed -i 's|Models|Experiences|g' "$dir"
|
||||
sed -i 's|Model|Experience|g' "$dir"
|
||||
#sed -i 's|model|experience|g' "$dir"
|
||||
#sed -i 's|models|experiences|g' "$dir"
|
||||
done
|
||||
sed -i 's|File(s) uploaded succesfully|File(s) uploaded succesfully. The experience is now being (re)generated, please be patient and check back later|g' /usr/src/app/config/locales/models/en.yml
|
||||
sed -i 's|File(s) uploaded succesfully|File(s) uploaded succesfully. The experience is now being (re)generated, please be patient and check back later|g' /usr/src/app/config/locales/model_files/en.yml
|
||||
}
|
||||
|
||||
allow_csp(){
|
||||
test -n "$FEDERATE_DRIVE_HOST" || return 0
|
||||
# allow iframes + other federated servers
|
||||
servers='"https://web.janusxr.org", "https://vesta.janusxr.org"'
|
||||
sed -i "s|:self,|:self, $servers, ENV['FEDERATE_DRIVE_HOST'], ENV['SERVER_CORS'], ENV['SERVER_JANUS'],|g" /usr/src/app/app/controllers/application_controller.rb
|
||||
sed -i "s|content_security_policy.connect_src(\*origins)|content_security_policy.connect_src(\*origins);content_security_policy.connect_src( $servers, ENV['FEDERATE_DRIVE_HOST'], ENV['SERVER_CORS'], ENV['SERVER_JANUS'])|g" /usr/src/app/app/controllers/application_controller.rb
|
||||
# content_security_policy.clear_directives()
|
||||
# content_security_policy.default_src '*'
|
||||
sed -i 's|Models|Experiences|g' /usr/src/app/config/locales/*.yml /usr/src/app/config/locales/*/*.yml
|
||||
sed -i 's|Model|Experience|g' /usr/src/app/config/locales/*.yml /usr/src/app/config/locales/*/*.yml
|
||||
}
|
||||
|
||||
start_syslog(){
|
||||
|
|
@ -293,10 +253,7 @@ force_public(){
|
|||
|
||||
import_assets(){
|
||||
test -n "$NO_ASSETS" && return 0 # nothing to do here
|
||||
# mount because rclone does support symlinks outside of the served folder
|
||||
mkdir /mnt/templates && mount --bind /nix/store/*-xrfragments/xrf/templates /mnt/templates
|
||||
mkdir /mnt/assets && mount --bind /nix/store/*-xrfragments/xrf/assets /mnt/assets
|
||||
add_lib_to_db /mnt/assets
|
||||
add_lib_to_db /mnt/asset
|
||||
add_lib_to_db /mnt/templates
|
||||
}
|
||||
|
||||
|
|
@ -310,11 +267,31 @@ janusxr(){
|
|||
|
||||
cd /root/corsanywhere
|
||||
npm install
|
||||
PORT=${SERVER_CORS/*:/} start_server ~/.run-corsanywhere node server.js &
|
||||
PORT=5577 start_server ~/.run-corsanywhere node server.js &
|
||||
|
||||
cd /root
|
||||
chmod +x janus_server-linux
|
||||
PORT=${SERVER_CORS/*:/} start_server ~/.run-janus-server ./janus_server-linux &
|
||||
PORT=5566 start_server ~/.run-janus-server ./janus_server-linux &
|
||||
|
||||
## we should do this in nix/docker.nix but the image gets into GB's :/
|
||||
#which git || apk add git
|
||||
#which janus || apk add janus-gateway
|
||||
#which node || apk add nodejs
|
||||
#which bash || apk add bash
|
||||
#cd /root
|
||||
|
||||
## install server
|
||||
#test -d janus-server || git clone --depth 1 https://github.com/janusvr/janus-server
|
||||
#cd janus-server
|
||||
#test -d node_modules || { apk add npm && npm install; }
|
||||
#test -f config.js || ln -f /root/.config/janus-server/config.js .
|
||||
#start_server(){
|
||||
# while sleep 2s; do
|
||||
# flock -n ~/.janus-server node server.js
|
||||
# echocolor "[janus-server]" "'node server.js' exited (why?)...restarting"
|
||||
# done
|
||||
#}
|
||||
#test -f ~/.janus-server || start_server &
|
||||
}
|
||||
|
||||
init_database(){
|
||||
|
|
@ -325,7 +302,7 @@ init_database(){
|
|||
set_global site_name "'$APPNAME'"
|
||||
set_global site_tagline "'$TAGLINE'"
|
||||
set_global model_tags_auto_tag_new "replace('--- \"\"\\n','\\n',char(10))"
|
||||
set_global model_path_template "replace('--- \"{creator}/{modelId}\"\\n','\\n',char(10))"
|
||||
set_global model_path_template "replace('--- \"{creator}/{modelId} \"\\n','\\n',char(10))"
|
||||
set_upload_path
|
||||
#set_global about "$ABOUT"
|
||||
import_assets
|
||||
|
|
@ -334,25 +311,17 @@ init_database(){
|
|||
touch ${db}.xrforgeinit
|
||||
}
|
||||
|
||||
caddy(){
|
||||
cat Caddyfile | sed 's|ip:|'$1':|g' > /tmp/Caddyfile
|
||||
set -x
|
||||
cat /tmp/Caddyfile
|
||||
cd /tmp
|
||||
$(which caddy) run
|
||||
}
|
||||
|
||||
# The new entrypoint of the docker
|
||||
boot(){
|
||||
echocolor "[$APPNAME]" "booting..."
|
||||
test -z "$NO_OVERLAYFS" && overlayfs
|
||||
start_syslog
|
||||
rename_app
|
||||
allow_csp
|
||||
set_homepage
|
||||
start_hook_daemon
|
||||
mount_rclone
|
||||
janusxr
|
||||
cp /root/templates/ARhome/* /mnt/janusweb/.
|
||||
force_public &
|
||||
|
||||
# enable development mode (disables template caching etc)
|
||||
|
|
|
|||
1
manyfold/mnt/janusweb/media/assets/webui/preview.html
Normal file
1
manyfold/mnt/janusweb/media/assets/webui/preview.html
Normal file
|
|
@ -0,0 +1 @@
|
|||
<janus-ui-settings-panels></janus-ui-settings-panels>
|
||||
20
manyfold/mnt/janusweb/media/assets/webui/preview.json
Normal file
20
manyfold/mnt/janusweb/media/assets/webui/preview.json
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{
|
||||
"apps": {
|
||||
"inventory": "./apps/inventory/inventory.json",
|
||||
"editor": "./apps/editor/editor.json",
|
||||
"locomotion": "./apps/locomotion/locomotion.json",
|
||||
"virtualgamepad": "./apps/virtualgamepad/virtualgamepad.json",
|
||||
"buttons": "./apps/buttons/buttons.json",
|
||||
"xrmenu": "./apps/xrmenu/xrmenu.json"
|
||||
},
|
||||
"includes": [
|
||||
],
|
||||
"templates": {
|
||||
"janusweb.ui": "./preview.html"
|
||||
},
|
||||
"css": [
|
||||
"./themes/preview.css"
|
||||
],
|
||||
"scripts": [
|
||||
]
|
||||
}
|
||||
|
|
@ -1375,9 +1375,3 @@ ui-wizard-navigation ui-buttonbar ui-button.state_active {
|
|||
ui-wizard-navigation ui-buttonbar ui-button.state_active::after {
|
||||
border-left: 1lh solid white;
|
||||
}
|
||||
|
||||
janus-button-voip,
|
||||
janus-button-audio,
|
||||
janus-ui-settings-button{
|
||||
display:none !important;
|
||||
}
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
var fs = require('fs');
|
||||
|
||||
module.exports = {
|
||||
/* Socket port to listen on */
|
||||
port: 5566,
|
||||
|
||||
/* SSL configurations */
|
||||
|
||||
/*
|
||||
************************************************************************
|
||||
*** The following options REQUIRE a redis database to function ! ***
|
||||
************************************************************************
|
||||
*/
|
||||
multiprocess: {
|
||||
enabled: false, // requires redis for IPC
|
||||
processes: 1
|
||||
},
|
||||
partyList: false,
|
||||
redis: {
|
||||
host: "127.0.0.1",
|
||||
port: 6379,
|
||||
//password: null
|
||||
},
|
||||
|
||||
|
||||
/*
|
||||
************************************************************************
|
||||
*** The following options REQUIRE a MySQL database to function ! ***
|
||||
************************************************************************
|
||||
*/
|
||||
|
||||
//// If you want to track how many users are online, set UserList: true.
|
||||
//Userlist: false,
|
||||
|
||||
///* Controls how many results a request for 'users_online' receives. */
|
||||
//maxUserResults: 100,
|
||||
|
||||
///* MySQL database connection info for janus-mysql-auth and janus-mysql-userlist */
|
||||
//MySQL_Hostname: 'localhost',
|
||||
//MySQL_Database: 'janusvr',
|
||||
//MySQL_Username: 'janusvr',
|
||||
//MySQL_Password: 'janusvr',
|
||||
|
||||
///* Authentication mode:
|
||||
// 'none' - Will not attempt to authenticate users,
|
||||
// anyone can connect with any unused userId.
|
||||
// 'optional' - Anyone can connect, but if userId has been registered
|
||||
// a password must be provided.
|
||||
// 'required' - Only users with userids and passwords are allowed to connect.
|
||||
//*/
|
||||
//authMode: "none",
|
||||
//
|
||||
//popularRooms: {
|
||||
// halfLife: 7 * 24 * 60 * 60 * 1000, // set halflife to 7 days
|
||||
// updateInterval: 3000, // interval between weight updates on the popular rooms
|
||||
// masterToken: "changethis"
|
||||
//},
|
||||
|
||||
/*
|
||||
************************************************************************
|
||||
*** The previous options REQUIRE a MySQL database to function ! ***
|
||||
************************************************************************
|
||||
*/
|
||||
|
||||
|
||||
|
||||
/* Plugins must be installed from npm, or manually created in node_module/ to be loaded. */
|
||||
/* hookPlugins are called while parsing messages */
|
||||
hookPlugins: {
|
||||
logon: {
|
||||
plugins: [
|
||||
//" janus-mysql-auth"
|
||||
]
|
||||
},
|
||||
enter_room: {
|
||||
plugins: [
|
||||
// "janus-mysql-popular"
|
||||
]
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
/* methodPlugins add new commands to the server */
|
||||
methodPlugins: {
|
||||
// ping: { plugin: "janus-method-ping" }
|
||||
},
|
||||
|
||||
/* intervalPlugins are called in intervals specified in seconds. */
|
||||
intervalPlugins: [
|
||||
//{ plugin: "janus-mysql-userlist-official", interval: 6 }
|
||||
],
|
||||
};
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
test -n "$2" || { echo "Usage: $0 <input.jpg> <output.jpg> [blurtimes]"; exit 0; }
|
||||
|
||||
# --- Configuration ---
|
||||
# Define the size of the rectangle to crop (Width x Height)
|
||||
CROP_SIZE="128x128"
|
||||
CROP_WIDTH=128
|
||||
CROP_HEIGHT=128
|
||||
BLURTIMES=0
|
||||
|
||||
test -n "$3" && BLURTIMES=$3
|
||||
|
||||
# Input and Output filenames
|
||||
INPUT_FILE="$1" # <-- **CHANGE THIS** to your actual input file name
|
||||
OUTPUT_FILE="$2"
|
||||
|
||||
# --- Pre-Check: Ensure the input file exists ---
|
||||
if [ ! -f "$INPUT_FILE" ]; then
|
||||
echo "🚨 Error: Input file '$INPUT_FILE' not found."
|
||||
echo "Please update the INPUT_FILE variable in the script."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# --- 1. Get the dimensions of the input image ---
|
||||
# The 'identify' command returns image info; we use awk/cut to extract just the dimensions.
|
||||
# Example output format: "1920x1080"
|
||||
IMAGE_GEOMETRY=$(identify -format "%wx%h" "$INPUT_FILE")
|
||||
IMAGE_WIDTH=$(echo "$IMAGE_GEOMETRY" | cut -dx -f1)
|
||||
IMAGE_HEIGHT=$(echo "$IMAGE_GEOMETRY" | cut -dx -f2)
|
||||
|
||||
echo "Input Image: $INPUT_FILE (${IMAGE_GEOMETRY})"
|
||||
echo "Crop Area: $CROP_SIZE"
|
||||
|
||||
# --- 2. Calculate the maximum possible starting coordinates ---
|
||||
# To ensure the 16x16 crop doesn't go off the edge:
|
||||
# Max_X_Start = Image_Width - Crop_Width
|
||||
# Max_Y_Start = Image_Height - Crop_Height
|
||||
MAX_X=$((IMAGE_WIDTH - CROP_WIDTH))
|
||||
MAX_Y=$((IMAGE_HEIGHT - CROP_HEIGHT))
|
||||
|
||||
# Check if the image is too small to crop
|
||||
if [ $MAX_X -lt 0 ] || [ $MAX_Y -lt 0 ]; then
|
||||
echo "🚨 Error: Image dimensions ($IMAGE_GEOMETRY) are smaller than the crop size ($CROP_SIZE)."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# --- 3. Generate Random Coordinates ---
|
||||
# $RANDOM generates a pseudo-random integer (0 to 32767).
|
||||
# We use the modulo operator (%) to limit it to the required range (0 to MAX_X or MAX_Y).
|
||||
|
||||
# Random X-coordinate (0 to MAX_X)
|
||||
RANDOM_X=$((RANDOM % (MAX_X + 1)))
|
||||
|
||||
# Random Y-coordinate (0 to MAX_Y)
|
||||
RANDOM_Y=$((RANDOM % (MAX_Y + 1)))
|
||||
|
||||
# --- 4. Assemble the ImageMagick Geometry String ---
|
||||
# The final geometry string is: <Width>x<Height>+<X_Offset>+<Y_Offset>
|
||||
CROP_GEOMETRY="${CROP_SIZE}+${RANDOM_X}+${RANDOM_Y}"
|
||||
|
||||
echo "Random Start Coordinate: X=${RANDOM_X}, Y=${RANDOM_Y}"
|
||||
echo "ImageMagick Crop String: ${CROP_GEOMETRY}"
|
||||
|
||||
# --- 5. Execute the ImageMagick Command ---
|
||||
# 'convert' is the core command.
|
||||
# -crop: Specifies the geometry string for cropping.
|
||||
# -quality 100: (Optional) Ensures best quality for the output JPEG.
|
||||
test -f $OUTPUT_FILE && rm $OUTPUT_FILE
|
||||
magick "$INPUT_FILE" \
|
||||
-crop "$CROP_GEOMETRY" \
|
||||
-blur 0x$BLURTIMES \
|
||||
-quality 100 \
|
||||
"$OUTPUT_FILE"
|
||||
|
||||
echo "✅ thumbnail generated"
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
#!/usr/bin/env ruby
|
||||
require 'yaml' # For reading input
|
||||
require 'json' # <--- REQUIRED FOR OUTPUT
|
||||
require 'fileutils'
|
||||
require 'pathname'
|
||||
require 'net/http'
|
||||
require 'uri'
|
||||
require 'erb'
|
||||
|
||||
if ! ENV['IMPORT_INSTANCES']
|
||||
exit 0 # nothing to do
|
||||
end
|
||||
|
||||
INPUT_ROOT_DIR = '/root/instances'
|
||||
OUTPUT_ROOT_DIR = '/mnt/instances'
|
||||
|
||||
FileUtils.mkdir_p(OUTPUT_ROOT_DIR)
|
||||
|
||||
puts "scanning yaml-files in /root/instances"
|
||||
|
||||
# 2. Iterate over all 'room.yaml' files recursively
|
||||
Dir.glob(File.join(INPUT_ROOT_DIR, '**', 'room.yaml')).each do |input_file_path|
|
||||
|
||||
begin
|
||||
input_data = YAML.load_file(input_file_path)
|
||||
rescue StandardError => e
|
||||
puts " ❌ Error reading or parsing YAML: #{e.message}"
|
||||
next
|
||||
end
|
||||
|
||||
relative_path = Pathname.new(input_file_path).relative_path_from(Pathname.new(INPUT_ROOT_DIR))
|
||||
path_components = relative_path.to_s.split(File::SEPARATOR)
|
||||
|
||||
unless path_components.length >= 4
|
||||
puts " ⚠️ Skipping: Path structure too shallow. Expected SERVER/AUTHOR/ROOM_NAME/room.yaml"
|
||||
next
|
||||
end
|
||||
|
||||
server_name = path_components[0]
|
||||
author_name = path_components[1]
|
||||
room_name = path_components[2]
|
||||
|
||||
begin
|
||||
u = input_data['url']
|
||||
r = Net::HTTP.new(URI.parse(u).host, URI.parse(u).port)
|
||||
r.use_ssl = (URI.parse(u).scheme == 'https')
|
||||
|
||||
a = r.request(Net::HTTP::Head.new(URI.parse(u).request_uri))
|
||||
|
||||
if a.code.to_i != 200
|
||||
puts " ⚠️ Skipping:HTTP code #{a.code} received :/"
|
||||
next
|
||||
end
|
||||
|
||||
# 5. Construct the final data structure (Hash)
|
||||
output_data = {}
|
||||
output_data['homepage'] = input_data['url']
|
||||
output_data['name'] = input_data['title']
|
||||
output_data['description'] = input_data['description']
|
||||
output_data['image'] = input_data['thumbnail']
|
||||
output_data['tags'] = [server_name]
|
||||
|
||||
output_dir = File.join(OUTPUT_ROOT_DIR, author_name, room_name)
|
||||
output_file_path = File.join(output_dir, 'datapackage.json')
|
||||
|
||||
begin
|
||||
|
||||
url = URI(input_data['thumbnail'])
|
||||
output_path = output_dir+"/.xrforge/thumbnail.jpg"
|
||||
|
||||
Net::HTTP.start(url.host, url.port, use_ssl: url.scheme == "https") do |http|
|
||||
request = Net::HTTP::Get.new(url)
|
||||
http.request(request) do |response|
|
||||
raise "Download failed: #{response.code}" unless response.is_a?(Net::HTTPSuccess)
|
||||
|
||||
File.open(output_path, "wb") do |file|
|
||||
response.read_body do |chunk|
|
||||
file.write(chunk)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if a.code.to_i != 200
|
||||
puts " ⚠️ Skipping:HTTP code #{a.code} receivedfor thumbnail :/"
|
||||
next
|
||||
end
|
||||
|
||||
# write datapackage.json
|
||||
FileUtils.mkdir_p(output_dir) # Create directory (including parents)
|
||||
File.write(output_file_path, JSON.pretty_generate(output_data))
|
||||
puts " ✅ HTTP 200: Wrote #{output_file_path}"
|
||||
|
||||
# write janusxr.html + scene.jml
|
||||
templateDir = File.dirname(__FILE__)+"/../../templates/"
|
||||
FileUtils.mkdir_p(output_dir+"/.xrforge") # Create directory (including parents)
|
||||
data = output_data
|
||||
data['title'] = output_data['name']
|
||||
$links = []
|
||||
janusweb_src = ENV['DEV'] ? "/mnt/janusweb/janusweb.js" : "/mnt/janusweb/janusweb.min.js"
|
||||
jml = ERB.new( File.read( templateDir+"JML/portalAR.erb" ) ).result(binding)
|
||||
html = ERB.new( File.read( templateDir+"JML/client.html") ).result(binding)
|
||||
File.write(output_dir+"/.xrforge/scene.jml", jml )
|
||||
puts " ✅ Wrote #{output_dir}/.xrforge/scene.jml"
|
||||
File.write(output_dir+"/.xrforge/janusxr.html", html )
|
||||
puts " ✅ Wrote #{output_dir}/.xrforge/janusxr.html"
|
||||
|
||||
rescue StandardError => e
|
||||
puts " ❌ Error writing output file: #{e.message}"
|
||||
end
|
||||
rescue StandardError => e
|
||||
# Optionally handle error quietly or output e.message
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
#!/usr/bin/env ruby
|
||||
|
||||
require 'json'
|
||||
require_relative './../../xrforge.rb'
|
||||
|
||||
# Check if a filename is provided
|
||||
if ARGV.length != 1
|
||||
puts "Usage: #{$0} <path/to/experience/datapackage.json>"
|
||||
exit 1
|
||||
end
|
||||
|
||||
filename = ARGV[0]
|
||||
|
||||
begin
|
||||
|
||||
# dont run for each file-update
|
||||
if ! filename.end_with?("datapackage.json")
|
||||
exit 0
|
||||
end
|
||||
|
||||
# Change the directory
|
||||
dir = File.dirname(filename)
|
||||
dirPublic = dir.gsub("/mnt/","").gsub("#","%23")
|
||||
Dir.chdir( File.dirname(filename) )
|
||||
# Read and parse the JSON file
|
||||
data = JSON.parse( File.read( "datapackage.json" ) )
|
||||
logfile = File.join( File.dirname(filename), ".xrforge/log.txt" )
|
||||
|
||||
XRForge.log("✅ starting generating audiovisual experience", logfile)
|
||||
|
||||
# Check if a model file was found after the loop
|
||||
#model_file = XRForge.getExperienceFile(data,dir,logfile)
|
||||
#if ! model_file
|
||||
# XRForge.log("❌ No suitable 3D file found for JanusXR-compatible experience", logfile)
|
||||
# exit
|
||||
#end
|
||||
|
||||
# Get the value of the environment variable FEDERATE_DRIVE_HOST
|
||||
federate_drive_host = ENV['FEDERATE_DRIVE_HOST']
|
||||
|
||||
autogenerate = true
|
||||
|
||||
if ! data['description']
|
||||
|
||||
end
|
||||
XRForge.log("✅ generated audiovisual experience", logfile)
|
||||
XRForge.log(" ", logfile)
|
||||
|
||||
# tag it!
|
||||
if ! data['keywords'].include?('audiovisual')
|
||||
data['keywords'].push('audiovisual')
|
||||
File.write("datapackage.json", JSON.pretty_generate(data) )
|
||||
end
|
||||
|
||||
rescue Errno::ENOENT
|
||||
puts "File #{filename} not found"
|
||||
rescue JSON::ParserError
|
||||
puts "Error parsing JSON from #{filename}"
|
||||
rescue => e
|
||||
puts "An error occurred: #{e.message}"
|
||||
end
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
require 'json'
|
||||
require 'erb'
|
||||
require 'cgi'
|
||||
require_relative './../../xrforge.rb'
|
||||
|
||||
# Check if a filename is provided
|
||||
|
|
@ -22,6 +21,7 @@ def addLink(url)
|
|||
return url
|
||||
end
|
||||
|
||||
|
||||
begin
|
||||
|
||||
# dont run for each file-update
|
||||
|
|
@ -49,6 +49,9 @@ begin
|
|||
XRForge.log("❌ No suitable 3D file found for JanusXR-compatible experience", logfile)
|
||||
end
|
||||
|
||||
# Get the value of the environment variable FEDERATE_DRIVE_HOST
|
||||
federate_drive_host = ENV['FEDERATE_DRIVE_HOST']
|
||||
|
||||
autogenerate = true
|
||||
janusweb_src = ENV['DEV'] ? "/janusweb/janusweb.js" : "/janusweb/janusweb.min.js"
|
||||
|
||||
|
|
@ -101,19 +104,16 @@ begin
|
|||
xrf_base = model_file ? File.basename(model_file, xrf_ext) : ""
|
||||
|
||||
# remove the metadata from the description
|
||||
description = CGI.escapeHTML(
|
||||
data['description'].gsub(metadataRegex,"")
|
||||
.strip()
|
||||
)
|
||||
description = data['description'].gsub(metadataRegex,"").strip()
|
||||
|
||||
data['resources'].each do |resource|
|
||||
ext = File.extname(resource['path'])
|
||||
|
||||
if ext.match(/(mp3|ogg)/i)
|
||||
if ext.match(/mp3/i)
|
||||
audiovisual = model_file ? false : true
|
||||
base = File.basename(resource['path'], ext)
|
||||
soundtrackUrl = addLink("model_files/#{resource["path"]}")
|
||||
assets += " <assetsound id=\"soundtrack\" src=\"#{soundtrackUrl}\"/>\n"
|
||||
soundtrackUrl = addLink("#{federate_drive_host}/#{dirPublic}/#{resource["path"]}")
|
||||
assets += " <assetsound id=\"soundtrack\" src=\"#{soundtrack_url}\"/>\n"
|
||||
objects += "<sound id=\"soundtrack\" loop=\"true\"/>\n"
|
||||
end
|
||||
|
||||
|
|
@ -124,7 +124,7 @@ begin
|
|||
|
||||
audiovisual = model_file ? false : true
|
||||
base = File.basename(resource['path'], ext)
|
||||
videoSrc = addLink("model_files/#{resource["path"]}")
|
||||
videoSrc = addLink("#{federate_drive_host}/#{dirPublic}/#{resource["path"]}")
|
||||
assets += "<assetimage id=\"image\" src=\"#{videoSrc}\" loop=\"true\" auto_play=\"true\"/>\n"
|
||||
objects += " <Object cull_face=\"none\" id=\"rplane\" js_id=\"image\" lighting=\"false\" pos=\"0 6.5 5.5\" scale=\"4 4 1\" image_id=\"image\"/>\n"
|
||||
end
|
||||
|
|
@ -133,7 +133,7 @@ begin
|
|||
if ext.match(/mp4/i) || ext.match(/webm/i)
|
||||
audiovisual = model_file ? false : true
|
||||
base = File.basename(resource['path'], ext)
|
||||
videoSrc = addLink("model_files/#{resource["path"]}")
|
||||
videoSrc = addLink("#{federate_drive_host}/#{dirPublic}/#{resource["path"]}")
|
||||
assets += "<assetvideo id=\"video\" src=\"#{videoSrc}\" loop=\"true\" auto_play=\"true\"/>\n"
|
||||
objects += " <Object cull_face=\"none\" id=\"rplane\" js_id=\"video\" lighting=\"false\" pos=\"0 6.5 5.5\" scale=\"4 4 1\" video_id=\"video\"/>\n"
|
||||
end
|
||||
|
|
@ -143,7 +143,7 @@ begin
|
|||
# TODO: copy files from a heuristic-based folder instead hardcoding it here
|
||||
startpos = "pos=\"0 0 -10\""
|
||||
use_local_asset = "room5"
|
||||
rplaneSrc = addLink("model_files/roundedplane.glb")
|
||||
rplaneSrc = addLink("#{federate_drive_host}/#{dirPublic}/roundedplane.glb")
|
||||
system("cp /root/templates/audiovisual/roundedplane.glb #{dir}/.")
|
||||
assets += " <assetobject id=\"rplane\" src=\"#{rplaneSrc}\"/>\n"
|
||||
objects += " <Object cull_face=\"none\" id=\"rplane\" js_id=\"text_rplane\" lighting=\"false\" pos=\"2.69 1.84 -3.37\" rotation=\"0 45 0\" scale=\"1.6 1 1\"/>\n"
|
||||
|
|
@ -164,11 +164,11 @@ begin
|
|||
end
|
||||
|
||||
if description && !data['keywords'].include?('nodescription')
|
||||
objects += " <paragraph pos=\"2.8 1 -3.21\" fwd=\"0 0 1\" lighting=\"false\" rotation=\"180 -45 180\" col=\"0.5 0.8 0.5\" scale=\"2 2 2\" font_size=\"50\" locked=\"false\">#{description}</paragraph>\n"
|
||||
objects += " <Paragraph pos=\"2.8 1 -3.21\" fwd=\"0 0 1\" lighting=\"false\" rotation=\"180 -45 180\" col=\"0.5 0.8 0.5\" scale=\"2 2 2\" font_size=\"50\" locked=\"false\">#{description}</Paragraph>\n"
|
||||
end
|
||||
|
||||
if model_file
|
||||
objectSrc = "model_files/#{model_file.gsub("#","%23")}"
|
||||
objectSrc = "#{federate_drive_host}/#{dirPublic}/#{model_file.gsub("#","%23")}"
|
||||
if ! $links.include?(objectSrc)
|
||||
objectSrc = addLink(objectSrc)
|
||||
assets += " <assetobject id=\"experience\" src=\"#{objectSrc}\"/>\n"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ end
|
|||
|
||||
filename = ARGV[0]
|
||||
|
||||
|
||||
# dont run for each file-update
|
||||
if ! filename.end_with?("datapackage.json")
|
||||
exit 0
|
||||
|
|
@ -69,7 +68,6 @@ begin
|
|||
logfile = File.join( File.dirname(filename), ".xrforge/log.txt" )
|
||||
|
||||
data['keywords'].each do |tag|
|
||||
puts tag
|
||||
if tag.match?(/^@.*@.*\./) # scan for activitypub handle (@foo@mastodon.online e.g.)
|
||||
generate(tag,filename,dir,data,logfile)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
url: https://vesta.janusxr.org/spyduck/lains-bedroom-serial-experiments-lain
|
||||
title: "Lain's Bedroom"
|
||||
description: "Recreation of the protagonist's bedroom from Serial Experiments Lain"
|
||||
thumbnail: https://vesta.janusxr.org/assets/thumbs/spyduck/c59d083f4c3e9fcde3f525d28d8acd69.jpg
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title><%=data['title']%> - JanusXR</title>
|
||||
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, maximum-scale=1.0, width=device-width" />
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
|
||||
<!--
|
||||
<meta name="theme-color" content="#2f363b">
|
||||
<meta http-equiv="origin-trial" data-feature="WebVR" data-expires="2017-06-12" content="Avy/Fo2QM5trR+WVHnaVz0t3LVltGxx3yvpSYSCC2oklwuDEYUEK6YdnxYv4p687MJGB61q//htZUvSIZPg93goAAABOeyJvcmlnaW4iOiJodHRwczovL3dlYi5qYW51c3ZyLmNvbTo0NDMiLCJmZWF0dXJlIjoiV2ViVlIiLCJleHBpcnkiOjE0OTczMTIwMDB9">
|
||||
<meta name="twitter:card" content="summary_large_image" />
|
||||
<meta name="twitter:site" content="@bai0" />
|
||||
<meta name="twitter:title" content="JanusWeb" />
|
||||
<meta name="twitter:description" content="The World Within The Web" />
|
||||
<meta name="twitter:image" content="https://janusxr.org/backgrounds/wallpapers/generic.png" />
|
||||
<meta name="twitter:image:alt" content="JanusWeb" />
|
||||
<meta property="og:app_id" content="1197654320349894" />
|
||||
<meta property="og:url" content="https://web.janusxr.org/" />
|
||||
<meta property="og:type" content="website" />
|
||||
<meta property="og:title" content="JanusWeb" />
|
||||
<meta property="og:description" content="The World Within The Web" />
|
||||
<meta property="og:image" content="https://janusxr.com/backgrounds/wallpapers/generic.png" />
|
||||
-->
|
||||
</head>
|
||||
<body>
|
||||
<janus-viewer homepage="/" autostart="false" showavatar="false">
|
||||
<%=jml%>
|
||||
</janus-viewer>
|
||||
<!-- archive.org hints -->
|
||||
<% $links.each do |link| %>
|
||||
<a href="<%=link%>"></a>
|
||||
<% end %>
|
||||
|
||||
<!-- map URL query args to room-attributes -->
|
||||
<script>
|
||||
args = new URLSearchParams(document.location.search)
|
||||
for( const [k,v] of args.entries()) document.querySelector("Room").setAttribute(k,v)
|
||||
</script>
|
||||
<script src="<%=janusweb_src%>"></script>
|
||||
<script>
|
||||
let serveruri = "ws://"+document.location.hostname+":5566"
|
||||
let corsproxy = document.location.origin.replace(/:[0-9].*/,'')+":5577/"
|
||||
if( document.location.protocol.match(/https/) ){
|
||||
corsproxy = corsproxy.replace(/\/\//,"//cors.").replace(/:[0-9].*/,"/")
|
||||
serveruri = serveruri.replace(/ws:\/\//,"wss://presence.").replace(/:[0-9].*/,"")
|
||||
}
|
||||
elation.config.set("engine.assets.corsproxy", corsproxy )
|
||||
elation.config.set("janusweb.network.host", serveruri )
|
||||
elation.janusweb.init({
|
||||
uiconfig: `/janusweb/media/assets/webui/${ args.get("networking") == "false" ? "preview" : "default"}.json`,
|
||||
// for more opts see getClientArgs() in
|
||||
// https://github.com/jbaicoianu/janusweb/blob/master/scripts/client.js
|
||||
})
|
||||
.then( (client) => {
|
||||
elation.janusweb.init = function(){} // prevent multi-inits
|
||||
})
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<!-- Hi there! Below is autogenerated JanusXR Markup (JML). -->
|
||||
<!-- If you want to tweak it, then first disable autogeneration -->
|
||||
<!-- How? remove the 'autogenerate' attribute from the <Room> tag below -->
|
||||
<!-- Please note: the tags will **no longer** reflect this JML -->
|
||||
<!-- -->
|
||||
<!-- JML info: -->
|
||||
<!-- https://coderofsalvation.github.io/janus-guide/#/examples/markup -->
|
||||
<!-- https://janusxr.org/docs/build/introtojml/index.html -->
|
||||
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<fireboxroom>
|
||||
<Assets>
|
||||
</Assets>
|
||||
<Room pos="0 0 0" skybox="true" showavatar="false" use_local_asset="room_plane">
|
||||
<link url="<%=data['url']%> col="1.0 0.0 1.0" title="<%=data['title']%> pos="0 0 5" scale="1.8 3.2 1"/>
|
||||
<Paragraph pos="2.8 1 -3.21" fwd="0 0 1" lighting="false" rotation="180 -45 180" col="0.5 0.8 0.5" scale="2 2 2" font_size="50" locked="false"><%=data['description']%></Paragraph>
|
||||
</Room>
|
||||
</fireboxroom>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<FireBoxRoom>
|
||||
<Assets>
|
||||
<%=assets%>
|
||||
<assetimage id="home" src="/view/home.png"/>
|
||||
</Assets>
|
||||
<Room autogenerate="true" <%=use_local_asset%> <%=private%> <%=showavatar%> <%=startpos%>>
|
||||
<%=objects%>
|
||||
<link url="/models" col="1.0 0.0 1.0" title="back to home" pos="0 0 -5" scale="1.8 3.2 1" image_id="home"/>
|
||||
</Room>
|
||||
</FireBoxRoom>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<FireBoxRoom>
|
||||
<Assets>
|
||||
<%=assets%>
|
||||
<assetimage id="home" src="/view/home.png"/>
|
||||
</Assets>
|
||||
<Room autogenerate="true" <%=use_local_asset%> <%=private%> <%=showavatar%> <%=startpos%>>
|
||||
<%=objects%>
|
||||
<link url="/models" col="1.0 0.0 1.0" title="back to home" pos="0 0 -5" scale="1.8 3.2 1" image_id="home"/>
|
||||
</Room>
|
||||
</FireBoxRoom>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
<fireboxroom>
|
||||
<assets>
|
||||
<assetimage id="image" src="lobby.png"/>
|
||||
<assetvideo auto_play="true" id="video" loop="true" src="video.mp4"/>
|
||||
<assetobject id="rplane" src="roundedplane.glb"/>
|
||||
</assets>
|
||||
<room use_local_asset="room5" pos="0 0 -10">
|
||||
<Object cull_face="none" id="rplane" js_id="video" lighting="false" pos="0 6.5 5.5" scale="4 4 1" video_id="video"/>
|
||||
<Object cull_face="none" id="rplane" js_id="text_rplane" lighting="false" pos="2.69 1.84 -3.37" rotation="0 45 0" scale="1.6 1 1"/>
|
||||
<Paragraph pos="2.8 1 -3.21" fwd="0 0 1" lighting="false" rotation="180 -45 180" col="0.5 0.8 0.5" scale="2 2 2" font_size="50" locked="false">
|
||||
This is a template for audiovisual experiences. Use it for beautiful spatial music/video releases, by just upload/replacing an audio- or video-file.
|
||||
</Paragraph>
|
||||
</room>
|
||||
</fireboxroom>
|
||||
<title>Audiovisual</title>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 821 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 51 KiB |
|
|
@ -142,7 +142,7 @@ module XRForge
|
|||
end
|
||||
end
|
||||
end
|
||||
return model_file ? File.basename(model_file) : model_file
|
||||
return File.basename(model_file)
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ class Components::ModelCard < Components::Base
|
|||
#open_button
|
||||
#whitespace
|
||||
if ! @model.tags.where(name: "singleuser" ).any?
|
||||
a alt: "start a meeting at this location", href: "/view/index.html?profile=default#janus.url="+model_url(@model), target: "_blank", class: "btn btn-secondary btn-sm" do
|
||||
a alt: "start a meeting at this location", href: ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/janusxr.html", target: "_blank", class: "btn btn-secondary btn-sm" do
|
||||
i class: "bi bi-telephone"
|
||||
img src: "/assets/janusxr.svg", style: "width: 16px; margin-left: 7px; transform: translate(0px,-2px);"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -15,14 +15,15 @@ class Components::PreviewFrame < Components::Base
|
|||
|
||||
def view_template
|
||||
|
||||
if @file
|
||||
a href: "/view/index.html?profile=preview#janus.url="+model_url(@file.model), target: "_blank" do
|
||||
a href: ENV['FEDERATE_DRIVE_HOST']+"/"+@file.model.library.name+"/"+@file.model.path.gsub("#","%23")+"/.xrforge/janusxr.html?networking=false", target: "_blank" do
|
||||
#a href: "/view?#{model_model_file_path(@file.model, @file, format: @file.extension)}", target:"_blank", alt: "launch single-user experience" do
|
||||
if @file
|
||||
local
|
||||
elsif @object.remote?
|
||||
remote
|
||||
else
|
||||
empty
|
||||
end
|
||||
elsif @object.remote?
|
||||
remote
|
||||
else
|
||||
empty
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,167 +0,0 @@
|
|||
class ApplicationController < ActionController::Base
|
||||
include Pundit::Authorization
|
||||
include BetterContentSecurityPolicy::HasContentSecurityPolicy
|
||||
after_action :verify_authorized, except: :index, unless: -> { respond_to?(:fasp_client_controller?) }
|
||||
after_action :verify_policy_scoped, only: :index, unless: -> { respond_to?(:fasp_client_controller?) }
|
||||
after_action :set_content_security_policy_header, if: -> { request.format.html? }
|
||||
|
||||
before_action :authenticate_user!, unless: -> { SiteSettings.multiuser_enabled? || has_signed_id? }
|
||||
around_action :switch_locale, if: -> { request.format.html? }
|
||||
before_action :check_for_first_use
|
||||
before_action :show_security_alerts
|
||||
before_action :check_scan_status
|
||||
before_action :remember_ordering
|
||||
before_action :restore_failed_search
|
||||
|
||||
protect_from_forgery with: :null_session, if: :is_api_request?
|
||||
|
||||
rescue_from ScopedSearch::QueryNotSupported, with: -> {
|
||||
flash[:alert] = t("application.search_error")
|
||||
flash[:query] = params[:q]
|
||||
redirect_back_or_to root_path
|
||||
}
|
||||
|
||||
unless Rails.env.test?
|
||||
rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
|
||||
end
|
||||
|
||||
def index
|
||||
raise NotImplementedError
|
||||
end
|
||||
|
||||
def authenticate_admin_user!
|
||||
authenticate_user!
|
||||
render plain: "401 Unauthorized", status: :unauthorized unless current_user.is_administrator?
|
||||
end
|
||||
|
||||
def check_for_first_use
|
||||
authenticate_user! if User.count == 0 # rubocop:disable Pundit/UsePolicyScope
|
||||
redirect_to(edit_user_registration_path) if current_user&.reset_password_token == "first_use"
|
||||
end
|
||||
|
||||
def check_scan_status
|
||||
@scan_in_progress = Sidekiq::Queue.new("scan").size > 0
|
||||
end
|
||||
|
||||
def remember_ordering
|
||||
session["order"] ||= "name"
|
||||
session["order"] = params["order"] if params["order"]
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def restore_failed_search
|
||||
@query ||= flash[:query]
|
||||
end
|
||||
|
||||
def is_api_request?
|
||||
request.format.manyfold_api_v0?
|
||||
end
|
||||
|
||||
def has_signed_id?
|
||||
params[:id] && ApplicationRecord.signed_id_verifier.valid_message?(params[:id])
|
||||
end
|
||||
|
||||
def img_src
|
||||
host = begin
|
||||
SiteSettings.site_icon ? URI.parse(SiteSettings.site_icon).host : nil
|
||||
rescue
|
||||
nil
|
||||
end
|
||||
[
|
||||
:self, "https://web.janusxr.org", "https://vesta.janusxr.org", ENV['FEDERATE_DRIVE_HOST'], ENV['SERVER_CORS'], ENV['SERVER_JANUS'],
|
||||
:data,
|
||||
host,
|
||||
"https://cdn.jsdelivr.net",
|
||||
"https://raw.githubusercontent.com",
|
||||
SiteSettings.federation_enabled? ? :https : nil
|
||||
].compact
|
||||
end
|
||||
|
||||
def frame_src
|
||||
[
|
||||
:self, "https://web.janusxr.org", "https://vesta.janusxr.org", ENV['FEDERATE_DRIVE_HOST'], ENV['SERVER_CORS'], ENV['SERVER_JANUS'],
|
||||
SiteSettings.federation_enabled? ? :https : nil
|
||||
].compact
|
||||
end
|
||||
|
||||
def configure_content_security_policy
|
||||
return if Rails.env.test?
|
||||
|
||||
# Standard security policy
|
||||
content_security_policy.default_src :self
|
||||
content_security_policy.connect_src :self
|
||||
content_security_policy.frame_ancestors :self
|
||||
content_security_policy.frame_src(*frame_src)
|
||||
content_security_policy.font_src :self, "https://web.janusxr.org", "https://vesta.janusxr.org", ENV['FEDERATE_DRIVE_HOST'], ENV['SERVER_CORS'], ENV['SERVER_JANUS'], "https://cdn.jsdelivr.net", "https://fonts.gstatic.com"
|
||||
content_security_policy.img_src(*img_src)
|
||||
content_security_policy.object_src :none
|
||||
content_security_policy.script_src :self
|
||||
content_security_policy.style_src :self
|
||||
content_security_policy.style_src_attr :unsafe_inline
|
||||
content_security_policy.style_src_elem :self, "https://web.janusxr.org", "https://vesta.janusxr.org", ENV['FEDERATE_DRIVE_HOST'], ENV['SERVER_CORS'], ENV['SERVER_JANUS'], "nonce-#{content_security_policy_nonce}", "https://fonts.googleapis.com"
|
||||
# Add library origins
|
||||
origins = Library.all.filter_map(&:storage_origin) # rubocop:disable Pundit/UsePolicyScope
|
||||
content_security_policy.img_src(*origins)
|
||||
content_security_policy.connect_src(*origins);content_security_policy.connect_src( "https://web.janusxr.org", "https://vesta.janusxr.org", ENV['FEDERATE_DRIVE_HOST'], ENV['SERVER_CORS'], ENV['SERVER_JANUS'])
|
||||
# If we're using Scout DevTrace in local development, we need to allow a load
|
||||
# of inline stuff, so we need to add that and NOT add the nonce
|
||||
if Rails.env.development? && ENV.fetch("SCOUT_DEV_TRACE", false) === "true"
|
||||
scout_csp = [:unsafe_inline, "https://apm.scoutapp.com", "https://scoutapm.com"]
|
||||
content_security_policy.img_src(*scout_csp)
|
||||
content_security_policy.script_src(*scout_csp)
|
||||
content_security_policy.style_src(*scout_csp)
|
||||
content_security_policy.connect_src(*scout_csp)
|
||||
content_security_policy.frame_src(*scout_csp)
|
||||
else
|
||||
content_security_policy.script_src "nonce-#{content_security_policy_nonce}"
|
||||
end
|
||||
end
|
||||
|
||||
def switch_locale(&action)
|
||||
locale = current_user&.interface_language || request.env["rack.locale"]
|
||||
I18n.with_locale(locale.presence, &action)
|
||||
end
|
||||
|
||||
def show_security_alerts
|
||||
return unless current_user&.is_administrator?
|
||||
return if ENV.fetch("SUDO_RUN_UNSAFELY", nil) === "enabled"
|
||||
flash.now[:alert] = t("security.running_as_root_html") if Process.uid == 0
|
||||
end
|
||||
|
||||
def random_delay
|
||||
# Not sure how secure this is; it's used to help with timing attacks on login ID lookups
|
||||
# by adding a random 0-2 second delay into the response. There is probably a better way.
|
||||
sleep Random.new.rand(2.0)
|
||||
end
|
||||
|
||||
def user_not_authorized
|
||||
if current_user
|
||||
raise ActiveRecord::RecordNotFound
|
||||
else
|
||||
redirect_to new_session_path(:user)
|
||||
end
|
||||
end
|
||||
|
||||
def set_indexable(content)
|
||||
arr = Array(content)
|
||||
@indexing_directives = [
|
||||
("noindex" unless arr.map(&:indexable?).all?),
|
||||
("noai noimageai" unless arr.map(&:ai_indexable?).all?)
|
||||
].compact.join(" ")
|
||||
response.headers["X-Robots-Tag"] = @indexing_directives if @indexing_directives.presence
|
||||
end
|
||||
|
||||
def send_file_content(attachment, disposition: :attachment, derivative: nil)
|
||||
head :not_found and return if attachment.nil?
|
||||
# Check if we can send a direct URL
|
||||
redirect_to(attachment.url, allow_other_host: true) if /https?:\/\//.match?(attachment.url)
|
||||
# Otherwise provide a direct download
|
||||
status, headers, body = attachment.to_rack_response(disposition: disposition)
|
||||
self.status = status
|
||||
self.headers.merge!(headers)
|
||||
self.response_body = body
|
||||
rescue Errno::ENOENT
|
||||
head :internal_server_error
|
||||
end
|
||||
end
|
||||
|
|
@ -1,157 +0,0 @@
|
|||
# app/controllers/cors_proxy_controller.rb
|
||||
class CorsProxyController < ApplicationController
|
||||
skip_after_action :verify_authorized
|
||||
after_action :verify_policy_scoped
|
||||
|
||||
HOP_BY_HOP_HEADERS = %w[
|
||||
connection keep-alive proxy-authenticate proxy-authorization
|
||||
te trailers transfer-encoding upgrade
|
||||
].freeze
|
||||
|
||||
# --- Main endpoint ---
|
||||
def proxy
|
||||
skip_authorization
|
||||
return handle_options if request.options?
|
||||
return handle_head if request.head?
|
||||
|
||||
puts "proxy: #{fetch_target_url}"
|
||||
# GET only
|
||||
target = fetch_target_url
|
||||
return render status: 400, plain: "Missing target URL" unless target
|
||||
|
||||
uri = URI.parse(target)
|
||||
upstream_response = forward_get(uri)
|
||||
|
||||
set_cors_response_headers
|
||||
copy_headers_from_upstream(upstream_response)
|
||||
|
||||
render plain: upstream_response.body,
|
||||
status: upstream_response.code.to_i
|
||||
rescue URI::InvalidURIError
|
||||
render status: 400, plain: "Invalid target URL"
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
# --- Allow only GET, HEAD, OPTIONS ---
|
||||
def validate_allowed_method
|
||||
allowed = %w[GET HEAD OPTIONS]
|
||||
unless allowed.include?(request.method)
|
||||
render status: 405, plain: "Method Not Allowed (only GET, HEAD, OPTIONS)"
|
||||
end
|
||||
end
|
||||
|
||||
# --- HEAD just returns headers with no body ---
|
||||
def handle_head
|
||||
target = fetch_target_url
|
||||
return render status: 400, plain: "Missing target URL" unless target
|
||||
|
||||
uri = URI.parse(target)
|
||||
upstream = forward_head(uri)
|
||||
|
||||
set_cors_response_headers
|
||||
copy_headers_from_upstream(upstream)
|
||||
|
||||
head upstream.code.to_i
|
||||
end
|
||||
|
||||
# --- OPTIONS preflight ---
|
||||
def handle_options
|
||||
set_cors_response_headers
|
||||
headers['Access-Control-Allow-Methods'] = "GET, HEAD, OPTIONS"
|
||||
headers['Access-Control-Allow-Headers'] =
|
||||
request.headers['Access-Control-Request-Headers'] ||
|
||||
"Origin, X-Requested-With, Content-Type, Accept"
|
||||
headers['Access-Control-Max-Age'] = '86400'
|
||||
head :no_content
|
||||
end
|
||||
|
||||
# --- Extract target URL ---
|
||||
def fetch_target_url
|
||||
if params[:url].present?
|
||||
params[:url]
|
||||
elsif params[:target].present?
|
||||
if request.query_string.present?
|
||||
"#{params[:target]}?#{request.query_string}"
|
||||
else
|
||||
params[:target]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# --- Forward GET ---
|
||||
def forward_get(uri)
|
||||
http = Net::HTTP.new(uri.host, uri.port)
|
||||
http.use_ssl = (uri.scheme == 'https')
|
||||
http.open_timeout = 10
|
||||
http.read_timeout = 30
|
||||
|
||||
req = Net::HTTP::Get.new(uri.request_uri)
|
||||
copy_request_headers(req)
|
||||
puts "URI:: #{uri.request_uri}"
|
||||
http.request(req)
|
||||
end
|
||||
|
||||
# --- Forward HEAD ---
|
||||
def forward_head(uri)
|
||||
http = Net::HTTP.new(uri.host, uri.port)
|
||||
http.use_ssl = (uri.scheme == 'https')
|
||||
|
||||
req = Net::HTTP::Head.new(uri.request_uri)
|
||||
copy_request_headers(req)
|
||||
http.request(req)
|
||||
end
|
||||
|
||||
# --- Copy incoming headers to outbound request ---
|
||||
def copy_request_headers(req)
|
||||
request.headers.each do |k, v|
|
||||
next if k.start_with?('rack.') || k.start_with?('action_dispatch.')
|
||||
name = normalize_header_name(k)
|
||||
next if HOP_BY_HOP_HEADERS.include?(name.to_s.downcase)
|
||||
next if name.to_s.downcase == 'host'
|
||||
|
||||
req[name] = v.to_s rescue nil
|
||||
end
|
||||
|
||||
req['User-Agent'] ||= "Rails-CorsProxy"
|
||||
end
|
||||
|
||||
def normalize_header_name(k)
|
||||
return nil unless k
|
||||
k = k.sub(/^HTTP_/, '') if k.start_with?("HTTP_")
|
||||
k.split('_').map(&:capitalize).join('-')
|
||||
end
|
||||
|
||||
# --- Copy upstream headers back to Rails ---
|
||||
def copy_headers_from_upstream(up)
|
||||
up.each_header do |k, v|
|
||||
next if HOP_BY_HOP_HEADERS.include?(k.downcase)
|
||||
response.headers[k] = v
|
||||
end
|
||||
end
|
||||
|
||||
# --- CORS headers ---
|
||||
def set_cors_response_headers
|
||||
origin = request.headers["Origin"] || "*"
|
||||
headers["Access-Control-Allow-Origin"] = origin
|
||||
headers["Vary"] = "Origin"
|
||||
headers["Access-Control-Expose-Headers"] = "Content-Length, Content-Type, ETag"
|
||||
end
|
||||
|
||||
# --- Origin validation (optional, can disable) ---
|
||||
def validate_origin
|
||||
# Always allow for now; add checks if needed
|
||||
end
|
||||
|
||||
# --- Prevent open proxy usage (recommended) ---
|
||||
def validate_target!
|
||||
url = fetch_target_url
|
||||
return if url.blank?
|
||||
|
||||
uri = URI.parse(url)
|
||||
unless uri.scheme =~ /\Ahttps?\z/
|
||||
render status: 400, plain: "Only http/https allowed"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -1,141 +0,0 @@
|
|||
module SupportedMimeTypes
|
||||
def self.image_types
|
||||
Mime::LOOKUP.filter { |k, v| is_image_mime_type?(v) }.values
|
||||
end
|
||||
|
||||
def self.image_extensions
|
||||
Mime::EXTENSION_LOOKUP.filter { |k, v| is_image_mime_type?(v) }.keys
|
||||
end
|
||||
|
||||
def self.audio_types
|
||||
Mime::LOOKUP.filter { |k, v| is_audio_mime_type?(v) }.values
|
||||
end
|
||||
|
||||
def self.audio_extensions
|
||||
Mime::EXTENSION_LOOKUP.filter { |k, v| is_audio_mime_type?(v) }.keys
|
||||
end
|
||||
|
||||
def self.video_types
|
||||
Mime::LOOKUP.filter { |k, v| is_video_mime_type?(v) }.values
|
||||
end
|
||||
|
||||
def self.video_extensions
|
||||
Mime::EXTENSION_LOOKUP.filter { |k, v| is_video_mime_type?(v) }.keys
|
||||
end
|
||||
|
||||
def self.document_types
|
||||
Mime::LOOKUP.filter { |k, v| is_document_mime_type?(v) }.values
|
||||
end
|
||||
|
||||
def self.document_extensions
|
||||
Mime::EXTENSION_LOOKUP.filter { |k, v| is_document_mime_type?(v) }.keys
|
||||
end
|
||||
|
||||
def self.archive_types
|
||||
Mime::LOOKUP.filter { |k, v| is_archive_mime_type?(v) }.values
|
||||
end
|
||||
|
||||
def self.archive_extensions
|
||||
Mime::EXTENSION_LOOKUP.filter { |k, v| is_archive_mime_type?(v) }.keys
|
||||
end
|
||||
|
||||
def self.model_types
|
||||
Mime::LOOKUP.filter { |k, v| is_model_mime_type?(v) }.values
|
||||
end
|
||||
|
||||
def self.model_extensions
|
||||
Mime::EXTENSION_LOOKUP.filter { |k, v| is_model_mime_type?(v) }.keys
|
||||
end
|
||||
|
||||
def self.loadable
|
||||
Mime::EXTENSION_LOOKUP.slice(
|
||||
*Assimp.extension_list.to_s.delete("*.").split(";")
|
||||
).values.map(&:to_sym)
|
||||
end
|
||||
|
||||
def self.can_load?(type)
|
||||
loadable.include? type
|
||||
end
|
||||
|
||||
def self.exportable
|
||||
Mime::EXTENSION_LOOKUP.slice(
|
||||
*(0...Assimp.aiGetExportFormatCount).map { |it| Assimp.aiGetExportFormatDescription it }.map(&:file_extension)
|
||||
).values.map(&:to_sym)
|
||||
end
|
||||
|
||||
def self.can_export?(type)
|
||||
exportable.include? type
|
||||
end
|
||||
|
||||
def self.indexable_types
|
||||
image_types + model_types + video_types + document_types + archive_types + audio_types
|
||||
end
|
||||
|
||||
def self.indexable_extensions
|
||||
image_extensions + model_extensions + video_extensions + document_extensions + archive_extensions + audio_extensions
|
||||
end
|
||||
|
||||
class << self
|
||||
private
|
||||
|
||||
def is_image_mime_type?(type)
|
||||
exclusions = [
|
||||
"image/vnd.dxf",
|
||||
"image/vnd.dwg"
|
||||
]
|
||||
type.to_s.start_with?("image/") && exclusions.exclude?(type.to_s)
|
||||
end
|
||||
|
||||
def is_audio_mime_type?(type)
|
||||
type.to_s.start_with?("audio/")
|
||||
end
|
||||
|
||||
def is_video_mime_type?(type)
|
||||
type.to_s.start_with?("video/")
|
||||
end
|
||||
|
||||
def is_document_mime_type?(type)
|
||||
[
|
||||
"application/pdf",
|
||||
"text/markdown",
|
||||
"text/plain",
|
||||
"text/html",
|
||||
"application/msword",
|
||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
|
||||
"application/octet-stream",
|
||||
"application/x-gerber",
|
||||
"application/x-gerber-job",
|
||||
"application/x-excellon",
|
||||
"application/x-kicad-project",
|
||||
"application/x-kicad-footprint",
|
||||
"application/x-kicad-pcb",
|
||||
"application/x-kicad-symbol",
|
||||
"application/x-kicad-schematic",
|
||||
"application/x-kicad-worksheet"
|
||||
].include?(type.to_s)
|
||||
end
|
||||
|
||||
def is_model_mime_type?(type)
|
||||
extras = [
|
||||
"text/x-gcode",
|
||||
"application/x-openscad",
|
||||
"image/vnd.dxf",
|
||||
"image/vnd.dwg",
|
||||
"application/x-3ds",
|
||||
"application/x-amf",
|
||||
"application/x-ldraw"
|
||||
]
|
||||
type.to_s.start_with?("model/") || extras.include?(type.to_s)
|
||||
end
|
||||
|
||||
def is_archive_mime_type?(type)
|
||||
[
|
||||
"application/zip",
|
||||
"application/gzip",
|
||||
"application/vnd.rar",
|
||||
"application/x-7z-compressed",
|
||||
"application/x-bzip2"
|
||||
].include?(type.to_s)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
<nav class="navbar navbar-expand-md bg-primary" data-bs-theme="dark">
|
||||
<div class='container-fluid'>
|
||||
<a class="navbar-brand ms-2" href="<%= root_path %>" aria-label="<%= translate ".home" %>">
|
||||
<%= image_tag site_icon, alt: site_name, height: "40px", class: "me-2" %>
|
||||
<span class="d-md-none"><%= site_name %></span>
|
||||
</a>
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbarTogglerDemo01" aria-expanded="false" aria-label="<%= translate ".navbar.toggler.label" %>">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse row" id="navbar">
|
||||
<ul class="navbar-nav col ps-4 ps-md-0 align-self-start">
|
||||
<li class="nav-item">
|
||||
<%= nav_link "box", Model.model_name.human(count: 100), models_path(@filter&.to_params), text_style: "d-md-none d-lg-inline" %>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<%= nav_link "people", Creator.model_name.human(count: 100), creators_path(@filter&.to_params(except: :creator)), text_style: "d-md-none d-lg-inline" %>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<%= nav_link "collection", Collection.model_name.human(count: 100), collections_path(@filter&.to_params(except: :collection)), text_style: "d-md-none d-lg-inline" %>
|
||||
</li>
|
||||
<% if SiteSettings.show_libraries %>
|
||||
<% policy_scope(Library).find_each do |library| %>
|
||||
<li class="nav-item">
|
||||
<%= nav_link(
|
||||
library.icon.presence || "boxes",
|
||||
library.name,
|
||||
models_path({library: library}.merge(@filter&.to_params(except: :library) || {})),
|
||||
title: library.caption
|
||||
) %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</ul>
|
||||
<ul class="navbar-nav col-auto pe-4 align-self-start justify-content-end">
|
||||
<li class="nav-item">
|
||||
<% if policy(:scan).create? %>
|
||||
<% if @scan_in_progress %>
|
||||
<%= nav_link "", t(".scanning"), activity_path, nofollow: true, style: "btn btn-outline-warning btn-sm me-1 mt-lg-1", icon_style: "spinner-border spinner-border-sm" %>
|
||||
<% else %>
|
||||
<div class="btn-group">
|
||||
<button type="button" data-bs-toggle="dropdown" aria-expanded="false"
|
||||
class="btn btn-warning btn-sm mt-1 me-1 dropdown-toggle">
|
||||
<%= render Components::Icon.new(icon: "radar") %>
|
||||
<%= t ".scan" %>
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= link_to t(".scan_changes"), scans_path, method: :post, nofollow: true, class: "dropdown-item" %></li>
|
||||
<li><%= link_to t(".check_existing"), scans_path(type: :check), method: :post, nofollow: true, class: "dropdown-item" %>
|
||||
<li><%= link_to t(".check_results"), scans_path({type: :check}.merge(@filter.to_params)), method: :post, nofollow: true, class: "dropdown-item" if @filter&.any? %>
|
||||
</ul>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<% if policy(:upload).index? %>
|
||||
<div class="btn-group">
|
||||
<%= link_to "Create", new_model_path, nofollow: true, class: "btn btn-secondary", style: "margin-right:7px" %>
|
||||
<!--
|
||||
<button type="button" data-bs-toggle="dropdown" aria-expanded="false"
|
||||
class="btn btn-warning btn-sm mt-1 me-1 dropdown-toggle">
|
||||
<%= render Components::Icon.new(icon: "plus-circle") %>
|
||||
<%= t ".add_models" %>
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= link_to t(".upload"), new_model_path, nofollow: true, class: "dropdown-item" %></li>
|
||||
<li><%= link_to t(".import_url"), new_import_path, nofollow: true, class: "dropdown-item" %>
|
||||
</ul>
|
||||
-->
|
||||
</div>
|
||||
<% end %>
|
||||
</li>
|
||||
<%- if current_user %>
|
||||
<% if policy(Problem).index? && Problem.visible(problem_settings).count > 0 %>
|
||||
<li class="nav-item">
|
||||
<% severity = max_problem_severity(policy_scope(Problem).all) %>
|
||||
<%= nav_link problem_icon(severity),
|
||||
Problem.model_name.human(count: 100),
|
||||
problems_path,
|
||||
title: translate("problems.severities.#{severity}"), # rubocop:todo I18n/RailsI18n/DecorateStringFormattingUsingInterpolation
|
||||
icon_style: "link-#{severity}",
|
||||
text_style: "d-md-none",
|
||||
aria_label: Problem.model_name.human(count: 100) %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% if policy(:activity).index? %>
|
||||
<li class="nav-item">
|
||||
<%= nav_link "activity", t(".activity"), activity_path, nofollow: true, text_style: "d-md-none" %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% if policy(:settings).index? %>
|
||||
<li class="nav-item">
|
||||
<%= nav_link "gear", t(".settings"), settings_path, nofollow: true, text_style: "d-md-none" %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% if policy(:user).index? and not policy(:settings).index? %>
|
||||
<li class="nav-item">
|
||||
<%= nav_link "people", t(".moderator_settings"), settings_users_path, nofollow: true, text_style: "d-md-none" %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<%- unless current_page?(root_path) %>
|
||||
<li id="nav-search" class="nav-item ms-1 me-3" data-turbo-permanent>
|
||||
<%= form_with url: models_path, method: :get, role: "search" do |f| %>
|
||||
<%= f.search_field :q, class: "form-control", placeholder: translate(".search"), aria_label: translate(".search"), aria_describedby: "button-search", value: @query || params[:q] %>
|
||||
<% end %>
|
||||
</li>
|
||||
<% end %>
|
||||
<%- if current_user %>
|
||||
<li class="nav-item">
|
||||
<%= nav_link "sliders", t(".account"), edit_user_registration_path, nofollow: true, text_style: "d-md-none" %>
|
||||
</li>
|
||||
<% end %>
|
||||
<%- if SiteSettings.multiuser_enabled? %>
|
||||
<li class="nav-item">
|
||||
<%- if current_user %>
|
||||
<%= nav_link "box-arrow-right", t(".log_out"), destroy_user_session_path, method: :delete, title: translate(".log_out"), text_style: "d-md-none" %>
|
||||
<% else %>
|
||||
<%= nav_link "box-arrow-in-right", t(".log_in"), new_user_session_path, title: translate(".log_in"), nofollow: true, style: "btn btn-secondary" %>
|
||||
<% end %>
|
||||
</li>
|
||||
<%- end %>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
|
@ -3,7 +3,11 @@
|
|||
<div class="row row-cols-md-2 mt-2">
|
||||
<div class="col-md-9" id="item_list">
|
||||
|
||||
<iframe allowfullscreen allow="xr-spatial-tracking; fullscreen" src="/view/index.html?overlay=true&profile=preview" style="width:100%; height:360px; border:0; border-radius:10px;"></iframe>
|
||||
<% if ENV['DEV'] %>
|
||||
<a target="_blank" href="<%=ENV['FEDERATE_DRIVE_HOST']%>/janusweb/index.html#janus.url=<%=ENV['FEDERATE_DRIVE_HOST']%>/janusweb/portalAR.xml">
|
||||
<img src="/assets/lobby.png" style="width:100%; border-radius:10px;margin-bottom:17px"/>
|
||||
</a>
|
||||
<% end %>
|
||||
|
||||
<%= yield :items %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -49,11 +49,6 @@
|
|||
<%= icon "bar-chart-line-fill", ModelFile.human_attribute_name(:presupported) %>
|
||||
<% end %>
|
||||
<%= problem_icon_tag(file.problems) if policy(Problem).show? %>
|
||||
|
||||
<!-- archive.org JanusXR verbatim asset hints -->
|
||||
|
||||
<a href="<%=model_path(@model)+"/model_files/"+file.filename%>"><i class="bi bi-link-45deg"></i></a>
|
||||
|
||||
</div>
|
||||
<div class="col col-auto">
|
||||
<div class="float-end">
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
<!-- JanusXR JML markup -->
|
||||
|
||||
<% content_for :items do %>
|
||||
<% if ! @models.empty? %>
|
||||
<fireboxroom>
|
||||
<assets>
|
||||
<assetobject src="/view/element/janus-script-peertube/asset/button.glb" id="button"/>
|
||||
<assetobject src="/view/element/janus-script-peertube/asset/button.icon.glb" id="icon"/>
|
||||
<assetsound src="/view/element/janus-script-peertube/asset/button.click.mp3" id="button-click"/>
|
||||
<assetsound src="/view/element/janus-script-peertube/asset/button.hover.mp3" id="button-hover"/>
|
||||
|
||||
<% @models.each_with_index do |model, i| %>
|
||||
<% @file = model.is_a?(Model) ? model.preview_file : policy_scope(model.models).first&.preview_file %>
|
||||
<% if @file&.filename? %>
|
||||
<assetimage id="thumb_<%= i %>" src="<%= model_url( model ) %>/model_files/<%= @file.filename %>" />
|
||||
<% end %>
|
||||
<% end %>
|
||||
</assets>
|
||||
<room pos="0 0 0" skybox="true" showavatar="false" use_local_asset="room_plane">
|
||||
<light js_id="dan9-janus:light/light_cone_angle=0-6" pos="0 3 2" collision_trigger="false" />
|
||||
<CircularLayout pos="0 0 0" radius="4.5" scale="1 1 1" >
|
||||
<% @models.each_with_index do |model, i| %>
|
||||
<object id="o_<%= i %>">
|
||||
<link url="<%= model_url( model ) %>" image_id="thumb_<%= i %>" pos="0 0 0.001" draw_glow="true" scale="3 3 0.1" thumb_id="thumb_<%= i %>" title="<%= model.name %>"/>
|
||||
<text text="<%= model.name %>" pos="0 2.3 0.3" font_scale="false" scale="0.15 0.15 0.2" />
|
||||
</object>
|
||||
<% end %>
|
||||
</CircularLayout>
|
||||
</room>
|
||||
</fireboxroom>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
<%= render "janusroom" %>
|
||||
|
||||
<% content_for :items do %>
|
||||
<% if @models.empty? %>
|
||||
<div class="alert alert-info">
|
||||
<%= icon "person-arms-up", "" %>
|
||||
<%= signed_in? ? t(".no_results_html") : t(".no_results_signed_out_html", link: new_user_session_path) %>
|
||||
<% if @search %>
|
||||
<%= t ".search.or_other_sites" %>
|
||||
<%= render "search_links" %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% else %>
|
||||
<div class="skip-link-container">
|
||||
<div class="clearfix">
|
||||
<%= skip_link "sidebar", t(".skip_models") %>
|
||||
<%= render "order_buttons" %>
|
||||
<% if pagination_settings["models"] %>
|
||||
<%= paginate @models %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 mb-4">
|
||||
<%= render_component_collection Components::ModelCard, :model, @models %>
|
||||
</div>
|
||||
<% if pagination_settings["models"] %>
|
||||
<%= paginate @models %>
|
||||
<% end %>
|
||||
<% if @search %>
|
||||
<div class="alert alert-info">
|
||||
<%= icon "search", "" %>
|
||||
<%= t ".search.other_sites" %>
|
||||
<%= render "search_links" %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<% content_for :actions do %>
|
||||
<%= link_to t(".bulk_edit"), edit_models_path((@additional_filters || {}).merge(@filter&.to_params)), class: "btn btn-secondary" if policy(:model).edit? %>
|
||||
<% end %>
|
||||
|
||||
<% content_for :sidebar do %>
|
||||
<%= render "filters_card" %>
|
||||
<%= render "tags_card" %>
|
||||
<% end %>
|
||||
|
|
@ -47,21 +47,4 @@
|
|||
Set this tag for experiences (meditation, personal productivity space) which are better off without multiple users.
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<a class="badge rounded-pill bg-secondary tag">showavatar</a>
|
||||
</td>
|
||||
<td>
|
||||
This shows avatars of users participating in the space.<Br>
|
||||
Enable this if you want metaverse-ish kind of experiences in which user-locations are important.
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<a class="badge rounded-pill bg-secondary tag">nodescription</a>
|
||||
</td>
|
||||
<td>
|
||||
Don't render the item in the 3D scene.
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
<h1><%= t ".title" %></h1>
|
||||
|
||||
<p>Click on the image below, to open the 'howto' in a new browser-tab:</p>
|
||||
|
||||
<center>
|
||||
<a href="/assets/howto.png" target="_blank">
|
||||
<img src="/assets/howto.png" style="width:200px;margin-top:20px;margin-bottom:40px"/>
|
||||
</a>
|
||||
</center>
|
||||
|
||||
<!--
|
||||
<p><%= t ".description" %></p>
|
||||
-->
|
||||
|
||||
<%= form_with url: models_path, id: "upload-form" do |form| %>
|
||||
|
||||
<% if SiteSettings.show_libraries %>
|
||||
<div class="row mb-3 input-group">
|
||||
<%= form.label :library, Library.model_name.human, class: "col-sm-2 col-form-label" %>
|
||||
<div class='col-sm-10 ps-0'>
|
||||
<%= form.select :library,
|
||||
policy_scope(Library).all.map { |lib| [library_select_title(lib), lib.to_param] },
|
||||
{include_blank: false, selected: Library.default.to_param},
|
||||
{class: "form-control form-select"} %>
|
||||
<span class="form-text"><%= t ".library.help" %></span>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div class="row mb-3 input-group" data-turbo-permanent>
|
||||
<%= form.label :files, t(".files.label"), class: "col-sm-2 col-form-label" %>
|
||||
<div class='col-sm-10 ps-0'>
|
||||
<%= content_tag :div, nil, data: {
|
||||
controller: "upload",
|
||||
action: "turbo:morph@window->upload#reconnect",
|
||||
max_file_size: SiteSettings.max_file_upload_size,
|
||||
allowed_file_types: input_accept_string,
|
||||
upload_endpoint: upload_path
|
||||
} %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= render "bulk_fields", form: form, default_tags: SiteSettings.model_tags_auto_tag_new %>
|
||||
|
||||
<div class="row mb-3">
|
||||
<%= form.label translate(".permission_preset"), for: :permission_preset, class: "col-sm-2 col-form-label" %>
|
||||
<div class="col-sm-10">
|
||||
<%= form.select :permission_preset, [
|
||||
[translate("settings.multiuser.default_viewer_role.options.private"), "private"],
|
||||
[translate("settings.multiuser.default_viewer_role.options.member"), "member"],
|
||||
[translate("settings.multiuser.default_viewer_role.options.public"), "public"]
|
||||
],
|
||||
{selected: SiteSettings.default_viewer_role, include_blank: true},
|
||||
{class: "form-control col-auto form-select"} %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row mb-3 input-group">
|
||||
<div class='offset-sm-2 col-sm-10 ps-0'>
|
||||
<!-- <%= submit_tag translate(".submit"), class: "btn btn-primary" %> -->
|
||||
<%= submit_tag "Create!", class: "btn btn-primary" %>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
@ -1,35 +1,11 @@
|
|||
<%
|
||||
|
||||
def clean_description(str)
|
||||
truncate(
|
||||
sanitize(
|
||||
str.gsub(/^(<!--|<fireboxroom).*/im,"") # strip metadata
|
||||
.gsub(/<\/?[^>]+>/, '') # strip html tags
|
||||
.gsub(/&(#\d+|#x[0-9a-fA-F]+|[a-zA-Z]+);/, "") # strip html entities
|
||||
),
|
||||
length:80
|
||||
)
|
||||
.strip()
|
||||
end
|
||||
|
||||
%>
|
||||
|
||||
<% content_for :head do %>
|
||||
<%= tag.meta property: "og:type", content: "website" %>
|
||||
<%= tag.meta property: "og:image", content: model_model_file_url(@model, @model.preview_file, format: @model.preview_file.extension) if @model.preview_file&.is_image? && !@model.sensitive %>
|
||||
<%= tag.meta name: "description", content: clean_description(@model.notes) if @model.notes.present? %>
|
||||
<%= tag.meta name: "description", content: truncate(sanitize(@model.notes), length: 80) if @model.notes.present? %>
|
||||
<%= tag.meta name: "fediverse:creator", content: @model.creator.federails_actor.at_address if @model.creator %>
|
||||
<%= tag.link rel: "alternate", type: Mime[:oembed], href: model_url(@model, format: :oembed), title: @model.name %>
|
||||
<% end %>
|
||||
|
||||
<%
|
||||
filePath = "/mnt/"+@model.library.name+"/"+@model.path+"/"
|
||||
janusURLCall = "/view/index.html?profile=default#janus.url="+model_url(@model)+"/"
|
||||
janusURLPreview = "/view/index.html?profile=preview#janus.url="+model_url(@model)+"/"
|
||||
#ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/janusxr.html"
|
||||
%>
|
||||
|
||||
|
||||
<div itemscope itemtype="https://schema.org/3DModel">
|
||||
<%= turbo_stream_from @model %>
|
||||
<h1>
|
||||
|
|
@ -52,28 +28,10 @@ end
|
|||
<div class="alert alert-info"><%= t(".preview", count: @locked_files) %></div>
|
||||
<% end %>
|
||||
|
||||
<% if File.exist?( filePath+".xrforge/janusxr.html" ) %>
|
||||
<% viewer_width = 360 %>
|
||||
<% if alert || notice %>
|
||||
<div class="shimcontainer" style="height: <%=viewer_width%>px">
|
||||
<article style="height: <%=viewer_width%>px">
|
||||
<div class="shimmer"></div>
|
||||
<img src="/assets/roundel-1d688b1e.svg" />
|
||||
<br><br>
|
||||
🚀 (Re)generating the experience..<br><br>
|
||||
☕ Please be patient or check back later.<br>
|
||||
</article>
|
||||
</div>
|
||||
<% else %>
|
||||
<iframe allowfullscreen allow="xr-spatial-tracking; fullscreen" src="<%=janusURLPreview%>?networking=false" style="width:100%; height:<%=viewer_width%>px; border:0; border-radius:10px;"></iframe>
|
||||
<% end %>
|
||||
<div style="height:15px"></div>
|
||||
<% else %>
|
||||
<%= render "image_carousel", images: @images %>
|
||||
<% end %>
|
||||
<%= render "image_carousel", images: @images %>
|
||||
|
||||
<%= card(:secondary) do %>
|
||||
<p class="card-text" itemprop="description"><%= markdownify @model.notes.gsub(/^(<!--|<fireboxroom).*/im,"") %></p>
|
||||
<p class="card-text" itemprop="description"><%= markdownify @model.notes %></p>
|
||||
<% end if @model.notes.present? %>
|
||||
|
||||
<% if @num_files > 0 %>
|
||||
|
|
@ -91,15 +49,21 @@ end
|
|||
</div>
|
||||
|
||||
<div class="col-md-3" id="sidebar">
|
||||
|
||||
<%= card :secondary, "XR networks" do %>
|
||||
<table class="table table-borderless table-sm">
|
||||
<% if File.exist?( filePath+".xrforge/janusxr.html" ) %>
|
||||
<% if ENV['FEDERATE_DRIVE_HOST'].present? %>
|
||||
|
||||
<% if @model.tags.where(name: "xrfragments" ).any? %>
|
||||
<tr>
|
||||
<td>
|
||||
<img src="/assets/janusxr.svg" style="width: 16px; transform: translate(0px,-2px);">
|
||||
</td>
|
||||
<td>
|
||||
<%= link_to "JanusXR", janusURLCall, target:"_blank" %>
|
||||
<%
|
||||
fediURL = ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/janusxr.html"
|
||||
%>
|
||||
<%= link_to "JanusXR", fediURL, target:"_blank" %>
|
||||
<a href="" target="_blank"><i class="bi bi-link-45deg"></i></a>
|
||||
<label for="toggle_janusxr"><i class="bi bi-info-circle"></i></label>
|
||||
<div class="toggle-box">
|
||||
|
|
@ -122,19 +86,16 @@ end
|
|||
jml = ""
|
||||
if File.exist?(jmlfile)
|
||||
jml = File.read(jmlfile)
|
||||
.gsub("model_files/",model_path(@model)+"/model_files/")
|
||||
.gsub("-->","")
|
||||
.gsub("--%3E","")
|
||||
end
|
||||
%>
|
||||
|
||||
<!-- JML (https://janusxr.org) spatial markup -->
|
||||
|
||||
<!--
|
||||
<%== jml %>
|
||||
-->
|
||||
|
||||
<% if File.exist?( filePath+".xrforge/scene.gltf" ) %>
|
||||
<% end %>
|
||||
|
||||
<% if @model.tags.where(name: "xrfragments" ).any? %>
|
||||
<tr>
|
||||
<td>⁂</td>
|
||||
<td>
|
||||
|
|
@ -177,7 +138,7 @@ end
|
|||
</tr>
|
||||
<% end %>
|
||||
|
||||
<% if File.exist?( filePath+".xrforge/scene.mml" ) %>
|
||||
<% if @model.tags.where(name: "xrfragments" ).any? %>
|
||||
<tr>
|
||||
<td>⁂</td>
|
||||
<td>
|
||||
|
|
@ -201,6 +162,7 @@ end
|
|||
</table>
|
||||
<% end %>
|
||||
|
||||
|
||||
<%= card :secondary, t(".model_details") do %>
|
||||
<table class="table table-borderless table-sm">
|
||||
|
||||
|
|
@ -232,6 +194,27 @@ end
|
|||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<i class="bi bi-controller" role="img"></i>
|
||||
</td>
|
||||
<td>
|
||||
<%= link_to "Godot project", ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/godot.zip" %>
|
||||
<label for="toggle_godot"><i class="bi bi-info-circle"></i></label>
|
||||
<div class="toggle-box">
|
||||
<input type="checkbox" id="toggle_godot" hidden>
|
||||
<div class="hidden-tooltip">
|
||||
<i class="bi bi-arrow-90deg-up"></i>
|
||||
<small>
|
||||
This is a Godot project which wraps your (3D file) experience.<br>
|
||||
<a href="https://godot.org" target="_blank">Godot</a> is a Free and Opensource Game engine.<br>
|
||||
The Godot project is basically its own XR Fragment browser (which you can extend).<br><br>
|
||||
<b>WARNING</b>: use <a href="https://en.wikipedia.org/wiki/Progressive_enhancement" target="_blank">progressive enhancement</a> so your 3D file experience will always run in other <a href="https://xrfragment.org" target="_blank">XR Fragment</a> viewers.
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<% if @model.collection %>
|
||||
<tr>
|
||||
|
|
@ -307,31 +290,6 @@ end
|
|||
<%= render Components::DownloadButton.new(model: @model) %>
|
||||
</div>
|
||||
|
||||
<%= card :secondary, "Packages" do %>
|
||||
<table class="table table-borderless table-sm">
|
||||
<tr>
|
||||
<td>
|
||||
<i class="bi bi-controller" role="img"></i>
|
||||
</td>
|
||||
<td>
|
||||
<%= link_to "Godot project", ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/godot.zip" %>
|
||||
<label for="toggle_godot"><i class="bi bi-info-circle"></i></label>
|
||||
<div class="toggle-box">
|
||||
<input type="checkbox" id="toggle_godot" hidden>
|
||||
<div class="hidden-tooltip">
|
||||
<i class="bi bi-arrow-90deg-up"></i>
|
||||
<small>
|
||||
This is a Godot project which wraps your (3D file) experience.<br>
|
||||
<a href="https://godot.org" target="_blank">Godot</a> is a Free and Opensource Game engine.<br>
|
||||
The Godot project is basically its own XR Fragment browser (which you can extend).<br><br>
|
||||
<b>WARNING</b>: use <a href="https://en.wikipedia.org/wiki/Progressive_enhancement" target="_blank">progressive enhancement</a> so your 3D file experience will always run in other <a href="https://xrfragment.org" target="_blank">XR Fragment</a> viewers.
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<% end %>
|
||||
|
||||
<%= card :secondary, t("layouts.card_list_page.actions_heading") do %>
|
||||
<%= render Components::ReportButton.new(object: @model, path: new_model_report_path(@model)) %>
|
||||
|
|
|
|||
|
|
@ -8,20 +8,3 @@ Rails.application.configure do
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
Rails.application.config.after_initialize do
|
||||
Rails.application.configure do
|
||||
config.content_security_policy do |policy|
|
||||
# Default policy for all content
|
||||
policy.default_src :self, :https, :http
|
||||
|
||||
# *** ADD THE DOMAIN(S) FOR YOUR IFRAME CONTENT HERE ***
|
||||
policy.frame_src :self, ENV['FEDERATE_DRIVE_HOST'], ENV['SERVER_CORS'], ENV['SERVER_JANUS']
|
||||
policy.script_src :self, ENV['FEDERATE_DRIVE_HOST'], ENV['SERVER_CORS'], ENV['SERVER_JANUS']
|
||||
policy.style_src :self, ENV['FEDERATE_DRIVE_HOST'], ENV['SERVER_CORS'], ENV['SERVER_JANUS']
|
||||
policy.connect_src :self, ENV['FEDERATE_DRIVE_HOST'], ENV['SERVER_CORS'], ENV['SERVER_JANUS']
|
||||
|
||||
# ...
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -15,8 +15,7 @@ Rails.application.config.to_prepare do
|
|||
|
||||
def run_cli_hooks
|
||||
|
||||
file = "#{self.model.library.path || ENV['UPLOAD_PATH'] || "/mnt/experiences"}"
|
||||
file = file.strip() + "/" + self.path_within_library().strip()
|
||||
file = "#{self.model.library.path}/#{self.path_within_library()}"
|
||||
|
||||
if File.exist?(file) && (ENV['BOOT_SCAN'].present? || file.match?("datapackage") )
|
||||
cache_key = "ttl:file:cli_hook:#{self.id}#{Digest::MD5.file(file).hexdigest}"
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
if ENV['CORS_PROXY']
|
||||
match '/cors/*target_url_segment', to: 'cors_proxy#proxy', via: :all, format: false
|
||||
end
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 906 KiB |
BIN
manyfold/usr/src/app/public/assets/lobby.png
Normal file
BIN
manyfold/usr/src/app/public/assets/lobby.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 472 KiB |
|
|
@ -32,53 +32,3 @@ input[type="checkbox"]:checked + .hidden-tooltip {
|
|||
.col-form-label{
|
||||
width:111px;
|
||||
}
|
||||
|
||||
/* shimmer loader */
|
||||
|
||||
.shimcontainer {
|
||||
width: 100%;
|
||||
box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1);
|
||||
background: #000;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
article {
|
||||
background: #000;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
box-sizing: border-box;
|
||||
border-radius: 10px;
|
||||
overflow: hidden;
|
||||
text-align:center;
|
||||
color:#AAA;
|
||||
}
|
||||
|
||||
.shimmer {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 50%;
|
||||
height: 100%;
|
||||
background: linear-gradient(
|
||||
100deg,
|
||||
rgba(255, 255, 255, 0) 20%,
|
||||
rgba(255, 255, 255, 0.2) 50%,
|
||||
rgba(255, 255, 255, 0) 80%
|
||||
);
|
||||
animation: shimmer 2s infinite linear;
|
||||
}
|
||||
|
||||
@keyframes shimmer {
|
||||
from {
|
||||
transform: translateX(-200%);
|
||||
}
|
||||
to {
|
||||
transform: translateX(200%);
|
||||
}
|
||||
}
|
||||
|
||||
.shimcontainer img {
|
||||
height: 175px;
|
||||
margin-top: 37px;
|
||||
display:inline-block;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
room.onLoad = function () {
|
||||
|
||||
buttonPrompt();
|
||||
|
||||
}
|
||||
|
||||
function buttonPrompt(){
|
||||
|
||||
let style = document.createElement("style")
|
||||
style.type = "text/css"
|
||||
style.innerHTML = `
|
||||
body{
|
||||
background: #555;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
overflow: hidden;
|
||||
padding: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
img#btn_play:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
img#btn_play {
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
width:30.000002%;
|
||||
max-width:400px;
|
||||
transform: translate(-50%,-50%);
|
||||
cursor: pointer;
|
||||
opacity: 0.6;
|
||||
transition: 0.3s;
|
||||
z-index: 999;
|
||||
}
|
||||
`)
|
||||
document.body.appendChild(style);
|
||||
|
||||
let playBtn = document.createElement("img")
|
||||
playBtn.src = "play.svg"
|
||||
playBtn.id = "btn_play"
|
||||
playBtn.onclick = function () {
|
||||
document.body.removeChild(promptDiv);
|
||||
janus.engine.client.startXR('immersive-ar', { requiredFeatures: [], optionalFeatures: ['local-floor', 'plane-detection'] });
|
||||
room.skybox = false;
|
||||
};
|
||||
document.body.appendChild(playBtn);
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,10 +0,0 @@
|
|||
<FireBoxRoom>
|
||||
<assets>
|
||||
<assetobject id="body" src="/view/avatar/janus-avatar-base.glb" />
|
||||
<assetobject id="avatar_animations" src="/view/avatar/janus-avatar-animations.glb" />
|
||||
<assetobject id="avatar_animations_sit" src="/view/avatar/janus-avatar-animations-sit.glb" />
|
||||
</assets>
|
||||
<room>
|
||||
<ghost scale=".01 .01 .01" col="#e0d5a1" body_id="body" bone_head="head" animation_extras="avatar_animations_sit" />
|
||||
</room>
|
||||
</FireBoxRoom>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 119 B |
|
|
@ -1,674 +0,0 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
opensource libraries:
|
||||
|
||||
https://github.com/jbaicoianu/janus-script-ui
|
||||
https://codeberg.org/coderofsalvation/janus-script-peertube
|
||||
|- https://codeberg.org/coderofsalvation/janus-script-jjq
|
||||
|- https://codeberg.org/coderofsalvation/janus-script-dialog
|
||||
|- https://codeberg.org/coderofsalvation/janus-script-tween
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
room.registerElement("fetch",{
|
||||
interval: 0,
|
||||
to: "",
|
||||
url: "",
|
||||
selector: "",
|
||||
append: false,
|
||||
prefix: "",
|
||||
loader: "loading..",
|
||||
|
||||
createChildren: function(){
|
||||
let el = this.children[0]
|
||||
if( !this.to ) return console.warn("<fetch> has no 'to' attr")
|
||||
if( !this.children.length ) return console.warn("<fetch> needs one child element")
|
||||
if( !el[this.to] ) el[this.to] = this.loader
|
||||
if( this.append ) this.prefix = el[ this.to ]
|
||||
this.fetch()
|
||||
|
||||
if( this.interval ) setInterval( () => this.fetch, this.interval * 1000 )
|
||||
},
|
||||
|
||||
fetch: function(){
|
||||
const finalUrl = `${elation.engine.assets.corsproxy||''}${this.url}`
|
||||
fetch( finalUrl )
|
||||
.then( (res) => res.text() )
|
||||
.then( (text) => {
|
||||
this.text = text
|
||||
this.updateChild()
|
||||
})
|
||||
},
|
||||
|
||||
updateChild: function(){
|
||||
let el = this.children[0]
|
||||
let result = this.text
|
||||
if( this.selector ){
|
||||
let div = document.createElement("div")
|
||||
div.innerHTML = this.text
|
||||
let partial = div.querySelector(this.selector)
|
||||
if( partial ){ result = partial.outerHTML
|
||||
}else result = "oops..remote content<br>not available"
|
||||
}
|
||||
el[ this.to ] = this.append ? this.prefix + result : result
|
||||
}
|
||||
|
||||
})
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
|
@ -1,159 +0,0 @@
|
|||
// https://hyperborea.org/tech-tips/fediverse-feeds/
|
||||
|
||||
room.registerElement('rss', {
|
||||
|
||||
index: 0,
|
||||
columns: 2,
|
||||
rows: 1,
|
||||
maxitems: 6,
|
||||
items: [],
|
||||
emoji: "💬",
|
||||
borderspacing: 20,
|
||||
padding: 20,
|
||||
cell_col: "#222",
|
||||
cell_radius: 15,
|
||||
cell_col_font: "#FDF",
|
||||
images: true,
|
||||
css: "",
|
||||
cellwidth: 290,
|
||||
cellheight: 220,
|
||||
overflow: true,
|
||||
|
||||
cssDefault(){
|
||||
return `
|
||||
.paragraphcontainer{
|
||||
}
|
||||
table{
|
||||
border-spacing: ${this.borderspacing}px;
|
||||
table-layout: fixed;
|
||||
}
|
||||
a{
|
||||
color: ${this.cell_col_font};
|
||||
}
|
||||
td > div,
|
||||
th > div,
|
||||
.grid > div{
|
||||
vertical-align:top;
|
||||
padding: ${this.padding}px;
|
||||
${this.overflow ? `min-height: ${this.cellheight}px;` : `height: ${this.cellheight}px !important` };
|
||||
width: ${this.cellwidth}px !important;
|
||||
background: ${this.cell_col};
|
||||
border-radius: ${this.cell_radius}px;
|
||||
color: ${this.cell_col_font};
|
||||
${this.overflow ? 'overflow: hidden !important' : ''}
|
||||
}
|
||||
.light{
|
||||
font-size:12px;
|
||||
font-face: monospace;
|
||||
opacity:0.66;
|
||||
}
|
||||
.grid {
|
||||
-webkit-column-count: ${this.columns};
|
||||
-webkit-column-gap: ${this.borderspacing}px;
|
||||
-moz-column-count: ${this.columns};
|
||||
-moz-column-gap: ${this.borderspacing}px;
|
||||
column-count: ${this.columns};
|
||||
column-gap: ${this.borderspacing}px;
|
||||
}
|
||||
.grid > div{
|
||||
margin-bottom: ${this.borderspacing}px;
|
||||
}
|
||||
h1{
|
||||
font-size:16px;
|
||||
font-weight:bold;
|
||||
}
|
||||
`
|
||||
},
|
||||
|
||||
createChildren(){
|
||||
this.paragraph = this.children.find( (el) => el.tag == 'PARAGRAPH' )
|
||||
if( !this.paragraph ) throw 'dialog-rss: error need paragraph child'
|
||||
if( !this.url ) throw 'dialog-rss: error need url'
|
||||
this.fetchRSS()
|
||||
},
|
||||
|
||||
fetchRSS(){
|
||||
try {
|
||||
let url = new URL(this.url)
|
||||
fetch(this.url)
|
||||
.then( res => res.text() )
|
||||
.then( xml => {
|
||||
this.items = this.rssToHTML( xml, url.origin )
|
||||
this.render()
|
||||
})
|
||||
}catch(e){
|
||||
console.error("dialog-rss: invalid URL: "+this.url)
|
||||
}
|
||||
},
|
||||
|
||||
render(){
|
||||
this.index = this.index % this.items.length // to be sure
|
||||
let maxCells = this.columns > 1 && this.rows > 1 ? this.columns * this.rows : 99999
|
||||
if( maxCells > this.maxitems ) maxCells = this.maxitems
|
||||
const css = this.cssDefault() + this.css
|
||||
const cssgridAvailable = 'grid' in document.documentElement.style;
|
||||
let html = `<style>.paragraphcontainer { background:transparent; } ${css} </style>`
|
||||
html += cssgridAvailable ? this.getCSSgrid(maxCells) : this.getTable()
|
||||
this.paragraph.text = html
|
||||
this.paragraph.visible = true
|
||||
},
|
||||
|
||||
getCSSgrid: function(maxCells){
|
||||
let i = 0
|
||||
let html = `<div class="grid">`
|
||||
while( this.items[ this.index + i ] && i < maxCells ){
|
||||
let content = this.items[ this.index + i ]
|
||||
html += `<div>${content}</div>`
|
||||
i++
|
||||
}
|
||||
html += `</div>`
|
||||
return html
|
||||
},
|
||||
|
||||
getTable: function(maxCells){
|
||||
let i = 0
|
||||
let html = `<table><tr>`
|
||||
while( this.items[ this.index + i ] && i < maxCells ){
|
||||
let content = this.items[ this.index + i ]
|
||||
if( i > 0 && (i % this.columns) == 0 ) html += `</tr><tr>`
|
||||
html += `<td><div>${content}</div></td>`
|
||||
i++
|
||||
}
|
||||
html += `</tr></table>`
|
||||
return html
|
||||
},
|
||||
|
||||
rssToHTML(xmlString, baseUrl){
|
||||
const doc = new DOMParser().parseFromString(xmlString, "text/xml");
|
||||
return [...doc.querySelectorAll("item")].map(item => {
|
||||
const title = String(
|
||||
item.querySelector("title")?.textContent ||
|
||||
item.querySelector("pubDate")?.textContent ||
|
||||
doc.querySelector("title")?.textContent ||
|
||||
""
|
||||
).replace(/ \+.*/,'')
|
||||
const server = doc.querySelector("link")?.textContent || baseUrl.replace(/.*\/\//,'')
|
||||
const link = item.querySelector("link")?.textContent || "#";
|
||||
let desc = item.querySelector("description")?.textContent || "";
|
||||
|
||||
// Fix relative paths
|
||||
desc = desc.replace(/(src|href)="\/([^"]+)"/g, `$1="${baseUrl}/$2"`);
|
||||
|
||||
// Extract media:content or media:thumbnail URLs
|
||||
const media = [
|
||||
...item.getElementsByTagNameNS("*", "content"),
|
||||
...item.getElementsByTagNameNS("*", "thumbnail")
|
||||
]
|
||||
.filter( (m) => m.getAttribute("url")?.match(/\.(png|jpg|jpeg|gif)/gi) )
|
||||
.map(m => `\n<img src="${m.getAttribute("url")}" width="100%"/>`).join("");
|
||||
|
||||
return `<h1>${this.emoji}${baseUrl.replace(/.*\/\//,'')}</h1>
|
||||
<span class="light">${title}</span>
|
||||
${desc}
|
||||
<br>
|
||||
${ this.images ? media : ''}
|
||||
`
|
||||
})
|
||||
},
|
||||
|
||||
})
|
||||
|
|
@ -1,326 +0,0 @@
|
|||
room.registerElement('pushbutton', {
|
||||
width: .5,
|
||||
length: .5,
|
||||
height: .5,
|
||||
clicking: false,
|
||||
state: 'off',
|
||||
accesskey: false,
|
||||
|
||||
onbuttondown: new CustomEvent('buttondown'),
|
||||
onbuttonpress: new CustomEvent('buttonpress'),
|
||||
onbuttonup: new CustomEvent('buttonup'),
|
||||
onclick: new CustomEvent('click'),
|
||||
|
||||
createChildren: function() {
|
||||
this.base = room.createObject('Object', {
|
||||
id: 'cube',
|
||||
collision_id: 'cube',
|
||||
col: V(.6,.6,.6),
|
||||
scale: V(this.length,this.height / 2,this.width),
|
||||
pos: V(0,this.height/4,0)
|
||||
}, this);
|
||||
this.button = room.createObject('Object', {
|
||||
id: 'cube',
|
||||
collision_id: 'cube',
|
||||
col: this.col,
|
||||
scale: V(this.length * .8, this.height / 4, this.width * .8),
|
||||
}, this);
|
||||
this.sounds = {
|
||||
clickin: room.createObject('Sound', { id: 'pushbutton-click-in', }, this),
|
||||
clickon: room.createObject('Sound', { id: 'pushbutton-click-on', }, this),
|
||||
clickoff: room.createObject('Sound', { id: 'pushbutton-click-off', }, this),
|
||||
};
|
||||
|
||||
this.button.addEventListener('mousedown', this.onMouseDown);
|
||||
window.addEventListener('mouseup', this.onMouseUp);
|
||||
window.addEventListener('touchend', this.onMouseUp);
|
||||
this.button.addEventListener('click', this.onClick);
|
||||
|
||||
if (this.accesskey) {
|
||||
room.onKeyDown = this.onKeyDown;
|
||||
room.onKeyUp = this.onKeyUp;
|
||||
}
|
||||
|
||||
this.setButtonPos();
|
||||
},
|
||||
press: function() {
|
||||
this.executeCallback(this.onbuttonpress);
|
||||
},
|
||||
onClick: function(ev) {
|
||||
if (this.onclick) {
|
||||
this.executeCallback(this.onclick);
|
||||
}
|
||||
},
|
||||
onMouseDown: function(ev) {
|
||||
this.button.sync = true;
|
||||
this.clicking = true;
|
||||
this.activate();
|
||||
|
||||
this.setState('in');
|
||||
this.executeCallback(this.onbuttondown);
|
||||
|
||||
if (ev) {
|
||||
ev.stopPropagation();
|
||||
}
|
||||
},
|
||||
onMouseUp: function(ev) {
|
||||
if (this.clicking) {
|
||||
this.setState('off');
|
||||
this.button.sync = true;
|
||||
this.clicking = false;
|
||||
this.executeCallback(this.onbuttonup);
|
||||
|
||||
if (ev) {
|
||||
ev.stopPropagation();
|
||||
}
|
||||
}
|
||||
},
|
||||
onKeyDown: function(ev) {
|
||||
if (ev.keyCode == this.accesskey) {
|
||||
this.onMouseDown(ev);
|
||||
}
|
||||
},
|
||||
onKeyUp: function(ev) {
|
||||
if (ev.keyCode == this.accesskey) {
|
||||
this.onMouseUp(ev);
|
||||
}
|
||||
},
|
||||
setActive: function(active) {
|
||||
this.setState(active ? 'on' : 'off');
|
||||
},
|
||||
setButtonPos: function(pos) {
|
||||
if (typeof pos == 'undefined') pos = (this.active ? .6 : 0);
|
||||
var percent = Math.min(1, Math.max(0, pos));
|
||||
var defaultpos = this.height / 2;
|
||||
this.button.pos = V(0, defaultpos - ((this.height / 8) * percent) + (this.height / 16), 0);
|
||||
},
|
||||
setState: function(state) {
|
||||
if (state != this.state) {
|
||||
this.state = state;
|
||||
if (state == 'in') {
|
||||
this.setButtonPos(1);
|
||||
this.sounds.clickin.play();
|
||||
} else if (state == 'on') {
|
||||
this.setButtonPos(.6);
|
||||
this.sounds.clickon.play();
|
||||
} else if (state == 'off') {
|
||||
this.setButtonPos(0);
|
||||
this.sounds.clickoff.play();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
room.registerElement('slider', {
|
||||
grabbing: false,
|
||||
value: 1,
|
||||
min: 0,
|
||||
max: 1,
|
||||
length: 1,
|
||||
width: .25,
|
||||
height: .2,
|
||||
|
||||
ongrabstart: new CustomEvent('grabstart'),
|
||||
onchange: new CustomEvent('change'),
|
||||
ongrabend: new CustomEvent('grabend'),
|
||||
|
||||
createChildren: function() {
|
||||
this.base = room.createObject('Object', {
|
||||
id: 'cube',
|
||||
collision_id: 'cube',
|
||||
col: V(.6,.6,.6),
|
||||
scale: V(this.length,this.height/2,this.width),
|
||||
pos: V(0,this.height/4,0)
|
||||
}, this);
|
||||
this.track = room.createObject('Object', {
|
||||
id: 'cube',
|
||||
collision_id: 'cube',
|
||||
col: V(.02,.02,.02),
|
||||
scale: V(this.length * .9, this.height / 4, this.width / 5),
|
||||
pos: V(0, this.base.pos.y + this.height / 4,0)
|
||||
}, this);
|
||||
this.handle = room.createObject('Object', {
|
||||
id: 'cube',
|
||||
collision_id: 'cube',
|
||||
col: this.col,
|
||||
scale: V(this.width / 4, this.height / 4, this.width * .75),
|
||||
pos: V(0,this.base.pos.y,0)
|
||||
}, this);
|
||||
this.sounds = {
|
||||
clickin: room.createObject('Sound', { id: 'pushbutton-click-in', }, this),
|
||||
clickon: room.createObject('Sound', { id: 'pushbutton-click-on', }, this),
|
||||
clickoff: room.createObject('Sound', { id: 'pushbutton-click-off', }, this),
|
||||
};
|
||||
|
||||
this.handle.addEventListener('mousedown', this.onMouseDown);
|
||||
this.track.addEventListener('mousedown', this.onMouseDown);
|
||||
// FIXME - bind these in mousedown, for maximum efficiency
|
||||
window.addEventListener('mouseup', this.onMouseUp);
|
||||
window.addEventListener('touchend', this.onMouseUp);
|
||||
window.addEventListener('mousemove', this.onMouseMove);
|
||||
window.addEventListener('touchmove', this.onMouseMove);
|
||||
this.handle.addEventListener('click', this.onClick);
|
||||
|
||||
this.setValue(this.value);
|
||||
},
|
||||
setValue: function(value, skipchange) {
|
||||
var realvalue = Math.min(this.max, Math.max(this.min, value));
|
||||
var percent = realvalue / (this.max - this.min);
|
||||
var pos = (percent - .5) * this.length * .9;
|
||||
this.handle.pos = V(pos, this.base.pos.y + this.height * 3 / 8 , 0);
|
||||
this.handle.sync = true;
|
||||
this.value = realvalue;
|
||||
|
||||
if (this.onchange && !skipchange) {
|
||||
this.executeCallback(this.onchange);
|
||||
}
|
||||
},
|
||||
updateValueFromCursorPos: function() {
|
||||
// FIXME - vector proxies are currently broken
|
||||
var sliderpos = this.parent.localToWorld(this.pos._target.clone());
|
||||
var dist = player.head_pos.distanceTo(sliderpos);
|
||||
|
||||
// Cast a ray from my head to the cursor position
|
||||
var dir = V(player.cursor_pos.x - player.head_pos.x, player.cursor_pos.y - player.head_pos.y, player.cursor_pos.z - player.head_pos.z);
|
||||
|
||||
// Then project the ray into the same plane as the slider I'm manipulating
|
||||
var pos = translate(player.head_pos, scalarMultiply(normalized(dir), dist));
|
||||
this.worldToLocal(pos);
|
||||
|
||||
// The slider position is now determined based on the x position (left/right) in the slider's own coordinate system, and the length of the slider
|
||||
var foo = pos.x / (this.length * .9) + .5;
|
||||
|
||||
this.setValue(foo * (this.max - this.min));
|
||||
},
|
||||
onMouseDown: function(ev) {
|
||||
this.grabbing = true;
|
||||
this.updateValueFromCursorPos();
|
||||
this.sounds.clickin.play();
|
||||
if (this.ongrabstart) this.executeCallback(this.ongrabstart);
|
||||
ev.preventDefault();
|
||||
ev.stopPropagation();
|
||||
},
|
||||
onMouseMove: function(ev) {
|
||||
if (this.grabbing) {
|
||||
this.updateValueFromCursorPos();
|
||||
ev.stopPropagation();
|
||||
}
|
||||
},
|
||||
onMouseUp: function(ev) {
|
||||
if (this.grabbing) {
|
||||
this.grabbing = false;
|
||||
this.sounds.clickoff.play();
|
||||
if (this.ongrabend) this.executeCallback(this.ongrabend);
|
||||
ev.stopPropagation();
|
||||
}
|
||||
},
|
||||
onClick: function(ev) {
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
room.registerElement('togglebutton', {
|
||||
width: .5,
|
||||
length: .5,
|
||||
height: .5,
|
||||
clicking: false,
|
||||
active: false,
|
||||
|
||||
onbuttondown: new CustomEvent('buttondown'),
|
||||
onbuttonpress: new CustomEvent('buttonpress'),
|
||||
onbuttonup: new CustomEvent('buttonup'),
|
||||
onactivate: new CustomEvent('activate'),
|
||||
ondeactivate: new CustomEvent('deactivate'),
|
||||
|
||||
createChildren: function() {
|
||||
this.base = room.createObject('Object', {
|
||||
id: 'cube',
|
||||
collision_id: 'cube',
|
||||
col: V(.6,.6,.6),
|
||||
scale: V(this.length,this.height / 2,this.width),
|
||||
pos: V(0,this.height/4,0)
|
||||
}, this);
|
||||
this.button = room.createObject('Object', {
|
||||
id: 'cube',
|
||||
collision_id: 'cube',
|
||||
col: this.col,
|
||||
scale: V(this.length * .8, this.height / 4, this.width * .8),
|
||||
}, this);
|
||||
this.sounds = {
|
||||
clickin: this.createObject('Sound', { id: 'pushbutton-click-in', }),
|
||||
clickon: this.createObject('Sound', { id: 'pushbutton-click-on', }),
|
||||
clickoff: this.createObject('Sound', { id: 'pushbutton-click-off', }),
|
||||
};
|
||||
|
||||
this.button.addEventListener('mousedown', this.onMouseDown);
|
||||
window.addEventListener('mouseup', this.onMouseUp);
|
||||
window.addEventListener('touchend', this.onMouseUp);
|
||||
this.button.addEventListener('click', this.onClick);
|
||||
|
||||
this.setButtonPos();
|
||||
},
|
||||
press: function() {
|
||||
this.active = !this.active;
|
||||
|
||||
if (this.active && this.onactivate) {
|
||||
this.executeCallback(this.onactivate);
|
||||
} else if (!this.active && this.ondeactivate) {
|
||||
this.executeCallback(this.ondeactivate);
|
||||
}
|
||||
},
|
||||
onClick: function(ev) {
|
||||
if (this.onclick) {
|
||||
this.executeCallback(this.onclick);
|
||||
}
|
||||
},
|
||||
onMouseDown: function(ev) {
|
||||
this.button.sync = true;
|
||||
this.clicking = true;
|
||||
this.press();
|
||||
|
||||
this.setState('in');
|
||||
|
||||
ev.stopPropagation();
|
||||
},
|
||||
onMouseUp: function(ev) {
|
||||
if (this.clicking) {
|
||||
if (this.active) {
|
||||
this.setState('on');
|
||||
} else {
|
||||
this.setState('off');
|
||||
}
|
||||
this.button.sync = true;
|
||||
this.clicking = false;
|
||||
|
||||
ev.stopPropagation();
|
||||
}
|
||||
},
|
||||
setActive: function(active) {
|
||||
this.active = active;
|
||||
this.setState(active ? 'on' : 'off');
|
||||
},
|
||||
setButtonPos: function(pos) {
|
||||
if (typeof pos == 'undefined') pos = (this.active ? .6 : 0);
|
||||
var percent = Math.min(1, Math.max(0, pos));
|
||||
var defaultpos = this.height / 2;
|
||||
this.button.pos = V(0, defaultpos - ((this.height / 8) * percent) + (this.height / 16), 0);
|
||||
},
|
||||
setState: function(state) {
|
||||
if (state != this.state) {
|
||||
this.state = state;
|
||||
if (state == 'in') {
|
||||
this.setButtonPos(1);
|
||||
this.sounds.clickin.play();
|
||||
} else if (state == 'on') {
|
||||
this.setButtonPos(.6);
|
||||
this.sounds.clickon.play();
|
||||
} else if (state == 'off') {
|
||||
this.setButtonPos(0);
|
||||
this.sounds.clickoff.play();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
room.registerElement('layout', {
|
||||
offset: V(1,0,0),
|
||||
spacing: 1,
|
||||
|
||||
createChildren: function() {
|
||||
var children = this.children;
|
||||
console.log('children!', children);
|
||||
var i = 0;
|
||||
for (var k in children) {
|
||||
children[k].pos = scalarMultiply(this.offset, i++ * this.spacing);
|
||||
}
|
||||
},
|
||||
});
|
||||
room.extendElement('layout', 'horizontallayout', {
|
||||
spacing: 1,
|
||||
offset: V(1,0,0),
|
||||
// FIXME - need proxy inheritance so we don't need to duplicate this function
|
||||
createChildren: function() {
|
||||
var children = this.children;
|
||||
console.log('children!', children);
|
||||
var i = 0;
|
||||
for (var k in children) {
|
||||
children[k].pos = scalarMultiply(this.offset, i++ * this.spacing);
|
||||
}
|
||||
},
|
||||
});
|
||||
room.extendElement('layout', 'verticallayout', {
|
||||
offset: V(0,1,0),
|
||||
spacing: 1,
|
||||
// FIXME - need proxy inheritance so we don't need to duplicate this function
|
||||
create: function() {
|
||||
var children = this.children;
|
||||
console.log('children!', children);
|
||||
var i = 0;
|
||||
for (var k in children) {
|
||||
children[k].pos = scalarMultiply(this.offset, i++ * this.spacing);
|
||||
}
|
||||
},
|
||||
});
|
||||
room.extendElement('layout', 'circularlayout', {
|
||||
radius: 1,
|
||||
|
||||
createChildren: function() {
|
||||
var spacing = -2 * Math.PI / this.children.length;
|
||||
|
||||
for (var i = 0; i < this.children.length; i++) {
|
||||
var child = this.children[i];
|
||||
child.pos = V(this.radius * Math.sin(spacing * i), 0, this.radius * Math.cos(spacing * i));
|
||||
child.zdir = scalarMultiply(normalized(child.pos), -1);
|
||||
child.xdir = cross(V(0,1,0), child.zdir);
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 402 KiB |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 7.4 KiB |
|
|
@ -1,24 +0,0 @@
|
|||
if( !janus.arfirst ){
|
||||
|
||||
janus.arfirst = true // only run once
|
||||
|
||||
var startXR = janus.engine.client.startXR
|
||||
var loadRoomAssets = room.loadRoomAssets
|
||||
var client = janus.engine.client
|
||||
|
||||
function room2AR(room){
|
||||
if( client.xrsession && client.xrsession.mode == 'immersive-ar' ){
|
||||
window.room.localasset.visible = false
|
||||
window.room.skybox = false
|
||||
}
|
||||
}
|
||||
|
||||
client.startXR = function(mode,opts){
|
||||
if( !mode ) mode = 'immersive-ar'
|
||||
startXR.apply(client, [mode,opts])
|
||||
room2AR()
|
||||
}
|
||||
|
||||
elation.events.add(this.janusweb, 'room_load_processed', (ev) => room2AR() )
|
||||
}
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
"apps": {
|
||||
},
|
||||
"templates": {
|
||||
},
|
||||
"scripts": [
|
||||
"./arfirst.js"
|
||||
],
|
||||
"css": [],
|
||||
"components": []
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
"apps": {
|
||||
"comms": "./apps/comms/comms.json",
|
||||
"navigation": "./apps/navigation/navigation.json",
|
||||
"avatar": "./apps/avatar/avatar.json",
|
||||
"inventory": "./apps/inventory/inventory.json",
|
||||
"editor": "./apps/editor/editor.json",
|
||||
"transporter": "./apps/transporter/transporter.json",
|
||||
"locomotion": "./apps/locomotion/locomotion.json",
|
||||
"virtualgamepad": "./apps/virtualgamepad/virtualgamepad.json",
|
||||
"settings": "./apps/settings/settings.json",
|
||||
"buttons": "./apps/buttons/buttons.json",
|
||||
"xrmenu": "./apps/xrmenu/xrmenu.json",
|
||||
"vfs": "./apps/vfs/vfs.json"
|
||||
},
|
||||
"includes": [],
|
||||
"templates": {
|
||||
"janusweb.ui": "./default.html"
|
||||
},
|
||||
"css": [
|
||||
"./themes/default.css"
|
||||
],
|
||||
"scripts": [
|
||||
"/view/element/layout.js",
|
||||
"/view/element/janus-script-ui/janus-script-ui.js",
|
||||
"/view/element/janus-script-peertube/janus-script-peertube.js"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
{
|
||||
"apps_after_sessionstart":{
|
||||
"arfirst": "./apps/arfirst/arfirst.json",
|
||||
"comms": "./apps/comms/comms.json",
|
||||
"navigation": "./apps/navigation/navigation.json",
|
||||
"avatar": "./apps/avatar/avatar.json",
|
||||
"inventory": "./apps/inventory/inventory.json",
|
||||
"editor": "./apps/editor/editor.json",
|
||||
"transporter": "./apps/transporter/transporter.json",
|
||||
"locomotion": "./apps/locomotion/locomotion.json",
|
||||
"virtualgamepad": "./apps/virtualgamepad/virtualgamepad.json",
|
||||
"settings": "./apps/settings/settings.json",
|
||||
"buttons": "./apps/buttons/buttons.json",
|
||||
"xrmenu": "./apps/xrmenu/xrmenu.json",
|
||||
"vfs": "./apps/vfs/vfs.json"
|
||||
},
|
||||
"apps": {
|
||||
},
|
||||
"includes": [],
|
||||
"templates": {
|
||||
"janusweb.ui": "./default.html"
|
||||
},
|
||||
"css": [
|
||||
"./themes/default.css"
|
||||
],
|
||||
"scripts": [
|
||||
"/view/element/layout.js",
|
||||
"/view/element/janus-script-ui/janus-script-ui.js",
|
||||
"/view/element/janus-script-peertube/janus-script-peertube.js"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
{
|
||||
"apps": {
|
||||
"arfirst": "./apps/arfirst/arfirst.json",
|
||||
"avatar": "./apps/avatar/avatar.json",
|
||||
"inventory": "./apps/inventory/inventory.json",
|
||||
"editor": "./apps/editor/editor.json",
|
||||
"transporter": "./apps/transporter/transporter.json",
|
||||
"locomotion": "./apps/locomotion/locomotion.json",
|
||||
"virtualgamepad": "./apps/virtualgamepad/virtualgamepad.json",
|
||||
"buttons": "./apps/buttons/buttons.json",
|
||||
"xrmenu": "./apps/xrmenu/xrmenu.json",
|
||||
"vfs": "./apps/vfs/vfs.json"
|
||||
},
|
||||
"includes": [ ],
|
||||
"templates": {
|
||||
"janusweb.ui": "./default.html"
|
||||
},
|
||||
"css": [
|
||||
"./themes/preview.css"
|
||||
],
|
||||
"scripts": [
|
||||
"/view/element/layout.js",
|
||||
"/view/element/janus-script-ui/janus-script-ui.js",
|
||||
"/view/element/janus-script-peertube/janus-script-peertube.js"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
{
|
||||
"apps": {
|
||||
"arfirst": "./apps/arfirst/arfirst.json",
|
||||
"avatar": "./apps/avatar/avatar.json",
|
||||
"inventory": "./apps/inventory/inventory.json",
|
||||
"editor": "./apps/editor/editor.json",
|
||||
"transporter": "./apps/transporter/transporter.json",
|
||||
"locomotion": "./apps/locomotion/locomotion.json",
|
||||
"virtualgamepad": "./apps/virtualgamepad/virtualgamepad.json",
|
||||
"settings": "./apps/settings/settings.json",
|
||||
"buttons": "./apps/buttons/buttons.json",
|
||||
"xrmenu": "./apps/xrmenu/xrmenu.json",
|
||||
"vfs": "./apps/vfs/vfs.json"
|
||||
},
|
||||
"includes": [],
|
||||
"templates": {
|
||||
"janusweb.ui": "./default.html"
|
||||
},
|
||||
"css": [
|
||||
"./themes/preview.css"
|
||||
],
|
||||
"scripts": [
|
||||
"/view/element/layout.js",
|
||||
"/view/element/janus-script-ui/janus-script-ui.js",
|
||||
"/view/element/janus-script-peertube/janus-script-peertube.js"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
ui-buttonbar{
|
||||
margin:15px;
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 58.752 58.752" style="enable-background:new 0 0 58.752 58.752;" xml:space="preserve">
|
||||
<g>
|
||||
<path stroke="#CCC" stroke-opacity="0.5" fill="white" d="M52.524,23.925L12.507,0.824c-1.907-1.1-4.376-1.097-6.276,0C4.293,1.94,3.088,4.025,3.088,6.264v46.205
|
||||
c0,2.24,1.204,4.325,3.131,5.435c0.953,0.555,2.042,0.848,3.149,0.848c1.104,0,2.192-0.292,3.141-0.843l40.017-23.103
|
||||
c1.936-1.119,3.138-3.203,3.138-5.439C55.663,27.134,54.462,25.05,52.524,23.925z M49.524,29.612L9.504,52.716
|
||||
c-0.082,0.047-0.18,0.052-0.279-0.005c-0.084-0.049-0.137-0.142-0.137-0.242V6.263c0-0.1,0.052-0.192,0.14-0.243
|
||||
c0.042-0.025,0.09-0.038,0.139-0.038c0.051,0,0.099,0.013,0.142,0.038l40.01,23.098c0.089,0.052,0.145,0.147,0.145,0.249
|
||||
C49.663,29.47,49.611,29.561,49.524,29.612z"/>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.2 KiB |
|
|
@ -1,8 +0,0 @@
|
|||
<fireboxroom>
|
||||
<Assets>
|
||||
</Assets>
|
||||
<Room pos="0 0 0" skybox="true" showavatar="false" use_local_asset="room_plane">
|
||||
<link url="https://web.janusxr.org/newlobby/index.html" col="1.0 0.0 1.0" title="XRForge entrypoint" pos="0 0 5" scale="1.8 3.2 1"/>
|
||||
<light js_id="dan9-janus:light/light_cone_angle=0-6" pos="0 3 2" collision_trigger="false" />
|
||||
</Room>
|
||||
</fireboxroom>
|
||||
10
manyfold/usr/src/app/public/view/vconsole.min.js
vendored
10
manyfold/usr/src/app/public/view/vconsole.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1,237 +0,0 @@
|
|||
*, *::before, *::after {
|
||||
padding: 0;
|
||||
margin: 0 auto;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
body {
|
||||
background-color: #def;
|
||||
background-image: linear-gradient(#201, #001 50%);
|
||||
color: #fff;
|
||||
min-height: 100vh;
|
||||
display: grid;
|
||||
place-items: center;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.outer {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
perspective: 660px;
|
||||
}
|
||||
.outer_scene {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
-webkit-animation: sceneRotate 5s infinite ease-in-out alternate;
|
||||
animation: sceneRotate 5s infinite ease-in-out alternate;
|
||||
}
|
||||
.outer_floor {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
width: 3200px;
|
||||
height: 3200px;
|
||||
transform: translate(-70%, -50%) rotateX(90deg) rotateZ(90deg) translateZ(-140px);
|
||||
background-image: linear-gradient(#111a, #1110, #001 60%), linear-gradient(#fff5 0, #fff0 15px);
|
||||
background-size: 100%, 130px 130px;
|
||||
}
|
||||
|
||||
.portal {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
width: 280px;
|
||||
height: 320px;
|
||||
background-image: linear-gradient(#201, #000 50%);
|
||||
border-radius: 50%;
|
||||
box-shadow: 0 0 20px #f77, 0 0 50px #7ff;
|
||||
perspective: 660px;
|
||||
overflow: hidden;
|
||||
-webkit-animation: portalRotate 5s infinite ease-in-out alternate;
|
||||
animation: portalRotate 5s infinite ease-in-out alternate;
|
||||
}
|
||||
@-webkit-keyframes portalRotate {
|
||||
from {
|
||||
transform: translate(-50%, -50%) rotateY(40deg);
|
||||
}
|
||||
to {
|
||||
transform: translate(-50%, -50%) rotateY(-40deg);
|
||||
}
|
||||
}
|
||||
@keyframes portalRotate {
|
||||
from {
|
||||
transform: translate(-50%, -50%) rotateY(40deg);
|
||||
}
|
||||
to {
|
||||
transform: translate(-50%, -50%) rotateY(-40deg);
|
||||
}
|
||||
}
|
||||
.portal_scene {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
-webkit-animation: sceneRotate 5s infinite ease-in-out alternate;
|
||||
animation: sceneRotate 5s infinite ease-in-out alternate;
|
||||
}
|
||||
@-webkit-keyframes sceneRotate {
|
||||
from {
|
||||
transform: rotateY(-40deg);
|
||||
}
|
||||
to {
|
||||
transform: rotateY(40deg);
|
||||
}
|
||||
}
|
||||
@keyframes sceneRotate {
|
||||
from {
|
||||
transform: rotateY(-40deg);
|
||||
}
|
||||
to {
|
||||
transform: rotateY(40deg);
|
||||
}
|
||||
}
|
||||
.portal_floor {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
width: 3200px;
|
||||
height: 3200px;
|
||||
transform: translate(-50%, -50%) rotateX(90deg) translateZ(-240px);
|
||||
background-color: #444;
|
||||
background-image: radial-gradient(#111a, #1110, #000 60%), repeating-linear-gradient(#fff5 0 5px, #fff0 0 75px), repeating-linear-gradient(90deg, #fff5 0 5px, #fff0 0 75px);
|
||||
}
|
||||
|
||||
.cube {
|
||||
position: absolute;
|
||||
top: 240px;
|
||||
transform: rotateY(var(--ry, 0)) translateZ(525px) rotateY(calc(var(--ry, 0) * -1));
|
||||
}
|
||||
.cube:nth-child(2) {
|
||||
--ry: 112.5deg;
|
||||
--delay: 0s;
|
||||
}
|
||||
.cube:nth-child(3) {
|
||||
--ry: 157.5deg;
|
||||
--delay: -1.5s;
|
||||
}
|
||||
.cube:nth-child(4) {
|
||||
--ry: 202.5deg;
|
||||
--delay: -3s;
|
||||
}
|
||||
.cube:nth-child(5) {
|
||||
--ry: 247.5deg;
|
||||
--delay: -4.5s;
|
||||
}
|
||||
.cube_body {
|
||||
position: absolute;
|
||||
left: -256px;
|
||||
top: -256px;
|
||||
width: 1015px;
|
||||
height: 312px;
|
||||
transform-origin: bottom;
|
||||
}
|
||||
.cube_body > #bg {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
background-color: #fff;
|
||||
opacity: 1;
|
||||
background: url(https://i.imgur.com/oG1Kxve.png) no-repeat;
|
||||
}
|
||||
.cube_body > #bg:nth-child(1) {
|
||||
transform: translateX(-522px) translateY(-140px) translateZ(290px);
|
||||
}
|
||||
|
||||
#cover {
|
||||
cursor:pointer;
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
left: 0px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: url(play.svg) no-repeat;
|
||||
z-index: 1000;
|
||||
background-position: center;
|
||||
background-size: 220px;
|
||||
animation: fadeInOut 4s ease-in-out infinite;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
@keyframes fadeInOut {
|
||||
/* At the start of the animation (0%) and end (100%), the element is hidden */
|
||||
0%, 100% {
|
||||
filter: blur(20px);
|
||||
transform: scale(1.2);
|
||||
opacity: 0;
|
||||
}
|
||||
/* In the middle of the animation (50%), the element is fully visible */
|
||||
40%, 60% {
|
||||
filter: blur(0px);
|
||||
transform: scale(1.0);
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes slideInOut {
|
||||
/* At the start of the animation (0%) and end (100%), the element is hidden */
|
||||
0%, 100% {
|
||||
transform: translate(600px,0);
|
||||
}
|
||||
/* In the middle of the animation (50%), the element is fully visible */
|
||||
40%, 60% {
|
||||
transform: translate(0px,0);
|
||||
}
|
||||
}
|
||||
#poweredby {
|
||||
pointer-events: all;
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
right: 0px;
|
||||
width: 300px;
|
||||
height: 160px;
|
||||
margin: 20px;
|
||||
text-align: right;
|
||||
z-index: 2000;
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
#poweredby > a > img {
|
||||
width: 80px;
|
||||
}
|
||||
|
||||
#poweredby::before{
|
||||
display: block;
|
||||
width: 500px;
|
||||
height: 500px;
|
||||
background: linear-gradient(45deg,#000c,#00f0);
|
||||
content: "";
|
||||
position: absolute;
|
||||
right: -235px;
|
||||
top: -291px;
|
||||
transform: rotate(54deg);
|
||||
z-index: -100;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
|
||||
body {
|
||||
background: #000 linear-gradient(-45deg, #ee775288, #e73c7e88, #23a6d588, #23d5ab88);
|
||||
-webkit-animation: gradient 15s ease infinite;
|
||||
animation: gradient 15s ease infinite;
|
||||
background-size: 280% 280%;
|
||||
}
|
||||
|
||||
h1 {
|
||||
position:absolute;
|
||||
display: block;
|
||||
bottom: 6%;
|
||||
z-index: 2000;
|
||||
left: 37%;
|
||||
color: #0008;
|
||||
font-size: 19px;
|
||||
}
|
||||
|
||||
.overlay{
|
||||
pointer-events:none;
|
||||
}
|
||||
|
||||
|
|
@ -41,15 +41,13 @@ let
|
|||
#### JANUSXR Stack
|
||||
|
||||
janusweb = builtins.fetchTarball {
|
||||
name = "janusweb";
|
||||
url = "https://github.com/coderofsalvation/janusweb/releases/download/1.5.56-peertube/janusweb-1.5.56.tar.gz";
|
||||
url = "https://github.com/coderofsalvation/janusweb/releases/download/1.5.56-xrf/janusweb-1.5.56.tar.gz";
|
||||
# Get the SHA256 hash by running: nix-prefetch-url --unpack <URL>
|
||||
sha256 = "11mlbhmi3vs1xpxjp4dlxb8yi60dmdrh0bfkl0j0hlfhr9y2px4d";
|
||||
sha256 = "0zkmfv07zxdf1nkhgr4g959fj86p2yp9f7n1ll1zyhlm186sfh31";
|
||||
};
|
||||
|
||||
# Fetch the source from the GitHub tag
|
||||
corsanywhere = pkgs.fetchzip {
|
||||
name = "corsanywhere";
|
||||
url = "https://github.com/Rob--W/cors-anywhere/archive/0.4.4.tar.gz";
|
||||
# You need to calculate the correct SHA256 hash for version 0.4.4
|
||||
# You can get this by running 'nix-prefetch-url --unpack https://github.com/Rob--W/cors-anywhere/archive/0.4.4.tar.gz'
|
||||
|
|
@ -64,26 +62,28 @@ let
|
|||
};
|
||||
|
||||
## 2. Create a minimal derivation to make the file executable
|
||||
janusServerBin = pkgs.stdenv.mkDerivation {
|
||||
pname = "janus-server";
|
||||
version = "1.0";
|
||||
src = janusServer;
|
||||
dontUnpack = true;
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp $src $out/bin/janus_server-linux
|
||||
chmod +x $out/bin/janus_server-linux
|
||||
'';
|
||||
};
|
||||
#janusServerBin = pkgs.stdenv.mkDerivation {
|
||||
# pname = "janus-server";
|
||||
# version = "1.0";
|
||||
# src = janusServer;
|
||||
# dontUnpack = true;
|
||||
# dontBuild = true;
|
||||
# installPhase = ''
|
||||
# mkdir -p $out/bin
|
||||
# cp $src $out/bin/janus_server-linux
|
||||
# chmod +x $out/bin/janus_server-linux
|
||||
# '';
|
||||
#};
|
||||
|
||||
janus = pkgs.runCommand "janus" {} ''
|
||||
mkdir -p $out/janusweb $out/root/corsanywhere
|
||||
cp -rT ${janusweb} $out/janusweb
|
||||
janus = pkgs.runCommand "janusweb-content" {} ''
|
||||
mkdir -p $out/mnt/janusweb $out/root/corsanywhere $out/root
|
||||
cp -rT ${janusweb} $out/mnt/janusweb
|
||||
cp -rT ${corsanywhere} $out/root/corsanywhere/.
|
||||
cp -rT ${janusServer} $out/root/janus_server-linux
|
||||
'';
|
||||
|
||||
#### XR FRAGMENTS
|
||||
|
||||
## $ nix-shell -p nix-prefetch-git --command 'nix-prefetch-git https://codeberg.org/coderofsalvation/xrfragment.git <commit>'
|
||||
xrfragmentsRepo = pkgs.fetchFromGitea {
|
||||
"domain" = "codeberg.org";
|
||||
|
|
@ -93,10 +93,10 @@ let
|
|||
"hash" = "sha256-P/RVwoDu0EYfwc0n2h1f4j0JZshtE4AtQsTU9iEkAcA=";
|
||||
};
|
||||
|
||||
xrfragments = pkgs.runCommand "xrfragments" {} ''
|
||||
mkdir -p $out/xrf/templates/xrfragments $out/xrf/assets/xrfragments
|
||||
cp -rT ${xrfragmentsRepo}/assets/library $out/xrf/assets/xrfragments/\#1
|
||||
find ${xrfragmentsRepo}/assets/template -maxdepth 1 -mindepth 1 -type d | awk '{ system("cp -rT "$0" '$out'/xrf/templates/xrfragments/#"(NR+1)) }'
|
||||
xrfragments = pkgs.runCommand "xrfragments-content" {} ''
|
||||
mkdir -p $out/mnt/asset/xrfragments $out/mnt/templates/xrfragments
|
||||
cp -r ${xrfragmentsRepo}/assets/library $out/mnt/asset/xrfragments/\#1
|
||||
find ${xrfragmentsRepo}//assets/template -maxdepth 1 -mindepth 1 -type d | awk '{ system("cp -r "$0" '$out'/mnt/templates/xrfragments/#"(NR+1)) }'
|
||||
'';
|
||||
|
||||
|
||||
|
|
@ -118,7 +118,7 @@ in
|
|||
rec
|
||||
{
|
||||
|
||||
xrforgeImage = pkgs.dockerTools.buildLayeredImage {
|
||||
xrforgeImage = pkgs.dockerTools.buildImage {
|
||||
|
||||
name = "xrforge";
|
||||
tag = "latest";
|
||||
|
|
@ -126,16 +126,16 @@ rec
|
|||
fromImage = manyfoldImage;
|
||||
|
||||
# add nix pkgs + local files
|
||||
contents = pkgs.buildEnv {
|
||||
copyToRoot = pkgs.buildEnv {
|
||||
name = "image-root";
|
||||
pathsToLink = ["/manyfold" "/bin" "/root" "/xrf" "/janusweb"];
|
||||
pathsToLink = ["/manyfold" "/bin" "/mnt" "/root"];
|
||||
paths = [
|
||||
#pkgs.pkgsStatic.rsync
|
||||
pkgs.rsync
|
||||
pkgs.sqlite
|
||||
pkgs.rclone
|
||||
pkgs.fuse3
|
||||
#pkgs.janus-gateway # webrtc voip for JanusXR
|
||||
pkgs.janus-gateway # webrtc voip for JanusXR
|
||||
pkgs.nodejs_20 # for corsanywhere
|
||||
#pkgs.acl # getfacl e.g.
|
||||
#pkgs.inotify-tools # inotifywait e.g.
|
||||
|
|
@ -145,20 +145,10 @@ rec
|
|||
#myAssimp # updated build of assimp
|
||||
janus
|
||||
xrfragments
|
||||
../manyfold
|
||||
../.
|
||||
];
|
||||
};
|
||||
|
||||
# we do this here (instead of creating a derivation which copies/links them)
|
||||
# because the derivation will duplicate the content (even when linking )
|
||||
# causing the image to balloon in size :/
|
||||
enableFakechroot = true;
|
||||
fakeRootCommands = ''
|
||||
for dir in /nix/store/*-manyfold/*; do
|
||||
ln -s $dir /manyfold/.
|
||||
done
|
||||
'';
|
||||
|
||||
config = {
|
||||
Cmd = ["/init"];
|
||||
# We substitute the /init entrypoing with our own wrapper
|
||||
|
|
|
|||
|
|
@ -22,10 +22,11 @@
|
|||
# nativeBuildInputs is usually what you want -- tools you need to run
|
||||
nativeBuildInputs = with pkgs.buildPackages; [
|
||||
|
||||
monolith
|
||||
nodejs_22
|
||||
nixos-generators
|
||||
#qemu
|
||||
sqlite
|
||||
pv
|
||||
|
||||
];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue