Browse Source

updating material library

Benjamin Guignabert 4 năm trước cách đây
mục cha
commit
9759ee6efb
29 tập tin đã thay đổi với 1756 bổ sung4 xóa
  1. 1685 1
      dist/preview release/babylon.ktx2Decoder.js
  2. 2 0
      materialsLibrary/src/cell/cell.fragment.fx
  3. 3 0
      materialsLibrary/src/cell/cellMaterial.ts
  4. 2 0
      materialsLibrary/src/fire/fire.fragment.fx
  5. 4 0
      materialsLibrary/src/fire/fireMaterial.ts
  6. 3 0
      materialsLibrary/src/fur/fur.fragment.fx
  7. 3 0
      materialsLibrary/src/fur/furMaterial.ts
  8. 3 0
      materialsLibrary/src/gradient/gradient.fragment.fx
  9. 3 0
      materialsLibrary/src/gradient/gradientMaterial.ts
  10. 2 0
      materialsLibrary/src/grid/grid.fragment.fx
  11. 3 0
      materialsLibrary/src/grid/gridMaterial.ts
  12. 2 0
      materialsLibrary/src/lava/lava.fragment.fx
  13. 3 0
      materialsLibrary/src/lava/lavaMaterial.ts
  14. 2 0
      materialsLibrary/src/mix/mix.fragment.fx
  15. 4 0
      materialsLibrary/src/mix/mixMaterial.ts
  16. 2 3
      materialsLibrary/src/normal/normal.fragment.fx
  17. 2 0
      materialsLibrary/src/shadowOnly/shadowOnly.fragment.fx
  18. 3 0
      materialsLibrary/src/shadowOnly/shadowOnlyMaterial.ts
  19. 2 0
      materialsLibrary/src/simple/simple.fragment.fx
  20. 3 0
      materialsLibrary/src/simple/simpleMaterial.ts
  21. 2 0
      materialsLibrary/src/sky/sky.fragment.fx
  22. 3 0
      materialsLibrary/src/sky/skyMaterial.ts
  23. 3 0
      materialsLibrary/src/terrain/terrain.fragment.fx
  24. 3 0
      materialsLibrary/src/terrain/terrainMaterial.ts
  25. 3 0
      materialsLibrary/src/triPlanar/triPlanarMaterial.ts
  26. 3 0
      materialsLibrary/src/triPlanar/triplanar.fragment.fx
  27. 1 0
      src/Rendering/prePassRenderer.ts
  28. 0 0
      src/Shaders/ShadersInclude/imageProcessingCompatibility.fx
  29. 2 0
      src/Shaders/sprites.fragment.fx

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1685 - 1
dist/preview release/babylon.ktx2Decoder.js


+ 2 - 0
materialsLibrary/src/cell/cell.fragment.fx

@@ -146,4 +146,6 @@ void main(void)
 #include<fogFragment>
 
 	gl_FragColor = color;
+
+#include<imageProcessingCompatibility>
 }

+ 3 - 0
materialsLibrary/src/cell/cellMaterial.ts

@@ -43,6 +43,7 @@ class CellMaterialDefines extends MaterialDefines {
     public CUSTOMUSERLIGHTING = true;
     public CELLBASIC = true;
     public DEPTHPREPASS = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
 
     constructor() {
         super();
@@ -158,6 +159,8 @@ export class CellMaterial extends PushMaterial {
                 fallbacks.addCPUSkinningFallback(0, mesh);
             }
 
+            defines.IMAGEPROCESSINGPOSTPROCESS = scene.imageProcessingConfiguration.applyByPostProcess;
+
             //Attributes
             var attribs = [VertexBuffer.PositionKind];
 

+ 2 - 0
materialsLibrary/src/fire/fire.fragment.fx

@@ -97,4 +97,6 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
+
+#include<imageProcessingCompatibility>
 }

+ 4 - 0
materialsLibrary/src/fire/fireMaterial.ts

@@ -39,6 +39,8 @@ class FireMaterialDefines extends MaterialDefines {
     public BonesPerMesh = 0;
     public NUM_BONE_INFLUENCERS = 0;
     public INSTANCES = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
+
 
     constructor() {
         super();
@@ -151,6 +153,8 @@ export class FireMaterial extends PushMaterial {
                 fallbacks.addCPUSkinningFallback(0, mesh);
             }
 
+            defines.IMAGEPROCESSINGPOSTPROCESS = scene.imageProcessingConfiguration.applyByPostProcess;
+
             //Attributes
             var attribs = [VertexBuffer.PositionKind];
 

+ 3 - 0
materialsLibrary/src/fur/fur.fragment.fx

@@ -130,4 +130,7 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
+
+#include<imageProcessingCompatibility>
+
 }

+ 3 - 0
materialsLibrary/src/fur/furMaterial.ts

@@ -45,6 +45,7 @@ class FurMaterialDefines extends MaterialDefines {
     public BonesPerMesh = 0;
     public INSTANCES = false;
     public HIGHLEVEL = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
 
     constructor() {
         super();
@@ -235,6 +236,8 @@ export class FurMaterial extends PushMaterial {
                 fallbacks.addCPUSkinningFallback(0, mesh);
             }
 
+            defines.IMAGEPROCESSINGPOSTPROCESS = scene.imageProcessingConfiguration.applyByPostProcess;
+
             //Attributes
             var attribs = [VertexBuffer.PositionKind];
 

+ 3 - 0
materialsLibrary/src/gradient/gradient.fragment.fx

@@ -99,4 +99,7 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
+
+#include<imageProcessingCompatibility>
+
 }

+ 3 - 0
materialsLibrary/src/gradient/gradientMaterial.ts

@@ -39,6 +39,7 @@ class GradientMaterialDefines extends MaterialDefines {
     public NUM_BONE_INFLUENCERS = 0;
     public BonesPerMesh = 0;
     public INSTANCES = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
 
     constructor() {
         super();
@@ -148,6 +149,8 @@ export class GradientMaterial extends PushMaterial {
                 fallbacks.addCPUSkinningFallback(0, mesh);
             }
 
+            defines.IMAGEPROCESSINGPOSTPROCESS = scene.imageProcessingConfiguration.applyByPostProcess;
+
             //Attributes
             var attribs = [VertexBuffer.PositionKind];
 

+ 2 - 0
materialsLibrary/src/grid/grid.fragment.fx

@@ -116,4 +116,6 @@ void main(void) {
     #endif
 #else    
 #endif
+
+#include<imageProcessingCompatibility>
 }

+ 3 - 0
materialsLibrary/src/grid/gridMaterial.ts

@@ -25,6 +25,7 @@ class GridMaterialDefines extends MaterialDefines {
     public UV2 = false;
     public INSTANCES = false;
     public THIN_INSTANCES = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
 
     constructor() {
         super();
@@ -177,6 +178,8 @@ export class GridMaterial extends PushMaterial {
                 attribs.push(VertexBuffer.UV2Kind);
             }
 
+            defines.IMAGEPROCESSINGPOSTPROCESS = scene.imageProcessingConfiguration.applyByPostProcess;
+
             MaterialHelper.PrepareAttributesForInstances(attribs, defines);
 
             // Defines

+ 2 - 0
materialsLibrary/src/lava/lava.fragment.fx

@@ -153,4 +153,6 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
+
+#include<imageProcessingCompatibility>
 }

+ 3 - 0
materialsLibrary/src/lava/lavaMaterial.ts

@@ -82,6 +82,7 @@ class LavaMaterialDefines extends MaterialDefines {
     public BonesPerMesh = 0;
     public INSTANCES = false;
     public UNLIT = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
 
     constructor() {
         super();
@@ -218,6 +219,8 @@ export class LavaMaterial extends PushMaterial {
                 fallbacks.addCPUSkinningFallback(0, mesh);
             }
 
+            defines.IMAGEPROCESSINGPOSTPROCESS = scene.imageProcessingConfiguration.applyByPostProcess;
+
             //Attributes
             var attribs = [VertexBuffer.PositionKind];
 

+ 2 - 0
materialsLibrary/src/mix/mix.fragment.fx

@@ -164,4 +164,6 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
+
+#include<imageProcessingCompatibility>
 }

+ 4 - 0
materialsLibrary/src/mix/mixMaterial.ts

@@ -43,6 +43,7 @@ class MixMaterialDefines extends MaterialDefines {
     public BonesPerMesh = 0;
     public INSTANCES = false;
     public MIXMAP2 = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
 
     constructor() {
         super();
@@ -246,6 +247,9 @@ export class MixMaterial extends PushMaterial {
                 fallbacks.addCPUSkinningFallback(0, mesh);
             }
 
+            defines.IMAGEPROCESSINGPOSTPROCESS = scene.imageProcessingConfiguration.applyByPostProcess;
+
+
             //Attributes
             var attribs = [VertexBuffer.PositionKind];
 

+ 2 - 3
materialsLibrary/src/normal/normal.fragment.fx

@@ -98,7 +98,6 @@ void main(void) {
 
 	gl_FragColor = color;
 
-#ifdef IMAGEPROCESSINGPOSTPROCESS
-	gl_FragColor.rgb = pow(gl_FragColor.rgb, vec3(2.2));
-#endif
+#include<imageProcessingCompatibility>
+
 }

+ 2 - 0
materialsLibrary/src/shadowOnly/shadowOnly.fragment.fx

@@ -52,4 +52,6 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
+
+#include<imageProcessingCompatibility>
 }

+ 3 - 0
materialsLibrary/src/shadowOnly/shadowOnlyMaterial.ts

@@ -33,6 +33,7 @@ class ShadowOnlyMaterialDefines extends MaterialDefines {
     public NUM_BONE_INFLUENCERS = 0;
     public BonesPerMesh = 0;
     public INSTANCES = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
 
     constructor() {
         super();
@@ -156,6 +157,8 @@ export class ShadowOnlyMaterial extends PushMaterial {
                 fallbacks.addCPUSkinningFallback(0, mesh);
             }
 
+            defines.IMAGEPROCESSINGPOSTPROCESS = scene.imageProcessingConfiguration.applyByPostProcess;
+
             //Attributes
             var attribs = [VertexBuffer.PositionKind];
 

+ 2 - 0
materialsLibrary/src/simple/simple.fragment.fx

@@ -96,4 +96,6 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
+
+#include<imageProcessingCompatibility>
 }

+ 3 - 0
materialsLibrary/src/simple/simpleMaterial.ts

@@ -40,6 +40,7 @@ class SimpleMaterialDefines extends MaterialDefines {
     public NUM_BONE_INFLUENCERS = 0;
     public BonesPerMesh = 0;
     public INSTANCES = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
 
     constructor() {
         super();
@@ -147,6 +148,8 @@ export class SimpleMaterial extends PushMaterial {
                 fallbacks.addCPUSkinningFallback(0, mesh);
             }
 
+            defines.IMAGEPROCESSINGPOSTPROCESS = scene.imageProcessingConfiguration.applyByPostProcess;
+
             //Attributes
             var attribs = [VertexBuffer.PositionKind];
 

+ 2 - 0
materialsLibrary/src/sky/sky.fragment.fx

@@ -168,4 +168,6 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
+
+#include<imageProcessingCompatibility>
 }

+ 3 - 0
materialsLibrary/src/sky/skyMaterial.ts

@@ -29,6 +29,7 @@ class SkyMaterialDefines extends MaterialDefines {
     public FOG = false;
     public VERTEXCOLOR = false;
     public VERTEXALPHA = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
 
     constructor() {
         super();
@@ -194,6 +195,8 @@ export class SkyMaterial extends PushMaterial {
                 fallbacks.addFallback(1, "FOG");
             }
 
+            defines.IMAGEPROCESSINGPOSTPROCESS = scene.imageProcessingConfiguration.applyByPostProcess;
+
             //Attributes
             var attribs = [VertexBuffer.PositionKind];
 

+ 3 - 0
materialsLibrary/src/terrain/terrain.fragment.fx

@@ -180,4 +180,7 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
+
+#include<imageProcessingCompatibility>
+
 }

+ 3 - 0
materialsLibrary/src/terrain/terrainMaterial.ts

@@ -43,6 +43,7 @@ class TerrainMaterialDefines extends MaterialDefines {
     public NUM_BONE_INFLUENCERS = 0;
     public BonesPerMesh = 0;
     public INSTANCES = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
 
     constructor() {
         super();
@@ -209,6 +210,8 @@ export class TerrainMaterial extends PushMaterial {
                 fallbacks.addCPUSkinningFallback(0, mesh);
             }
 
+            defines.IMAGEPROCESSINGPOSTPROCESS = scene.imageProcessingConfiguration.applyByPostProcess;
+
             //Attributes
             var attribs = [VertexBuffer.PositionKind];
 

+ 3 - 0
materialsLibrary/src/triPlanar/triPlanarMaterial.ts

@@ -47,6 +47,7 @@ class TriPlanarMaterialDefines extends MaterialDefines {
     public NUM_BONE_INFLUENCERS = 0;
     public BonesPerMesh = 0;
     public INSTANCES = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
 
     constructor() {
         super();
@@ -210,6 +211,8 @@ export class TriPlanarMaterial extends PushMaterial {
                 fallbacks.addCPUSkinningFallback(0, mesh);
             }
 
+            defines.IMAGEPROCESSINGPOSTPROCESS = scene.imageProcessingConfiguration.applyByPostProcess;
+
             //Attributes
             var attribs = [VertexBuffer.PositionKind];
 

+ 3 - 0
materialsLibrary/src/triPlanar/triplanar.fragment.fx

@@ -147,4 +147,7 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
+
+#include<imageProcessingCompatibility>
+
 }

+ 1 - 0
src/Rendering/prePassRenderer.ts

@@ -217,6 +217,7 @@ export class PrePassRenderer {
     /**
      * Sets the proper output textures to draw in the engine.
      * @param effect The effect that is drawn. It can be or not be compatible with drawing to several output textures.
+     * @param subMesh Submesh on which the effect is applied
      */
     public bindAttachmentsForEffect(effect: Effect, subMesh: SubMesh) {
         if (this.enabled) {

src/Shaders/ShadersInclude/linearTransform.fx → src/Shaders/ShadersInclude/imageProcessingCompatibility.fx


+ 2 - 0
src/Shaders/sprites.fragment.fx

@@ -23,4 +23,6 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
+
+#include<imageProcessingCompatibility>
 }