浏览代码

Fix water assets

unknown 6 年之前
父节点
当前提交
2d115a9228
共有 2 个文件被更改,包括 25 次插入1 次删除
  1. 16 1
      Sources/arm/render/RenderPathDeferred.hx
  2. 9 0
      compiled/Shaders/compiled.inc

+ 16 - 1
Sources/arm/render/RenderPathDeferred.hx

@@ -218,7 +218,7 @@ class RenderPathDeferred {
 
 		#if rp_water
 		{
-			path.loadShader("shader_datas/water_pass/water_pass");
+			path.loadShader("water_pass/water_pass/water_pass");
 			path.loadShader("shader_datas/copy_pass/copy_pass");
 		}
 		#end
@@ -817,6 +817,21 @@ class RenderPathDeferred {
 			path.drawShader("shader_datas/deferred_light/deferred_light_VoxelAOvar") :
 			path.drawShader("shader_datas/deferred_light/deferred_light");
 
+		#if rp_water
+		{
+			path.setTarget("buf");
+			path.bindTarget("tex", "tex");
+			path.drawShader("shader_datas/copy_pass/copy_pass");
+			path.setTarget("tex");
+			path.bindTarget("_main", "gbufferD");
+			path.bindTarget("buf", "tex");
+			path.drawShader("water_pass/water_pass/water_pass");
+			Scene.active.embedData("water_base.png", function() {});
+			Scene.active.embedData("water_detail.png", function() {});
+			Scene.active.embedData("water_foam.png", function() {});
+		}
+		#end
+
 		#if (!kha_opengl)
 		path.setDepthFrom("tex", "gbuffer0"); // Re-bind depth
 		#end

+ 9 - 0
compiled/Shaders/compiled.inc

@@ -50,4 +50,13 @@ const float voxelgiOffset = 1.5;
 const float voxelgiAperture = 1.2;
 const int skinMaxBones = 50;
 
+const float waterLevel = 0.0;
+const float waterDisplace = 1.0;
+const float waterSpeed = 1.0;
+const float waterFreq = 1.0;
+const vec3 waterColor = vec3(1.0, 1.0, 1.0);
+const float waterDensity = 1.0;
+const float waterRefract = 1.0;
+const float waterReflect = 1.0;
+
 #endif // _COMPILED_GLSL_