From 59ab763bb090cc7c15aba87d750ee526fbfde490 Mon Sep 17 00:00:00 2001 From: yyc <395976266@qq.com> Date: Sun, 26 May 2019 17:40:54 +0800 Subject: [PATCH] feat(skybox): fix "left and right reverse" bug solution change webgl1_skybox_fragment.glsl->v_texCoord.x to -v_texCoord.x (update wonder-webgl version) --- package.json | 4 ++-- src/glsl/ShaderChunkSystem.re | 4 +++- src/glsl/skybox/webgl1_skybox_fragment.glsl | 2 +- src/service/record/all/sender/DrawGLSLService.re | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5b2a61f09f..f3c96d1c6c 100755 --- a/package.json +++ b/package.json @@ -75,11 +75,11 @@ "wonder-imgui": "^0.0.34", "wonder-log": "^0.2.11", "wonder-most-animation-frame": "0.0.3", - "wonder-webgl": "^0.0.10" + "wonder-webgl": "^0.0.11" }, "resolutions": { "wonder-log": "^0.2.11", - "wonder-webgl": "^0.0.10", + "wonder-webgl": "^0.0.11", "wonder-commonlib": "0.2.32", "wonder-bs-jest": "0.3.0", "wonder-bs-puppeteer": "^0.1.6" diff --git a/src/glsl/ShaderChunkSystem.re b/src/glsl/ShaderChunkSystem.re index 316627ecdd..6eaa9af7c5 100755 --- a/src/glsl/ShaderChunkSystem.re +++ b/src/glsl/ShaderChunkSystem.re @@ -60,7 +60,9 @@ varying vec3 v_texCoord; |},{| |}),{| -gl_FragColor = textureCube(u_skyboxCubeMapSampler, v_texCoord); +//gl_FragColor = textureCube(u_skyboxCubeMapSampler, v_texCoord); +vec3 dir = vec3(-v_texCoord.x, v_texCoord.y, v_texCoord.z); +gl_FragColor = textureCube(u_skyboxCubeMapSampler, dir); |})) |> set("webgl1_outline_origin_vertex", _buildChunk(({| diff --git a/src/glsl/skybox/webgl1_skybox_fragment.glsl b/src/glsl/skybox/webgl1_skybox_fragment.glsl index 8f759409e3..93929b31b0 100755 --- a/src/glsl/skybox/webgl1_skybox_fragment.glsl +++ b/src/glsl/skybox/webgl1_skybox_fragment.glsl @@ -4,5 +4,5 @@ varying vec3 v_texCoord; @body -gl_FragColor = textureCube(u_skyboxCubeMapSampler, v_texCoord); +gl_FragColor = textureCube(u_skyboxCubeMapSampler, vec3(-v_texCoord.x, v_texCoord.y, v_texCoord.z)); @end \ No newline at end of file diff --git a/src/service/record/all/sender/DrawGLSLService.re b/src/service/record/all/sender/DrawGLSLService.re index e9fccdab13..7b447f3175 100755 --- a/src/service/record/all/sender/DrawGLSLService.re +++ b/src/service/record/all/sender/DrawGLSLService.re @@ -10,7 +10,7 @@ let drawElement = let drawArray = (drawMode: int, verticesCount: int, gl) => { let startOffset = 0; - drawArray(drawMode, startOffset, verticesCount, gl); + drawArrays(drawMode, startOffset, verticesCount, gl); (); };