Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0ace214070 | |||
| d725c9c73a | |||
| c0e4705a13 |
|
|
@ -1,9 +0,0 @@
|
|||
https://ip:443 {
|
||||
reverse_proxy localhost:8080
|
||||
}
|
||||
https://ip:5566 {
|
||||
reverse_proxy localhost:6566
|
||||
}
|
||||
https://ip:5577 {
|
||||
reverse_proxy localhost:6577
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
> Self-sovereign **XR Experiences** for teams & organisations, powered by FOSS ♥
|
||||
|
||||

|
||||

|
||||
|
||||
* View [index.html](https://coderofsalvation.codeberg.page/xrforge) for the official docs
|
||||
* Click [here](manyfold/README.md) for backend-installation instructions.
|
||||
|
|
@ -10,7 +10,6 @@
|
|||
Powered by:
|
||||
|
||||
* [NIX](https://nixos.org) for reproducibility and reliability
|
||||
* [JanusWeb](https://github.com/jbaicoianu/janusweb) for browsing JML / JanusXR immersive web-layer
|
||||
* [XR Fragments](https://xrfragment.org) for interoperability between XR experiences
|
||||
* [Manyfold](https://manyfold.app) for curating & collaborating XR experiences
|
||||
* [Godot](https://godot.org) & [Blender](https://blender.org) for editing XR experiences
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@ $ mkdir mnt config
|
|||
$ docker run -t xrforge docker.io/coderofsalvation/xrforge:latest -v ./mnt:/mnt -v ./config:/config
|
||||
```
|
||||
|
||||
> To scan all (mounted) libraries run this once: `$ docker exec xrforge /manyfold/cli/manyfold.sh scan_libraries`
|
||||
|
||||
# Build & Run the container-image
|
||||
|
||||
> **NOTE**: [nix](https://nixos.org) is used to promote reproducability-over-repeatability
|
||||
|
|
@ -26,7 +24,7 @@ $ docker run -t xrforge docker.io/coderofsalvation/xrforge:latest -v ./mnt:/mnt
|
|||
$ git clone --recurse-submodules --depth 1 https://codeberg.org/coderofsalvation/xrforge.git
|
||||
$ cd xrforge
|
||||
$ docker load < $(nix-build nix/docker.nix)
|
||||
$ docker run $(manyfold/cli/manyfold run) # generates a dockercmd with sane env-flags
|
||||
$ manyfold/cli/manyfold run
|
||||
|
||||
[xrforge] podman detected..starting OCI container
|
||||
+ /run/current-system/sw/bin/podman run -p 8790:3214 -p 8791:3215 --name xrforge -e SECRET_KEY_BASE=lkjwljlkwejrlkjek34k234l -e DATABASE_ADAPTER=sqlite3 -e SUDO_RUN_UNSAFELY=enabled -e MULTIUSER=enabled -e FEDERATION=enabled -e THEME=vapor -e HOMEPAGE=/models -e FEDERATE_DRIVE_CACHE=5s -v ./xrfragment/assets:/mnt/assets/xrfragment/#1 --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse xrforge
|
||||
|
|
@ -38,11 +36,11 @@ sending incremental file list
|
|||
|
||||
> NOTE: if you don't want the default XR Fragments asset-library, omit `--recurse-submodules` in the git cmd
|
||||
|
||||
To preserve your uploaded models and db, add these docker volume-flags, for example:
|
||||
To preserve your uploaded models, add the `experiences` as a docker volume-flag, for example:
|
||||
|
||||
```
|
||||
$ mkdir experiences config
|
||||
$ docker run -t xrforge docker.io/coderofsalvation/xrforge:latest -v ./config:/config -v ./experiences:/mnt/experiences
|
||||
$ mkdir experiences
|
||||
$ manyfold/cli/manyfold run -v ./experiences:/mnt/experiences
|
||||
|
||||
```
|
||||
|
||||
|
|
@ -53,7 +51,6 @@ $ 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) |
|
||||
| `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 +71,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 +132,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
|
||||
|
||||
|
|
@ -192,49 +186,3 @@ For a quick dev-environment run:
|
|||
$ mkdir /dev
|
||||
$ 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:
|
||||
|
||||
* [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:
|
||||
|
||||
* wss://presence.foo.bar.com => localhost:5566
|
||||
* https://cors.foo.bar.com > localhost:5577
|
||||
|
||||
> 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)
|
||||
|
||||
# Developing
|
||||
|
||||
```
|
||||
$ podman load < $(nix-build nix/docker.nix) # build xrforge-overlay on manyfold-image
|
||||
$ $(./manyfold/cli/manyfold.sh run -e DEV=1) # start docker
|
||||
```
|
||||
|
||||
> Profit! now point your browser to 'https://localhost:8080'
|
||||
|
||||
### 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.
|
||||
|
|
|
|||
|
|
@ -6,16 +6,6 @@ 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
|
||||
}
|
||||
db=/config/manyfold.sqlite3
|
||||
|
||||
# utility funcs
|
||||
|
|
@ -29,34 +19,22 @@ create_config(){
|
|||
}
|
||||
|
||||
run(){
|
||||
{
|
||||
test -x ${oci} || { echo "warning: not running manyfold OCI container [install podman/docker/etc]"; exit; }
|
||||
${oci} rm -f xrforge
|
||||
} 1>&2
|
||||
#-e NO_OVERLAYFS=true \
|
||||
#-e NO_DEFAULTDB=true \
|
||||
#-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 \
|
||||
test -x ${oci} || { echo "warning: not running manyfold OCI container [install podman/docker/etc]"; exit; }
|
||||
echocolor "[$APPNAME]" "$(basename ${oci}) detected..starting OCI container"
|
||||
${oci} rm -f xrforge
|
||||
#-e NO_OVERLAYFS=true \
|
||||
#-e NO_DEFAULTDB=true \
|
||||
#-e PUBLIC_HOSTNAME=localhost \
|
||||
#-e PUBLIC_PORT=80 \
|
||||
debug ${oci} run "$@" -p 8790:3214 -p 8791:3215 --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,14 +45,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
|
||||
#apply_patches
|
||||
rsync -rvzi * /.
|
||||
}
|
||||
|
||||
# cron-like function using sleep (./manifold.sh infinite 3600 zip -r /backup.zip /)
|
||||
|
|
@ -99,11 +71,10 @@ hook(){
|
|||
logger "$ hook $*"
|
||||
cmd=$1
|
||||
shift
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
|
|
@ -125,20 +96,6 @@ start_hook_daemon(){
|
|||
#find /mnt | grep datapackage | xargs -n1 $0 hook inotify_MODIFY
|
||||
}
|
||||
|
||||
apply_patches(){
|
||||
echocolor "[$APPNAME]" "applying patches"
|
||||
for patch_file in /manyfold/patches/*.patch; do
|
||||
if patch -p1 -N --forward < "$patch_file"; then
|
||||
echo "✅ Successfully applied **$(basename "$patch_file")**"
|
||||
else
|
||||
echo "🛑 Failed to apply **$(basename "$patch_file")**"
|
||||
echo "Aborting script. Please inspect the failed patch and resolve conflicts."
|
||||
# Use 'exit' to stop the script on the first failure
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
db(){
|
||||
default(){
|
||||
|
|
@ -166,13 +123,12 @@ 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))"
|
||||
sqlite3 $db "UPDATE settings set value = $id where var = 'default_library';"
|
||||
}
|
||||
|
||||
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 | while read dir; do
|
||||
echocolor "[$APPNAME]" "mounting $dir as library"
|
||||
add_lib_to_db "$dir"
|
||||
done
|
||||
|
|
@ -236,26 +192,10 @@ set_homepage(){
|
|||
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
|
||||
}
|
||||
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> and <a href="https://nixos.org" target="_blank">NIX</a>|g' /usr/src/app/config/locales/*.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(){
|
||||
|
|
@ -266,18 +206,10 @@ start_syslog(){
|
|||
}
|
||||
|
||||
scan_libraries(){
|
||||
sleep 10 # wait for manyfold/redis to boot first
|
||||
cd /usr/src/app
|
||||
echocolor "scanning libraries"
|
||||
BOOT_SCAN=$BOOT_SCAN flock -n /tmp/.scanlibrary bin/manyfold libraries scan
|
||||
rm /tmp/.scanlibrary
|
||||
}
|
||||
|
||||
scan_experience(){
|
||||
# don't do this when all libraries are already being scanned
|
||||
test -f /tmp/.scanlibrary && return 0
|
||||
id=$1
|
||||
cd /usr/src/app
|
||||
rails_query 'Model.find('$id').add_new_files_later(include_all_subfolders:false)'
|
||||
bin/manyfold libraries scan
|
||||
}
|
||||
|
||||
rails_query(){
|
||||
|
|
@ -291,55 +223,36 @@ force_public(){
|
|||
infinite 60 rails_query 'Model.find_each { |it| it.grant_permission_to("view", nil) }' &
|
||||
}
|
||||
|
||||
import_assets(){
|
||||
get_xrfragment_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
|
||||
test -d /mnt/asset || {
|
||||
echocolor "fetching XR Fragments asset & templates"
|
||||
mkdir -p /mnt/asset/xrfragment /mnt/templates/xrfragment
|
||||
cd /tmp
|
||||
timeout 50 wget "https://codeberg.org/coderofsalvation/xrfragment/archive/main.zip"
|
||||
unzip main.zip
|
||||
cp -r xrfragment/assets/library /mnt/asset/xrfragment/\#1
|
||||
cp -r xrfragment/assets/template /mnt/templates/xrfragment/\#2
|
||||
}
|
||||
add_lib_to_db /mnt/asset
|
||||
add_lib_to_db /mnt/templates
|
||||
}
|
||||
|
||||
janusxr(){
|
||||
start_server(){
|
||||
while sleep 2s; do
|
||||
flock -n "$@"
|
||||
echocolor "[$1]" "'$2 $3 $4' exited (why?)...restarting"
|
||||
done
|
||||
}
|
||||
|
||||
cd /root/corsanywhere
|
||||
npm install
|
||||
PORT=${SERVER_CORS/*:/} 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 &
|
||||
}
|
||||
|
||||
init_database(){
|
||||
test -f ${db}.xrforgeinit && exit 0 # already inited
|
||||
sleep 3
|
||||
test -z "$THEME" || set_global theme "'$THEME'"
|
||||
set_admin
|
||||
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_upload_path
|
||||
set_global model_tags_auto_tag_new "'build'"
|
||||
set_global model_path_template "replace('--- \"{creator}/{modelId} \"\\n','\\n',char(10))"
|
||||
#set_global about "$ABOUT"
|
||||
import_assets
|
||||
mount_rclone
|
||||
set_upload_path &
|
||||
force_public &
|
||||
get_xrfragment_assets
|
||||
mount_dir
|
||||
BOOT_SCAN=1 scan_libraries &
|
||||
touch ${db}.xrforgeinit
|
||||
}
|
||||
|
||||
caddy(){
|
||||
cat Caddyfile | sed 's|ip:|'$1':|g' > /tmp/Caddyfile
|
||||
set -x
|
||||
cat /tmp/Caddyfile
|
||||
cd /tmp
|
||||
$(which caddy) run
|
||||
scan_libraries &
|
||||
}
|
||||
|
||||
# The new entrypoint of the docker
|
||||
|
|
@ -348,15 +261,12 @@ boot(){
|
|||
test -z "$NO_OVERLAYFS" && overlayfs
|
||||
start_syslog
|
||||
rename_app
|
||||
allow_csp
|
||||
set_homepage
|
||||
start_hook_daemon
|
||||
mount_rclone
|
||||
janusxr
|
||||
force_public &
|
||||
|
||||
# enable development mode (disables template caching etc)
|
||||
test -n "$DEV" && {
|
||||
# sed -i 's|^exec.*|exec s6-setuidgid $PUID:$PGID bin/dev|g' /usr/src/app/bin/docker-entrypoint.sh
|
||||
sed -i 's|config.enable_reloading = false|config.enable_reloading = true|g' /usr/src/app/config/environments/production.rb
|
||||
apk add vim
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,9 +1,8 @@
|
|||
#!/bin/sh
|
||||
test -z "$FEDERATE_DRIVE_HOST" && FEDERATE_DRIVE_HOST=http://localhost:8081
|
||||
test -z "$FEDERATE_DRIVE_HOST" && FEDERATE_DRIVE_HOST=http://localhost:3215
|
||||
test -z "$FEDERATE_DRIVE_PATH" && FEDERATE_DRIVE_PATH=/mnt
|
||||
test -z "$FEDERATE_DRIVE_PORT" && FEDERATE_DRIVE_PORT=8081
|
||||
test -z "$FEDERATE_DRIVE_CACHE" && FEDERATE_DRIVE_CACHE=0s
|
||||
test -n "$DEV" && FEDERATE_DRIVE_CACHE=0s
|
||||
test -z "$FEDERATE_DRIVE_PORT" && FEDERATE_DRIVE_PORT=3215
|
||||
test -z "$FEDERATE_DRIVE_CACHE" && FEDERATE_DRIVE_CACHE=1m0s
|
||||
|
||||
test "$FEDERATE_DRIVE_PATH" = 0 && exit 0 # nothing to do (disabled)
|
||||
|
||||
|
|
@ -18,6 +17,5 @@ test -n "$FEDERATE_DRIVE_CERT" && test -m "$FEDERATE_DRIVE_KEY" && {
|
|||
|
||||
set -x
|
||||
rclone serve http \
|
||||
--links --exclude .xrforge \
|
||||
--allow-origin '*' --poll-interval $FEDERATE_DRIVE_CACHE --dir-cache-time $FEDERATE_DRIVE_CACHE \
|
||||
--exclude .xrforge --poll-interval $FEDERATE_DRIVE_CACHE \
|
||||
--addr 0.0.0.0:$FEDERATE_DRIVE_PORT ${AUTH} ${SSL} $FEDERATE_DRIVE_PATH &> /var/log/rclone.log &
|
||||
|
|
|
|||
|
|
@ -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,3 +1,13 @@
|
|||
#!/bin/sh
|
||||
test -n "$RUNTESTS" || exit 0
|
||||
exec /test/runtests.sh
|
||||
|
||||
test -z "$RUNTESTS" && exit 0 # nothing to do
|
||||
|
||||
echo ""
|
||||
echo "[!] RUNTESTS=1 was set "
|
||||
echo "[.] running tests in /test/*"
|
||||
echo ""
|
||||
|
||||
find -L /test/* -type f -executable -maxdepth 1 | while read testscript; do
|
||||
echo "[.] test: "$testscript
|
||||
$testscript "$@" 2>&1 | awk '{ print " | "$0 }'
|
||||
done
|
||||
|
|
|
|||
|
|
@ -1,82 +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/somefile.xxx>"
|
||||
exit 1
|
||||
end
|
||||
|
||||
filename = ARGV[0]
|
||||
|
||||
require 'base64'
|
||||
require 'json'
|
||||
|
||||
begin
|
||||
|
||||
# Change the directory
|
||||
dir = File.dirname(filename)
|
||||
Dir.chdir( dir )
|
||||
# Read and parse the JSON file
|
||||
data = JSON.parse( File.read( "datapackage.json" ) )
|
||||
logfile = File.join( File.dirname(filename), ".xrforge/log.txt" )
|
||||
|
||||
|
||||
data['resources'].each do |resource|
|
||||
ext = File.extname(resource['path'])
|
||||
filenameWithoutExt = File.basename(resource['path'], ext)
|
||||
if ! XRForge::MODEL_EXT.any?( ext )
|
||||
next # skip unknown 3d files
|
||||
end
|
||||
if ! resource['path'].match(/^[a-zA-Z0-9]/)
|
||||
next # skip filenames like '_generated.glb' e.g. (produced by hooks)
|
||||
end
|
||||
|
||||
XRForge.log("✅ unpacking textures", logfile)
|
||||
gltf_path = ".xrforge/#{filenameWithoutExt}.gltf"
|
||||
system("assimp export #{resource['path']} #{gltf_path} --embed-textures")
|
||||
Dir.chdir("#{dir}/.xrforge")
|
||||
system("assimp extract #{filenameWithoutExt}.gltf | sed 's|/.*/||g'")
|
||||
Dir.chdir(dir)
|
||||
|
||||
# Read and parse the GLTF JSON
|
||||
gltf = JSON.parse(File.read(gltf_path))
|
||||
|
||||
# Ensure images section exists
|
||||
unless gltf['images'] && gltf['images'].is_a?(Array)
|
||||
puts "✅ No 'images' array found in #{gltf_path}"
|
||||
next
|
||||
end
|
||||
|
||||
# Iterate through the images array
|
||||
gltf['images'].each_with_index do |img, i|
|
||||
imgExts = ["jpg","png"]
|
||||
new_filename = "#{dir}/#{filenameWithoutExt}_img#{i}"
|
||||
old_filename = "#{dir}/.xrforge/#{filenameWithoutExt}_img#{i}"
|
||||
|
||||
imgExts.each do |imgExt|
|
||||
# move file to modeldirectory (but dont overwrite if user overwrite it)
|
||||
if File.exist?("#{old_filename}.#{imgExt}") && !File.exist?("#{new_filename}.#{imgExt}")
|
||||
puts "✅ Renaming #{old_filename}.#{imgExt} -> #{new_filename}.#{imgExt}"
|
||||
File.rename( "#{old_filename}.#{imgExt}", "#{new_filename}.#{imgExt}" )
|
||||
else
|
||||
if File.exist?("#{new_filename}.#{imgExt}")
|
||||
puts "✅ Not overwriting (useruploaded) #{new_filename}.#{imgExt}"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
XRForge.log(" ", logfile)
|
||||
|
||||
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
|
||||
|
||||
5
manyfold/root/hook.d/experience_updated/1000-scan-dir.sh
Executable file
|
|
@ -0,0 +1,5 @@
|
|||
#!/bin/sh
|
||||
cd "$(dirname $1)"
|
||||
echo "[v] scan (new) files of model"
|
||||
id="$(basename "$dir" | sed 's/\#//g')"
|
||||
#echo "Model.find(id).add_new_files_later()" | /usr/src/app/bin/rails console
|
||||
|
|
@ -1,80 +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/somefile.xxx>"
|
||||
exit 1
|
||||
end
|
||||
|
||||
filename = ARGV[0]
|
||||
|
||||
require 'base64'
|
||||
require 'json'
|
||||
|
||||
begin
|
||||
|
||||
# Change the directory
|
||||
dir = File.dirname(filename)
|
||||
Dir.chdir( dir )
|
||||
# Read and parse the JSON file
|
||||
data = JSON.parse( File.read( "datapackage.json" ) )
|
||||
logfile = File.join( File.dirname(filename), ".xrforge/log.txt" )
|
||||
update = false
|
||||
|
||||
data['resources'].each do |resource|
|
||||
ext = File.extname(resource['path'])
|
||||
filenameWithoutExt = File.basename(resource['path'], ext)
|
||||
if ! XRForge::MODEL_EXT.any?( ext )
|
||||
next # skip unknown 3d files
|
||||
end
|
||||
if ! resource['path'].match(/^[a-zA-Z0-9]/)
|
||||
next # skip filenames like '_generated.glb' e.g. (produced by hooks)
|
||||
end
|
||||
|
||||
XRForge.log("✅ compiling textures", logfile)
|
||||
gltf_path = ".xrforge/#{filenameWithoutExt}.gltf"
|
||||
|
||||
# Read and parse the GLTF JSON
|
||||
gltf = JSON.parse(File.read(gltf_path))
|
||||
|
||||
# Ensure images section exists
|
||||
unless gltf['images'] && gltf['images'].is_a?(Array)
|
||||
XRForge.log("✅ No 'images' array found in #{gltf_path}",logfile)
|
||||
next
|
||||
end
|
||||
|
||||
# Iterate through the images array
|
||||
gltf['images'].each_with_index do |img, i|
|
||||
|
||||
# move file to modeldirectory (but dont overwrite if user overwrite it)
|
||||
imgExts = ["jpg","png"]
|
||||
imgExts.each do |imgExt|
|
||||
new_filename = "#{dir}/#{filenameWithoutExt}_img#{i}.#{imgExt}"
|
||||
if File.exist?(new_filename)
|
||||
XRForge.log("🤔 detected #{File.basename(new_filename)}",logfile)
|
||||
XRForge.log("✅ importing #{File.basename(new_filename)} -> #{resource['path']}",logfile)
|
||||
img['uri'] = new_filename # NOTE: editing uri will cause assimp to drop image['name'] when exporting :/
|
||||
update = true
|
||||
end
|
||||
end
|
||||
end
|
||||
if update
|
||||
File.write( gltf_path, JSON.pretty_generate(gltf) )
|
||||
XRForge.log("✅ writing #{resource['path']}",logfile)
|
||||
system("assimp export #{gltf_path} #{resource['path']} --embed-textures")
|
||||
end
|
||||
end
|
||||
|
||||
XRForge.log(" ", logfile)
|
||||
|
||||
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
|
||||
|
||||
|
|
@ -1,52 +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/somefile.xxx>"
|
||||
exit 1
|
||||
end
|
||||
|
||||
filename = ARGV[0]
|
||||
|
||||
require 'base64'
|
||||
require 'json'
|
||||
|
||||
begin
|
||||
|
||||
# Change the directory
|
||||
dir = File.dirname(filename)
|
||||
Dir.chdir( File.dirname(filename) )
|
||||
# Read and parse the JSON file
|
||||
data = JSON.parse( File.read( "datapackage.json" ) )
|
||||
|
||||
ext = File.extname(filename)
|
||||
filenameWithoutExt = File.basename(filename, ext)
|
||||
|
||||
if ! XRForge::MODEL_EXT.any?( ext ) || ext == ".gltf"
|
||||
exit(0) # not a 3d file
|
||||
end
|
||||
|
||||
logfile = File.join( File.dirname(filename), ".xrforge/log.txt" )
|
||||
XRForge.log("✅ generating gltf", logfile)
|
||||
gltf_path = ".xrforge/scene.gltf"
|
||||
system("assimp export #{filename} #{gltf_path} --embed-textures")
|
||||
|
||||
# tag it!
|
||||
if ! data['keywords'].include?('gltf')
|
||||
data['keywords'].push('gltf')
|
||||
File.write("datapackage.json", JSON.pretty_generate(data) )
|
||||
end
|
||||
|
||||
XRForge.log(" ", logfile)
|
||||
|
||||
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
|
||||
|
||||
|
|
@ -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
|
||||
4
manyfold/root/hook.d/experience_updated/300-package_godot_zip.sh
Executable file → Normal file
|
|
@ -4,7 +4,7 @@ cd "$dir"
|
|||
echo "[package_godot_zip.sh] zipping godot.zip"
|
||||
|
||||
# overwrite empty godot template project-zip with given URL
|
||||
test -n "$GODOT_TEMPLATE_ZIP" && timeout 50 wget "$GODOT_TEMPLATE_ZIP" -O ~/templates/template_godot.zip
|
||||
test -n "$GODOT_TEMPLATE_ZIP" && timeout 50 wget "$GODOT_TEMPLATE_ZIP" -O ~/template_godot.zip
|
||||
|
||||
cp ~/templates/template_godot.zip .xrforge/godot.zip
|
||||
cp ~/template_godot.zip package_godot.zip
|
||||
zip .xrforge/godot.zip *.glb *.usdz *.obj
|
||||
|
|
|
|||
|
|
@ -1,203 +1,106 @@
|
|||
#!/usr/bin/env ruby
|
||||
|
||||
require 'json'
|
||||
require 'erb'
|
||||
require 'cgi'
|
||||
require_relative './../../xrforge.rb'
|
||||
|
||||
# Check if a filename is provided
|
||||
if ARGV.length != 1
|
||||
puts "Usage: #{$0} <path/to/experience/datapackage.json>"
|
||||
puts "Usage: #{$0} <path/to/experience/somefile.xxx>"
|
||||
exit 1
|
||||
end
|
||||
|
||||
filename = ARGV[0]
|
||||
JMLHeuristic = /<fireboxroom>.*?<\/fireboxroom>/im
|
||||
metadataRegex= /(^<!--|<fireboxroom).*/im
|
||||
templateDir = File.dirname(__FILE__)+"/../../templates/"
|
||||
$links = []
|
||||
|
||||
def addLink(url)
|
||||
$links.push(url)
|
||||
return url
|
||||
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 = File.dirname(filename)
|
||||
Dir.chdir( File.dirname(filename) )
|
||||
# Read and parse the JSON file
|
||||
data = JSON.parse( File.read( "datapackage.json" ) )
|
||||
|
||||
#if data['keywords'].empty? || data['keywords'].include?('janusxr')
|
||||
if data['keywords'].empty? || data['keywords'].include?('janusxr')
|
||||
|
||||
logfile = File.join( File.dirname(filename), ".xrforge/log.txt" )
|
||||
logfile = File.join( File.dirname(filename), ".xrforge/log.txt" )
|
||||
|
||||
XRForge.log("✅ starting build janusXR XR scene", logfile)
|
||||
XRForge.log("✅ starting build janusXR XR scene", logfile)
|
||||
|
||||
model_file = XRForge.getExperienceFile(data,dir,logfile)
|
||||
|
||||
# Check if a model file was found after the loop
|
||||
if ! model_file
|
||||
XRForge.log("❌ No suitable 3D file found for JanusXR-compatible experience", logfile)
|
||||
end
|
||||
# Extract the desired field (assuming the field is named 'model_file')
|
||||
thumb_file = data['image']
|
||||
|
||||
autogenerate = true
|
||||
janusweb_src = ENV['DEV'] ? "/janusweb/janusweb.js" : "/janusweb/janusweb.min.js"
|
||||
|
||||
if data['description'] && data['description'].match(JMLHeuristic)
|
||||
if ! data['description'].match(/<room.* autogenerate.*>/i)
|
||||
XRForge.log("✅ autogenerate attribute found in JML..keeping this JML",logfile)
|
||||
autogenerate = false
|
||||
jmlMatch = data['description'].match(JMLHeuristic)
|
||||
jml = jmlMatch[0]
|
||||
end
|
||||
end
|
||||
|
||||
if autogenerate
|
||||
assets = ""
|
||||
objects = ""
|
||||
startpos = ""
|
||||
audiovisual = false
|
||||
showavatar = "showavatar=\"false\""
|
||||
data['keywords'] = data['keywords'] || []
|
||||
data['description'] = data['description'] || ""
|
||||
if data['description'].strip().length == 0
|
||||
data['description'] = "Click the edit-button to change this description, or add the 'nodescription' tag to hide this."
|
||||
end
|
||||
|
||||
# tags to JML rooms
|
||||
use_local_asset = ""
|
||||
use_local_asset = data['keywords'].include?('room1') ? "room1" : use_local_asset
|
||||
use_local_asset = data['keywords'].include?('room2') ? "room2" : use_local_asset
|
||||
use_local_asset = data['keywords'].include?('room3') ? "room3" : use_local_asset
|
||||
use_local_asset = data['keywords'].include?('room4') ? "room4" : use_local_asset
|
||||
use_local_asset = data['keywords'].include?('room5') ? "room5" : use_local_asset
|
||||
use_local_asset = data['keywords'].include?('room6') ? "room5" : use_local_asset
|
||||
use_local_asset = data['keywords'].include?('room1_pedestal') ? "room1_pedestal" : use_local_asset
|
||||
use_local_asset = data['keywords'].include?('room2_pedestal') ? "room2_pedestal" : use_local_asset
|
||||
use_local_asset = data['keywords'].include?('room2_narrow') ? "room3_narrow" : use_local_asset
|
||||
|
||||
# private room or not
|
||||
if data['keywords'].include?('singleuser')
|
||||
private = "private=\"true\""
|
||||
data['keywords'] = data['keywords'] || []
|
||||
showavatar = "showavatar=\"false\""
|
||||
end
|
||||
XRForge.log("✅ thumbnail sidecar-file '#{thumb_file}' detected", logfile)
|
||||
|
||||
if data['keywords'].include?('showavatar')
|
||||
showavatar = "showavatar=\"false\""
|
||||
end
|
||||
|
||||
# detect audio track sidecarfile as per XR Fragment spec: https://xrfragment.org/#%F0%9F%93%9C%20level0%3A%20File
|
||||
xrf_ext = model_file ? File.extname(model_file) : ""
|
||||
xrf_base = model_file ? File.basename(model_file, xrf_ext) : ""
|
||||
|
||||
# remove the metadata from the description
|
||||
description = CGI.escapeHTML(
|
||||
data['description'].gsub(metadataRegex,"")
|
||||
.strip()
|
||||
)
|
||||
|
||||
data['resources'].each do |resource|
|
||||
ext = File.extname(resource['path'])
|
||||
|
||||
if ext.match(/(mp3|ogg)/i)
|
||||
audiovisual = model_file ? false : true
|
||||
base = File.basename(resource['path'], ext)
|
||||
soundtrackUrl = addLink("#{resource["path"]}")
|
||||
assets += " <assetsound id=\"soundtrack\" src=\"#{soundtrackUrl}\"/>\n"
|
||||
objects += "<sound id=\"soundtrack\" loop=\"true\"/>\n"
|
||||
end
|
||||
|
||||
if ext.match(/(png|jpg|jpeg|gif)/i)
|
||||
imgbase = File.basename(resource['path'])
|
||||
if File.basename( data['image'] || "") != imgbase && # ignore thumbnail
|
||||
xrf_base != imgbase # ignore XR Fragments thumbnail
|
||||
|
||||
audiovisual = model_file ? false : true
|
||||
base = File.basename(resource['path'], ext)
|
||||
videoSrc = addLink("#{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
|
||||
end
|
||||
|
||||
if ext.match(/mp4/i) || ext.match(/webm/i)
|
||||
audiovisual = model_file ? false : true
|
||||
base = File.basename(resource['path'], ext)
|
||||
videoSrc = addLink("#{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"
|
||||
# Get the base name of the thumbnail file without its extension
|
||||
base_name = File.basename(thumb_file, File.extname(thumb_file))
|
||||
|
||||
model_file = nil # Initialize model_file to nil
|
||||
|
||||
# Loop over the list of extensions
|
||||
XRForge::MODEL_EXT.each do |ext|
|
||||
# Construct the filename with the current extension
|
||||
filename = "#{base_name}#{ext}"
|
||||
|
||||
# Check if the file exists
|
||||
if File.exist?(filename)
|
||||
XRForge.log("✅ 3D file '#{filename}' detected", logfile)
|
||||
model_file = "#{dir.gsub("/mnt/","")}/#{filename}" # Store the found filename
|
||||
break # Stop the loop once a file is found
|
||||
else
|
||||
# Log a message for the file that was not found, but don't stop
|
||||
XRForge.log("⚠️ 3D file '#{filename}' not detected", logfile)
|
||||
end
|
||||
end
|
||||
|
||||
if audiovisual
|
||||
# TODO: copy files from a heuristic-based folder instead hardcoding it here
|
||||
startpos = "pos=\"0 0 -10\""
|
||||
use_local_asset = "room5"
|
||||
rplaneSrc = addLink("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"
|
||||
if ! data['keywords'].include?( use_local_asset )
|
||||
data['keywords'].push( use_local_asset )
|
||||
end
|
||||
end
|
||||
|
||||
# generate thumbnail if no thumbnail
|
||||
if data['resources'].length == 1
|
||||
thumbfile = "thumbnail.jpg"
|
||||
if model_file
|
||||
thumbfile = "#{xrf_base}.jpg"
|
||||
end
|
||||
system("/root/bin/random_thumbnail.sh","/root/templates/thumbnailseed.jpg","#{dir}/#{thumbfile}","6","2>&1 | sed 's|/root/template||g'")
|
||||
data['image'] = thumbfile
|
||||
XRForge.log("✅ generated thumbnail", logfile)
|
||||
|
||||
# Check if a model file was found after the loop
|
||||
if model_file
|
||||
XRForge.log("✅ Final model file: '#{model_file}'", logfile)
|
||||
else
|
||||
XRForge.log("❌ No suitable 3D file found for XR Fragments- / JanusXR-compatible experience", logfile)
|
||||
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"
|
||||
# Get the value of the environment variable FEDERATE_DRIVE_HOST
|
||||
federate_drive_host = ENV['FEDERATE_DRIVE_HOST']
|
||||
|
||||
# Define the HTML content using a multi-line string (heredoc)
|
||||
# Ruby's heredoc allows for variable interpolation (using #{})
|
||||
jml = <<~JML
|
||||
<FireBoxRoom>
|
||||
<Assets>
|
||||
<assetobject id="experience" src="#{federate_drive_host}/#{model_file.gsub("#","%23")}"/>
|
||||
</Assets>
|
||||
<Room>
|
||||
<object pos="0 0 0" collision_id="experience" id="experience" />
|
||||
</Room>
|
||||
</FireBoxRoom>
|
||||
JML
|
||||
|
||||
html = <<~HTML
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>janusxr room</title>
|
||||
</head>
|
||||
<body>
|
||||
<script src="https://web.janusvr.com/janusweb.js"></script>
|
||||
<janus-viewer>
|
||||
#{jml}
|
||||
</janus-viewer>
|
||||
</body>
|
||||
</html>
|
||||
HTML
|
||||
|
||||
File.write('.xrforge/janusxr.html', html)
|
||||
File.write('.xrforge/scene.jml', jml)
|
||||
|
||||
XRForge.log("✅ generated scene.jml", logfile)
|
||||
XRForge.log("✅ generated janusxr.html", logfile)
|
||||
XRForge.log(" ", logfile)
|
||||
|
||||
# tag it!
|
||||
if ! data['keywords'].include?('janusxr')
|
||||
data['keywords'].push('janusxr')
|
||||
File.write(file_path, JSON.pretty_generate(data) )
|
||||
end
|
||||
|
||||
if model_file
|
||||
objectSrc = "#{model_file.gsub("#","%23")}"
|
||||
if ! $links.include?(objectSrc)
|
||||
objectSrc = addLink(objectSrc)
|
||||
assets += " <assetobject id=\"experience\" src=\"#{objectSrc}\"/>\n"
|
||||
objects += " <object pos=\"0 0 5\" rotation=\"-180 0 180\" lighting=\"false\" collision_id=\"experience\" id=\"experience\" />"
|
||||
end
|
||||
end
|
||||
|
||||
use_local_asset = use_local_asset ? "use_local_asset=\"#{use_local_asset}\"" : ""
|
||||
|
||||
jml = ERB.new( File.read( templateDir+"JML/room.erb" ) ).result(binding)
|
||||
data['description'] = data['description'] ? data['description'].gsub(metadataRegex,"") : ""
|
||||
data['description'] += "\n\n" + ERB.new( File.read( templateDir+"JML/header.erb" ) ).result(binding)
|
||||
data['description'] += jml
|
||||
File.write("datapackage.json", JSON.pretty_generate(data) )
|
||||
end
|
||||
|
||||
html = ERB.new( File.read( templateDir+"JML/client.html") ).result(binding)
|
||||
|
||||
File.write('.xrforge/janusxr.html', html)
|
||||
File.write('.xrforge/scene.jml', jml)
|
||||
|
||||
XRForge.log("✅ generated scene.jml", logfile)
|
||||
XRForge.log("✅ generated janusxr.html", logfile)
|
||||
XRForge.log(" ", logfile)
|
||||
|
||||
# tag it!
|
||||
if ! data['keywords'].include?('janusxr')
|
||||
data['keywords'].push('janusxr')
|
||||
File.write("datapackage.json", JSON.pretty_generate(data) )
|
||||
end
|
||||
|
||||
rescue Errno::ENOENT
|
||||
|
|
@ -207,4 +110,3 @@ rescue JSON::ParserError
|
|||
rescue => e
|
||||
puts "An error occurred: #{e.message}"
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -11,11 +11,6 @@ end
|
|||
|
||||
filename = ARGV[0]
|
||||
|
||||
# dont run for each file-update
|
||||
if ! filename.end_with?("datapackage.json")
|
||||
exit 0
|
||||
end
|
||||
|
||||
begin
|
||||
|
||||
# Change the directory
|
||||
|
|
@ -24,37 +19,63 @@ begin
|
|||
# Read and parse the JSON file
|
||||
data = JSON.parse( File.read( "datapackage.json" ) )
|
||||
|
||||
#if data['keywords'].empty? || data['keywords'].include?('mml')
|
||||
if data['keywords'].empty? || data['keywords'].include?('mml')
|
||||
|
||||
logfile = File.join( File.dirname(filename), ".xrforge/log.txt" )
|
||||
logfile = File.join( File.dirname(filename), ".xrforge/log.txt" )
|
||||
|
||||
XRForge.log("✅ starting build mml XR scene", logfile)
|
||||
XRForge.log("✅ starting build mml XR scene", logfile)
|
||||
|
||||
model_file = XRForge.getExperienceFile(data,dir,logfile)
|
||||
|
||||
# Check if a model file was found after the loop
|
||||
if ! model_file
|
||||
XRForge.log("❌ No suitable 3D file found for MML-compatible experience", logfile)
|
||||
exit 0
|
||||
end
|
||||
# Extract the desired field (assuming the field is named 'model_file')
|
||||
thumb_file = data['image']
|
||||
|
||||
# Get the value of the environment variable FEDERATE_DRIVE_HOST
|
||||
federate_drive_host = ENV['FEDERATE_DRIVE_HOST']
|
||||
XRForge.log("✅ thumbnail sidecar-file '#{thumb_file}' detected", logfile)
|
||||
|
||||
# Get the base name of the thumbnail file without its extension
|
||||
base_name = File.basename(thumb_file, File.extname(thumb_file))
|
||||
|
||||
model_file = nil # Initialize model_file to nil
|
||||
|
||||
# Loop over the list of extensions
|
||||
XRForge::MODEL_EXT.each do |ext|
|
||||
# Construct the filename with the current extension
|
||||
filename = "#{base_name}#{ext}"
|
||||
|
||||
# Check if the file exists
|
||||
if File.exist?(filename)
|
||||
XRForge.log("✅ 3D file '#{filename}' detected", logfile)
|
||||
model_file = "#{dir.gsub("/mnt/","")}/#{filename}" # Store the found filename
|
||||
break # Stop the loop once a file is found
|
||||
else
|
||||
# Log a message for the file that was not found, but don't stop
|
||||
XRForge.log("⚠️ 3D file '#{filename}' not detected", logfile)
|
||||
end
|
||||
end
|
||||
|
||||
# Check if a model file was found after the loop
|
||||
if model_file
|
||||
XRForge.log("✅ Final model file: '#{model_file}'", logfile)
|
||||
else
|
||||
XRForge.log("❌ No suitable 3D file found for XR Fragments- / MML-compatible experience", logfile)
|
||||
end
|
||||
|
||||
# https://viewer.mml.io/main/v1/?url=https%3A%2F%2Ffoo.org%2Fbar.mml
|
||||
mml = <<~MML
|
||||
<m-model src="#{federate_drive_host}/#{model_file.gsub("#","%23")}" anim-loop="true" anim-enabled="true"></m-model>
|
||||
MML
|
||||
# Get the value of the environment variable FEDERATE_DRIVE_HOST
|
||||
federate_drive_host = ENV['FEDERATE_DRIVE_HOST']
|
||||
|
||||
File.write('.xrforge/scene.mml', mml)
|
||||
# https://viewer.mml.io/main/v1/?url=https%3A%2F%2Ffoo.org%2Fbar.mml
|
||||
mml = <<~MML
|
||||
<m-model src="#{federate_drive_host}/#{model_file.gsub("#","%23")}" anim-loop="true" anim-enabled="true"></m-model>
|
||||
MML
|
||||
|
||||
XRForge.log("✅ generated scene.mml", logfile)
|
||||
XRForge.log(" ", logfile)
|
||||
File.write('.xrforge/scene.mml', mml)
|
||||
|
||||
# tag it!
|
||||
if ! data['keywords'].include?('mml')
|
||||
data['keywords'].push('mml')
|
||||
File.write("datapackage.json", JSON.pretty_generate(data) )
|
||||
XRForge.log("✅ generated scene.mml", logfile)
|
||||
XRForge.log(" ", logfile)
|
||||
|
||||
# tag it!
|
||||
if ! data['keywords'].include?('mml')
|
||||
data['keywords'].push('mml')
|
||||
File.write(file_path, JSON.pretty_generate(data) )
|
||||
end
|
||||
end
|
||||
|
||||
rescue Errno::ENOENT
|
||||
|
|
|
|||
|
|
@ -13,41 +13,50 @@ filename = ARGV[0]
|
|||
|
||||
begin
|
||||
# Change the directory
|
||||
dir = File.dirname(filename)
|
||||
Dir.chdir( dir )
|
||||
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 XR fragments check", logfile)
|
||||
|
||||
model_file = XRForge.getExperienceFile(data,dir,logfile)
|
||||
# Extract the desired field (assuming the field is named 'model_file')
|
||||
thumb_file = data['image']
|
||||
XRForge.log("✅ thumbnail sidecar-file '#{thumb_file}' detected", logfile)
|
||||
|
||||
# Check if a model file was found after the loop
|
||||
if ! model_file
|
||||
XRForge.log("❌ No suitable 3D file found for XR Fragments-compatible experience", logfile)
|
||||
exit 0
|
||||
# Get the base name of the thumbnail file without its extension
|
||||
base_name = File.basename(thumb_file, File.extname(thumb_file))
|
||||
|
||||
model_file = nil # Initialize model_file to nil
|
||||
|
||||
# Loop over the list of extensions
|
||||
XRForge::MODEL_EXT.each do |ext|
|
||||
# Construct the filename with the current extension
|
||||
filename = "#{base_name}#{ext}"
|
||||
|
||||
# Check if the file exists
|
||||
if File.exist?(filename)
|
||||
XRForge.log("✅ 3D file '#{filename}' detected", logfile)
|
||||
model_file = filename # Store the found filename
|
||||
break # Stop the loop once a file is found
|
||||
else
|
||||
# Log a message for the file that was not found, but don't stop
|
||||
XRForge.log("⚠️ 3D file '#{filename}' not detected", logfile)
|
||||
end
|
||||
end
|
||||
|
||||
# Check if a model file was found after the loop
|
||||
if model_file
|
||||
XRForge.log("✅ Final model file: '#{model_file}'", logfile)
|
||||
# update datapackage
|
||||
data['main'] = model_file
|
||||
if ! data['keywords'].include?('xrfragments')
|
||||
data['keywords'].push('xrfragments')
|
||||
end
|
||||
File.write("datapackage.json", JSON.pretty_generate(data) )
|
||||
system("assimp export #{model_file} .xrforge/scene.gltf")
|
||||
else
|
||||
XRForge.log("❌ No suitable 3D file found for XR Fragments-compatible experience", logfile)
|
||||
# update datapackage
|
||||
if data['keywords'].include?('xrfragments')
|
||||
data['keywords'].delete('xrfragments')
|
||||
File.write("datapackage.json", JSON.pretty_generate(data) )
|
||||
end
|
||||
end
|
||||
XRForge.log("✅ updating xrfragment tag", logfile)
|
||||
|
||||
# Construct the output filename
|
||||
output_file = "#{File.basename(model_file, File.extname(model_file))}.blend"
|
||||
|
||||
# Execute the system call
|
||||
puts("assimp", model_file, output_file)
|
||||
system("assimp", model_file, output_file)
|
||||
|
||||
XRForge.log(" ", logfile)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,93 +0,0 @@
|
|||
#!/usr/bin/env ruby
|
||||
|
||||
require 'rss'
|
||||
require 'json'
|
||||
require 'open-uri'
|
||||
require 'cgi'
|
||||
require_relative './../../xrforge.rb'
|
||||
|
||||
# Check if a filename is provided
|
||||
if ARGV.length != 1
|
||||
puts "Usage: #{$0} <path/to/experience/somefile.xxx>"
|
||||
exit 1
|
||||
end
|
||||
|
||||
filename = ARGV[0]
|
||||
|
||||
|
||||
# dont run for each file-update
|
||||
if ! filename.end_with?("datapackage.json")
|
||||
exit 0
|
||||
end
|
||||
|
||||
def generate(aphandle,filename,dir,data,logfile)
|
||||
|
||||
XRForge.log("✅ starting mastodon-post for #{aphandle}", logfile)
|
||||
|
||||
parts = aphandle.split("@")
|
||||
server = parts[2].sub(/@/,"")
|
||||
rssUrl = "https://#{server}/@#{parts[1]}.rss"
|
||||
XRForge.log("✅ checking #{rssUrl}", logfile)
|
||||
|
||||
feed = RSS::Parser.parse(URI.open(rssUrl, 'User-Agent' => 'Ruby-RSS-Client'))
|
||||
|
||||
puts feed.channel.title
|
||||
puts feed.channel.link
|
||||
|
||||
first_item = feed.items.first
|
||||
if first_item
|
||||
description = CGI.unescapeHTML(first_item.description.to_s)
|
||||
.split("\n")[0,4].join("\n") # max 5 lines
|
||||
.gsub(/<[^>]*>/, '') # remove other tags
|
||||
#.gsub(/<br\s*\/?>/i, "\n") # preserve linebreaks
|
||||
#.gsub(/<\/p>/i, "\n") # preserve linebreaks
|
||||
description = description.length > 130 ? description = description[0,130] + " (..)" : description
|
||||
else
|
||||
XRForge.log("❌ did not find post", logfile)
|
||||
exit 0
|
||||
end
|
||||
|
||||
puts description
|
||||
|
||||
# look for first image
|
||||
media_regex = /<media:content url=['"]([^'"]+)['"]/
|
||||
img = feed.to_s.match(media_regex)
|
||||
if img and img[1] and img[1].match(/(png|jpg)/)
|
||||
imgurl = img[1]
|
||||
end
|
||||
|
||||
# generate the final .glb
|
||||
system("/root/templates/mastodon-post/mastodon-post.sh", description, feed.channel.title, feed.channel.link, aphandle, "#{dir}/#{aphandle}.glb")
|
||||
end
|
||||
|
||||
begin
|
||||
# Change the directory
|
||||
dir = File.dirname(filename)
|
||||
Dir.chdir( dir )
|
||||
# Read and parse the JSON file
|
||||
data = JSON.parse( File.read( "datapackage.json" ) )
|
||||
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
|
||||
end
|
||||
|
||||
XRForge.log(" ", logfile)
|
||||
|
||||
rescue OpenURI::HTTPError => e
|
||||
# Handle HTTP errors (e.g., 404 not found, 403 forbidden)
|
||||
puts "Error fetching feed: #{e.message}"
|
||||
exit
|
||||
rescue => e
|
||||
# Handle other parsing or connection errors
|
||||
puts "An error occurred: #{e.message}"
|
||||
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
|
||||
|
|
@ -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>
|
||||
|
Before Width: | Height: | Size: 821 KiB |
|
Before Width: | Height: | Size: 51 KiB |
|
|
@ -1,154 +0,0 @@
|
|||
{
|
||||
"asset":{
|
||||
"generator":"Khronos glTF Blender I/O v4.4.56",
|
||||
"version":"2.0"
|
||||
},
|
||||
"extensionsUsed":[
|
||||
"KHR_materials_unlit"
|
||||
],
|
||||
"scene":0,
|
||||
"scenes":[
|
||||
{
|
||||
"name":"Scene",
|
||||
"nodes":[
|
||||
0
|
||||
]
|
||||
}
|
||||
],
|
||||
"nodes":[
|
||||
{
|
||||
"mesh":0,
|
||||
"name":"mastodon-post",
|
||||
"rotation":[
|
||||
0.70710688829422,
|
||||
0,
|
||||
0,
|
||||
0.7071066498756409
|
||||
],
|
||||
"scale":[
|
||||
2.471118211746216,
|
||||
2.471118450164795,
|
||||
2.471118450164795
|
||||
]
|
||||
}
|
||||
],
|
||||
"materials":[
|
||||
{
|
||||
"doubleSided":true,
|
||||
"extensions":{
|
||||
"KHR_materials_unlit":{}
|
||||
},
|
||||
"name":"unlit.001",
|
||||
"pbrMetallicRoughness":{
|
||||
"baseColorTexture":{
|
||||
"index":0
|
||||
},
|
||||
"metallicFactor":0,
|
||||
"roughnessFactor":0.9
|
||||
}
|
||||
}
|
||||
],
|
||||
"meshes":[
|
||||
{
|
||||
"name":"Plane",
|
||||
"primitives":[
|
||||
{
|
||||
"attributes":{
|
||||
"POSITION":0,
|
||||
"NORMAL":1,
|
||||
"TEXCOORD_0":2
|
||||
},
|
||||
"indices":3,
|
||||
"material":0
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"textures":[
|
||||
{
|
||||
"sampler":0,
|
||||
"source":0
|
||||
}
|
||||
],
|
||||
"images":[
|
||||
{
|
||||
"mimeType":"image/png",
|
||||
"name":"mastodon-post",
|
||||
"uri":"mastodon-post.png"
|
||||
}
|
||||
],
|
||||
"accessors":[
|
||||
{
|
||||
"bufferView":0,
|
||||
"componentType":5126,
|
||||
"count":20,
|
||||
"max":[
|
||||
1,
|
||||
0,
|
||||
1
|
||||
],
|
||||
"min":[
|
||||
-1,
|
||||
0,
|
||||
-1
|
||||
],
|
||||
"type":"VEC3"
|
||||
},
|
||||
{
|
||||
"bufferView":1,
|
||||
"componentType":5126,
|
||||
"count":20,
|
||||
"type":"VEC3"
|
||||
},
|
||||
{
|
||||
"bufferView":2,
|
||||
"componentType":5126,
|
||||
"count":20,
|
||||
"type":"VEC2"
|
||||
},
|
||||
{
|
||||
"bufferView":3,
|
||||
"componentType":5123,
|
||||
"count":54,
|
||||
"type":"SCALAR"
|
||||
}
|
||||
],
|
||||
"bufferViews":[
|
||||
{
|
||||
"buffer":0,
|
||||
"byteLength":240,
|
||||
"byteOffset":0,
|
||||
"target":34962
|
||||
},
|
||||
{
|
||||
"buffer":0,
|
||||
"byteLength":240,
|
||||
"byteOffset":240,
|
||||
"target":34962
|
||||
},
|
||||
{
|
||||
"buffer":0,
|
||||
"byteLength":160,
|
||||
"byteOffset":480,
|
||||
"target":34962
|
||||
},
|
||||
{
|
||||
"buffer":0,
|
||||
"byteLength":108,
|
||||
"byteOffset":640,
|
||||
"target":34963
|
||||
}
|
||||
],
|
||||
"samplers":[
|
||||
{
|
||||
"magFilter":9729,
|
||||
"minFilter":9987
|
||||
}
|
||||
],
|
||||
"buffers":[
|
||||
{
|
||||
"byteLength":748,
|
||||
"uri":"mastodon-post.bin"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
Before Width: | Height: | Size: 176 B |
|
|
@ -1,34 +0,0 @@
|
|||
#!/bin/sh
|
||||
test -n "$5" || { echo "usage: ./mastodon-post.sh <text> <title> <link> <handle> </abs/path/to/out.glb>"; exit 0; }
|
||||
|
||||
out="$5"
|
||||
tmpdir=/tmp/.mastodon-post
|
||||
outdir="$(dirname "$out")"
|
||||
mydir="$(dirname $(readlink -f $0))"
|
||||
bgfile="$outdir"/mastodon-post-bg.png
|
||||
cd $mydir
|
||||
|
||||
set -x
|
||||
# create tmp workspace
|
||||
test -d $tmpdir && rm -rf $tmpdir
|
||||
mkdir $tmpdir
|
||||
cp * $tmpdir/.
|
||||
# use template PNG from modeldir
|
||||
test -f "$bgfile" || cp $tmpdir/mastodon-post-bg.png "$bgfile"
|
||||
cp "$bgfile" $tmpdir/.
|
||||
rm $tmpdir/mastodon-post.png # IMPORTANT: prevent newer/older imagemagick -clobber (non)existence
|
||||
|
||||
magick "$bgfile" \
|
||||
\( -size 580x -background none -pointsize 32 -interline-spacing 10 -fill \#FFF -font Montserrat-SemiBold.ttf "caption:$1" \) \
|
||||
-gravity center -composite \
|
||||
-pointsize 20 \
|
||||
-fill \#FFFFFF -gravity NorthWest -annotate +152+130 "$4" \
|
||||
-fill \#9c9cc9 -gravity NorthWest -annotate +152+160 "$2" \
|
||||
-fill \#9c9cc9 -gravity NorthWest -annotate +52+460 "$3" \
|
||||
-define png:compression-level=9 \
|
||||
-define png:compression-filter=5 \
|
||||
-define png:compression-strategy=1 \
|
||||
$tmpdir/mastodon-post.png
|
||||
|
||||
cd $tmpdir
|
||||
assimp export mastodon-post.gltf $out --embed-textures
|
||||
|
Before Width: | Height: | Size: 51 KiB |
|
|
@ -1,9 +1,6 @@
|
|||
require 'rexml/document'
|
||||
require 'rexml/formatters/pretty'
|
||||
|
||||
module XRForge
|
||||
|
||||
MODEL_EXT = ['.glb', '.gltf', '.blend', '.usdz', '.obj', '.dae', '.x3d']
|
||||
MODEL_EXT = ['.glb', '.gltf', '.blend', '.usdz', '.obj', '.dae']
|
||||
|
||||
def self.log(message, filename)
|
||||
# Append the log entry to the log file
|
||||
|
|
@ -13,136 +10,4 @@ module XRForge
|
|||
puts("#{message}\n")
|
||||
end
|
||||
|
||||
# ==============================================================================
|
||||
# 1. JSON (Ruby Hash) to XML String
|
||||
# ==============================================================================
|
||||
|
||||
# Internal recursive helper for converting Hash/Array structure to REXML.
|
||||
# Handles attribute conversion (@key -> attribute), hash nesting, and arrays
|
||||
# (which create multiple sibling elements of the same name).
|
||||
#
|
||||
# @param data [Hash, Array, String] The data fragment.
|
||||
# @param p [REXML::Element] The parent REXML element.
|
||||
def self.j2x_rec(data, p)
|
||||
# Check if data is a Hash (for attributes and children)
|
||||
if data.is_a?(Hash)
|
||||
data.each { |k, v| k.start_with?('@') ? p.attributes[k[1..-1]] = v.to_s : j2x_rec(v, p.add_element(k)) }
|
||||
# Check if data is an Array (for repeated elements)
|
||||
elsif data.is_a?(Array)
|
||||
# The parent in this context (e.g., <obj>) is already created. For each array item,
|
||||
# we need to create a new element with the same name as the current parent's *name*
|
||||
# and attach it to the parent's *parent*.
|
||||
# This requires looking up the parent's parent, which breaks terseness.
|
||||
# We must use a simpler recursive structure for compactness.
|
||||
|
||||
# We assume array structure requires us to create a new element named by the
|
||||
# parent, and assign attributes/children recursively.
|
||||
data.each { |v| j2x_rec(v, p) } # Recursive call to continue processing children
|
||||
# Handle text content
|
||||
else
|
||||
p.text = data.to_s
|
||||
end
|
||||
end
|
||||
|
||||
# The entry point for converting Ruby Hash to XML string.
|
||||
#
|
||||
# @param data [Hash] The root hash structure.
|
||||
# @return [String] The resulting compact XML string.
|
||||
def self.json2xml(data)
|
||||
# Corrected recursive logic for arrays that are values (e.g., "obj" => [..])
|
||||
j2x_map = lambda do |d, p_name, p|
|
||||
if d.is_a?(Hash)
|
||||
d.each { |k, v| k.start_with?('@') ? p.attributes[k[1..-1]] = v.to_s : j2x_map.call(v, k, p.add_element(k)) }
|
||||
elsif d.is_a?(Array)
|
||||
# If the value is an array, we iterate, create a sibling element for each, and recurse
|
||||
d.each { |v| j2x_map.call(v, p.name, p.parent.add_element(p.name)) }
|
||||
p.remove # Remove the placeholder element created before hitting the array
|
||||
else
|
||||
p.text = d.to_s
|
||||
end
|
||||
end
|
||||
|
||||
# Initialize Document and process the single root key
|
||||
doc = REXML::Document.new
|
||||
data.each { |k, v| j2x_map.call(v, k, doc.add_element(k)) }
|
||||
|
||||
# Output with 2-space indentation
|
||||
o = ""; f = REXML::Formatters::Default.new; f.indentation = 2; f.write(doc.root, o); o.strip
|
||||
end
|
||||
|
||||
# ==============================================================================
|
||||
# 2. XML String to JSON (Ruby Hash)
|
||||
# ==============================================================================
|
||||
|
||||
# Internal recursive helper for converting REXML Element to Hash structure.
|
||||
# Handles attribute conversion (attribute -> @key), text, and array creation for siblings.
|
||||
#
|
||||
# @param e [REXML::Element] The XML element.
|
||||
# @return [Hash, String] The resulting hash or simple text value.
|
||||
def self.x2j_rec(e)
|
||||
h = {}; e.attributes.each { |k, v| h["@#{k}"] = v } # Attributes first
|
||||
|
||||
e.elements.each do |c| # Iterate children
|
||||
v = x2j_rec(c)
|
||||
if h.key?(c.name)
|
||||
h[c.name] = [h[c.name]] unless h[c.name].is_a?(Array)
|
||||
h[c.name] << v
|
||||
else
|
||||
h[c.name] = v
|
||||
end
|
||||
end
|
||||
|
||||
# Check for text content if no children were processed
|
||||
t = e.get_text.to_s.strip; return t if t && !t.empty? && h.empty?; return h
|
||||
end
|
||||
|
||||
# The entry point for converting XML string to Ruby Hash.
|
||||
#
|
||||
# @param xmlstr [String] The XML string.
|
||||
# @return [Hash] The resulting Ruby hash structure.
|
||||
def self.xml2json(xmlstr)
|
||||
doc = REXML::Document.new(xmlstr)
|
||||
root = doc.root
|
||||
{ root.name => x2j_rec(root) }
|
||||
end
|
||||
|
||||
def self.getExperienceFile(datapackage, dir, logfile)
|
||||
model_file = nil # Initialize model_file to nil
|
||||
base_name = ""
|
||||
# Extract the desired field (assuming the field is named 'model_file')
|
||||
thumb_file = datapackage['image']
|
||||
if thumb_file && ! thumb_file.empty?
|
||||
# HEURISTIC: XR Fragments sidecarfile https://xrfragment.org/#%F0%9F%93%9C%20level0%3A%20File
|
||||
# Get the base name of the thumbnail file without its extension
|
||||
base_name = File.basename(thumb_file, File.extname(thumb_file))
|
||||
XRForge.log("✅ thumbnail sidecar-file '#{thumb_file}' detected", logfile)
|
||||
# Loop over the list of extensions
|
||||
MODEL_EXT.each do |ext|
|
||||
# Construct the filename with the current extension
|
||||
filename = "#{base_name}#{ext}"
|
||||
|
||||
# Check if the file exists
|
||||
if File.exist?(filename)
|
||||
XRForge.log("✅ 3D file '#{filename}' detected (heuristic: XRFragment sidecarfile)", logfile)
|
||||
model_file = "#{dir.gsub("/mnt/","")}/#{filename}" # Store the found filename
|
||||
break # Stop the loop once a file is found
|
||||
else
|
||||
# Log a message for the file that was not found, but don't stop
|
||||
XRForge.log("⚠️ 3D file '#{filename}' not detected", logfile)
|
||||
end
|
||||
end
|
||||
else
|
||||
# HEURISTIC: get first suitable 3D file
|
||||
datapackage['resources'].each do |resource|
|
||||
ext = File.extname(resource['path'])
|
||||
if MODEL_EXT.include?( ext )
|
||||
model_file = resource['path']
|
||||
XRForge.log("✅ 3D file '#{model_file}' detected (heuristic: first-found)", logfile)
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
return model_file ? File.basename(model_file) : model_file
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
which rclone &>/dev/null || { echo "❌ rclone not installed"; exit 1; }
|
||||
|
||||
test -d /mnt/experiences || { echo "❌ /mnt/models does not exist"; exit 1; }
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
#!/bin/sh
|
||||
experience=/mnt/templates/xrfragments/\#4
|
||||
dir=/tmp/hook-extract-textures
|
||||
xrfdir=$dir/.xrforge
|
||||
|
||||
which assimp || {
|
||||
echo "❌ assimp was not installed";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
mkdir -p $xrfdir || true
|
||||
rm $experience/*_img*.* || true
|
||||
/root/hook.d/experience_updated/*-extract-textures.rb $experience/datapackage.json 2>&1 \
|
||||
| grep "Wrote texture 0" || {
|
||||
echo "❌ $experience/murial3D_img0.png was not written";
|
||||
exit 1;
|
||||
}
|
||||
test -f $experience/murial3D_img0.png || {
|
||||
echo "❌ $experience/murial3D_img0.png was not written";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
rm -rf $dir
|
||||
exit 0
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#!/bin/sh
|
||||
experience=/mnt/templates/xrfragments/\#4
|
||||
dir=/tmp/hook-compile-textures
|
||||
xrfdir=$dir/.xrforge
|
||||
|
||||
which assimp || {
|
||||
echo "❌ assimp was not installed";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
mkdir -p $xrfdir || true
|
||||
/root/hook.d/experience_updated/*-compile-textures.rb $experience/datapackage.json 2>&1 | grep "wrote output" || {
|
||||
echo "❌ $experience/murial3D.glb was not updated";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
rm -rf $dir
|
||||
exit 0
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
#!/bin/sh
|
||||
dir=/tmp/11-hook
|
||||
xrfdir=$dir/.xrforge
|
||||
mkdir -p $xrfdir
|
||||
echo 1 > $xrfdir/log.txt
|
||||
/root/hook.d/experience_updated/*-reset-log.sh $dir/datapackage.json
|
||||
test "$(cat $xrfdir/log.txt)" = "1" && {
|
||||
echo "❌ log.txt was not reset";
|
||||
exit 1;
|
||||
}
|
||||
rm -rf $dir
|
||||
exit 0
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
#!/bin/sh
|
||||
dir=/tmp/hook-package_godot_zip
|
||||
xrfdir=$dir/.xrforge
|
||||
mkdir -p $xrfdir
|
||||
touch $xrfdir/foo.glb
|
||||
/root/hook.d/experience_updated/*-package_godot_zip.sh $dir/datapackage.json
|
||||
test -f $xrfdir/godot.zip || {
|
||||
echo "❌ godot.zip was not created";
|
||||
exit 1;
|
||||
}
|
||||
rm -rf $dir
|
||||
exit 0
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
#!/bin/sh
|
||||
id=janusxr
|
||||
dir=/tmp/hook-package_$id
|
||||
xrfdir=$dir/.xrforge
|
||||
mkdir -p $xrfdir
|
||||
|
||||
testjml(){
|
||||
/root/hook.d/experience_updated/*-package_$id.rb $dir/datapackage.json
|
||||
test -f $xrfdir/scene.jml || {
|
||||
echo "❌ scene.jml was not created";
|
||||
exit 1;
|
||||
}
|
||||
test -f $xrfdir/janusxr.html || {
|
||||
echo "❌ janusxr.html was not created";
|
||||
exit 1;
|
||||
}
|
||||
}
|
||||
|
||||
echo "### test xrfragment heuristic"
|
||||
touch $dir/foo.png
|
||||
touch $dir/foo.glb
|
||||
echo '{
|
||||
"image":"foo.png",
|
||||
"resources": [{"path":"foo.glb"}]
|
||||
}' > $dir/datapackage.json
|
||||
testjml
|
||||
|
||||
echo "### test first-suitable-3d-file heuristic"
|
||||
rm $dir/foo.png
|
||||
echo '{
|
||||
"resources": [{"path":"foo.glb"}]
|
||||
}' > $dir/datapackage.json
|
||||
testjml
|
||||
|
||||
rm -rf $dir
|
||||
exit 0
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#!/bin/sh
|
||||
test $(ps aux | grep run-janus-server | wc -l) = 2 || {
|
||||
echo "❌ janus-server is not running"
|
||||
exit 1;
|
||||
}
|
||||
echo "✅ janus-server is running"
|
||||
|
||||
test $(ps aux | grep run-corsanywhere | wc -l) = 2 || {
|
||||
echo "❌ corsanywhere is not running"
|
||||
exit 1;
|
||||
}
|
||||
echo "✅ corsanywhere is running"
|
||||
|
||||
|
||||
|
||||
5
manyfold/test/rclone.sh
Executable file
|
|
@ -0,0 +1,5 @@
|
|||
#!/bin/sh
|
||||
|
||||
which rclone &>/dev/null || { echo "[!] rclone not installed"; exit 0; }
|
||||
|
||||
test -d /mnt/models || { echo "[!] /mnt/models does not exist"; exit 0; }
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
echo ""
|
||||
echo "running tests in /test/*"
|
||||
echo ""
|
||||
|
||||
error(){ echocolor "❌" "$*"; exit 1; }
|
||||
ok(){ echocolor "✅" "$*"; return 0; }
|
||||
echocolor(){ printf "\033[96m%s\033[0m \033[95m%s\033[0m %s\n" "$1" "$2" "$3"; }
|
||||
|
||||
find -L /test/* -type f -executable -maxdepth 1 | grep -v runtests | sort -V | while read testscript; do
|
||||
echo "🛠 $testscript"
|
||||
{
|
||||
$testscript "$@" 2>&1 && ok "$testscript" || error "$testscript"
|
||||
} | awk '{ print " | "$0 }'
|
||||
done
|
||||
|
|
@ -105,19 +105,17 @@ class Components::ModelCard < Components::Base
|
|||
def actions
|
||||
div class: "card-footer" do
|
||||
div class: "row" do
|
||||
div class: "col" do
|
||||
#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
|
||||
i class: "bi bi-telephone"
|
||||
img src: "/assets/janusxr.svg", style: "width: 16px; margin-left: 7px; transform: translate(0px,-2px);"
|
||||
end
|
||||
end
|
||||
whitespace
|
||||
status_badges @model
|
||||
end
|
||||
div class: "col" do
|
||||
#open_button
|
||||
#whitespace
|
||||
status_badges @model
|
||||
end
|
||||
div class: "col col-auto" do
|
||||
i class: "bi bi-telephone"
|
||||
whitespace
|
||||
link_to "meeting", ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/janusxr.html", {
|
||||
target:"_blank",
|
||||
}
|
||||
whitespace
|
||||
BurgerMenu do
|
||||
#DropdownItem(icon: "app", label: "Open in Godot Web" , path: "/godot/?url="+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/package_godot.zip", aria_label: translate("components.model_card.edit_button.label", name: @model.name), target: "_blank" )
|
||||
|
|
|
|||
|
|
@ -14,15 +14,14 @@ class Components::PreviewFrame < Components::Base
|
|||
end
|
||||
|
||||
def view_template
|
||||
|
||||
if @file
|
||||
a href: "/view/index.html?profile=preview#janus.url="+model_url(@file.model), target: "_blank" do
|
||||
a href: "/view?#{model_model_file_path(@file.model, @file, format: @file.extension)}", target:"_blank" 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>
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
<%= yield :page_header %>
|
||||
|
||||
<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>
|
||||
|
||||
<%= yield :items %>
|
||||
</div>
|
||||
<div class="col-md-3" id="sidebar">
|
||||
<% action_content = yield :actions %>
|
||||
<%= card(:secondary, t(".actions_heading"), class: "action-card") { action_content } if action_content.present? %>
|
||||
<%= yield :sidebar %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<% parent_layout "application" %>
|
||||
|
|
@ -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,52 +0,0 @@
|
|||
<%= form_with model: @model do |form| %>
|
||||
<%= text_input_row form, :name %>
|
||||
|
||||
<%= render "tags_edit", form: form, name: "model[tag_list]", value: (@model.tags.order(taggings_count: :desc, name: :asc).map { |tag| tag.name }).join(","), label: translate(".tags"), tags: @available_tags %>
|
||||
<div style="margin-left: 97px; max-height: 333px; overflow: scroll; margin-bottom: 50px; border: 1px solid #CCC; border-radius: 5px; margin-right:10px; background:black; padding:20px;">
|
||||
<b>Available tags:</b><br>
|
||||
<%= render 'models/tags_info' %>
|
||||
</div>
|
||||
|
||||
<%= collection_select_input_row form, :preview_file, @model.valid_preview_files, :id, :name, help: t(".preview_file.help") %>
|
||||
|
||||
<%= collection_select_input_row form,
|
||||
:creator, @creators, :id, :name_with_domain,
|
||||
include_blank: true,
|
||||
selected: @default_creator&.id,
|
||||
button: (if policy(:creator).new?
|
||||
{
|
||||
path: new_creator_path,
|
||||
label: t("creators.general.new")
|
||||
}
|
||||
end) %>
|
||||
|
||||
<% if SiteSettings.show_libraries || current_user.is_administrator? %>
|
||||
<%= unless @model.contains_other_models?
|
||||
collection_select_input_row form,
|
||||
:library, policy_scope(Library).all, :id, :name,
|
||||
include_blank: true
|
||||
end %>
|
||||
<% end %>
|
||||
|
||||
|
||||
<%= collection_select_input_row form,
|
||||
:collection, @collections, :id, :name_with_domain,
|
||||
include_blank: true,
|
||||
button: (if policy(:collection).new?
|
||||
{
|
||||
path: new_collection_path,
|
||||
label: t("collections.general.new")
|
||||
}
|
||||
end) %>
|
||||
|
||||
<%= render "links_form", form: form %>
|
||||
<%= text_input_row form, :caption %>
|
||||
<%= rich_text_input_row form, :notes, help: t(".notes.help_html") %>
|
||||
<%= select_input_row form, :license, license_select_options(selected: @model.license), include_blank: true %>
|
||||
<%= checkbox_input_row form, :sensitive %>
|
||||
<%= select_input_row form, :indexable, indexable_select_options(form.object) %>
|
||||
<%= select_input_row form, :ai_indexable, ai_indexable_select_options(form.object) if SiteSettings.allow_ai_bots %>
|
||||
<%= render "caber_relations_form", form: form %>
|
||||
|
||||
<%= form.submit "Save", class: "btn btn-primary" %>
|
||||
<% end %>
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<!-- JanusXR JML markup -->
|
||||
|
||||
<% content_for :items do %>
|
||||
<% if ! @models.empty? %>
|
||||
<fireboxroom>
|
||||
<assets>
|
||||
<assetscript src="/view/element/layout.js"/>
|
||||
<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 %>
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
Features can be toggled via tags:<br>
|
||||
<br>
|
||||
<table class="table">
|
||||
<tr>
|
||||
<td>
|
||||
|
|
@ -10,58 +12,21 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<a class="badge rounded-pill bg-secondary tag">your@mastodon.online</a>
|
||||
<a class="badge rounded-pill bg-secondary tag">janusxr</a>
|
||||
</td>
|
||||
<td>
|
||||
Simply enter your mastodon address as tag, and XRForge will generate a 3D model, based on your last post on mastodon.<br>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<Hr/>
|
||||
<b>JanusXR tags:</b>
|
||||
<table class="table">
|
||||
<tr>
|
||||
<td style="vertical-align:top">
|
||||
<a class="badge rounded-pill bg-secondary tag">room1</a><br>
|
||||
<a class="badge rounded-pill bg-secondary tag">room2</a><br>
|
||||
<a class="badge rounded-pill bg-secondary tag">room3</a><br>
|
||||
<a class="badge rounded-pill bg-secondary tag">room4</a><br>
|
||||
<a class="badge rounded-pill bg-secondary tag">room5</a><br>
|
||||
<a class="badge rounded-pill bg-secondary tag">room6</a><br>
|
||||
<a class="badge rounded-pill bg-secondary tag">room1_pedestal</a><br>
|
||||
<a class="badge rounded-pill bg-secondary tag">room2_pedestal</a><br>
|
||||
<a class="badge rounded-pill bg-secondary tag">room2_narrow</a><br>
|
||||
</td>
|
||||
<td>
|
||||
This wraps a room around the 3D asset:<br><Br>
|
||||
<img src="/assets/jml_templates.png" style="width:100%; max-width:800px"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<a class="badge rounded-pill bg-secondary tag">singleuser</a>
|
||||
</td>
|
||||
<td>
|
||||
This disables multiuser mode (the <a alt="start a meeting at this location" href="#" class="btn btn-secondary btn-sm"><i class="bi bi-telephone"></i></a> button).<br>
|
||||
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.
|
||||
This generates an JanusXR address.<br>
|
||||
<a href="https://janusxr.org/" target="_blank">JanusXR</a> is an Open Immersive Web-layer since 2015, which allows existing webpages to become spatial.<br>
|
||||
It is Free and Opensource, and allows you to meet others in this experience (avatars, chat and voice etc).<br>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<a class="badge rounded-pill bg-secondary tag">mml</a>
|
||||
</td>
|
||||
<td>
|
||||
This generates an MML address.<br>
|
||||
Metaverse Markup Language (<a href="https://mml.io" target="_blank">MML</a>) is an open markup language used to define experiences.
|
||||
</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,34 +1,10 @@
|
|||
<%
|
||||
|
||||
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 %>
|
||||
|
|
@ -47,39 +23,20 @@ end
|
|||
|
||||
<div class="row row-cols-md-2 mt-2">
|
||||
<div class="col-md-9" id="item_list">
|
||||
|
||||
<% if @locked_files > 0 %>
|
||||
<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 %>
|
||||
<h2><a name="files"><%= t(".files") %></a></h2>
|
||||
<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 mb-4">
|
||||
<%= render partial: "file", collection: (@groups.delete(nil)) + @images %>
|
||||
<%= render partial: "file", collection: @groups.delete(nil) %>
|
||||
</div>
|
||||
<% @groups.each_pair do |group, files| %>
|
||||
<h3><a name="<%= group.parameterize %>"><%= group.strip.careful_titleize %>*</a></h3>
|
||||
|
|
@ -89,78 +46,19 @@ end
|
|||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3" id="sidebar">
|
||||
<%= card :secondary, "XR networks" do %>
|
||||
<%= card :secondary, t(".model_details") do %>
|
||||
<table class="table table-borderless table-sm">
|
||||
<% if File.exist?( filePath+".xrforge/janusxr.html" ) %>
|
||||
<tr>
|
||||
<td>
|
||||
<img src="/assets/janusxr.svg" style="width: 16px; transform: translate(0px,-2px);">
|
||||
</td>
|
||||
<td>
|
||||
<%= link_to "JanusXR", janusURLCall, 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">
|
||||
<input type="checkbox" id="toggle_janusxr" hidden>
|
||||
<div class="hidden-tooltip">
|
||||
<i class="bi bi-arrow-90deg-up"></i>
|
||||
<small>
|
||||
Click to view this page in a JanusXR (JML) browser like JanusWeb.<br>
|
||||
<a href="https://janusxr.org/" target="_blank">JanusXR</a> is an Open XR content-weblayer since 2013, which allows existing webpages to become spatial.<br>
|
||||
It is Free and Opensource, and allows you to meet others in this experience (avatars, chat and voice etc).<br>
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<%
|
||||
# lets generate a JanusXR spatial layer for the current scene
|
||||
jmlfile = @model.library.path+"/"+@model.path+"/.xrforge/scene.jml"
|
||||
jml = ""
|
||||
if File.exist?(jmlfile)
|
||||
jml = File.read(jmlfile)
|
||||
.gsub(/src=(["'])(?!(?:http|\/|\.\/))(.*?)/i, "src=\\1#{model_path(@model)}/model_files/\\2")
|
||||
.gsub("-->","")
|
||||
.gsub("--%3E","")
|
||||
end
|
||||
%>
|
||||
|
||||
<!-- JML (https://janusxr.org) spatial markup -->
|
||||
|
||||
<!--
|
||||
<%== jml %>
|
||||
-->
|
||||
|
||||
<% if File.exist?( filePath+".xrforge/scene.gltf" ) %>
|
||||
<tr>
|
||||
<td>⁂</td>
|
||||
<td>
|
||||
<%= link_to "XR Fragments", ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/scene.gltf" %>
|
||||
<label for="toggle_gltf"><i class="bi bi-info-circle"></i></label>
|
||||
<div class="toggle-box">
|
||||
<input type="checkbox" id="toggle_gltf" hidden>
|
||||
<div class="hidden-tooltip">
|
||||
<i class="bi bi-arrow-90deg-up"></i>
|
||||
<small>
|
||||
This is the glTF JSON URL with embedded hyperlinks for immersive navigation to other 3D scene-files, as per the <a href="https://xrfragment.org" target="_blank">XR Fragments</a> spec.<br>
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
<% if SiteSettings.federation_enabled? %>
|
||||
<tr>
|
||||
<td>⁂</td>
|
||||
<td><% if @model.remote? %>
|
||||
<%= link_to @model.federails_actor.at_address, @model.federails_actor.profile_url, target: "new" %>
|
||||
<small><%= link_to @model.federails_actor.at_address, @model.federails_actor.profile_url, target: "new" %></small>
|
||||
<% else %>
|
||||
<small>
|
||||
<%= @model.federails_actor.short_at_address %>
|
||||
<%= render Components::CopyButton.new(text: @model.federails_actor.at_address) %>
|
||||
</small>
|
||||
<% end %>
|
||||
<label for="toggle_activitypub"><i class="bi bi-info-circle"></i></label>
|
||||
<div class="toggle-box">
|
||||
|
|
@ -176,12 +74,63 @@ end
|
|||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% if @model.creator %>
|
||||
<tr>
|
||||
<td><%= icon "person", Creator.model_name.human %></td>
|
||||
<td><%= link_to @model.creator.name, @model.creator, itemprop: "author" %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% if ENV['FEDERATE_DRIVE_HOST'].present? %>
|
||||
|
||||
<% if File.exist?( filePath+".xrforge/scene.mml" ) %>
|
||||
<% if @model.tags.where(name: "janusxr" ).any? %>
|
||||
<tr>
|
||||
<td>
|
||||
<i class="bi bi-eye-fill" role="img"></i>
|
||||
</td>
|
||||
<td>
|
||||
<%
|
||||
fediURL = ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/janusxr.html"
|
||||
%>
|
||||
<%= link_to "JanusXR address", 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">
|
||||
<input type="checkbox" id="toggle_janusxr" hidden>
|
||||
<div class="hidden-tooltip">
|
||||
<i class="bi bi-arrow-90deg-up"></i>
|
||||
<small>
|
||||
This is the JanusXR address.<br>
|
||||
<a href="https://janusxr.org/" target="_blank">JanusXR</a> is an Open Immersive Web-layer since 2015, which allows existing webpages to become spatial.<br>
|
||||
It is Free and Opensource, and allows you to meet others in this experience (avatars, chat and voice etc).<br>
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<%
|
||||
# lets generate a JanusXR spatial layer for the current scene
|
||||
jmlfile = @model.library.path+"/"+@model.path+"/.xrforge/scene.jml"
|
||||
jml = ""
|
||||
if File.exist?(jmlfile)
|
||||
jml = File.read(jmlfile)
|
||||
end
|
||||
%>
|
||||
|
||||
<!-- JML (https://janusxr.org) spatial markup
|
||||
|
||||
<%== jml %>
|
||||
-->
|
||||
|
||||
<% end %>
|
||||
|
||||
<% if @model.tags.where(name: "mml" ).any? %>
|
||||
<tr>
|
||||
<td>⁂</td>
|
||||
<td>
|
||||
<i class="bi bi-eye-fill" role="img"></i>
|
||||
</td>
|
||||
<td>
|
||||
<%= link_to "MML", "https://viewer.mml.io/main/v1/?url="+URI.encode_www_form_component(ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/scene.mml"), target:"_blank" %>
|
||||
<%= link_to "MML address", "https://viewer.mml.io/main/v1/?url="+URI.encode_www_form_component(ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/scene.mml"), target:"_blank" %>
|
||||
<a href="<%= ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/scene.mml" %>" target="_blank"><i class="bi bi-link-45deg"></i></a>
|
||||
<label for="toggle_mml"><i class="bi bi-info-circle"></i></label>
|
||||
<div class="toggle-box">
|
||||
|
|
@ -197,19 +146,7 @@ end
|
|||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</table>
|
||||
<% end %>
|
||||
|
||||
<%= card :secondary, t(".model_details") do %>
|
||||
<table class="table table-borderless table-sm">
|
||||
|
||||
<% if @model.creator %>
|
||||
<tr>
|
||||
<td><%= icon "person", Creator.model_name.human %></td>
|
||||
<td><%= link_to @model.creator.name, @model.creator, itemprop: "author" %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<tr>
|
||||
<td>
|
||||
<i class="bi bi-journal-check" role="img"></i>
|
||||
|
|
@ -224,14 +161,34 @@ end
|
|||
<small>
|
||||
This is the build log of XR Forge.<br>
|
||||
When you add files, they are processed, validated (for <a href="https://xrfragment.org" target="_blank">XR Fragment</a> compliance).<br>
|
||||
Features can be toggled via tags:<br>
|
||||
<br>
|
||||
<%= render 'models/tags_info' %>
|
||||
<% render 'models/tags_info' %>
|
||||
</small>
|
||||
</div>
|
||||
</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>
|
||||
<% end %>
|
||||
|
||||
<% if @model.collection %>
|
||||
<tr>
|
||||
|
|
@ -281,7 +238,7 @@ end
|
|||
<div class="hidden-tooltip" style="max-height:400px">
|
||||
<i class="bi bi-arrow-90deg-up"></i>
|
||||
<small>
|
||||
<%= render 'models/tags_info' %>
|
||||
<% render 'models/tags_info' %>
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -302,36 +259,10 @@ end
|
|||
<%= render Components::GoButton.new(icon: "pencil", label: t("general.edit"), href: edit_model_path(@model), variant: "primary") if policy(@model).edit? %>
|
||||
<%= render Components::DoButton.new(icon: "trash", label: t("general.delete"), href: model_path(@model), method: :delete, variant: "outline-danger", confirm: translate("models.destroy.confirm")) if policy(@model).destroy? %>
|
||||
<% end %>
|
||||
|
||||
|
||||
<div class="mb-3 w-100 text-center">
|
||||
<%= 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,7 +8,7 @@ echo "Preparing database..."
|
|||
bundle exec rails db:prepare:with_data
|
||||
|
||||
echo "run boot 'hook'"
|
||||
/manyfold/cli/manyfold.sh hook boot || true
|
||||
/manyfold/cli/manyfold.sh hook boot &
|
||||
|
||||
echo "Setting database file ownership (SQLite3 only)..."
|
||||
bundle exec rake db:chown
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
# why: the database-write are sometimes chatty/duplicated.
|
||||
# therefore it ratelimits and prevents processing unchanged files.
|
||||
|
||||
require 'pp'
|
||||
require 'digest'
|
||||
|
||||
Rails.application.config.to_prepare do
|
||||
|
|
@ -15,10 +16,9 @@ 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") )
|
||||
if File.exist?(file)
|
||||
cache_key = "ttl:file:cli_hook:#{self.id}#{Digest::MD5.file(file).hexdigest}"
|
||||
ttl = 60.0 # dont trigger hook twice for the same file within 60 seconds
|
||||
now = Time.current
|
||||
|
|
@ -30,14 +30,11 @@ Rails.application.config.to_prepare do
|
|||
if last_run_time.nil? || (now - last_run_time) > ttl
|
||||
# 2. Write the new execution time to the shared cache
|
||||
# Use `write` to set the new time. Caching a string representation is often safer/easier.
|
||||
Rails.cache.write(cache_key, now.to_s, expires_in: ttl + 3.second)
|
||||
Rails.cache.write(cache_key, now.to_s, expires_in: ttl + 1.minute)
|
||||
|
||||
puts "[app/config/initializers/xrforge.rb] running hook #{file}\n"
|
||||
Bundler.with_unbundled_env do
|
||||
#`TS_SLOTS=5 ts /manyfold/cli/manyfold.sh hook experience_updated #{file} &`
|
||||
`/manyfold/cli/manyfold.sh hook experience_updated #{file}`
|
||||
end
|
||||
Model.find(self.model.id).add_new_files_later(include_all_subfolders:false)
|
||||
puts "[app/config/initializers/xrforge.rb] runnin hook\n"
|
||||
command = "TS_SLOTS=5 ts /manyfold/cli/manyfold.sh hook experience_updated #{file} &"
|
||||
system(command)
|
||||
else
|
||||
puts "[app/config/initializers/xrforge.rb] skipping hook\n"
|
||||
end
|
||||
|
|
@ -46,64 +43,3 @@ Rails.application.config.to_prepare do
|
|||
|
||||
end
|
||||
end
|
||||
|
||||
#class XRForgeRoutes
|
||||
# # Rack endpoints must implement a #call method that accepts the Rack environment hash (env).
|
||||
# def call(env)
|
||||
# # Wrap the environment in a Rails Request object for easier parameter access
|
||||
# request = ActionDispatch::Request.new(env)
|
||||
#
|
||||
# # 1. Access the model ID from the route parameters
|
||||
# # The route path parameters are stored in the routing information
|
||||
# model_id = request.path_parameters[:id]
|
||||
#
|
||||
# begin
|
||||
# # 2. Find the model
|
||||
# # Note: We are outside the controller, so we access Model directly.
|
||||
# model = Model.find(model_id)
|
||||
#
|
||||
# puts "-------------------------"
|
||||
# Rails.logger.info("build process for Model ID: #{model.id}")
|
||||
# url_helpers = Rails.application.routes.url_helpers
|
||||
# redirect_path = url_helpers.model_path(model)
|
||||
#
|
||||
# # 302 Found response for a temporary redirect
|
||||
# [
|
||||
# 302,
|
||||
# {
|
||||
# 'Content-Type' => 'text/html',
|
||||
# 'Location' => redirect_path
|
||||
# },
|
||||
# ['Build process started successfully.']
|
||||
# ]
|
||||
#
|
||||
# rescue ActiveRecord::RecordNotFound
|
||||
# # Handle model not found error
|
||||
# [
|
||||
# 404,
|
||||
# { 'Content-Type' => 'text/plain' },
|
||||
# ["Model with ID #{model_id} not found."]
|
||||
# ]
|
||||
# rescue => e
|
||||
# # Handle other errors
|
||||
# Rails.logger.error("Build Rack App Error: #{e.message}")
|
||||
# [
|
||||
# 500,
|
||||
# { 'Content-Type' => 'text/plain' },
|
||||
# ["Internal Server Error: Could not initiate build."]
|
||||
# ]
|
||||
# end
|
||||
# end
|
||||
#end
|
||||
#
|
||||
#Rails.configuration.to_prepare do
|
||||
# Rails.application.routes.draw do
|
||||
# resources :models, only: [] do
|
||||
# member do
|
||||
# # Point the route directly to an instance of the Rack application class.
|
||||
# # The route is: POST /models/:id/build
|
||||
# match 'build', to: XRForgeRoutes.new, via: :post
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
#end
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
if ENV['CORS_PROXY']
|
||||
match '/cors/*target_url_segment', to: 'cors_proxy#proxy', via: :all, format: false
|
||||
end
|
||||
|
Before Width: | Height: | Size: 906 KiB |
|
Before Width: | Height: | Size: 69 KiB |
|
|
@ -1,23 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
version="1.1"
|
||||
width="500.44669"
|
||||
height="526.20935"
|
||||
id="svg46"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<defs
|
||||
id="defs46" />
|
||||
<path
|
||||
d="m 355.95692,38.225006 c 2.73479,2.461154 5.39209,4.994684 8.01758,7.571777 1.34542,1.316746 2.71389,2.609828 4.08398,3.900879 6.87186,6.601735 12.61753,13.935978 18.35938,21.511719 1.13437,-0.639375 2.26875,-1.27875 3.4375,-1.9375 8.27553,-4.036494 14.6524,-3.37541 23.29687,-0.410156 20.96255,8.650811 34.56671,29.342441 43.21143,49.559575 11.18602,27.52311 17.36113,56.91586 12.51514,86.51855 -2.69159,19.09202 5.52731,31.81769 15.36645,47.34644 17.668,27.88651 17.668,27.88651 14.77417,41.84497 -2.16162,7.24282 -7.64806,11.92453 -13.60156,16.26562 -8.45868,6.85964 -13.04155,18.66184 -14.44947,29.16578 -0.37215,3.75471 -0.68688,7.51068 -0.98803,11.27172 -1.87048,20.90882 -5.32469,40.51095 -21.5625,55.375 -2.85414,2.34651 -5.75482,4.23758 -9,6 -0.82371,0.45118 -1.64742,0.90235 -2.4961,1.36719 -16.13456,7.73544 -35.26629,7.046 -52.77587,7.16699 -10.30918,-0.0912 -10.30918,-0.0912 -19.72803,3.46582 -3.4632,5.12978 -5.11284,11.14152 -6.69922,17.05469 -0.48693,1.75394 -0.974,3.50785 -1.46118,5.26172 -0.24896,0.90766 -0.49792,1.81532 -0.75443,2.75049 -7.2809,26.46075 -16.04317,51.78931 -27.08517,76.9331 -5.72933,-0.6399 -10.95971,-2.06834 -16.44922,-3.80078 -0.89387,-0.27764 -1.78774,-0.55529 -2.7087,-0.84135 -2.84477,-0.88514 -5.68714,-1.77777 -8.52958,-2.67037 -1.88983,-0.58835 -3.7798,-1.17624 -5.66992,-1.76367 -5.21932,-1.62524 -10.43287,-3.26807 -15.64258,-4.92383 -1.01372,-0.32142 -1.01372,-0.32142 -2.04791,-0.64935 -1.70079,-0.5419 -3.39885,-1.09234 -5.09662,-1.64361 -0.88664,-0.28771 -1.77327,-0.57541 -2.68677,-0.87183 -2.1687,-0.83521 -2.1687,-0.83521 -5.1687,-2.83521 -4.26651,-0.38661 -8.54211,-0.32916 -12.82398,-0.31567 -2.10282,0.003 -4.20423,-0.0203 -6.30688,-0.0457 -1.34049,-0.002 -2.68099,-0.003 -4.02149,-0.002 -1.82519,-0.004 -1.82519,-0.004 -3.68725,-0.009 -3.56773,0.4203 -4.39448,1.22301 -7.1604,3.37231 -2.98157,1.18491 -6.04867,2.07743 -9.1211,2.9961 -0.89574,0.27482 -1.79148,0.54963 -2.71437,0.83278 -2.86509,0.87713 -5.73343,1.74305 -8.60203,2.60862 -1.89541,0.57804 -3.7906,1.15681 -5.68555,1.73633 -3.64787,1.11522 -7.29838,2.22117 -10.95068,3.32178 -3.01197,0.91131 -6.01048,1.8496 -8.99707,2.84082 -1.14324,0.37496 -2.28648,0.74991 -3.46436,1.13623 -0.95399,0.32364 -1.90797,0.64727 -2.89087,0.98071 -2.99203,0.63542 -4.71313,0.64942 -7.57397,-0.45337 -1.38697,-2.02075 -1.38697,-2.02075 -2.47266,-4.73828 -0.41854,-1.02907 -0.83708,-2.05815 -1.26831,-3.1184 -0.43611,-1.14042 -0.87221,-2.28084 -1.32153,-3.45582 -0.46898,-1.19262 -0.93796,-2.38524 -1.42115,-3.61401 -8.70125,-22.36667 -16.18549,-45.23058 -21.93115,-68.53369 -2.03413,-10.5326 -2.03413,-10.5326 -8.26758,-18.66968 -6.69644,-2.74275 -14.2617,-2.30183 -21.38613,-2.35119 -22.502322,-0.18974 -46.337252,-0.43669 -63.931492,-16.51893 -13.83191,-15.39279 -17.60146,-34.36322 -19,-54.3125 -1.22377,-17.31546 -5.66451,-30.87225 -19,-42.6875 -1.0789999,-0.83894 -2.1618899,-1.67292 -3.2499999,-2.5 -4.15117,-3.77378 -6.29127995,-7.45743 -7.13280995,-13.03906 -0.75997,-17.5805 10.99539985,-33.43582 20.07542985,-47.59253 9.56114,-14.99879 12.65147,-25.61969 9.80738,-43.24341 -5.4019,-36.3138 6.589,-77.94207 27.51562,-107.953124 9.29206,-12.511354 22.11961,-24.30302 38.10938,-26.671875 7.020142,-0.401789 13.117592,2.099822 18.875002,6 0.41572,-0.877852 0.41572,-0.877852 0.83984,-1.773438 3.97707,-7.632757 10.32837,-13.996733 16.16016,-20.226562 1.21816,-1.316777 1.21816,-1.316777 2.46094,-2.660157 11.76049,-12.272588 25.4555,-21.61809 40.53906,-29.339843 0.92546,-0.477114 0.92546,-0.477114 1.86963,-0.963867 56.77867,-28.87966 131.24829,-21.222612 179.66943,20.979552 z"
|
||||
fill="#4cb96f"
|
||||
id="path1" />
|
||||
<path
|
||||
d="m 104.48036,74.209386 c 14.01919,9.544982 17.28909,27.479924 20.9375,43.000004 0.34781,1.46349 0.34781,1.46349 0.70264,2.95654 3.9666,16.83356 7.13574,33.77169 10.17238,50.78966 4.94765,27.65632 10.55273,55.18357 18.12498,82.2538 0.21592,0.77408 0.43184,1.54816 0.6543,2.3457 5.69367,20.18367 12.22766,40.2264 22.3457,58.6543 0.69292,1.29807 1.38562,2.59625 2.07813,3.89453 4.85041,8.96022 10.35159,17.39712 16.05078,25.83594 2.51273,3.72383 4.97364,7.47022 7.37109,11.26953 0.58781,0.92813 1.17563,1.85625 1.78125,2.8125 4.16437,7.72302 6.41065,15.04331 7.34375,23.75 0.11916,1.03649 0.23832,2.07297 0.36108,3.14087 1.31022,12.42718 1.79484,24.92019 2.28003,37.40234 0.32998,8.23421 0.78685,16.41561 1.69092,24.60913 0.0781,0.7089 0.15615,1.4178 0.23659,2.14818 1.638,13.89438 5.50414,26.91584 10.16429,40.07887 0.3408,0.97437 0.68159,1.94874 1.03272,2.95264 0.30969,0.86472 0.61939,1.72944 0.93847,2.62036 0.70466,2.61015 0.719,4.79568 0.6709,7.48511 -6.7243,2.12356 -13.45057,4.24083 -20.17822,6.35376 -2.28757,0.71926 -4.57468,1.43995 -6.86133,2.16211 -3.29033,1.03886 -6.58224,2.07253 -9.87451,3.10522 -1.52846,0.48442 -1.52846,0.48442 -3.0878,0.97863 -4.64994,1.45342 -9.14539,2.79279 -13.99814,3.40028 -4.25493,-8.82759 -7.84647,-17.67925 -11.0625,-26.9375 -0.40799,-1.15951 -0.81598,-2.31902 -1.23633,-3.51367 -0.82345,-2.34028 -1.64329,-4.68184 -2.45947,-7.02466 -0.83606,-2.3729 -1.68896,-4.73992 -2.55762,-7.10107 -2.70984,-7.38288 -4.90529,-14.70373 -6.68408,-22.3606 -1.68682,-6.94843 -3.38042,-13.87552 -5.5625,-20.6875 -0.35191,-1.10602 -0.70383,-2.21203 -1.06641,-3.35156 -2.24045,-4.9405 -4.92423,-8.26055 -9.80859,-10.83594 -6.07494,-2.02498 -11.81683,-2.33875 -18.15234,-2.39844 -1.68947,-0.0281 -3.37892,-0.0568 -5.06836,-0.0859 -2.62573,-0.0409 -5.25129,-0.0778 -7.8772,-0.10449 C 84.939569,413.59976 66.85999,412.17514 52.382702,398.4047 38.718144,383.13734 36.06592,361.22023 35.364635,341.59611 34.551434,325.69568 26.593093,312.67134 15.042858,302.14689 c -1.235459,-1.09677 -2.472338,-2.19194 -3.710937,-3.28516 -3.7754319,-3.43635 -3.7754319,-3.43635 -4.1874999,-7.05078 -0.586941,-17.20186 10.8112229,-31.757 19.6821279,-45.75171 6.320153,-10.07205 10.787181,-18.70157 10.778809,-30.72485 6.45e-4,-0.94948 0.0013,-1.89895 0.002,-2.8772 -0.04662,-6.22488 -0.64097,-12.10354 -1.732422,-18.23608 -4.852679,-31.97792 8.967014,-72.55721 27.833252,-98.270269 9.00489,-11.875077 24.526541,-27.04615 40.772172,-21.741455 z"
|
||||
fill="#eff7f9"
|
||||
id="path2" />
|
||||
<path
|
||||
d="m 406.41786,73.209386 c 19.25538,6.768868 32.14526,23.622413 40.86719,41.308594 12.36273,26.41954 19.99939,56.17564 15.63281,85.25391 -3.53699,23.64241 4.2922,39.12412 17.125,58.5 5.48203,8.27792 12.41526,19.13006 12.625,29.25 0.0387,1.10795 0.0387,1.10795 0.0781,2.23828 -0.88208,6.58409 -4.79511,10.09514 -9.57813,14.13672 -13.9383,12.30953 -18.45791,26.64607 -19.75,44.6875 -1.35283,18.73921 -4.43964,38.99647 -18.8125,52.5 -12.2884,9.85902 -27.59803,12.18836 -42.92969,12.33594 -1.66016,0.0281 -3.32032,0.0567 -4.98047,0.0859 -2.57568,0.0412 -5.15117,0.0781 -7.72705,0.1045 -15.51745,-0.24013 -15.51745,-0.24013 -29.42529,5.72363 -4.7446,6.41917 -6.8127,13.74762 -8.5625,21.4375 -1.9491,8.124 -4.15709,16.07942 -6.77002,24.01611 -0.93383,2.85328 -1.8442,5.71376 -2.75732,8.57373 -4.93702,15.29249 -10.60339,30.12249 -17.03516,44.84769 -6.07975,-0.65079 -11.63799,-2.2844 -17.45703,-4.125 -1.47626,-0.46044 -1.47626,-0.46044 -2.98235,-0.93018 -2.06909,-0.64641 -4.13738,-1.29538 -6.20491,-1.94677 -3.17349,-0.99971 -6.34931,-1.99174 -9.52563,-2.98243 -2.01251,-0.62976 -4.02489,-1.25995 -6.03711,-1.89062 -0.95204,-0.29793 -1.90408,-0.59587 -2.88497,-0.90283 -1.31728,-0.41548 -1.31728,-0.41548 -2.66117,-0.83936 -1.1608,-0.36521 -1.1608,-0.36521 -2.34505,-0.73779 -1.90178,-0.64502 -1.90178,-0.64502 -3.90178,-1.64502 0.58313,-7.25383 2.64659,-13.78262 4.875,-20.6875 4.45365,-13.85851 7.51171,-27.09272 8.6875,-41.625 0.12559,-1.45997 0.25124,-2.91993 0.37695,-4.37988 0.69327,-8.30279 1.20649,-16.60591 1.58789,-24.92871 0.0411,-0.88719 0.0821,-1.77437 0.12441,-2.68843 0.19608,-4.31989 0.37451,-8.63956 0.52623,-12.96123 0.77791,-20.25966 6.05514,-34.69661 17.57202,-51.41675 15.399,-22.76918 26.3875,-45.27462 35.25,-71.3125 0.28617,-0.83789 0.57234,-1.67578 0.86719,-2.53906 11.82929,-35.01939 18.09788,-71.56471 24.78988,-107.8216 13.6546,-73.951398 13.6546,-73.951398 29.21402,-87.237001 3.86755,-2.547613 7.67898,-2.136857 12.12891,-1.402343 z"
|
||||
fill="#eff7f9"
|
||||
id="path3" />
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 8.2 KiB |
|
Before Width: | Height: | Size: 239 KiB |
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 16 KiB |
|
|
@ -21,64 +21,3 @@ input[type="checkbox"]:checked + .hidden-tooltip {
|
|||
display: block;
|
||||
}
|
||||
|
||||
#model_notes {
|
||||
min-height: 50vh;
|
||||
font-family: monospace;
|
||||
font-size: 13px;
|
||||
color: #CCF;
|
||||
background: #000;
|
||||
}
|
||||
|
||||
.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);
|
||||
}
|
||||
|
||||
|
|
@ -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>
|
||||
|
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
|
||||
}
|
||||
|
||||
})
|
||||
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
Before Width: | Height: | Size: 402 KiB |
|
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"
|
||||
]
|
||||
}
|
||||