bg2e-js 2.2.11 → 2.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bg2e-js",
-  "version": "2.2.11",
+  "version": "2.2.12",
   "description": "a graphics engine for productivity applications",
   "main": "./dist/bg2e-js.js",
   "types": "./src/index.ts",

package/src/shaders/DepthRenderShader.ts

@@ -2,39 +2,64 @@ import Shader from "../render/Shader";
 import ShaderFunction from "./ShaderFunction";
 import ShaderProgram from "../render/webgl/ShaderProgram";
 import PolyListRenderer from '../render/PolyListRenderer';
-import MaterialRenderer from '../render/MaterialRenderer';
+import MaterialRenderer from '../render/webgl/MaterialRenderer';
 import Mat4 from "../math/Mat4";
 import Renderer from "../render/Renderer";
 import WebGLRenderer from "../render/webgl/Renderer";
 import WebGLPolyListRenderer from "../render/webgl/PolyListRenderer";
+import { getUniformsFunctions, getColorCorrectionFunctions } from "./webgl";
 
 const g_code = {
     webgl: {
         vertex: `precision mediump float;
         attribute vec3 position;
         attribute vec2 texCoord;
+        attribute vec2 texCoord2;
 
         uniform mat4 uModelMatrix;
         uniform mat4 uViewMatrix;
         uniform mat4 uProjMatrix;
 
         varying vec2 fragTexCoord;
+        varying vec2 fragTexCoord2;
         
         void main() {
             fragTexCoord = texCoord;
+            fragTexCoord2 = texCoord2;
             gl_Position = uProjMatrix * uViewMatrix * uModelMatrix * vec4(position, 1.0);
         }`,
 
         fragment: ShaderFunction.GetShaderCode(
             `precision mediump float;
+
+            uniform vec4 uAlbedo;
+            uniform float uAlphaCutoff;
+            uniform sampler2D uAlbedoTexture;
+            uniform vec2 uAlbedoScale;
+            uniform int uAlbedoMap;
             
             varying vec2 fragTexCoord;
+            varying vec2 fragTexCoord2;
             `,
             [
                 new ShaderFunction('void','main','',`{
-                    float d = gl_FragCoord.z / gl_FragCoord.w;
-                    gl_FragColor = vec4(d, d, d, 1.0);
-                }`)
+                    PBRMaterialData mat;
+                    mat.albedo = uAlbedo;
+                    mat.albedoScale = uAlbedoScale;
+                    mat.albedoUVSet = uAlbedoMap;
+                    vec4 albedo = sampleAlbedo(uAlbedoTexture, fragTexCoord, fragTexCoord2, mat, 1.8);
+                    
+                    if (albedo.a < uAlphaCutoff) {
+                        discard;
+                    }
+                    else {
+                        float d = gl_FragCoord.z / gl_FragCoord.w;
+                        gl_FragColor = vec4(d, d, d, 1.0);
+                    }
+                }`, [
+                    ...getColorCorrectionFunctions(),
+                    ...getUniformsFunctions()
+                ])
             ])
     }
 }
@@ -70,15 +95,26 @@ export default class DepthRenderShader extends Shader {
             throw new Error("DepthRenderShader: shader program is not loaded");
         }
 
+        const material = materialRenderer.material;
+        materialRenderer.mergeTextures();
+
         const rend = this.renderer as WebGLRenderer;
         rend.state.shaderProgram = this._program;
 
         this._program.bindMatrix("uModelMatrix", modelMatrix);
         this._program.bindMatrix("uViewMatrix", viewMatrix);
         this._program.bindMatrix("uProjMatrix", projMatrix);
+        
+        materialRenderer.bindTexture(this._program, "albedoTexture", "uAlbedoTexture", 0);
+        materialRenderer.bindColor(this._program, "albedo", "uAlbedo");
 
+        this._program.uniform1i("uAlbedoMap", material.albedoUV);
+        this._program.bindVector("uAlbedoScale", material.albedoScale);
+        this._program.uniform1f("uAlphaCutoff", material.alphaCutoff);
+    
         this._program.positionAttribPointer((plistRenderer as WebGLPolyListRenderer).positionAttribParams("position"));
         this._program.texCoordAttribPointer((plistRenderer as WebGLPolyListRenderer).texCoord0AttribParams("texCoord"));
+        this._program.texCoordAttribPointer((plistRenderer as WebGLPolyListRenderer).texCoord1AttribParams("texCoord2"));
     }
 
     destroy() {