-- 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: 284d3a23b3ff498ffcda3db3cdb4746aa4b1c7ee:
path_to:
revision_to:

commit 284d3a23b3ff498ffcda3db3cdb4746aa4b1c7ee
Author: James Baicoianu <james_github@baicoianu.com>
Date:   Sun Dec 2 01:47:46 2018 -0800

    Support for custom texture attribute

diff --git a/scripts/room.js b/scripts/room.js

--- a/scripts/room.js
+++ b/scripts/room.js
@@ -1108,6 +1108,7 @@ elation.require([
             assettype:'image',
             name:args.id,
             src: src,
+            texture: args.texture,
             tex_linear: args.tex_linear,
             sbs3d: args.sbs3d,
             ou3d: args.ou3d,
@@ -1120,6 +1121,15 @@ elation.require([
           assetlist.push(assetargs);
         } else if (args.canvas) {
           assetlist.push({ assettype:'image', name:args.id, canvas: args.canvas, tex_linear: args.tex_linear, hasalpha: args.hasalpha, baseurl: this.baseurl });
+        } else if (args.texture) {
+          assetlist.push({
+            assettype:'image',
+            name:args.id,
+            texture: args.texture,
+            tex_linear: args.tex_linear,
+            hasalpha: args.hasalpha,
+            baseurl: this.baseurl
+          });
         }
       } else if (type == 'video') {
         var src = (args.src.match(/^file:/) ? args.src.replace(/^file:/, datapath) : args.src);

-- Response ended

-- Page fetched on Sun Jun 2 15:21:01 2024