Merge branch 'pbr' into development

create3000 · Sep 29, 2023 · f2bf6bd · f2bf6bd
2 parents 76d856b + 04bdf75
commit f2bf6bd
Show file tree

Hide file tree

Showing 69 changed files with 1,317 additions and 811 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,6 +15,7 @@
    "cSpell.words": [
       "ammojs",
       "bbox",
+      "BDRF",
       "Catmull",
       "dicom",
       "fract",

diff --git a/src/assets/shaders/webgl1/Default1.vs.js b/src/assets/shaders/webgl1/Default1.vs.js
@@ -4,7 +4,7 @@ precision highp int;
 precision highp sampler2D;
 precision highp samplerCube;
 
-#pragma X3D include "include/Vertex.glsl"
+#pragma X3D include "common/Vertex.glsl"
 
 void
 main ()

diff --git a/src/assets/shaders/webgl1/Depth1.fs.js b/src/assets/shaders/webgl1/Depth1.fs.js
@@ -5,8 +5,8 @@ precision highp sampler2D;
 
 varying vec3 vertex;
 
-#pragma X3D include "include/ClipPlanes.glsl"
-#pragma X3D include "include/Point.glsl"
+#pragma X3D include "common/ClipPlanes.glsl"
+#pragma X3D include "common/Point.glsl"
 
 void
 main ()

diff --git a/src/assets/shaders/webgl1/Depth1.vs.js b/src/assets/shaders/webgl1/Depth1.vs.js
@@ -9,7 +9,7 @@ attribute vec4 x3d_Vertex;
 
 varying vec3 vertex;
 
-#pragma X3D include "include/PointSize.glsl"
+#pragma X3D include "common/PointSize.glsl"
 
 void
 main ()

diff --git a/src/assets/shaders/webgl1/Gouraud1.fs.js b/src/assets/shaders/webgl1/Gouraud1.fs.js
@@ -4,7 +4,7 @@ precision highp int;
 precision highp sampler2D;
 precision highp samplerCube;
 
-#pragma X3D include "include/Fragment.glsl"
+#pragma X3D include "common/Fragment.glsl"
 
 varying vec4 frontColor;
 

diff --git a/src/assets/shaders/webgl1/Gouraud1.vs.js b/src/assets/shaders/webgl1/Gouraud1.vs.js
@@ -4,8 +4,8 @@ precision highp int;
 precision highp sampler2D;
 precision highp samplerCube;
 
-#pragma X3D include "include/Vertex.glsl"
-#pragma X3D include "include/Material.glsl"
+#pragma X3D include "common/Vertex.glsl"
+#pragma X3D include "common/Material.glsl"
 
 varying vec4 frontColor;
 
@@ -22,10 +22,10 @@ getMaterialColor (const in vec3 N,
 
    float alpha = 1.0 - x3d_Material .transparency;
 
+   vec4 diffuseParameter = vec4 (x3d_Material .diffuseColor, alpha);
+
    #if defined (X3D_COLOR_MATERIAL)
-      vec4 diffuseParameter = vec4 (color .rgb, color .a * alpha);
-   #else
-      vec4 diffuseParameter = vec4 (x3d_Material .diffuseColor, alpha);
+      diffuseParameter *= color;
    #endif
 
    // Get material color.
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ attribute vec4 x3d_Vertex; @@
     varying vec3 vertex;
-    #pragma X3D include "include/PointSize.glsl"
+    #pragma X3D include "common/PointSize.glsl"
     void
     main ()
@@ Expand Down @@