updated logo alpha mask and index.html usage

secretrobotron · May 17, 2011 · 80b60bf · 80b60bf
1 parent 0ddba18
commit 80b60bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*/.DS_Store
+.DS_Store
diff --git a/img/logo-alpha.jpg b/img/logo-alpha.jpg
diff --git a/index.html b/index.html
@@ -258,7 +258,6 @@
             color: new CubicVR.Texture("img/logo.jpg"),
             alpha: new CubicVR.Texture("img/logo-alpha.jpg"),
           },
-          opacity: 0.99,
         });
 
         var logoMesh = CubicVR.primitives.plane({

diff --git a/lib/cubicvr/CubicVR_Core.fs b/lib/cubicvr/CubicVR_Core.fs
@@ -124,14 +124,18 @@ void main(void)
   color = texture2D(colorMap, vec2(texCoord.s, texCoord.t)).rgba;
   color.rgb *= mColor;
 #endif
-	if (color.a<=0.9) discard;  
+  if (color.a<=0.9) discard;  
 #else
 	color = vec4(mColor,1.0);
 #endif
 
 #if hasAlphaMap
 	color.a = texture2D(alphaMap, texCoord).r;
+#if alphaDepth
+  if (color.a < 0.9) discard;
+#else
   if (color.a==0.0) discard;
+#endif
 #else
 #if hasAlpha
 	color.a = mAlpha;