repo: janusweb
action: commit
revision: 
path_from: 
revision_from: d31f27a7ffb314487b7b9dfa8210d099396980f6:
path_to: 
revision_to: 

commit d31f27a7ffb314487b7b9dfa8210d099396980f6
Author: James Baicoianu 
Date:   Thu Oct 19 21:09:56 2017 -0700

    Support for AssetImage canvas parameter for dynamic textures

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

--- a/scripts/room.js
+++ b/scripts/room.js
@@ -958,8 +958,12 @@ elation.require([

       var assetlist = [];
       if (type == 'image') {
-        var src = (args.src.match(/^file:/) ? args.src.replace(/^file:/, datapath) : args.src);
-        assetlist.push({ assettype:'image', name:args.id, src: src, baseurl: this.baseurl });
+        if (args.src) {
+          var src = (args.src.match(/^file:/) ? args.src.replace(/^file:/, datapath) : args.src);
+          assetlist.push({ assettype:'image', name:args.id, src: src, tex_linear: args.tex_linear, hasalpha: args.hasalpha, baseurl: this.baseurl });
+        } 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 (type == 'video') {
         var src = (args.src.match(/^file:/) ? args.src.replace(/^file:/, datapath) : args.src);
         assetlist.push({

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