-- 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: eeb9c7dc61745b9f585e5e41da28cde763f0e3f5: path_to: revision_to:
commit eeb9c7dc61745b9f585e5e41da28cde763f0e3f5 Author: Spyduck <flock.of.murkrows@gmail.com> Date: Tue Feb 25 04:34:12 2020 +0000 Fix video playback on objects diff --git a/scripts/object.js b/scripts/object.js
--- a/scripts/object.js +++ b/scripts/object.js @@ -146,10 +146,10 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() { this.updateVideo = function() { if (!this.modelasset) return; if (!this.videoasset || this.videoasset.name != this.video_id) { - if (this.video_id && this.video_id != '' && !this.image_id) { + if (this.video_id && this.video_id != '' && this.image_id == '') { this.loadVideo(this.video_id); if (this.modelasset && texture) { - this.assignTextureParameters(texture, this.modelasset); + this.assignTextureParameters(texture, this.modelasset, texture); } } else { this.videotexture = null; @@ -382,11 +382,11 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() { } } } - if (this.video_id && this.video_id != '' && this.image_id == '') { + if (this.video_id && this.video_id != '' && !this.image_id) { this.loadVideo(this.video_id); texture = this.videotexture; if (texture) { - this.assignTextureParameters(texture, modelasset); + this.assignTextureParameters(texture, modelasset, texture); if (this.videoasset.sbs3d) { texture.repeat.x *= 0.5; }
-----END OF PAGE-----
-- Response ended
-- Page fetched on Sun Jun 2 14:44:05 2024