diff --git a/manyfold/root/hook.d/experience_updated/300-package_janusxr.rb b/manyfold/root/hook.d/experience_updated/300-package_janusxr.rb index 004db62..508437d 100755 --- a/manyfold/root/hook.d/experience_updated/300-package_janusxr.rb +++ b/manyfold/root/hook.d/experience_updated/300-package_janusxr.rb @@ -112,7 +112,7 @@ begin if ext.match(/(mp3|ogg)/i) audiovisual = model_file ? false : true base = File.basename(resource['path'], ext) - soundtrackUrl = addLink("model_files/#{resource["path"]}") + soundtrackUrl = addLink("#{resource["path"]}") assets += " \n" objects += "\n" end @@ -124,7 +124,7 @@ begin audiovisual = model_file ? false : true base = File.basename(resource['path'], ext) - videoSrc = addLink("model_files/#{resource["path"]}") + videoSrc = addLink("#{resource["path"]}") assets += "\n" objects += " \n" end @@ -133,7 +133,7 @@ begin if ext.match(/mp4/i) || ext.match(/webm/i) audiovisual = model_file ? false : true base = File.basename(resource['path'], ext) - videoSrc = addLink("model_files/#{resource["path"]}") + videoSrc = addLink("#{resource["path"]}") assets += "\n" objects += " \n" end @@ -143,7 +143,7 @@ begin # TODO: copy files from a heuristic-based folder instead hardcoding it here startpos = "pos=\"0 0 -10\"" use_local_asset = "room5" - rplaneSrc = addLink("model_files/roundedplane.glb") + rplaneSrc = addLink("roundedplane.glb") system("cp /root/templates/audiovisual/roundedplane.glb #{dir}/.") assets += " \n" objects += " \n" @@ -168,7 +168,7 @@ begin end if model_file - objectSrc = "model_files/#{model_file.gsub("#","%23")}" + objectSrc = "#{model_file.gsub("#","%23")}" if ! $links.include?(objectSrc) objectSrc = addLink(objectSrc) assets += " \n" diff --git a/manyfold/usr/src/app/app/views/models/_janusroom.html.erb b/manyfold/usr/src/app/app/views/models/_janusroom.html.erb index 4306daf..1e4bb00 100644 --- a/manyfold/usr/src/app/app/views/models/_janusroom.html.erb +++ b/manyfold/usr/src/app/app/views/models/_janusroom.html.erb @@ -4,6 +4,7 @@ <% if ! @models.empty? %> + diff --git a/manyfold/usr/src/app/app/views/models/show.html.erb b/manyfold/usr/src/app/app/views/models/show.html.erb index 6ed843b..7c9ea1c 100644 --- a/manyfold/usr/src/app/app/views/models/show.html.erb +++ b/manyfold/usr/src/app/app/views/models/show.html.erb @@ -122,9 +122,9 @@ end jml = "" if File.exist?(jmlfile) jml = File.read(jmlfile) - .gsub("model_files/",model_path(@model)+"/model_files/") - .gsub("-->","") - .gsub("--%3E","") + .gsub(/src=(["'])(?!(?:http|\/|\.\/))(.*?)/i, "src=\\1#{model_path(@model)}/model_files/\\2") + .gsub("-->","") + .gsub("--%3E","") end %> diff --git a/manyfold/usr/src/app/public/assets/roundel-1d688b1e.svg b/manyfold/usr/src/app/public/assets/roundel-1d688b1e.svg index ec6004a..16da786 100644 --- a/manyfold/usr/src/app/public/assets/roundel-1d688b1e.svg +++ b/manyfold/usr/src/app/public/assets/roundel-1d688b1e.svg @@ -1,262 +1,3 @@ - + - -[]XR Forge +[]