- fixed displacement

redcamel · Dec 6, 2021 · 2c0cbe9 · 2c0cbe9
1 parent 72e661a
commit 2c0cbe9
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 20 deletions.
diff --git a/dist/RedGPU.min.mjs b/dist/RedGPU.min.mjs
diff --git a/examples/loader/gltf/index.js b/examples/loader/gltf/index.js
@@ -53,6 +53,7 @@ new RedGPU.RedGPUContext(
         renderer = new RedGPU.Render();
         render = time => {
             renderer.render(time, this);
+                // tScene.children[0].rotationY+=0.1
             requestAnimationFrame(render);
         };
         requestAnimationFrame(render);

diff --git a/src/base/ShareGLSL.js b/src/base/ShareGLSL.js
@@ -40,15 +40,26 @@ export default class ShareGLSL {
 	        float sumOpacity;
 	    } meshUniforms;
 		`,
-    calcDisplacement: `
-		 vec3 calcDisplacement(vec3 vNormal, float displacementFlowSpeedX, float displacementFlowSpeedY, float displacementPower, vec2 targetUV, texture2D targetDisplacementTexture, sampler targetSampler)
-		 {
-		    return normalize(vNormal) * texture(sampler2D(targetDisplacementTexture, targetSampler), targetUV + vec2(
-		              displacementFlowSpeedX * (systemUniforms.time/1000.0),
-		               displacementFlowSpeedY * (systemUniforms.time/1000.0)
-		          )).x * displacementPower ;
-		 }
-		`,
+    calcDisplacement: (
+        vNormal='vNormal',
+        displacementFlowSpeedX='displacementFlowSpeedX',
+        displacementFlowSpeedY='displacementFlowSpeedY',
+        displacementPower='displacementPower',
+        targetUV='targetUV',
+        targetDisplacementTexture='targetDisplacementTexture',
+        targetSampler='targetSampler'
+    )=>{
+        return `
+        normalize(${vNormal}) 
+        * texture(
+            sampler2D(${targetDisplacementTexture}, ${targetSampler}), 
+            ${targetUV} + vec2(
+                ${displacementFlowSpeedX} * (systemUniforms.time/1000.0),
+                ${displacementFlowSpeedY} * (systemUniforms.time/1000.0)
+            )
+        ).x * ${displacementPower};
+		`
+    },
     getSprite3DMatrix: `
 		mat4 getSprite3DMatrix(mat4 cameraMTX, mat4 mvMatrix){
 			mat4 tMTX = cameraMTX * mvMatrix;

diff --git a/src/material/ColorPhongTextureMaterial.js b/src/material/ColorPhongTextureMaterial.js
@@ -26,7 +26,7 @@ export default class ColorPhongTextureMaterial extends Mix.mix(
   static vertexShaderGLSL = `
 	${ShareGLSL.GLSL_VERSION}
 	${ShareGLSL.GLSL_SystemUniforms_vertex.systemUniforms}
-    ${ShareGLSL.GLSL_SystemUniforms_vertex.calcDisplacement}    
+    
     ${ShareGLSL.GLSL_SystemUniforms_vertex.meshUniforms}
 	layout( location = 0 ) in vec3 position;
 	layout( location = 1 ) in vec3 normal;
@@ -51,7 +51,7 @@ export default class ColorPhongTextureMaterial extends Mix.mix(
 		vUV = uv;
 		vMouseColorID = meshUniforms.mouseColorID;
 		vSumOpacity = meshUniforms.sumOpacity;
-		// if(vertexUniforms.__displacementTextureRenderYn == TRUTHY)  vVertexPosition.xyz += calcDisplacement(vNormal, vertexUniforms.displacementFlowSpeedX, vertexUniforms.displacementFlowSpeedY, vertexUniforms.displacementPower, uv, uDisplacementTexture, uSampler);
+		if(vertexUniforms.__displacementTextureRenderYn == TRUTHY) vVertexPosition.xyz += ${ShareGLSL.GLSL_SystemUniforms_vertex.calcDisplacement('vNormal', 'vertexUniforms.displacementFlowSpeedX', 'vertexUniforms.displacementFlowSpeedY', 'vertexUniforms.displacementPower', 'uv', 'uDisplacementTexture', 'uSampler')}
 		gl_Position = systemUniforms.perspectiveMTX * systemUniforms.cameraMTX * vVertexPosition;
 	}
 	`;

diff --git a/src/material/EnvironmentMaterial.js b/src/material/EnvironmentMaterial.js
@@ -27,7 +27,6 @@ export default class EnvironmentMaterial extends Mix.mix(
   static vertexShaderGLSL = `
 	${ShareGLSL.GLSL_VERSION}
     ${ShareGLSL.GLSL_SystemUniforms_vertex.systemUniforms}
-    ${ShareGLSL.GLSL_SystemUniforms_vertex.calcDisplacement}    
     ${ShareGLSL.GLSL_SystemUniforms_vertex.meshUniforms}
          
 	layout( location = 0 ) in vec3 position;
@@ -53,7 +52,7 @@ export default class EnvironmentMaterial extends Mix.mix(
 		vUV = uv;
 		vMouseColorID = meshUniforms.mouseColorID;
 		vSumOpacity = meshUniforms.sumOpacity;
-		// if(vertexUniforms.__displacementTextureRenderYn == TRUTHY) vVertexPosition.xyz += calcDisplacement(vNormal, vertexUniforms.displacementFlowSpeedX, vertexUniforms.displacementFlowSpeedY, vertexUniforms.displacementPower, uv, uDisplacementTexture, uDisplacementSampler);
+		if(vertexUniforms.__displacementTextureRenderYn == TRUTHY) vVertexPosition.xyz += ${ShareGLSL.GLSL_SystemUniforms_vertex.calcDisplacement('vNormal', 'vertexUniforms.displacementFlowSpeedX', 'vertexUniforms.displacementFlowSpeedY', 'vertexUniforms.displacementPower', 'uv', 'uDisplacementTexture', 'uDisplacementSampler')}
 		gl_Position = systemUniforms.perspectiveMTX * systemUniforms.cameraMTX * vVertexPosition;
 	
 	

diff --git a/src/material/RefractionMaterial.js b/src/material/RefractionMaterial.js
@@ -28,7 +28,6 @@ export default class RefractionMaterial extends Mix.mix(
   static vertexShaderGLSL = `
 	${ShareGLSL.GLSL_VERSION}
     ${ShareGLSL.GLSL_SystemUniforms_vertex.systemUniforms}
-    ${ShareGLSL.GLSL_SystemUniforms_vertex.calcDisplacement}    
     ${ShareGLSL.GLSL_SystemUniforms_vertex.meshUniforms}
          
 	layout( location = 0 ) in vec3 position;
@@ -54,7 +53,7 @@ export default class RefractionMaterial extends Mix.mix(
 		vUV = uv;
 		vMouseColorID = meshUniforms.mouseColorID;
 		vSumOpacity = meshUniforms.sumOpacity;
-		// if(vertexUniforms.__displacementTextureRenderYn == TRUTHY) vVertexPosition.xyz += calcDisplacement(vNormal, vertexUniforms.displacementFlowSpeedX, vertexUniforms.displacementFlowSpeedY, vertexUniforms.displacementPower, uv, uDisplacementTexture, uDisplacementSampler);
+		if(vertexUniforms.__displacementTextureRenderYn == TRUTHY) vVertexPosition.xyz += ${ShareGLSL.GLSL_SystemUniforms_vertex.calcDisplacement('vNormal', 'vertexUniforms.displacementFlowSpeedX', 'vertexUniforms.displacementFlowSpeedY', 'vertexUniforms.displacementPower', 'uv', 'uDisplacementTexture', 'uDisplacementSampler')}
 		gl_Position = systemUniforms.perspectiveMTX * systemUniforms.cameraMTX * vVertexPosition;		
 	}
 	`;

diff --git a/src/material/StandardMaterial.js b/src/material/StandardMaterial.js
@@ -27,7 +27,6 @@ export default class StandardMaterial extends Mix.mix(
   static vertexShaderGLSL = `
 	${ShareGLSL.GLSL_VERSION}
     ${ShareGLSL.GLSL_SystemUniforms_vertex.systemUniforms}
-    ${ShareGLSL.GLSL_SystemUniforms_vertex.calcDisplacement}    
     ${ShareGLSL.GLSL_SystemUniforms_vertex.meshUniforms}
          
 	layout( location = 0 ) in vec3 position;
@@ -53,7 +52,7 @@ export default class StandardMaterial extends Mix.mix(
 		vUV = uv;
 		vMouseColorID = meshUniforms.mouseColorID;
 		vSumOpacity = meshUniforms.sumOpacity;
-		// if(vertexUniforms.__displacementTextureRenderYn == TRUTHY) vVertexPosition.xyz += calcDisplacement(vNormal, vertexUniforms.displacementFlowSpeedX, vertexUniforms.displacementFlowSpeedY, vertexUniforms.displacementPower, uv, uDisplacementTexture, uSampler);
+		if(vertexUniforms.__displacementTextureRenderYn == TRUTHY) vVertexPosition.xyz += ${ShareGLSL.GLSL_SystemUniforms_vertex.calcDisplacement('vNormal', 'vertexUniforms.displacementFlowSpeedX', 'vertexUniforms.displacementFlowSpeedY', 'vertexUniforms.displacementPower', 'uv', 'uDisplacementTexture', 'uSampler')}
 		gl_Position = systemUniforms.perspectiveMTX * systemUniforms.cameraMTX * vVertexPosition;
 	
 	

diff --git a/src/material/system/PBRMaterial_System.js b/src/material/system/PBRMaterial_System.js
@@ -30,7 +30,6 @@ export default class PBRMaterial_System extends Mix.mix(
   static vertexShaderGLSL = `
 	${ShareGLSL.GLSL_VERSION}
     ${ShareGLSL.GLSL_SystemUniforms_vertex.systemUniforms}
-    ${ShareGLSL.GLSL_SystemUniforms_vertex.calcDisplacement}
     ${ShareGLSL.GLSL_SystemUniforms_vertex.meshUniforms}
          
 	layout( location = 0 ) in vec3 position;
@@ -86,7 +85,7 @@ export default class PBRMaterial_System extends Mix.mix(
 		vVertexTangent = vertexTangent;
 		vMouseColorID = meshUniforms.mouseColorID;
 		vSumOpacity = meshUniforms.sumOpacity;
-		// if(vertexUniforms.__displacementTextureRenderYn == TRUTHY) vVertexPosition.xyz += calcDisplacement(vNormal, vertexUniforms.displacementFlowSpeedX, vertexUniforms.displacementFlowSpeedY, vertexUniforms.displacementPower, uv, uDisplacementTexture, uDisplacementSampler);
+		if(vertexUniforms.__displacementTextureRenderYn == TRUTHY) vVertexPosition.xyz += ${ShareGLSL.GLSL_SystemUniforms_vertex.calcDisplacement('vNormal', 'vertexUniforms.displacementFlowSpeedX', 'vertexUniforms.displacementFlowSpeedY', 'vertexUniforms.displacementPower', 'uv', 'uDisplacementTexture', 'uDisplacementSampler')}
 		gl_Position = systemUniforms.perspectiveMTX * systemUniforms.cameraMTX * vVertexPosition;		
 	}
 	`;