-- Leo's gemini proxy

-- Connecting to git.thebackupbox.net:1965...

-- Connected

-- Sending request

-- Meta line: 20 text/gemini

repo: janusweb
action: commit
revision:
path_from:
revision_from: 1b51c8f38167e74000f55abae5c567bfd06e1edf:
path_to:
revision_to:

git.thebackupbox.net

janusweb

git://git.thebackupbox.net/janusweb

commit 1b51c8f38167e74000f55abae5c567bfd06e1edf
Author: James Baicoianu <james_github@baicoianu.com>
Date:   Tue Jul 23 12:09:16 2019 -0700

    Parse <AssetShader> from room source

diff --git a/scripts/external/JanusFireboxParser.js b/scripts/external/JanusFireboxParser.js

index b693e251d73d026e3cfca81d5dcd6fc7153ac81b..

index ..7c685f4c194b17d1f7a5b6e5d507b421028f09d4 100644

--- a/scripts/external/JanusFireboxParser.js
+++ b/scripts/external/JanusFireboxParser.js
@@ -61,6 +61,7 @@ JanusFireboxParser.prototype.parseAssets = function(xml, baseurl, datapath) {
   var scriptassets = this.getAsArray(this.arrayget(assetxml, "_children.assetscript", []));
   var ghostassets = this.getAsArray(this.arrayget(assetxml, "_children.assetghost", []));
   var websurfaceassets = this.getAsArray(this.arrayget(assetxml, "_children.assetwebsurface", []));
+  var shaderassets = this.getAsArray(this.arrayget(assetxml, "_children.assetshader", []));
   var assetlist = [];
   if (!datapath) {
     datapath = 'http://web.janusvr.com/media';
@@ -115,6 +116,17 @@ JanusFireboxParser.prototype.parseAssets = function(xml, baseurl, datapath) {
       baseurl: baseurl
     });
   });
+  shaderassets.forEach(function(n) {
+    n.uniforms = (n._children && n._children.uniform ? n._children.uniform : false);
+    assetlist.push({
+      assettype: 'shader',
+      name: n.id,
+      fragment_src: n.src,
+      vertex_src: n.vertex_src,
+      uniforms: n.uniforms,
+      baseurl: baseurl,
+    });
+  });

   var objlist = [];
   objectassets.forEach(function(n) {
@@ -135,6 +147,7 @@ JanusFireboxParser.prototype.parseAssets = function(xml, baseurl, datapath) {
     websurfaces: websurfaces,
     scripts: scriptassets,
     ghosts: ghostassets,
+    shaders: shaderassets,
     assetlist: assetlist
   };
   return assets;

-----END OF PAGE-----

-- Response ended

-- Page fetched on Sun Jun 2 15:05:14 2024