diff --git a/src/page/dir.lua b/src/page/dir.lua index 148403d..3b34819 100644 --- a/src/page/dir.lua +++ b/src/page/dir.lua @@ -101,7 +101,7 @@ return { data.janusurl = (v.janusxr and v.janusxr.wrap) and app.opts.baseurl .. util.stripPath(v.url) -- if parent has redirect to item set, use parent url if not data.janusurl or v.parent.redirect == v.url then - data.janusurl = app.opts.baseurl .. util.stripPath(v.parent.url) + data.janusurl = app.opts.baseurl .. util.stripPath(v.parent.redirect) end if v.janusxr and v.janusxr.wrap and v.janusxr.wrap.file then -- what to do here? no generated portals? diff --git a/src/page/janusxr.html b/src/page/janusxr.html index 9f9973e..ad44aea 100644 --- a/src/page/janusxr.html +++ b/src/page/janusxr.html @@ -48,10 +48,10 @@ end} room = app.opts.plugin_janusxr_portalroom end - function initRoom(i) - if i.janusxr and i.janusxr.room then + function initRoom(r) + if r.janusxr and r.janusxr.room then pos = '0 0 1' -- todo make startup location configurable - room = i.janusxr.room + room = r.janusxr.room end end initRoom(item or {}) diff --git a/src/plugin/janusxr.lua b/src/plugin/janusxr.lua index e9f4798..28ddd57 100644 --- a/src/plugin/janusxr.lua +++ b/src/plugin/janusxr.lua @@ -33,10 +33,14 @@ app.on('scan_experience_file', function(exp) exp.janusxr = exp.janusxr or {} exp.janusxr.wrap = nil -- erase previous 3D models print("✅ └─ plugin/janusxr: " .. exp.file.name) - if data:match(pattern_aframe) and app.opts.plugin_janusxr_wrap_aframe == 'enabled' then - exp.janusxr.wrap = {file = true } + if data:match(pattern_aframe) and app.opts.plugin_janusxr_wrap_aframe ~= '' then + if not data:match("