@babylonjs/materials 5.0.0-rc.4 → 5.0.0-rc.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cell/cell.fragment.d.ts +13 -13
- package/cell/cell.fragment.js +4 -2
- package/cell/cell.fragment.js.map +1 -1
- package/cell/cell.vertex.d.ts +14 -14
- package/cell/cell.vertex.js +4 -2
- package/cell/cell.vertex.js.map +1 -1
- package/cell/cellMaterial.d.ts +10 -10
- package/cell/cellMaterial.js +22 -8
- package/cell/cellMaterial.js.map +1 -1
- package/cell/index.js.map +1 -1
- package/custom/customMaterial.d.ts +6 -6
- package/custom/customMaterial.js +27 -29
- package/custom/customMaterial.js.map +1 -1
- package/custom/index.js.map +1 -1
- package/custom/pbrCustomMaterial.d.ts +7 -7
- package/custom/pbrCustomMaterial.js +30 -32
- package/custom/pbrCustomMaterial.js.map +1 -1
- package/fire/fire.fragment.d.ts +7 -7
- package/fire/fire.fragment.js +4 -2
- package/fire/fire.fragment.js.map +1 -1
- package/fire/fire.vertex.d.ts +11 -11
- package/fire/fire.vertex.js +4 -2
- package/fire/fire.vertex.js.map +1 -1
- package/fire/fireMaterial.d.ts +10 -10
- package/fire/fireMaterial.js +26 -11
- package/fire/fireMaterial.js.map +1 -1
- package/fire/index.js.map +1 -1
- package/fur/fur.fragment.d.ts +13 -13
- package/fur/fur.fragment.js +4 -2
- package/fur/fur.fragment.js.map +1 -1
- package/fur/fur.vertex.d.ts +14 -14
- package/fur/fur.vertex.js +4 -2
- package/fur/fur.vertex.js.map +1 -1
- package/fur/furMaterial.d.ts +11 -11
- package/fur/furMaterial.js +33 -13
- package/fur/furMaterial.js.map +1 -1
- package/fur/index.js.map +1 -1
- package/gradient/gradient.fragment.d.ts +13 -13
- package/gradient/gradient.fragment.js +4 -2
- package/gradient/gradient.fragment.js.map +1 -1
- package/gradient/gradient.vertex.d.ts +14 -14
- package/gradient/gradient.vertex.js +4 -2
- package/gradient/gradient.vertex.js.map +1 -1
- package/gradient/gradientMaterial.d.ts +10 -10
- package/gradient/gradientMaterial.js +25 -9
- package/gradient/gradientMaterial.js.map +1 -1
- package/gradient/index.js.map +1 -1
- package/grid/grid.fragment.d.ts +4 -4
- package/grid/grid.fragment.js +4 -2
- package/grid/grid.fragment.js.map +1 -1
- package/grid/grid.vertex.d.ts +5 -5
- package/grid/grid.vertex.js +4 -2
- package/grid/grid.vertex.js.map +1 -1
- package/grid/gridMaterial.d.ts +9 -9
- package/grid/gridMaterial.js +21 -6
- package/grid/gridMaterial.js.map +1 -1
- package/grid/index.js.map +1 -1
- package/index.js.map +1 -1
- package/lava/index.js.map +1 -1
- package/lava/lava.fragment.d.ts +13 -13
- package/lava/lava.fragment.js +4 -2
- package/lava/lava.fragment.js.map +1 -1
- package/lava/lava.vertex.d.ts +14 -14
- package/lava/lava.vertex.js +4 -2
- package/lava/lava.vertex.js.map +1 -1
- package/lava/lavaMaterial.d.ts +10 -10
- package/lava/lavaMaterial.js +30 -14
- package/lava/lavaMaterial.js.map +1 -1
- package/legacy/legacy-cell.d.ts +1 -1
- package/legacy/legacy-cell.js +3 -3
- package/legacy/legacy-cell.js.map +1 -1
- package/legacy/legacy-custom.d.ts +1 -1
- package/legacy/legacy-custom.js +3 -3
- package/legacy/legacy-custom.js.map +1 -1
- package/legacy/legacy-fire.d.ts +1 -1
- package/legacy/legacy-fire.js +3 -3
- package/legacy/legacy-fire.js.map +1 -1
- package/legacy/legacy-fur.d.ts +1 -1
- package/legacy/legacy-fur.js +3 -3
- package/legacy/legacy-fur.js.map +1 -1
- package/legacy/legacy-gradient.d.ts +1 -1
- package/legacy/legacy-gradient.js +3 -3
- package/legacy/legacy-gradient.js.map +1 -1
- package/legacy/legacy-grid.d.ts +1 -1
- package/legacy/legacy-grid.js +3 -3
- package/legacy/legacy-grid.js.map +1 -1
- package/legacy/legacy-lava.d.ts +1 -1
- package/legacy/legacy-lava.js +3 -3
- package/legacy/legacy-lava.js.map +1 -1
- package/legacy/legacy-mix.d.ts +1 -1
- package/legacy/legacy-mix.js +3 -3
- package/legacy/legacy-mix.js.map +1 -1
- package/legacy/legacy-normal.d.ts +1 -1
- package/legacy/legacy-normal.js +3 -3
- package/legacy/legacy-normal.js.map +1 -1
- package/legacy/legacy-shadowOnly.d.ts +1 -1
- package/legacy/legacy-shadowOnly.js +3 -3
- package/legacy/legacy-shadowOnly.js.map +1 -1
- package/legacy/legacy-simple.d.ts +1 -1
- package/legacy/legacy-simple.js +3 -3
- package/legacy/legacy-simple.js.map +1 -1
- package/legacy/legacy-sky.d.ts +1 -1
- package/legacy/legacy-sky.js +3 -3
- package/legacy/legacy-sky.js.map +1 -1
- package/legacy/legacy-terrain.d.ts +1 -1
- package/legacy/legacy-terrain.js +3 -3
- package/legacy/legacy-terrain.js.map +1 -1
- package/legacy/legacy-triPlanar.d.ts +1 -1
- package/legacy/legacy-triPlanar.js +3 -3
- package/legacy/legacy-triPlanar.js.map +1 -1
- package/legacy/legacy-water.d.ts +1 -1
- package/legacy/legacy-water.js +3 -3
- package/legacy/legacy-water.js.map +1 -1
- package/legacy/legacy.d.ts +1 -1
- package/legacy/legacy.js +3 -3
- package/legacy/legacy.js.map +1 -1
- package/mix/index.js.map +1 -1
- package/mix/mix.fragment.d.ts +13 -13
- package/mix/mix.fragment.js +4 -2
- package/mix/mix.fragment.js.map +1 -1
- package/mix/mix.vertex.d.ts +14 -14
- package/mix/mix.vertex.js +4 -2
- package/mix/mix.vertex.js.map +1 -1
- package/mix/mixMaterial.d.ts +11 -11
- package/mix/mixMaterial.js +40 -13
- package/mix/mixMaterial.js.map +1 -1
- package/normal/index.js.map +1 -1
- package/normal/normal.fragment.d.ts +13 -13
- package/normal/normal.fragment.js +4 -2
- package/normal/normal.fragment.js.map +1 -1
- package/normal/normal.vertex.d.ts +14 -14
- package/normal/normal.vertex.js +4 -2
- package/normal/normal.vertex.js.map +1 -1
- package/normal/normalMaterial.d.ts +10 -10
- package/normal/normalMaterial.js +23 -9
- package/normal/normalMaterial.js.map +1 -1
- package/package.json +22 -254
- package/readme.md +2 -2
- package/shadowOnly/index.js.map +1 -1
- package/shadowOnly/shadowOnly.fragment.d.ts +12 -12
- package/shadowOnly/shadowOnly.fragment.js +4 -2
- package/shadowOnly/shadowOnly.fragment.js.map +1 -1
- package/shadowOnly/shadowOnly.vertex.d.ts +14 -14
- package/shadowOnly/shadowOnly.vertex.js +4 -2
- package/shadowOnly/shadowOnly.vertex.js.map +1 -1
- package/shadowOnly/shadowOnlyMaterial.d.ts +10 -10
- package/shadowOnly/shadowOnlyMaterial.js +23 -9
- package/shadowOnly/shadowOnlyMaterial.js.map +1 -1
- package/simple/index.js.map +1 -1
- package/simple/simple.fragment.d.ts +13 -13
- package/simple/simple.fragment.js +4 -2
- package/simple/simple.fragment.js.map +1 -1
- package/simple/simple.vertex.d.ts +14 -14
- package/simple/simple.vertex.js +4 -2
- package/simple/simple.vertex.js.map +1 -1
- package/simple/simpleMaterial.d.ts +10 -10
- package/simple/simpleMaterial.js +22 -8
- package/simple/simpleMaterial.js.map +1 -1
- package/sky/index.js.map +1 -1
- package/sky/sky.fragment.d.ts +6 -6
- package/sky/sky.fragment.js +4 -2
- package/sky/sky.fragment.js.map +1 -1
- package/sky/sky.vertex.d.ts +5 -5
- package/sky/sky.vertex.js +4 -2
- package/sky/sky.vertex.js.map +1 -1
- package/sky/skyMaterial.d.ts +13 -14
- package/sky/skyMaterial.js +31 -12
- package/sky/skyMaterial.js.map +1 -1
- package/terrain/index.js.map +1 -1
- package/terrain/terrain.fragment.d.ts +13 -13
- package/terrain/terrain.fragment.js +4 -2
- package/terrain/terrain.fragment.js.map +1 -1
- package/terrain/terrain.vertex.d.ts +14 -14
- package/terrain/terrain.vertex.js +4 -2
- package/terrain/terrain.vertex.js.map +1 -1
- package/terrain/terrainMaterial.d.ts +11 -11
- package/terrain/terrainMaterial.js +27 -12
- package/terrain/terrainMaterial.js.map +1 -1
- package/triPlanar/index.js.map +1 -1
- package/triPlanar/triPlanarMaterial.d.ts +10 -10
- package/triPlanar/triPlanarMaterial.js +24 -12
- package/triPlanar/triPlanarMaterial.js.map +1 -1
- package/triPlanar/triplanar.fragment.d.ts +13 -13
- package/triPlanar/triplanar.fragment.js +4 -2
- package/triPlanar/triplanar.fragment.js.map +1 -1
- package/triPlanar/triplanar.vertex.d.ts +14 -14
- package/triPlanar/triplanar.vertex.js +4 -2
- package/triPlanar/triplanar.vertex.js.map +1 -1
- package/water/index.js.map +1 -1
- package/water/water.fragment.d.ts +15 -15
- package/water/water.fragment.js +4 -2
- package/water/water.fragment.js.map +1 -1
- package/water/water.vertex.d.ts +16 -16
- package/water/water.vertex.js +4 -2
- package/water/water.vertex.js.map +1 -1
- package/water/waterMaterial.d.ts +17 -14
- package/water/waterMaterial.js +51 -20
- package/water/waterMaterial.js.map +1 -1
@@ -1,19 +1,19 @@
|
|
1
|
-
import "@babylonjs/core/Shaders/ShadersInclude/helperFunctions";
|
2
|
-
import "@babylonjs/core/Shaders/ShadersInclude/imageProcessingDeclaration";
|
3
|
-
import "@babylonjs/core/Shaders/ShadersInclude/imageProcessingFunctions";
|
4
|
-
import "@babylonjs/core/Shaders/ShadersInclude/lightFragmentDeclaration";
|
5
|
-
import "@babylonjs/core/Shaders/ShadersInclude/lightUboDeclaration";
|
6
|
-
import "@babylonjs/core/Shaders/ShadersInclude/lightsFragmentFunctions";
|
7
|
-
import "@babylonjs/core/Shaders/ShadersInclude/shadowsFragmentFunctions";
|
8
|
-
import "@babylonjs/core/Shaders/ShadersInclude/clipPlaneFragmentDeclaration";
|
9
|
-
import "@babylonjs/core/Shaders/ShadersInclude/logDepthDeclaration";
|
10
|
-
import "@babylonjs/core/Shaders/ShadersInclude/fogFragmentDeclaration";
|
11
|
-
import "@babylonjs/core/Shaders/ShadersInclude/clipPlaneFragment";
|
12
|
-
import "@babylonjs/core/Shaders/ShadersInclude/lightFragment";
|
13
|
-
import "@babylonjs/core/Shaders/ShadersInclude/logDepthFragment";
|
14
|
-
import "@babylonjs/core/Shaders/ShadersInclude/fogFragment";
|
1
|
+
import "@babylonjs/core/Shaders/ShadersInclude/helperFunctions.js";
|
2
|
+
import "@babylonjs/core/Shaders/ShadersInclude/imageProcessingDeclaration.js";
|
3
|
+
import "@babylonjs/core/Shaders/ShadersInclude/imageProcessingFunctions.js";
|
4
|
+
import "@babylonjs/core/Shaders/ShadersInclude/lightFragmentDeclaration.js";
|
5
|
+
import "@babylonjs/core/Shaders/ShadersInclude/lightUboDeclaration.js";
|
6
|
+
import "@babylonjs/core/Shaders/ShadersInclude/lightsFragmentFunctions.js";
|
7
|
+
import "@babylonjs/core/Shaders/ShadersInclude/shadowsFragmentFunctions.js";
|
8
|
+
import "@babylonjs/core/Shaders/ShadersInclude/clipPlaneFragmentDeclaration.js";
|
9
|
+
import "@babylonjs/core/Shaders/ShadersInclude/logDepthDeclaration.js";
|
10
|
+
import "@babylonjs/core/Shaders/ShadersInclude/fogFragmentDeclaration.js";
|
11
|
+
import "@babylonjs/core/Shaders/ShadersInclude/clipPlaneFragment.js";
|
12
|
+
import "@babylonjs/core/Shaders/ShadersInclude/lightFragment.js";
|
13
|
+
import "@babylonjs/core/Shaders/ShadersInclude/logDepthFragment.js";
|
14
|
+
import "@babylonjs/core/Shaders/ShadersInclude/fogFragment.js";
|
15
15
|
/** @hidden */
|
16
|
-
export declare
|
16
|
+
export declare const waterPixelShader: {
|
17
17
|
name: string;
|
18
18
|
shader: string;
|
19
19
|
};
|
package/water/water.fragment.js
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
// Do not edit.
|
1
2
|
import { ShaderStore } from "@babylonjs/core/Engines/shaderStore.js";
|
2
3
|
import "@babylonjs/core/Shaders/ShadersInclude/helperFunctions.js";
|
3
4
|
import "@babylonjs/core/Shaders/ShadersInclude/imageProcessingDeclaration.js";
|
@@ -13,8 +14,9 @@ import "@babylonjs/core/Shaders/ShadersInclude/clipPlaneFragment.js";
|
|
13
14
|
import "@babylonjs/core/Shaders/ShadersInclude/lightFragment.js";
|
14
15
|
import "@babylonjs/core/Shaders/ShadersInclude/logDepthFragment.js";
|
15
16
|
import "@babylonjs/core/Shaders/ShadersInclude/fogFragment.js";
|
16
|
-
var name =
|
17
|
-
var shader = "#ifdef LOGARITHMICDEPTH\n#extension GL_EXT_frag_depth : enable\n#endif\nprecision highp float;\
|
17
|
+
var name = "waterPixelShader";
|
18
|
+
var shader = "#ifdef LOGARITHMICDEPTH\n#extension GL_EXT_frag_depth : enable\n#endif\nprecision highp float;\nuniform vec4 vEyePosition;\nuniform vec4 vDiffuseColor;\n#ifdef SPECULARTERM\nuniform vec4 vSpecularColor;\n#endif\nvarying vec3 vPositionW;\n#ifdef NORMAL\nvarying vec3 vNormalW;\n#endif\n#if defined(VERTEXCOLOR) || defined(INSTANCESCOLOR)\nvarying vec4 vColor;\n#endif\n#include<helperFunctions>\n#include<imageProcessingDeclaration>\n#include<imageProcessingFunctions>\n#include<__decl__lightFragment>[0..maxSimultaneousLights]\n#include<lightsFragmentFunctions>\n#include<shadowsFragmentFunctions>\n#ifdef BUMP\nvarying vec2 vNormalUV;\n#ifdef BUMPSUPERIMPOSE\nvarying vec2 vNormalUV2;\n#endif\nuniform sampler2D normalSampler;\nuniform vec2 vNormalInfos;\n#endif\nuniform sampler2D refractionSampler;\nuniform sampler2D reflectionSampler;\nconst float LOG2=1.442695;\nuniform vec3 cameraPosition;\nuniform vec4 waterColor;\nuniform float colorBlendFactor;\nuniform vec4 waterColor2;\nuniform float colorBlendFactor2;\nuniform float bumpHeight;\nuniform float time;\nvarying vec3 vRefractionMapTexCoord;\nvarying vec3 vReflectionMapTexCoord;\nvarying vec3 vPosition;\n#include<clipPlaneFragmentDeclaration>\n#include<logDepthDeclaration>\n#include<fogFragmentDeclaration>\n#define CUSTOM_FRAGMENT_DEFINITIONS\nvoid main(void) {\n#define CUSTOM_FRAGMENT_MAIN_BEGIN\n#include<clipPlaneFragment>\nvec3 viewDirectionW=normalize(vEyePosition.xyz-vPositionW);\nvec4 baseColor=vec4(1.,1.,1.,1.);\nvec3 diffuseColor=vDiffuseColor.rgb;\nfloat alpha=vDiffuseColor.a;\n#ifdef BUMP\n#ifdef BUMPSUPERIMPOSE\nbaseColor=0.6*texture2D(normalSampler,vNormalUV)+0.4*texture2D(normalSampler,vec2(vNormalUV2.x,vNormalUV2.y));\n#else\nbaseColor=texture2D(normalSampler,vNormalUV);\n#endif\nvec3 bumpColor=baseColor.rgb;\n#ifdef ALPHATEST\nif (baseColor.a<0.4)\ndiscard;\n#endif\nbaseColor.rgb*=vNormalInfos.y;\n#else\nvec3 bumpColor=vec3(1.0);\n#endif\n#if defined(VERTEXCOLOR) || defined(INSTANCESCOLOR)\nbaseColor.rgb*=vColor.rgb;\n#endif\n#ifdef NORMAL\nvec2 perturbation=bumpHeight*(baseColor.rg-0.5);\n#ifdef BUMPAFFECTSREFLECTION\nvec3 normalW=normalize(vNormalW+vec3(perturbation.x*8.0,0.0,perturbation.y*8.0));\nif (normalW.y<0.0) {\nnormalW.y=-normalW.y;\n}\n#else\nvec3 normalW=normalize(vNormalW);\n#endif\n#else\nvec3 normalW=vec3(1.0,1.0,1.0);\nvec2 perturbation=bumpHeight*(vec2(1.0,1.0)-0.5);\n#endif\n#ifdef FRESNELSEPARATE\n#ifdef REFLECTION\nvec2 projectedRefractionTexCoords=clamp(vRefractionMapTexCoord.xy/vRefractionMapTexCoord.z+perturbation*0.5,0.0,1.0);\nvec4 refractiveColor=texture2D(refractionSampler,projectedRefractionTexCoords);\n#ifdef IS_REFRACTION_LINEAR\nrefractiveColor.rgb=toGammaSpace(refractiveColor.rgb);\n#endif\nvec2 projectedReflectionTexCoords=clamp(vec2(\nvReflectionMapTexCoord.x/vReflectionMapTexCoord.z+perturbation.x*0.3,\nvReflectionMapTexCoord.y/vReflectionMapTexCoord.z+perturbation.y\n),0.0,1.0);\nvec4 reflectiveColor=texture2D(reflectionSampler,projectedReflectionTexCoords);\n#ifdef IS_REFLECTION_LINEAR\nreflectiveColor.rgb=toGammaSpace(reflectiveColor.rgb);\n#endif\nvec3 upVector=vec3(0.0,1.0,0.0);\nfloat fresnelTerm=clamp(abs(pow(dot(viewDirectionW,upVector),3.0)),0.05,0.65);\nfloat IfresnelTerm=1.0-fresnelTerm;\nrefractiveColor=colorBlendFactor*waterColor+(1.0-colorBlendFactor)*refractiveColor;\nreflectiveColor=IfresnelTerm*colorBlendFactor2*waterColor+(1.0-colorBlendFactor2*IfresnelTerm)*reflectiveColor;\nvec4 combinedColor=refractiveColor*fresnelTerm+reflectiveColor*IfresnelTerm;\nbaseColor=combinedColor;\n#endif\nvec3 diffuseBase=vec3(0.,0.,0.);\nlightingInfo info;\nfloat shadow=1.;\n#ifdef SPECULARTERM\nfloat glossiness=vSpecularColor.a;\nvec3 specularBase=vec3(0.,0.,0.);\nvec3 specularColor=vSpecularColor.rgb;\n#else\nfloat glossiness=0.;\n#endif\n#include<lightFragment>[0..maxSimultaneousLights]\nvec3 finalDiffuse=clamp(baseColor.rgb,0.0,1.0);\n#ifdef VERTEXALPHA\nalpha*=vColor.a;\n#endif\n#ifdef SPECULARTERM\nvec3 finalSpecular=specularBase*specularColor;\n#else\nvec3 finalSpecular=vec3(0.0);\n#endif\n#else \n#ifdef REFLECTION\nvec2 projectedRefractionTexCoords=clamp(vRefractionMapTexCoord.xy/vRefractionMapTexCoord.z+perturbation,0.0,1.0);\nvec4 refractiveColor=texture2D(refractionSampler,projectedRefractionTexCoords);\n#ifdef IS_REFRACTION_LINEAR\nrefractiveColor.rgb=toGammaSpace(refractiveColor.rgb);\n#endif\nvec2 projectedReflectionTexCoords=clamp(vReflectionMapTexCoord.xy/vReflectionMapTexCoord.z+perturbation,0.0,1.0);\nvec4 reflectiveColor=texture2D(reflectionSampler,projectedReflectionTexCoords);\n#ifdef IS_REFLECTION_LINEAR\nreflectiveColor.rgb=toGammaSpace(reflectiveColor.rgb);\n#endif\nvec3 upVector=vec3(0.0,1.0,0.0);\nfloat fresnelTerm=max(dot(viewDirectionW,upVector),0.0);\nvec4 combinedColor=refractiveColor*fresnelTerm+reflectiveColor*(1.0-fresnelTerm);\nbaseColor=colorBlendFactor*waterColor+(1.0-colorBlendFactor)*combinedColor;\n#endif\nvec3 diffuseBase=vec3(0.,0.,0.);\nlightingInfo info;\nfloat shadow=1.;\n#ifdef SPECULARTERM\nfloat glossiness=vSpecularColor.a;\nvec3 specularBase=vec3(0.,0.,0.);\nvec3 specularColor=vSpecularColor.rgb;\n#else\nfloat glossiness=0.;\n#endif\n#include<lightFragment>[0..maxSimultaneousLights]\nvec3 finalDiffuse=clamp(baseColor.rgb,0.0,1.0);\n#ifdef VERTEXALPHA\nalpha*=vColor.a;\n#endif\n#ifdef SPECULARTERM\nvec3 finalSpecular=specularBase*specularColor;\n#else\nvec3 finalSpecular=vec3(0.0);\n#endif\n#endif\nvec4 color=vec4(finalDiffuse+finalSpecular,alpha);\n#include<logDepthFragment>\n#include<fogFragment>\n#ifdef IMAGEPROCESSINGPOSTPROCESS\ncolor.rgb=toLinearSpace(color.rgb);\n#elif defined(IMAGEPROCESSING)\ncolor.rgb=toLinearSpace(color.rgb);\ncolor=applyImageProcessing(color);\n#endif\ngl_FragColor=color;\n#define CUSTOM_FRAGMENT_MAIN_END\n}\n";
|
19
|
+
// Sideeffect
|
18
20
|
ShaderStore.ShadersStore[name] = shader;
|
19
21
|
/** @hidden */
|
20
22
|
export var waterPixelShader = { name: name, shader: shader };
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"water.fragment.js","sourceRoot":"","sources":["
|
1
|
+
{"version":3,"file":"water.fragment.js","sourceRoot":"","sources":["../../../../../lts/materials/generated/water/water.fragment.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,OAAO,EAAE,WAAW,EAAE,+CAAiC;AACvD,mEAAqD;AACrD,8EAAgE;AAChE,4EAA8D;AAC9D,4EAA8D;AAC9D,uEAAyD;AACzD,2EAA6D;AAC7D,4EAA8D;AAC9D,gFAAkE;AAClE,uEAAyD;AACzD,0EAA4D;AAC5D,qEAAuD;AACvD,iEAAmD;AACnD,oEAAsD;AACtD,+DAAiD;AAEjD,IAAM,IAAI,GAAG,kBAAkB,CAAC;AAChC,IAAM,MAAM,GAAG,6pLAmLd,CAAC;AACF,aAAa;AACb,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;AACxC,cAAc;AACd,MAAM,CAAC,IAAM,gBAAgB,GAAG,EAAE,IAAI,MAAA,EAAE,MAAM,QAAA,EAAE,CAAC","sourcesContent":["// Do not edit.\nimport { ShaderStore } from \"core/Engines/shaderStore\";\nimport \"core/Shaders/ShadersInclude/helperFunctions\";\nimport \"core/Shaders/ShadersInclude/imageProcessingDeclaration\";\nimport \"core/Shaders/ShadersInclude/imageProcessingFunctions\";\nimport \"core/Shaders/ShadersInclude/lightFragmentDeclaration\";\nimport \"core/Shaders/ShadersInclude/lightUboDeclaration\";\nimport \"core/Shaders/ShadersInclude/lightsFragmentFunctions\";\nimport \"core/Shaders/ShadersInclude/shadowsFragmentFunctions\";\nimport \"core/Shaders/ShadersInclude/clipPlaneFragmentDeclaration\";\nimport \"core/Shaders/ShadersInclude/logDepthDeclaration\";\nimport \"core/Shaders/ShadersInclude/fogFragmentDeclaration\";\nimport \"core/Shaders/ShadersInclude/clipPlaneFragment\";\nimport \"core/Shaders/ShadersInclude/lightFragment\";\nimport \"core/Shaders/ShadersInclude/logDepthFragment\";\nimport \"core/Shaders/ShadersInclude/fogFragment\";\n\nconst name = \"waterPixelShader\";\nconst shader = `#ifdef LOGARITHMICDEPTH\n#extension GL_EXT_frag_depth : enable\n#endif\nprecision highp float;\runiform vec4 vEyePosition;\runiform vec4 vDiffuseColor;\r#ifdef SPECULARTERM\nuniform vec4 vSpecularColor;\r#endif\nvarying vec3 vPositionW;\r#ifdef NORMAL\nvarying vec3 vNormalW;\r#endif\n#if defined(VERTEXCOLOR) || defined(INSTANCESCOLOR)\nvarying vec4 vColor;\r#endif\n#include<helperFunctions>\n#include<imageProcessingDeclaration>\n#include<imageProcessingFunctions>\n#include<__decl__lightFragment>[0..maxSimultaneousLights]\n#include<lightsFragmentFunctions>\n#include<shadowsFragmentFunctions>\n#ifdef BUMP\nvarying vec2 vNormalUV;\r#ifdef BUMPSUPERIMPOSE\nvarying vec2 vNormalUV2;\r#endif\nuniform sampler2D normalSampler;\runiform vec2 vNormalInfos;\r#endif\nuniform sampler2D refractionSampler;\runiform sampler2D reflectionSampler;\rconst float LOG2=1.442695;\runiform vec3 cameraPosition;\runiform vec4 waterColor;\runiform float colorBlendFactor;\runiform vec4 waterColor2;\runiform float colorBlendFactor2;\runiform float bumpHeight;\runiform float time;\rvarying vec3 vRefractionMapTexCoord;\rvarying vec3 vReflectionMapTexCoord;\rvarying vec3 vPosition;\r#include<clipPlaneFragmentDeclaration>\n#include<logDepthDeclaration>\n#include<fogFragmentDeclaration>\n#define CUSTOM_FRAGMENT_DEFINITIONS\nvoid main(void) {\r#define CUSTOM_FRAGMENT_MAIN_BEGIN\n#include<clipPlaneFragment>\nvec3 viewDirectionW=normalize(vEyePosition.xyz-vPositionW);\rvec4 baseColor=vec4(1.,1.,1.,1.);\rvec3 diffuseColor=vDiffuseColor.rgb;\rfloat alpha=vDiffuseColor.a;\r#ifdef BUMP\n#ifdef BUMPSUPERIMPOSE\nbaseColor=0.6*texture2D(normalSampler,vNormalUV)+0.4*texture2D(normalSampler,vec2(vNormalUV2.x,vNormalUV2.y));\r#else\nbaseColor=texture2D(normalSampler,vNormalUV);\r#endif\nvec3 bumpColor=baseColor.rgb;\r#ifdef ALPHATEST\nif (baseColor.a<0.4)\rdiscard;\r#endif\nbaseColor.rgb*=vNormalInfos.y;\r#else\nvec3 bumpColor=vec3(1.0);\r#endif\n#if defined(VERTEXCOLOR) || defined(INSTANCESCOLOR)\nbaseColor.rgb*=vColor.rgb;\r#endif\n#ifdef NORMAL\nvec2 perturbation=bumpHeight*(baseColor.rg-0.5);\r#ifdef BUMPAFFECTSREFLECTION\nvec3 normalW=normalize(vNormalW+vec3(perturbation.x*8.0,0.0,perturbation.y*8.0));\rif (normalW.y<0.0) {\rnormalW.y=-normalW.y;\r}\r#else\nvec3 normalW=normalize(vNormalW);\r#endif\n#else\nvec3 normalW=vec3(1.0,1.0,1.0);\rvec2 perturbation=bumpHeight*(vec2(1.0,1.0)-0.5);\r#endif\n#ifdef FRESNELSEPARATE\n#ifdef REFLECTION\nvec2 projectedRefractionTexCoords=clamp(vRefractionMapTexCoord.xy/vRefractionMapTexCoord.z+perturbation*0.5,0.0,1.0);\rvec4 refractiveColor=texture2D(refractionSampler,projectedRefractionTexCoords);\r#ifdef IS_REFRACTION_LINEAR\nrefractiveColor.rgb=toGammaSpace(refractiveColor.rgb);\r#endif\nvec2 projectedReflectionTexCoords=clamp(vec2(\rvReflectionMapTexCoord.x/vReflectionMapTexCoord.z+perturbation.x*0.3,\rvReflectionMapTexCoord.y/vReflectionMapTexCoord.z+perturbation.y\r),0.0,1.0);\rvec4 reflectiveColor=texture2D(reflectionSampler,projectedReflectionTexCoords);\r#ifdef IS_REFLECTION_LINEAR\nreflectiveColor.rgb=toGammaSpace(reflectiveColor.rgb);\r#endif\nvec3 upVector=vec3(0.0,1.0,0.0);\rfloat fresnelTerm=clamp(abs(pow(dot(viewDirectionW,upVector),3.0)),0.05,0.65);\rfloat IfresnelTerm=1.0-fresnelTerm;\rrefractiveColor=colorBlendFactor*waterColor+(1.0-colorBlendFactor)*refractiveColor;\rreflectiveColor=IfresnelTerm*colorBlendFactor2*waterColor+(1.0-colorBlendFactor2*IfresnelTerm)*reflectiveColor;\rvec4 combinedColor=refractiveColor*fresnelTerm+reflectiveColor*IfresnelTerm;\rbaseColor=combinedColor;\r#endif\nvec3 diffuseBase=vec3(0.,0.,0.);\rlightingInfo info;\rfloat shadow=1.;\r#ifdef SPECULARTERM\nfloat glossiness=vSpecularColor.a;\rvec3 specularBase=vec3(0.,0.,0.);\rvec3 specularColor=vSpecularColor.rgb;\r#else\nfloat glossiness=0.;\r#endif\n#include<lightFragment>[0..maxSimultaneousLights]\nvec3 finalDiffuse=clamp(baseColor.rgb,0.0,1.0);\r#ifdef VERTEXALPHA\nalpha*=vColor.a;\r#endif\n#ifdef SPECULARTERM\nvec3 finalSpecular=specularBase*specularColor;\r#else\nvec3 finalSpecular=vec3(0.0);\r#endif\n#else \n#ifdef REFLECTION\nvec2 projectedRefractionTexCoords=clamp(vRefractionMapTexCoord.xy/vRefractionMapTexCoord.z+perturbation,0.0,1.0);\rvec4 refractiveColor=texture2D(refractionSampler,projectedRefractionTexCoords);\r#ifdef IS_REFRACTION_LINEAR\nrefractiveColor.rgb=toGammaSpace(refractiveColor.rgb);\r#endif\nvec2 projectedReflectionTexCoords=clamp(vReflectionMapTexCoord.xy/vReflectionMapTexCoord.z+perturbation,0.0,1.0);\rvec4 reflectiveColor=texture2D(reflectionSampler,projectedReflectionTexCoords);\r#ifdef IS_REFLECTION_LINEAR\nreflectiveColor.rgb=toGammaSpace(reflectiveColor.rgb);\r#endif\nvec3 upVector=vec3(0.0,1.0,0.0);\rfloat fresnelTerm=max(dot(viewDirectionW,upVector),0.0);\rvec4 combinedColor=refractiveColor*fresnelTerm+reflectiveColor*(1.0-fresnelTerm);\rbaseColor=colorBlendFactor*waterColor+(1.0-colorBlendFactor)*combinedColor;\r#endif\nvec3 diffuseBase=vec3(0.,0.,0.);\rlightingInfo info;\rfloat shadow=1.;\r#ifdef SPECULARTERM\nfloat glossiness=vSpecularColor.a;\rvec3 specularBase=vec3(0.,0.,0.);\rvec3 specularColor=vSpecularColor.rgb;\r#else\nfloat glossiness=0.;\r#endif\n#include<lightFragment>[0..maxSimultaneousLights]\nvec3 finalDiffuse=clamp(baseColor.rgb,0.0,1.0);\r#ifdef VERTEXALPHA\nalpha*=vColor.a;\r#endif\n#ifdef SPECULARTERM\nvec3 finalSpecular=specularBase*specularColor;\r#else\nvec3 finalSpecular=vec3(0.0);\r#endif\n#endif\nvec4 color=vec4(finalDiffuse+finalSpecular,alpha);\r#include<logDepthFragment>\n#include<fogFragment>\n#ifdef IMAGEPROCESSINGPOSTPROCESS\ncolor.rgb=toLinearSpace(color.rgb);\r#elif defined(IMAGEPROCESSING)\ncolor.rgb=toLinearSpace(color.rgb);\rcolor=applyImageProcessing(color);\r#endif\ngl_FragColor=color;\r#define CUSTOM_FRAGMENT_MAIN_END\n}\r`;\n// Sideeffect\nShaderStore.ShadersStore[name] = shader;\n/** @hidden */\nexport const waterPixelShader = { name, shader };\n"]}
|
package/water/water.vertex.d.ts
CHANGED
@@ -1,20 +1,20 @@
|
|
1
|
-
import "@babylonjs/core/Shaders/ShadersInclude/bonesDeclaration";
|
2
|
-
import "@babylonjs/core/Shaders/ShadersInclude/bakedVertexAnimationDeclaration";
|
3
|
-
import "@babylonjs/core/Shaders/ShadersInclude/instancesDeclaration";
|
4
|
-
import "@babylonjs/core/Shaders/ShadersInclude/clipPlaneVertexDeclaration";
|
5
|
-
import "@babylonjs/core/Shaders/ShadersInclude/fogVertexDeclaration";
|
6
|
-
import "@babylonjs/core/Shaders/ShadersInclude/lightFragmentDeclaration";
|
7
|
-
import "@babylonjs/core/Shaders/ShadersInclude/lightUboDeclaration";
|
8
|
-
import "@babylonjs/core/Shaders/ShadersInclude/logDepthDeclaration";
|
9
|
-
import "@babylonjs/core/Shaders/ShadersInclude/instancesVertex";
|
10
|
-
import "@babylonjs/core/Shaders/ShadersInclude/bonesVertex";
|
11
|
-
import "@babylonjs/core/Shaders/ShadersInclude/bakedVertexAnimation";
|
12
|
-
import "@babylonjs/core/Shaders/ShadersInclude/clipPlaneVertex";
|
13
|
-
import "@babylonjs/core/Shaders/ShadersInclude/fogVertex";
|
14
|
-
import "@babylonjs/core/Shaders/ShadersInclude/shadowsVertex";
|
15
|
-
import "@babylonjs/core/Shaders/ShadersInclude/logDepthVertex";
|
1
|
+
import "@babylonjs/core/Shaders/ShadersInclude/bonesDeclaration.js";
|
2
|
+
import "@babylonjs/core/Shaders/ShadersInclude/bakedVertexAnimationDeclaration.js";
|
3
|
+
import "@babylonjs/core/Shaders/ShadersInclude/instancesDeclaration.js";
|
4
|
+
import "@babylonjs/core/Shaders/ShadersInclude/clipPlaneVertexDeclaration.js";
|
5
|
+
import "@babylonjs/core/Shaders/ShadersInclude/fogVertexDeclaration.js";
|
6
|
+
import "@babylonjs/core/Shaders/ShadersInclude/lightFragmentDeclaration.js";
|
7
|
+
import "@babylonjs/core/Shaders/ShadersInclude/lightUboDeclaration.js";
|
8
|
+
import "@babylonjs/core/Shaders/ShadersInclude/logDepthDeclaration.js";
|
9
|
+
import "@babylonjs/core/Shaders/ShadersInclude/instancesVertex.js";
|
10
|
+
import "@babylonjs/core/Shaders/ShadersInclude/bonesVertex.js";
|
11
|
+
import "@babylonjs/core/Shaders/ShadersInclude/bakedVertexAnimation.js";
|
12
|
+
import "@babylonjs/core/Shaders/ShadersInclude/clipPlaneVertex.js";
|
13
|
+
import "@babylonjs/core/Shaders/ShadersInclude/fogVertex.js";
|
14
|
+
import "@babylonjs/core/Shaders/ShadersInclude/shadowsVertex.js";
|
15
|
+
import "@babylonjs/core/Shaders/ShadersInclude/logDepthVertex.js";
|
16
16
|
/** @hidden */
|
17
|
-
export declare
|
17
|
+
export declare const waterVertexShader: {
|
18
18
|
name: string;
|
19
19
|
shader: string;
|
20
20
|
};
|
package/water/water.vertex.js
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
// Do not edit.
|
1
2
|
import { ShaderStore } from "@babylonjs/core/Engines/shaderStore.js";
|
2
3
|
import "@babylonjs/core/Shaders/ShadersInclude/bonesDeclaration.js";
|
3
4
|
import "@babylonjs/core/Shaders/ShadersInclude/bakedVertexAnimationDeclaration.js";
|
@@ -14,8 +15,9 @@ import "@babylonjs/core/Shaders/ShadersInclude/clipPlaneVertex.js";
|
|
14
15
|
import "@babylonjs/core/Shaders/ShadersInclude/fogVertex.js";
|
15
16
|
import "@babylonjs/core/Shaders/ShadersInclude/shadowsVertex.js";
|
16
17
|
import "@babylonjs/core/Shaders/ShadersInclude/logDepthVertex.js";
|
17
|
-
var name =
|
18
|
-
var shader = "precision highp float;\
|
18
|
+
var name = "waterVertexShader";
|
19
|
+
var shader = "precision highp float;\nattribute vec3 position;\n#ifdef NORMAL\nattribute vec3 normal;\n#endif\n#ifdef UV1\nattribute vec2 uv;\n#endif\n#ifdef UV2\nattribute vec2 uv2;\n#endif\n#ifdef VERTEXCOLOR\nattribute vec4 color;\n#endif\n#include<bonesDeclaration>\n#include<bakedVertexAnimationDeclaration>\n#include<instancesDeclaration>\nuniform mat4 view;\nuniform mat4 viewProjection;\n#ifdef BUMP\nvarying vec2 vNormalUV;\n#ifdef BUMPSUPERIMPOSE\nvarying vec2 vNormalUV2;\n#endif\nuniform mat4 normalMatrix;\nuniform vec2 vNormalInfos;\n#endif\n#ifdef POINTSIZE\nuniform float pointSize;\n#endif\nvarying vec3 vPositionW;\n#ifdef NORMAL\nvarying vec3 vNormalW;\n#endif\n#if defined(VERTEXCOLOR) || defined(INSTANCESCOLOR)\nvarying vec4 vColor;\n#endif\n#include<clipPlaneVertexDeclaration>\n#include<fogVertexDeclaration>\n#include<__decl__lightFragment>[0..maxSimultaneousLights]\n#include<logDepthDeclaration>\nuniform mat4 worldReflectionViewProjection;\nuniform vec2 windDirection;\nuniform float waveLength;\nuniform float time;\nuniform float windForce;\nuniform float waveHeight;\nuniform float waveSpeed;\nuniform float waveCount;\nvarying vec3 vPosition;\nvarying vec3 vRefractionMapTexCoord;\nvarying vec3 vReflectionMapTexCoord;\n#define CUSTOM_VERTEX_DEFINITIONS\nvoid main(void) {\n#define CUSTOM_VERTEX_MAIN_BEGIN\n#include<instancesVertex>\n#include<bonesVertex>\n#include<bakedVertexAnimation>\nvec4 worldPos=finalWorld*vec4(position,1.0);\nvPositionW=vec3(worldPos);\n#ifdef NORMAL\nvNormalW=normalize(vec3(finalWorld*vec4(normal,0.0)));\n#endif\n#ifndef UV1\nvec2 uv=vec2(0.,0.);\n#endif\n#ifndef UV2\nvec2 uv2=vec2(0.,0.);\n#endif\n#ifdef BUMP\nif (vNormalInfos.x==0.)\n{\nvNormalUV=vec2(normalMatrix*vec4((uv*1.0)/waveLength+time*windForce*windDirection,1.0,0.0));\n#ifdef BUMPSUPERIMPOSE\nvNormalUV2=vec2(normalMatrix*vec4((uv*0.721)/waveLength+time*1.2*windForce*windDirection,1.0,0.0));\n#endif\n}\nelse\n{\nvNormalUV=vec2(normalMatrix*vec4((uv2*1.0)/waveLength+time*windForce*windDirection ,1.0,0.0));\n#ifdef BUMPSUPERIMPOSE\nvNormalUV2=vec2(normalMatrix*vec4((uv2*0.721)/waveLength+time*1.2*windForce*windDirection ,1.0,0.0));\n#endif\n}\n#endif\n#include<clipPlaneVertex>\n#include<fogVertex>\n#include<shadowsVertex>[0..maxSimultaneousLights]\n#ifdef VERTEXCOLOR\nvColor=color;\n#elif INSTANCESCOLOR\nvColor=instanceColor;\n#endif\n#if defined(POINTSIZE) && !defined(WEBGPU)\ngl_PointSize=pointSize;\n#endif\nfloat finalWaveCount=1.0/(waveCount*0.5);\nvec3 p=position;\nfloat newY=(sin(((p.x/finalWaveCount)+time*waveSpeed))*waveHeight*windDirection.x*5.0)\n+ (cos(((p.z/finalWaveCount)+ time*waveSpeed))*waveHeight*windDirection.y*5.0);\np.y+=abs(newY);\ngl_Position=viewProjection*finalWorld*vec4(p,1.0);\n#ifdef REFLECTION\nworldPos=viewProjection*finalWorld*vec4(p,1.0);\nvPosition=position;\nvRefractionMapTexCoord.x=0.5*(worldPos.w+worldPos.x);\nvRefractionMapTexCoord.y=0.5*(worldPos.w+worldPos.y);\nvRefractionMapTexCoord.z=worldPos.w;\nworldPos=worldReflectionViewProjection*vec4(position,1.0);\nvReflectionMapTexCoord.x=0.5*(worldPos.w+worldPos.x);\nvReflectionMapTexCoord.y=0.5*(worldPos.w+worldPos.y);\nvReflectionMapTexCoord.z=worldPos.w;\n#endif\n#include<logDepthVertex>\n#define CUSTOM_VERTEX_MAIN_END\n}\n";
|
20
|
+
// Sideeffect
|
19
21
|
ShaderStore.ShadersStore[name] = shader;
|
20
22
|
/** @hidden */
|
21
23
|
export var waterVertexShader = { name: name, shader: shader };
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"water.vertex.js","sourceRoot":"","sources":["
|
1
|
+
{"version":3,"file":"water.vertex.js","sourceRoot":"","sources":["../../../../../lts/materials/generated/water/water.vertex.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,OAAO,EAAE,WAAW,EAAE,+CAAiC;AACvD,oEAAsD;AACtD,mFAAqE;AACrE,wEAA0D;AAC1D,8EAAgE;AAChE,wEAA0D;AAC1D,4EAA8D;AAC9D,uEAAyD;AACzD,uEAAyD;AACzD,mEAAqD;AACrD,+DAAiD;AACjD,wEAA0D;AAC1D,mEAAqD;AACrD,6DAA+C;AAC/C,iEAAmD;AACnD,kEAAoD;AAEpD,IAAM,IAAI,GAAG,mBAAmB,CAAC;AACjC,IAAM,MAAM,GAAG,irGAoHd,CAAC;AACF,aAAa;AACb,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;AACxC,cAAc;AACd,MAAM,CAAC,IAAM,iBAAiB,GAAG,EAAE,IAAI,MAAA,EAAE,MAAM,QAAA,EAAE,CAAC","sourcesContent":["// Do not edit.\nimport { ShaderStore } from \"core/Engines/shaderStore\";\nimport \"core/Shaders/ShadersInclude/bonesDeclaration\";\nimport \"core/Shaders/ShadersInclude/bakedVertexAnimationDeclaration\";\nimport \"core/Shaders/ShadersInclude/instancesDeclaration\";\nimport \"core/Shaders/ShadersInclude/clipPlaneVertexDeclaration\";\nimport \"core/Shaders/ShadersInclude/fogVertexDeclaration\";\nimport \"core/Shaders/ShadersInclude/lightFragmentDeclaration\";\nimport \"core/Shaders/ShadersInclude/lightUboDeclaration\";\nimport \"core/Shaders/ShadersInclude/logDepthDeclaration\";\nimport \"core/Shaders/ShadersInclude/instancesVertex\";\nimport \"core/Shaders/ShadersInclude/bonesVertex\";\nimport \"core/Shaders/ShadersInclude/bakedVertexAnimation\";\nimport \"core/Shaders/ShadersInclude/clipPlaneVertex\";\nimport \"core/Shaders/ShadersInclude/fogVertex\";\nimport \"core/Shaders/ShadersInclude/shadowsVertex\";\nimport \"core/Shaders/ShadersInclude/logDepthVertex\";\n\nconst name = \"waterVertexShader\";\nconst shader = `precision highp float;\rattribute vec3 position;\r#ifdef NORMAL\nattribute vec3 normal;\r#endif\n#ifdef UV1\nattribute vec2 uv;\r#endif\n#ifdef UV2\nattribute vec2 uv2;\r#endif\n#ifdef VERTEXCOLOR\nattribute vec4 color;\r#endif\n#include<bonesDeclaration>\n#include<bakedVertexAnimationDeclaration>\n#include<instancesDeclaration>\nuniform mat4 view;\runiform mat4 viewProjection;\r#ifdef BUMP\nvarying vec2 vNormalUV;\r#ifdef BUMPSUPERIMPOSE\nvarying vec2 vNormalUV2;\r#endif\nuniform mat4 normalMatrix;\runiform vec2 vNormalInfos;\r#endif\n#ifdef POINTSIZE\nuniform float pointSize;\r#endif\nvarying vec3 vPositionW;\r#ifdef NORMAL\nvarying vec3 vNormalW;\r#endif\n#if defined(VERTEXCOLOR) || defined(INSTANCESCOLOR)\nvarying vec4 vColor;\r#endif\n#include<clipPlaneVertexDeclaration>\n#include<fogVertexDeclaration>\n#include<__decl__lightFragment>[0..maxSimultaneousLights]\n#include<logDepthDeclaration>\nuniform mat4 worldReflectionViewProjection;\runiform vec2 windDirection;\runiform float waveLength;\runiform float time;\runiform float windForce;\runiform float waveHeight;\runiform float waveSpeed;\runiform float waveCount;\rvarying vec3 vPosition;\rvarying vec3 vRefractionMapTexCoord;\rvarying vec3 vReflectionMapTexCoord;\r#define CUSTOM_VERTEX_DEFINITIONS\nvoid main(void) {\r#define CUSTOM_VERTEX_MAIN_BEGIN\n#include<instancesVertex>\n#include<bonesVertex>\n#include<bakedVertexAnimation>\nvec4 worldPos=finalWorld*vec4(position,1.0);\rvPositionW=vec3(worldPos);\r#ifdef NORMAL\nvNormalW=normalize(vec3(finalWorld*vec4(normal,0.0)));\r#endif\n#ifndef UV1\nvec2 uv=vec2(0.,0.);\r#endif\n#ifndef UV2\nvec2 uv2=vec2(0.,0.);\r#endif\n#ifdef BUMP\nif (vNormalInfos.x==0.)\r{\rvNormalUV=vec2(normalMatrix*vec4((uv*1.0)/waveLength+time*windForce*windDirection,1.0,0.0));\r#ifdef BUMPSUPERIMPOSE\nvNormalUV2=vec2(normalMatrix*vec4((uv*0.721)/waveLength+time*1.2*windForce*windDirection,1.0,0.0));\r#endif\n}\relse\r{\rvNormalUV=vec2(normalMatrix*vec4((uv2*1.0)/waveLength+time*windForce*windDirection ,1.0,0.0));\r#ifdef BUMPSUPERIMPOSE\nvNormalUV2=vec2(normalMatrix*vec4((uv2*0.721)/waveLength+time*1.2*windForce*windDirection ,1.0,0.0));\r#endif\n}\r#endif\n#include<clipPlaneVertex>\n#include<fogVertex>\n#include<shadowsVertex>[0..maxSimultaneousLights]\n#ifdef VERTEXCOLOR\nvColor=color;\r#elif INSTANCESCOLOR\nvColor=instanceColor;\r#endif\n#if defined(POINTSIZE) && !defined(WEBGPU)\ngl_PointSize=pointSize;\r#endif\nfloat finalWaveCount=1.0/(waveCount*0.5);\rvec3 p=position;\rfloat newY=(sin(((p.x/finalWaveCount)+time*waveSpeed))*waveHeight*windDirection.x*5.0)\r+ (cos(((p.z/finalWaveCount)+ time*waveSpeed))*waveHeight*windDirection.y*5.0);\rp.y+=abs(newY);\rgl_Position=viewProjection*finalWorld*vec4(p,1.0);\r#ifdef REFLECTION\nworldPos=viewProjection*finalWorld*vec4(p,1.0);\rvPosition=position;\rvRefractionMapTexCoord.x=0.5*(worldPos.w+worldPos.x);\rvRefractionMapTexCoord.y=0.5*(worldPos.w+worldPos.y);\rvRefractionMapTexCoord.z=worldPos.w;\rworldPos=worldReflectionViewProjection*vec4(position,1.0);\rvReflectionMapTexCoord.x=0.5*(worldPos.w+worldPos.x);\rvReflectionMapTexCoord.y=0.5*(worldPos.w+worldPos.y);\rvReflectionMapTexCoord.z=worldPos.w;\r#endif\n#include<logDepthVertex>\n#define CUSTOM_VERTEX_MAIN_END\n}\r`;\n// Sideeffect\nShaderStore.ShadersStore[name] = shader;\n/** @hidden */\nexport const waterVertexShader = { name, shader };\n"]}
|
package/water/waterMaterial.d.ts
CHANGED
@@ -1,15 +1,15 @@
|
|
1
|
-
import { Nullable } from "@babylonjs/core/types";
|
2
|
-
import { Matrix, Vector2 } from "@babylonjs/core/Maths/math.vector";
|
3
|
-
import { Color3 } from "@babylonjs/core/Maths/math.color";
|
4
|
-
import { IAnimatable } from
|
5
|
-
import { SmartArray } from "@babylonjs/core/Misc/smartArray";
|
6
|
-
import { BaseTexture } from "@babylonjs/core/Materials/Textures/baseTexture";
|
7
|
-
import { RenderTargetTexture } from "@babylonjs/core/Materials/Textures/renderTargetTexture";
|
8
|
-
import { PushMaterial } from "@babylonjs/core/Materials/pushMaterial";
|
9
|
-
import { AbstractMesh } from "@babylonjs/core/Meshes/abstractMesh";
|
10
|
-
import { SubMesh } from "@babylonjs/core/Meshes/subMesh";
|
11
|
-
import { Mesh } from "@babylonjs/core/Meshes/mesh";
|
12
|
-
import { Scene } from "@babylonjs/core/scene";
|
1
|
+
import { Nullable } from "@babylonjs/core/types.js";
|
2
|
+
import { Matrix, Vector2 } from "@babylonjs/core/Maths/math.vector.js";
|
3
|
+
import { Color3 } from "@babylonjs/core/Maths/math.color.js";
|
4
|
+
import { IAnimatable } from "@babylonjs/core/Animations/animatable.interface.js";
|
5
|
+
import { SmartArray } from "@babylonjs/core/Misc/smartArray.js";
|
6
|
+
import { BaseTexture } from "@babylonjs/core/Materials/Textures/baseTexture.js";
|
7
|
+
import { RenderTargetTexture } from "@babylonjs/core/Materials/Textures/renderTargetTexture.js";
|
8
|
+
import { PushMaterial } from "@babylonjs/core/Materials/pushMaterial.js";
|
9
|
+
import { AbstractMesh } from "@babylonjs/core/Meshes/abstractMesh.js";
|
10
|
+
import { SubMesh } from "@babylonjs/core/Meshes/subMesh.js";
|
11
|
+
import { Mesh } from "@babylonjs/core/Meshes/mesh.js";
|
12
|
+
import { Scene } from "@babylonjs/core/scene.js";
|
13
13
|
import "./water.fragment";
|
14
14
|
import "./water.vertex";
|
15
15
|
export declare class WaterMaterial extends PushMaterial {
|
@@ -103,8 +103,11 @@ export declare class WaterMaterial extends PushMaterial {
|
|
103
103
|
*/
|
104
104
|
get hasRenderTargetTextures(): boolean;
|
105
105
|
/**
|
106
|
-
|
107
|
-
|
106
|
+
* Constructor
|
107
|
+
* @param name
|
108
|
+
* @param scene
|
109
|
+
* @param renderTargetSize
|
110
|
+
*/
|
108
111
|
constructor(name: string, scene?: Scene, renderTargetSize?: Vector2);
|
109
112
|
get useLogarithmicDepth(): boolean;
|
110
113
|
set useLogarithmicDepth(value: boolean);
|
package/water/waterMaterial.js
CHANGED
@@ -2,7 +2,7 @@ import { __decorate, __extends } from "tslib";
|
|
2
2
|
import { serializeAsVector2, serializeAsTexture, serialize, expandToProperty, serializeAsColor3, SerializationHelper } from "@babylonjs/core/Misc/decorators.js";
|
3
3
|
import { Matrix, Vector2, Vector3 } from "@babylonjs/core/Maths/math.vector.js";
|
4
4
|
import { Color3 } from "@babylonjs/core/Maths/math.color.js";
|
5
|
-
import { Plane } from
|
5
|
+
import { Plane } from "@babylonjs/core/Maths/math.plane.js";
|
6
6
|
import { Constants } from "@babylonjs/core/Engines/constants.js";
|
7
7
|
import { SmartArray } from "@babylonjs/core/Misc/smartArray.js";
|
8
8
|
import { RenderTargetTexture } from "@babylonjs/core/Materials/Textures/renderTargetTexture.js";
|
@@ -13,10 +13,10 @@ import { PushMaterial } from "@babylonjs/core/Materials/pushMaterial.js";
|
|
13
13
|
import { MaterialFlags } from "@babylonjs/core/Materials/materialFlags.js";
|
14
14
|
import { VertexBuffer } from "@babylonjs/core/Buffers/buffer.js";
|
15
15
|
import { Scene } from "@babylonjs/core/scene.js";
|
16
|
-
import { RegisterClass } from
|
16
|
+
import { RegisterClass } from "@babylonjs/core/Misc/typeStore.js";
|
17
17
|
import "./water.fragment.js";
|
18
18
|
import "./water.vertex.js";
|
19
|
-
import { EffectFallbacks } from
|
19
|
+
import { EffectFallbacks } from "@babylonjs/core/Materials/effectFallbacks.js";
|
20
20
|
import { CreateGround } from "@babylonjs/core/Meshes/Builders/groundBuilder.js";
|
21
21
|
var WaterMaterialDefines = /** @class */ (function (_super) {
|
22
22
|
__extends(WaterMaterialDefines, _super);
|
@@ -72,8 +72,11 @@ var WaterMaterialDefines = /** @class */ (function (_super) {
|
|
72
72
|
var WaterMaterial = /** @class */ (function (_super) {
|
73
73
|
__extends(WaterMaterial, _super);
|
74
74
|
/**
|
75
|
-
|
76
|
-
|
75
|
+
* Constructor
|
76
|
+
* @param name
|
77
|
+
* @param scene
|
78
|
+
* @param renderTargetSize
|
79
|
+
*/
|
77
80
|
function WaterMaterial(name, scene, renderTargetSize) {
|
78
81
|
if (renderTargetSize === void 0) { renderTargetSize = new Vector2(512, 512); }
|
79
82
|
var _this = _super.call(this, name, scene) || this;
|
@@ -146,8 +149,8 @@ var WaterMaterial = /** @class */ (function (_super) {
|
|
146
149
|
_this.disableClipPlane = false;
|
147
150
|
_this._renderTargets = new SmartArray(16);
|
148
151
|
/*
|
149
|
-
|
150
|
-
|
152
|
+
* Private members
|
153
|
+
*/
|
151
154
|
_this._mesh = null;
|
152
155
|
_this._reflectionTransform = Matrix.Zero();
|
153
156
|
_this._lastTime = 0;
|
@@ -233,7 +236,7 @@ var WaterMaterial = /** @class */ (function (_super) {
|
|
233
236
|
configurable: true
|
234
237
|
});
|
235
238
|
WaterMaterial.prototype.needAlphaBlending = function () {
|
236
|
-
return
|
239
|
+
return this.alpha < 1.0;
|
237
240
|
};
|
238
241
|
WaterMaterial.prototype.needAlphaTesting = function () {
|
239
242
|
return false;
|
@@ -295,8 +298,8 @@ var WaterMaterial = /** @class */ (function (_super) {
|
|
295
298
|
return false;
|
296
299
|
}
|
297
300
|
this._imageProcessingConfiguration.prepareDefines(defines);
|
298
|
-
defines.IS_REFLECTION_LINEAR =
|
299
|
-
defines.IS_REFRACTION_LINEAR =
|
301
|
+
defines.IS_REFLECTION_LINEAR = this.reflectionTexture != null && !this.reflectionTexture.gammaSpace;
|
302
|
+
defines.IS_REFRACTION_LINEAR = this.refractionTexture != null && !this.refractionTexture.gammaSpace;
|
300
303
|
}
|
301
304
|
// Attribs
|
302
305
|
MaterialHelper.PrepareDefinesForAttributes(mesh, defines, true, true);
|
@@ -343,20 +346,48 @@ var WaterMaterial = /** @class */ (function (_super) {
|
|
343
346
|
// Legacy browser patch
|
344
347
|
var shaderName = "water";
|
345
348
|
var join = defines.toString();
|
346
|
-
var uniforms = [
|
347
|
-
"
|
349
|
+
var uniforms = [
|
350
|
+
"world",
|
351
|
+
"view",
|
352
|
+
"viewProjection",
|
353
|
+
"vEyePosition",
|
354
|
+
"vLightsType",
|
355
|
+
"vDiffuseColor",
|
356
|
+
"vSpecularColor",
|
357
|
+
"vFogInfos",
|
358
|
+
"vFogColor",
|
359
|
+
"pointSize",
|
348
360
|
"vNormalInfos",
|
349
361
|
"mBones",
|
350
|
-
"vClipPlane",
|
362
|
+
"vClipPlane",
|
363
|
+
"vClipPlane2",
|
364
|
+
"vClipPlane3",
|
365
|
+
"vClipPlane4",
|
366
|
+
"vClipPlane5",
|
367
|
+
"vClipPlane6",
|
368
|
+
"normalMatrix",
|
351
369
|
"logarithmicDepthConstant",
|
352
370
|
// Water
|
353
|
-
"worldReflectionViewProjection",
|
354
|
-
"
|
355
|
-
"
|
371
|
+
"worldReflectionViewProjection",
|
372
|
+
"windDirection",
|
373
|
+
"waveLength",
|
374
|
+
"time",
|
375
|
+
"windForce",
|
376
|
+
"cameraPosition",
|
377
|
+
"bumpHeight",
|
378
|
+
"waveHeight",
|
379
|
+
"waterColor",
|
380
|
+
"waterColor2",
|
381
|
+
"colorBlendFactor",
|
382
|
+
"colorBlendFactor2",
|
383
|
+
"waveSpeed",
|
384
|
+
"waveCount",
|
356
385
|
];
|
357
|
-
var samplers = [
|
386
|
+
var samplers = [
|
387
|
+
"normalSampler",
|
358
388
|
// Water
|
359
|
-
"refractionSampler",
|
389
|
+
"refractionSampler",
|
390
|
+
"reflectionSampler",
|
360
391
|
];
|
361
392
|
var uniformBuffers = new Array();
|
362
393
|
if (ImageProcessingConfiguration) {
|
@@ -368,7 +399,7 @@ var WaterMaterial = /** @class */ (function (_super) {
|
|
368
399
|
uniformBuffersNames: uniformBuffers,
|
369
400
|
samplers: samplers,
|
370
401
|
defines: defines,
|
371
|
-
maxSimultaneousLights: this.maxSimultaneousLights
|
402
|
+
maxSimultaneousLights: this.maxSimultaneousLights,
|
372
403
|
});
|
373
404
|
subMesh.setEffect(scene.getEngine().createEffect(shaderName, {
|
374
405
|
attributes: attribs,
|
@@ -379,7 +410,7 @@ var WaterMaterial = /** @class */ (function (_super) {
|
|
379
410
|
fallbacks: fallbacks,
|
380
411
|
onCompiled: this.onCompiled,
|
381
412
|
onError: this.onError,
|
382
|
-
indexParameters: { maxSimultaneousLights: this._maxSimultaneousLights }
|
413
|
+
indexParameters: { maxSimultaneousLights: this._maxSimultaneousLights },
|
383
414
|
}, engine), defines, this._materialContext);
|
384
415
|
}
|
385
416
|
if (!subMesh.effect || !subMesh.effect.isReady()) {
|