coderofsalvation/xrforge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: coderofsalvation:26a3d22882415b1c1444e704e3c3289d4ea9ae53
Branches Tags
coderofsalvation:master
coderofsalvation:feat/godot
coderofsalvation:fix/reproduce
..
compare: coderofsalvation:556a9158eb48de7a62036ab19c612410a62e5b3b
Branches Tags
coderofsalvation:master
coderofsalvation:feat/godot
coderofsalvation:fix/reproduce

No commits in common. "26a3d22882415b1c1444e704e3c3289d4ea9ae53" and "556a9158eb48de7a62036ab19c612410a62e5b3b" have entirely different histories.
26a3d22882 ... 556a9158eb

5 changed files with 8 additions and 68 deletions
Show stats Expand all files Collapse all files

2
manyfold/cli/manyfold.sh
View file

@ -231,9 +231,9 @@ boot(){
mount_rclone mount_rclone
set_upload_path set_upload_path
force_public force_public
start_hook_daemon
get_xrfragment_assets get_xrfragment_assets
mount_dir mount_dir
start_hook_daemon
scan_libraries & scan_libraries &
hook boot # emit unixy hook-event (/root/hook.d/boot/* scripts) hook boot # emit unixy hook-event (/root/hook.d/boot/* scripts)

32
manyfold/root/hook.d/inotify_MODIFY/package_janusxr.sh
View file

@ -1,32 +0,0 @@
#!/bin/sh
echo "$1" | grep datapackage || exit 0 # nothing to do
dir=$(dirname $1)
cd "$dir"
echo "[package_janusxr.sh] packing janusxr.html"
glb=$(ls *.glb | head -n1) # todo: check datapackage.json instead of first match
jml='
<html>
<head>
<title>janusxr room</title>
</head>
<body>
<script src="https://web.janusvr.com/janusweb.js"></script>
<janus-viewer>
<FireBoxRoom>
 <Assets>
 <AssetObject id="experience" src="'$glb'" ></AssetObject>
 </Assets>
 <Room>
<Object id="experience" locked="true" pos="0 0 0"></Object>
 </Room>
</FireBoxRoom>
</janus-viewer>
</body>
</html>
'
echo "$jml" > janusxr.html

6
manyfold/usr/src/app/app/views/models/show.html.erb
View file

@ -68,12 +68,6 @@
<td><%= link_to @model.creator.name, @model.creator, itemprop: "author" %></td> <td><%= link_to @model.creator.name, @model.creator, itemprop: "author" %></td>
</tr> </tr>
<% end %> <% end %>
<tr>
<td>
<i class="bi bi-people" role="img"></i>
</td>
<td><%= link_to "JanusXR room", "/"+@model.library.name+"/"+@model.path.gsub("#","%23")+"/janusxr.html" %></td>
</tr>
<tr> <tr>
<td> <td>
<i class="bi bi-file-zip" role="img"></i> <i class="bi bi-file-zip" role="img"></i>

2
manyfold/usr/src/app/public/view/index.html
View file

@ -1,4 +1,4 @@
<!-- Saved from local source at 2025-10-24T13:48:06Z using monolith v2.10.1 --> <!-- Saved from local source at 2025-10-23T17:12:49Z using monolith v2.10.1 -->
<!DOCTYPE html><html><head> <!DOCTYPE html><html><head>
<style type="text/css"> <style type="text/css">

34
nix/docker.nix
View file

@ -22,36 +22,14 @@ let
# generate the reproducable blob below via: # generate the reproducable blob below via:
# $ nix-shell -p nix-prefetch-docker --run 'nix-prefetch-docker ghcr.io/manyfold3d/manyfold-solo 0.120.0' # $ nix-shell -p nix-prefetch-docker --run 'nix-prefetch-docker ghcr.io/manyfold3d/manyfold-solo 0.120.0'
#manyfoldImage = pkgs.dockerTools.pullImage {
# imageName = "ghcr.io/manyfold3d/manyfold-solo";
# imageDigest = "sha256:6250e562a05bf9476ddcfdc897a7b03cbf2090c727d9fe051afde486579b54a6";
# sha256 = "sha256-V5y1N0l4JQjVDQbboGYX15MQaImXtP/HpNwPjDtxeJQ=";
# finalImageName = "ghcr.io/manyfold3d/manyfold-solo";
# finalImageTag = "0.121.0";
#};
manyfoldImage = pkgs.dockerTools.pullImage { manyfoldImage = pkgs.dockerTools.pullImage {
imageName = "ghcr.io/manyfold3d/manyfold-solo"; imageName = "ghcr.io/manyfold3d/manyfold-solo";
imageDigest = "sha256:465399a2d296034ef84dba18a13744b567694c652387bd17fe97d51c672d1fa9"; imageDigest = "sha256:6250e562a05bf9476ddcfdc897a7b03cbf2090c727d9fe051afde486579b54a6";
hash = "sha256-j7YSUGRFUDh6FJ1CrIQEzGU/0B8uPO8y1kd9lYLad4w="; sha256 = "sha256-V5y1N0l4JQjVDQbboGYX15MQaImXtP/HpNwPjDtxeJQ=";
finalImageName = "ghcr.io/manyfold3d/manyfold-solo"; finalImageName = "ghcr.io/manyfold3d/manyfold-solo";
finalImageTag = "latest"; finalImageTag = "0.121.0";
}; };
# 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 in
rec rec
{ {
@ -76,7 +54,7 @@ rec
pkgs.pkgsStatic.inotify-tools # inotifywait e.g. pkgs.pkgsStatic.inotify-tools # inotifywait e.g.
pkgs.pkgsStatic.zip # inotifywait e.g. pkgs.pkgsStatic.zip # inotifywait e.g.
pkgs.pkgsStatic.ts # job management pkgs.pkgsStatic.ts # job management
myAssimp # cli 3D editing/conversion pkgs.pkgsStatic.assimp # cli 3D editing/conversion
./.. ./..
]; ];
}; };