-- 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: 9ed3130aca6890f4b63128afd50229d46f5c5007:
path_to:
revision_to:

git.thebackupbox.net

janusweb

git://git.thebackupbox.net/janusweb

commit 9ed3130aca6890f4b63128afd50229d46f5c5007
Author: James Baicoianu <james_github@baicoianu.com>
Date:   Fri Nov 5 16:34:41 2021 -0700

    Fix <image> transparency

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

index 3a4127acb44d7e96b5a89bcf4ce2c0bffded3532..

index ..cd068770c02d150d3279db6b4bfb5889e2a5f630 100644

--- a/scripts/image.js
+++ b/scripts/image.js
@@ -55,7 +55,7 @@ elation.require(['janusweb.janusbase'], function() {
         color: this.properties.color,
         transparent: (this.opacity < 1),
         opacity: this.opacity,
-        alphaTest: 0.2
+        alphaTest: this.alphatest
       };

       this.asset = this.getAsset('image', this.image_id);
@@ -68,6 +68,9 @@ elation.require(['janusweb.janusbase'], function() {
           elation.events.add(this.texture, 'update', elation.bind(this, this.refresh));

           matargs.transparent = this.asset.hasalpha;
+          elation.events.add(this.asset, 'asset_load', ev => {
+            matargs.transparent = this.asset.hasalpha;
+          });
         }
       }
       if (this.texture) {
@@ -156,6 +159,9 @@ elation.require(['janusweb.janusbase'], function() {
       this.sidetex.image = this.texture.image;
       this.sidetex.needsUpdate = true;

+      this.frontmaterial.transparent = this.asset.hasalpha;
+      this.sidematerial.transparent = this.asset.hasalpha;
+
       if (this.properties.sbs3d || this.asset.sbs3d) {
         // TODO - to really support 3d video, we need to set offset based on which eye is being rendered
         var texture = new THREE.SBSTexture(this.texture.image);

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

-- Response ended

-- Page fetched on Sun Jun 2 17:04:00 2024