repo: janusweb action: commit revision: path_from: revision_from: 39c29eb098b940fa1bb615465083f635b6030965: path_to: revision_to:
commit 39c29eb098b940fa1bb615465083f635b6030965 Author: SpyduckDate: Tue Feb 25 21:56:28 2020 +0000 use videoasset instead of texture diff --git a/scripts/object.js b/scripts/object.js
--- a/scripts/object.js
+++ b/scripts/object.js
@@ -149,7 +149,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
if (this.video_id && this.video_id != '' && !this.image_id) {
this.loadVideo(this.video_id);
if (this.modelasset && texture) {
- this.assignTextureParameters(texture, this.modelasset, texture);
+ this.assignTextureParameters(texture, this.modelasset, this.videoasset);
}
} else {
this.videotexture = null;
@@ -386,7 +386,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
this.loadVideo(this.video_id);
texture = this.videotexture;
if (texture) {
- this.assignTextureParameters(texture, modelasset, texture);
+ this.assignTextureParameters(texture, modelasset, this.videoasset);
if (this.videoasset.sbs3d) {
texture.repeat.x *= 0.5;
}
-----END OF PAGE-----