Compare commits

..

3 commits

Author SHA1 Message Date
0ace214070 wip 2025-11-10 15:05:01 +01:00
d725c9c73a wip 2025-11-06 22:49:28 +01:00
c0e4705a13 wip 2025-11-06 09:04:50 +01:00
33 changed files with 380 additions and 1316 deletions

View file

@ -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
```

View file

@ -6,7 +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 "$CORS_PROXY" || export CORS_PROXY=1
db=/config/manyfold.sqlite3
# utility funcs
@ -20,15 +19,14 @@ 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 \
echo ${oci} run "$@" -p 8790:3214 -p 8791:3215 --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:8791 \
@ -73,7 +71,6 @@ 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 $*"
@ -127,9 +124,7 @@ set_upload_path(){
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 model_path_template "replace('--- \"{creator}/{modelId} \"\\n','\\n',char(10))"
sqlite3 $db "INSERT INTO settings VALUES(6,'default_library',$id);
INSERT INTO sqlite_sequence VALUES('settings',6);"
sqlite3 $db "UPDATE settings set value = $id where var = 'default_library';"
}
mount_dir(){
@ -197,7 +192,8 @@ 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
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
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
}
@ -210,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(){
@ -239,32 +227,32 @@ get_xrfragment_assets(){
test -n "$NO_ASSETS" && return 0 # nothing to do here
test -d /mnt/asset || {
echocolor "fetching XR Fragments asset & templates"
mkdir -p /mnt/asset/xrfragments /mnt/templates/xrfragments
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/xrfragments/\#1
find xrfragment/assets/template -maxdepth 1 -mindepth 1 -type d | awk '{ system("cp -r "$0" /mnt/templates/xrfragments/#"(NR+1)) }'
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
}
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_tags_auto_tag_new "'build'"
set_global model_path_template "replace('--- \"{creator}/{modelId} \"\\n','\\n',char(10))"
set_upload_path
#set_global about "$ABOUT"
mount_rclone
set_upload_path &
force_public &
get_xrfragment_assets
mount_dir
BOOT_SCAN=1 scan_libraries &
touch ${db}.xrforgeinit
scan_libraries &
}
# The new entrypoint of the docker
@ -275,11 +263,10 @@ boot(){
rename_app
set_homepage
start_hook_daemon
mount_rclone
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
}

View file

@ -1,77 +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|
new_filename = "#{dir}/#{filenameWithoutExt}_img#{i}.png"
old_filename = "#{dir}/.xrforge/#{filenameWithoutExt}_img#{i}.png"
# move file to modeldirectory (but dont overwrite if user overwrite it)
if File.exist?(old_filename) && !File.exist?(new_filename)
puts "✅ Renaming #{old_filename} -> #{new_filename}"
File.rename(old_filename, new_filename)
else
puts "✅ Not overwriting (useruploaded) #{new_filename}"
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

View 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

View file

@ -1,78 +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|
new_filename = ""
new_filename = "#{dir}/#{filenameWithoutExt}_img#{i}.png"
# move file to modeldirectory (but dont overwrite if user overwrite it)
XRForge.log("🤔 checking #{new_filename}",logfile)
if File.exist?(new_filename)
XRForge.log("✅ importing #{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
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

View file

@ -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

View 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

View file

@ -5,152 +5,102 @@ 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
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)
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']
autogenerate = true
if data['description'] && data['description'].match(JMLHeuristic)
if data['description'].match(/autogenerate=["']false["']/i)
XRForge.log("✅ autogenerate='false' found in JML..keeping this JML",logfile)
autogenerate = false
jmlMatch = data['description'].match(JMLHeuristic)
jml = jmlMatch[0]
end
end
if autogenerate
assets = "<assetobject id=\"experience\" src=\"#{federate_drive_host}/#{dirPublic}/#{model_file.gsub("#","%23")}\"/>\n"
objects = ""
# detect audio track sidecarfile as per XR Fragment spec: https://xrfragment.org/#%F0%9F%93%9C%20level0%3A%20File
xrf_ext = File.extname(model_file)
xrf_base = File.basename(model_file, xrf_ext)
data['resources'].each do |resource|
ext = File.extname(resource['path'])
if ext.match(/mp3/i)
base = File.basename(resource['path'], ext)
if base == xrf_base
XRForge.log("✅ XR Fragments side-car file found: #{resource['path']}",logfile)
assets = assets + " <assetsound id=\"soundtrack\" src=\"#{federate_drive_host}/#{dirPublic}/#{resource["path"]}\"/>\n"
objects = objects + "<sound id=\"soundtrack\" loop=\"true\"/>\n"
end
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- / JanusXR-compatible experience", logfile)
end
private = data['keywords'].include?('singleuser') ? "private='true'" : ""
# tags to JML rooms *REFACTOR PLEASE*
use_local_asset = ""
use_local_asset = data['keywords'].include?('room1') ? "use_local_asset=\"room1\"" : use_local_asset
use_local_asset = data['keywords'].include?('room2') ? "use_local_asset=\"room2\"" : use_local_asset
use_local_asset = data['keywords'].include?('room3') ? "use_local_asset=\"room3\"" : use_local_asset
use_local_asset = data['keywords'].include?('room4') ? "use_local_asset=\"room4\"" : use_local_asset
use_local_asset = data['keywords'].include?('room5') ? "use_local_asset=\"room5\"" : use_local_asset
use_local_asset = data['keywords'].include?('room6') ? "use_local_asset=\"room5\"" : use_local_asset
use_local_asset = data['keywords'].include?('room1_pedestal') ? "use_local_asset=\"room1_pedestal\"" : use_local_asset
use_local_asset = data['keywords'].include?('room2_pedestal') ? "use_local_asset=\"room2_pedestal\"" : use_local_asset
use_local_asset = data['keywords'].include?('room2_narrow') ? "use_local_asset=\"room3_narrow\"" : use_local_asset
objects = objects + " <object pos=\"0 0 5\" rotation=\"-180 0 180\" lighting=\"false\" collision_id=\"experience\" id=\"experience\" />"
# 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>
#{assets}
</Assets>
<Room autogenerate="true" #{use_local_asset} #{private}>
#{objects}
</Room>
</FireBoxRoom>
<!-- archive.org hints -->
<a href="#{federate_drive_host}/#{dirPublic}/#{model_file.gsub("#","%23")}"></a>
<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
data['description'] = data['description'] ? data['description'] : "your description here\n"
data['description'] = <<~DESCRIPTION#{data['description']}
<!-- Hi there! Below is autogenerated JanusXR Markup (JML). -->
<!-- If you want to tweak it, then first disable autogeneration -->
<!-- How? make sure to set autogenerate to "false" (see room-tag below) -->
<!-- -->
<!-- JML info: -->
<!-- https://coderofsalvation.github.io/janus-guide/#/examples/markup -->
<!-- https://janusxr.org/docs/build/introtojml/index.html -->
#{jml}
DESCRIPTION
File.write("datapackage.json", JSON.pretty_generate(data) )
end
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
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>
File.write('.xrforge/janusxr.html', html)
File.write('.xrforge/scene.jml', jml)
<!-- map query args as attributes -->
<script>
args = new URLSearchParams(document.location.search)
for( const [k,v] of args.entries()) document.querySelector("Room").setAttribute(k,v)
</script>
XRForge.log("✅ generated scene.jml", logfile)
XRForge.log("✅ generated janusxr.html", logfile)
XRForge.log(" ", logfile)
<!-- archive.org hints -->
<a href="#{federate_drive_host}/#{model_file.gsub("#","%23")}"></a>
</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("datapackage.json", JSON.pretty_generate(data) )
# tag it!
if ! data['keywords'].include?('janusxr')
data['keywords'].push('janusxr')
File.write(file_path, JSON.pretty_generate(data) )
end
end
rescue Errno::ENOENT
@ -160,4 +110,3 @@ rescue JSON::ParserError
rescue => e
puts "An error occurred: #{e.message}"
end

View file

@ -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

View file

@ -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)

View file

@ -1,91 +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|
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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

View file

@ -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"
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 B

View file

@ -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

View file

@ -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 File.basename(model_file)
end
end

View file

@ -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: ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/janusxr.html", target: "_blank", class: "btn btn-secondary btn-sm" do
i class: "bi bi-telephone"
img src: "/assets/janusxr.svg", style: "width: 16px; margin-left: 7px; transform: translate(0px,-2px);"
end
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" )

View file

@ -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 %>

View file

@ -1,3 +1,5 @@
Features can be toggled via tags:<br>
<br>
<table class="table">
<tr>
<td>
@ -10,41 +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"/>
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">singleuser</a>
<a class="badge rounded-pill bg-secondary tag">mml</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.
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>

View file

@ -36,7 +36,7 @@
<% 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>
@ -46,81 +46,19 @@
<% 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 ENV['FEDERATE_DRIVE_HOST'].present? %>
<% if @model.tags.where(name: "xrfragments" ).any? %>
<tr>
<td>
<img src="/assets/janusxr.svg" style="width: 16px; transform: translate(0px,-2px);">
</td>
<td>
<%
fediURL = ENV['FEDERATE_DRIVE_HOST']+"/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/.xrforge/janusxr.html"
%>
<%= link_to "JanusXR", fediURL, target:"_blank" %>
<a href="" target="_blank"><i class="bi bi-link-45deg"></i></a>
<label for="toggle_janusxr"><i class="bi bi-info-circle"></i></label>
<div class="toggle-box">
<input type="checkbox" id="toggle_janusxr" hidden>
<div class="hidden-tooltip">
<i class="bi bi-arrow-90deg-up"></i>&nbsp;
<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)
end
%>
<!-- JML (https://janusxr.org) spatial markup -->
<%== jml %>
<% end %>
<% if @model.tags.where(name: "xrfragments" ).any? %>
<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>&nbsp;
<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">
@ -136,12 +74,63 @@
</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 @model.tags.where(name: "xrfragments" ).any? %>
<% 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>&nbsp;
<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">
@ -157,20 +146,7 @@
</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>
@ -185,9 +161,7 @@
<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>
@ -214,6 +188,7 @@
</div>
</td>
</tr>
<% end %>
<% if @model.collection %>
<tr>
@ -263,7 +238,7 @@
<div class="hidden-tooltip" style="max-height:400px">
<i class="bi bi-arrow-90deg-up"></i>&nbsp;
<small>
<%= render 'models/tags_info' %>
<% render 'models/tags_info' %>
</small>
</div>
</div>
@ -288,7 +263,6 @@
<div class="mb-3 w-100 text-center">
<%= render Components::DownloadButton.new(model: @model) %>
</div>
<%= card :secondary, t("layouts.card_list_page.actions_heading") do %>
<%= render Components::ReportButton.new(object: @model, path: new_model_report_path(@model)) %>

View file

@ -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

View file

@ -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
@ -17,7 +18,7 @@ Rails.application.config.to_prepare do
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
@ -29,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\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
@ -45,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

View file

@ -1,101 +0,0 @@
require 'net/http'
require 'uri'
# Defines the controller logic for the CORS proxy endpoint.
# It handles all HTTP methods and forwards the request to the target URL
# provided as a path segment (e.g., /cors/https://example.com/data?q=1).
class CorsProxyController < ApplicationController
# Skip CSRF protection for this action, as it's intended to handle external requests
# that might not have a valid CSRF token.
skip_before_action :verify_authenticity_token
# The main proxy action.
def proxy
# Assuming the route is configured as: match '/cors/*target_url_segment', ...
target_url_segment = params[:target_url_segment]
# Reconstruct the full target URL. The globbing parameter captures the base path
# (e.g., "https://example.com/data"), and we re-attach the raw query string
# (e.g., "?q=1&param=2") that the Rails router parsed separately.
query_string = request.query_string.present? ? "?#{request.query_string}" : ""
target_url = target_url_segment.to_s + query_string
# 1. Input Validation
unless target_url.present?
return render json: { error: 'Target URL is required as a path segment after /cors/.' }, status: :bad_request
end
begin
uri = URI.parse(target_url)
# Security check: Only allow standard HTTP/HTTPS schemes.
unless ['http', 'https'].include?(uri.scheme&.downcase)
return render json: { error: 'Invalid URL scheme. Only http and https are supported.' }, status: :bad_request
end
rescue URI::InvalidURIError
return render json: { error: 'Invalid URL format.' }, status: :bad_request
end
# 2. Determine the appropriate Net::HTTP request class based on the incoming method
request_class = case request.method
when 'GET' then Net::HTTP::Get
when 'POST' then Net::HTTP::Post
when 'PUT' then Net::HTTP::Put
when 'DELETE' then Net::HTTP::Delete
when 'PATCH' then Net::HTTP::Patch
when 'HEAD' then Net::HTTP::Head
else
return render json: { error: "Unsupported HTTP method: #{request.method}" }, status: :method_not_allowed
end
# 3. Initialize the outgoing request
# Use uri.request_uri which includes the path and query parameters of the target
outgoing_request = request_class.new(uri.request_uri)
# 4. Copy relevant headers from the incoming request to the outgoing request
# We explicitly skip certain headers that are managed by the HTTP client or should not be proxied.
request.headers.each do |key, value|
header_key = key.sub(/^HTTP_/, '').underscore.dasherize.split('-').map(&:capitalize).join('-')
# Skip internal/sensitive/managed headers
next if ['Host', 'Content-Length', 'Connection', 'Transfer-Encoding', 'X-Request-Id', 'X-Forwarded-For'].include?(header_key)
next if header_key.start_with?('X-') # Generally skip custom Rails internal headers
# Pass all other headers (including Authorization, Content-Type, etc.)
outgoing_request[header_key] = value
end
# 5. Handle request body for methods that carry a payload
if request.body.present? && !['GET', 'HEAD'].include?(request.method)
request.body.rewind # Ensure we read from the beginning of the stream
outgoing_request.body = request.body.read
end
# 6. Execute the request
http = Net::HTTP.new(uri.host, uri.port)
http.use_ssl = (uri.scheme == 'https')
# Set reasonable timeouts
http.read_timeout = 15
http.open_timeout = 5
target_response = http.request(outgoing_request)
# 7. Proxy the response back to the client
# Copy headers from the target response to the client response
target_response.each_header do |key, value|
# Skip internal headers but ensure CORS headers (Access-Control-*) are passed
next if ['Transfer-Encoding', 'Connection', 'Content-Length'].include?(key.downcase)
response.headers[key] = value
end
# Set status and send back the body and content type
render plain: target_response.body,
status: target_response.code.to_i,
content_type: target_response['Content-Type'] || 'text/plain'
rescue StandardError => e
# Catch network errors (DNS failures, timeouts, etc.)
Rails.logger.error "CORS Proxy Error: #{e.class}: #{e.message}"
render json: { error: "Proxy request failed due to a server error: #{e.message}" }, status: :internal_server_error
end
end

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 69 KiB

View file

@ -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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 239 KiB

View file

@ -2,16 +2,43 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="128.27412mm"
width="128.27411mm"
height="145.65482mm"
viewBox="0 0 128.27413 145.65482"
viewBox="0 0 128.27411 145.65482"
version="1.1"
id="svg5"
xml:space="preserve"
inkscape:export-filename="../../../../../Downloads/xrforge.svg"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
sodipodi:docname="logo.svg"
inkscape:dataloss="true"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><defs
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
id="namedview7"
pagecolor="#505050"
bordercolor="#ffffff"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="1"
inkscape:deskcolor="#505050"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="0.56323837"
inkscape:cx="226.36952"
inkscape:cy="409.24058"
inkscape:window-width="1920"
inkscape:window-height="1030"
inkscape:window-x="0"
inkscape:window-y="26"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" /><defs
id="defs2"><linearGradient
inkscape:collect="always"
id="linearGradient12286"><stop
style="stop-color:#ea0bfe;stop-opacity:0.11569338;"
offset="0"
@ -19,6 +46,7 @@
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop12284" /></linearGradient><linearGradient
inkscape:collect="always"
id="linearGradient12159"><stop
style="stop-color:#fe83ff;stop-opacity:0.35045233;"
offset="0"
@ -26,6 +54,7 @@
style="stop-color:#3c9cff;stop-opacity:0.32712477;"
offset="1"
id="stop12157" /></linearGradient><linearGradient
inkscape:collect="always"
id="linearGradient12153"><stop
style="stop-color:#fe83ff;stop-opacity:0.29342434;"
offset="0"
@ -33,6 +62,7 @@
style="stop-color:#3c9cff;stop-opacity:0.31577286;"
offset="1"
id="stop12151" /></linearGradient><linearGradient
inkscape:collect="always"
id="linearGradient12139"><stop
style="stop-color:#ea0bfe;stop-opacity:0.50826901;"
offset="0"
@ -40,6 +70,7 @@
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop12137" /></linearGradient><linearGradient
inkscape:collect="always"
id="linearGradient12102"><stop
style="stop-color:#fe83ff;stop-opacity:1;"
offset="0"
@ -47,6 +78,7 @@
style="stop-color:#3c9cff;stop-opacity:0.81848603;"
offset="1"
id="stop12100" /></linearGradient><linearGradient
inkscape:collect="always"
id="linearGradient7688"><stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
@ -68,6 +100,7 @@
x2="273.12695"
y2="24.048252"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7688"
id="linearGradient7692"
x1="115.42191"
@ -75,6 +108,7 @@
x2="117.16759"
y2="131.87457"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient12102"
id="linearGradient12104"
x1="54.029213"
@ -82,6 +116,7 @@
x2="176.85757"
y2="71.733955"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient12159"
id="linearGradient12108"
gradientUnits="userSpaceOnUse"
@ -90,6 +125,7 @@
x2="176.85757"
y2="71.733955"
gradientTransform="translate(0,4.7625002)" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient12153"
id="linearGradient12112"
gradientUnits="userSpaceOnUse"
@ -98,6 +134,7 @@
y1="71.733955"
x2="176.85757"
y2="71.733955" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient12286"
id="linearGradient12141"
x1="137.33427"
@ -106,6 +143,7 @@
y2="88.766113"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.2850723,0,0,1.2367478,-50.791853,-16.999519)" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient12139"
id="linearGradient12239"
gradientUnits="userSpaceOnUse"
@ -115,8 +153,9 @@
y2="88.766113"
gradientTransform="matrix(-1.2669282,0,0,1.2603766,278.3952,-19.18513)" /><filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter12743"
x="-0.079006466"
x="-0.079006463"
y="-0.2479955"
width="1.1580434"
height="1.4959902"><feFlood
@ -143,11 +182,12 @@
result="composite2"
id="feComposite12741" /></filter><filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter13745"
x="-0.13442897"
y="-0.73597233"
width="1.2688579"
height="2.4719447"><feFlood
x="-0.13448349"
y="-0.73597109"
width="1.268967"
height="2.4719422"><feFlood
flood-opacity="1"
flood-color="rgb(26,135,255)"
result="flood"
@ -170,6 +210,7 @@
operator="over"
result="composite2"
id="feComposite13743" /></filter><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient12286"
id="linearGradient14475"
gradientUnits="userSpaceOnUse"
@ -178,22 +219,41 @@
y1="88.766113"
x2="177.37935"
y2="88.766113" /></defs><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-51.358538,-4.8451999)"><path
sodipodi:type="star"
style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:2.3;stroke-dasharray:none"
id="path1638-3"
inkscape:flatsided="true"
sodipodi:sides="6"
sodipodi:cx="138.75616"
sodipodi:cy="263.41873"
sodipodi:r1="70.000412"
sodipodi:r2="60.622131"
sodipodi:arg1="-2.6179939"
sodipodi:arg2="-2.0943951"
inkscape:rounded="0"
inkscape:randomized="0"
d="m 78.134029,228.41853 60.622131,-35.00021 60.62214,35.0002 0,70.00042 -60.62213,35.0002 -60.62214,-35.0002 z"
inkscape:transform-center-x="-4.0923148e-06"
inkscape:transform-center-y="-2.6621219e-06"
transform="matrix(1.0382846,0,0,1.0210168,-28.572793,-191.28234)" /><g
id="g12126"><path
id="g12126"
inkscape:label="lines"><path
style="fill:none;fill-opacity:1;stroke:url(#linearGradient12104);stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1"
d="M 54.029427,71.745371 176.85736,71.722537"
id="path12042" /><path
id="path12042"
inkscape:label="line" /><path
style="fill:none;fill-opacity:1;stroke:url(#linearGradient12108);stroke-width:0.6;stroke-dasharray:none;stroke-opacity:1"
d="M 54.029427,76.507874 176.85736,76.48504"
id="path12106" /><path
id="path12106"
inkscape:label="line" /><path
style="fill:none;fill-opacity:1;stroke:url(#linearGradient12112);stroke-width:0.8;stroke-dasharray:none;stroke-opacity:1"
d="M 54.029427,91.32455 176.85736,91.301716"
id="path12110" /><path
id="path12110"
inkscape:label="line" /><path
style="fill:url(#linearGradient12239);fill-opacity:1;stroke:none;stroke-width:2.416;stroke-dasharray:none;stroke-opacity:1"
d="M 104.40252,71.315371 53.668551,108.90527 v 5.16648 z"
id="path12133-5" /><path
@ -202,10 +262,12 @@
id="path12133" /><path
style="fill:url(#linearGradient12141);fill-opacity:1;stroke:none;stroke-width:2.41042;stroke-dasharray:none;stroke-opacity:1"
d="m 115.37951,70.94784 5.14781,74.3852 c 0,0 -4.42958,5.94658 -10.22727,-0.9757 z"
id="path12280" /></g><path
id="path12280"
sodipodi:nodetypes="cccc" /></g><path
style="fill:url(#linearGradient7692);fill-opacity:1;stroke:none;stroke-width:2.3;stroke-dasharray:none;stroke-opacity:1"
d="M 53.906377,71.659657 H 177.09207 l 0.24519,40.701533 -61.93861,35.18517 -61.54407,-35.3442 z"
id="path7625" /><g
id="path7625"
sodipodi:nodetypes="cccccc" /><g
id="g4494"
transform="matrix(2.7825702,0,0,3.2095953,58.857189,44.497537)"
style="filter:url(#filter12743)"><g
@ -238,6 +300,7 @@
x="69.809654"
y="107.18471"
id="text1004"><tspan
sodipodi:role="line"
id="tspan1002"
style="font-style:normal;font-variant:normal;font-weight:100;font-stretch:normal;font-size:19.7556px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Thin';stroke-width:0.5;stroke-dasharray:none"
x="69.809654"
@ -247,16 +310,18 @@
x="160.00148"
y="107.33738"
id="text1004-3"><tspan
sodipodi:role="line"
id="tspan1002-6"
style="font-style:normal;font-variant:normal;font-weight:100;font-stretch:normal;font-size:19.7556px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Thin';stroke-width:0.5;stroke-dasharray:none"
x="160.00148"
y="107.33738">]</tspan></text><text
xml:space="preserve"
style="font-weight:100;font-size:16.2278px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Thin';text-align:center;letter-spacing:0.529167px;writing-mode:tb-rl;text-orientation:upright;text-anchor:middle;fill:#020202;fill-opacity:1;stroke:#000000;stroke-width:2.3;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter13745)"
x="75.235199"
y="106.55447"
x="85.100029"
y="91.992111"
id="text3268"><tspan
sodipodi:role="line"
id="tspan3266"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.2278px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.3;stroke-opacity:1"
x="75.235199"
y="106.55447">XR Forge</tspan></text></g></svg>
x="85.100029"
y="91.992111">XR Forge</tspan></text></g></svg>

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -21,14 +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;
}

File diff suppressed because one or more lines are too long

View file

@ -38,18 +38,18 @@ let
finalImageTag = "latest";
};
## generate the reproducable blob below via:
## $ nix-shell -p nix-prefetch-github --command 'nix-prefetch-github assimp assimp --rev e778c84cd62bc8b38d8e491ad3d2c27cb8ed37d5'
#assimpSrc = pkgs.fetchFromGitHub {
# "owner" = "assimp";
# "repo" = "assimp";
# "rev" = "e778c84cd62bc8b38d8e491ad3d2c27cb8ed37d5";
# "hash" = "sha256-ja5pFwpnzLT2MDIR8ISwC6+eA5UXyqRZW2CMCCrF1Q0=";
#};
#myAssimp = pkgs.pkgsStatic.assimp.overrideAttrs (oldAttrs: {
# inherit assimpSrc; # Set the source to the fetched commit
# src = assimpSrc;
#});
# generate the reproducable blob below via:
# $ nix-shell -p nix-prefetch-github --command 'nix-prefetch-github assimp assimp --rev e778c84cd62bc8b38d8e491ad3d2c27cb8ed37d5'
assimpSrc = pkgs.fetchFromGitHub {
"owner" = "assimp";
"repo" = "assimp";
"rev" = "e778c84cd62bc8b38d8e491ad3d2c27cb8ed37d5";
"hash" = "sha256-ja5pFwpnzLT2MDIR8ISwC6+eA5UXyqRZW2CMCCrF1Q0=";
};
myAssimp = pkgs.pkgsStatic.assimp.overrideAttrs (oldAttrs: {
inherit assimpSrc; # Set the source to the fetched commit
src = assimpSrc;
});
in
@ -64,22 +64,21 @@ rec
fromImage = manyfoldImage;
# add nix pkgs + local files
copyToRoot = pkgs.buildEnv {
contents = pkgs.buildEnv {
name = "image-root";
pathsToLink = ["/manyfold" "/bin" ];
paths = [
#pkgs.pkgsStatic.rsync
pkgs.rsync
pkgs.sqlite
pkgs.rclone
pkgs.fuse3
#pkgs.acl # getfacl e.g.
#pkgs.inotify-tools # inotifywait e.g.
pkgs.zip # inotifywait e.g.
pkgs.assimp
##pkgs.ts # job management
#myAssimp # updated build of assimp
../.
pkgs.pkgsStatic.rsync
pkgs.pkgsStatic.sqlite
pkgs.pkgsStatic.rclone
pkgs.pkgsStatic.fuse3
pkgs.pkgsStatic.acl # getfacl e.g.
pkgs.pkgsStatic.inotify-tools # inotifywait e.g.
pkgs.pkgsStatic.zip # inotifywait e.g.
pkgs.pkgsStatic.ts # job management
pkgs.janus-gateway # webrtc server
myAssimp # cli 3D editing/conversion
./..
];
};
@ -87,9 +86,6 @@ rec
Cmd = ["/init"];
# We substitute the /init entrypoing with our own wrapper
EntryPoint = ["/manyfold/cli/manyfold.sh" "boot"];
Env = [
"LD_PRELOAD=" # unset LD_PRELOAD (some package is setting it a nonexisting lib)
];
};
};