feat(skybox): fix draw cube texture->gl format

Wonder-Technology · May 14, 2019 · 2e14fd1 · 2e14fd1
1 parent c7ec5b9
commit 2e14fd1
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 100 deletions.
diff --git a/src/asset/converter/ConvertTexturesSystem.re b/src/asset/converter/ConvertTexturesSystem.re
@@ -30,22 +30,6 @@ let _buildDefaultName = textureIndex =>
    | None => false
    }; */
 
-let _getFormat = mimeType =>
-  switch (mimeType) {
-  | "image/png" => SourceTextureType.Rgba
-  | "image/jpeg" => SourceTextureType.Rgb
-  | mimeType =>
-    WonderLog.Log.fatal(
-      WonderLog.Log.buildFatalMessage(
-        ~title="_getFormat",
-        ~description={j|unknown mimeType|j},
-        ~reason="",
-        ~solution={j||j},
-        ~params={j|mimeType: $mimeType|j},
-      ),
-    )
-  };
-
 let convertToBasicSourceTextures =
     (({textures, images}: GLTFType.gltf) as gltf)
     : array(WDType.basicSourceTexture) =>
@@ -83,14 +67,9 @@ let convertToBasicSourceTextures =
                          source,
                        );
 
-                     /* _isBase64Image(uri) ?
-                        _getFormat(
-                          uri
-                          |> OptionService.unsafeGet
-                          |> BufferUtils.getBase64MimeType,
-                        ) : */
-
-                     _getFormat(mimeType |> OptionService.unsafeGet);
+                     TextureFormatService.getFormatByMimeType(
+                       mimeType |> OptionService.unsafeGet,
+                     );
                    },
                    /* TODO test */
                    flipY:

diff --git a/src/asset/generate/material/BuildLightMaterialDiffuseMapSystem.re b/src/asset/generate/material/BuildLightMaterialDiffuseMapSystem.re
@@ -122,22 +122,9 @@ let _convertBase64MimeTypeToWDBMimeType = mimeType =>
   };
 
 let _getImageMimeType = source =>
-  switch (FileNameService.getFileExtName(Obj.magic(source)##name)) {
-  | None
-  | Some(".png") => "image/png"
-  | Some(".jpg")
-  | Some(".jpeg") => "image/jpeg"
-  | mimeType =>
-    WonderLog.Log.fatal(
-      WonderLog.Log.buildFatalMessage(
-        ~title="_getImageMimeType",
-        ~description={j|unknown image mimeType: $mimeType|j},
-        ~reason="",
-        ~solution={j||j},
-        ~params={j||j},
-      ),
-    )
-  };
+  ImageService.getMimeTypeByExtname(
+    FileNameService.getFileExtName(Obj.magic(source)##name),
+  );
 
 let _getImageBase64 = (texture, source) =>
   _convertImageToBase64(

diff --git a/src/glsl/skybox/webgl1_skybox_fragment.glsl b/src/glsl/skybox/webgl1_skybox_fragment.glsl
diff --git a/src/glsl/skybox/webgl1_skybox_vertex.glsl b/src/glsl/skybox/webgl1_skybox_vertex.glsl
diff --git a/src/job/no_worker/loop/RenderSkyboxJob.re b/src/job/no_worker/loop/RenderSkyboxJob.re
@@ -38,69 +38,61 @@ let _unsafeGetNZImage = state =>
 let _unsafeGetSkyboxGameObject = state =>
   state.jobDataRecord.skyboxData.skyboxGameObject |> OptionService.unsafeGet;
 
-/* let  */
+let _getTextureFormat = (gl, imageExtname) =>
+  imageExtname
+  |> ImageService.getMimeTypeByExtname
+  |> TextureFormatService.getFormatByMimeType
+  |> TextureFormatService.getGlFormat(gl);
+
+let _drawTexture = (gl, target, source) => {
+  let glFormat =
+    _getTextureFormat(
+      gl,
+      FileNameService.getFileExtName(Obj.magic(source)##src),
+    );
 
-let _updateCubeTexture = (gl, target, state) => {
-  gl
-  |> WonderWebgl.Gl.texImage2D(
-       gl |> WonderWebgl.Gl.getTextureCubeMapPositiveX,
-       0,
-       gl |> WonderWebgl.Gl.getRgb,
-       gl |> WonderWebgl.Gl.getRgb,
-       gl |> WonderWebgl.Gl.getUnsignedByte,
-       _unsafeGetPXImage(state)
-       |> WonderWebgl.GlType.imageElementToTextureSource,
-     );
-  gl
-  |> WonderWebgl.Gl.texImage2D(
-       gl |> WonderWebgl.Gl.getTextureCubeMapNegativeX,
-       0,
-       gl |> WonderWebgl.Gl.getRgb,
-       gl |> WonderWebgl.Gl.getRgb,
-       gl |> WonderWebgl.Gl.getUnsignedByte,
-       _unsafeGetNXImage(state)
-       |> WonderWebgl.GlType.imageElementToTextureSource,
-     );
-  gl
-  |> WonderWebgl.Gl.texImage2D(
-       gl |> WonderWebgl.Gl.getTextureCubeMapPositiveY,
-       0,
-       gl |> WonderWebgl.Gl.getRgb,
-       gl |> WonderWebgl.Gl.getRgb,
-       gl |> WonderWebgl.Gl.getUnsignedByte,
-       _unsafeGetPYImage(state)
-       |> WonderWebgl.GlType.imageElementToTextureSource,
-     );
-  gl
-  |> WonderWebgl.Gl.texImage2D(
-       gl |> WonderWebgl.Gl.getTextureCubeMapNegativeY,
-       0,
-       gl |> WonderWebgl.Gl.getRgb,
-       gl |> WonderWebgl.Gl.getRgb,
-       gl |> WonderWebgl.Gl.getUnsignedByte,
-       _unsafeGetNYImage(state)
-       |> WonderWebgl.GlType.imageElementToTextureSource,
-     );
-  gl
-  |> WonderWebgl.Gl.texImage2D(
-       gl |> WonderWebgl.Gl.getTextureCubeMapPositiveZ,
-       0,
-       gl |> WonderWebgl.Gl.getRgb,
-       gl |> WonderWebgl.Gl.getRgb,
-       gl |> WonderWebgl.Gl.getUnsignedByte,
-       _unsafeGetPZImage(state)
-       |> WonderWebgl.GlType.imageElementToTextureSource,
-     );
   gl
   |> WonderWebgl.Gl.texImage2D(
-       gl |> WonderWebgl.Gl.getTextureCubeMapNegativeZ,
+       target,
        0,
-       gl |> WonderWebgl.Gl.getRgb,
-       gl |> WonderWebgl.Gl.getRgb,
+       glFormat,
+       glFormat,
        gl |> WonderWebgl.Gl.getUnsignedByte,
-       _unsafeGetNZImage(state)
-       |> WonderWebgl.GlType.imageElementToTextureSource,
+       source,
      );
+};
+
+let _updateCubeTexture = (gl, target, state) => {
+  _drawTexture(
+    gl,
+    gl |> WonderWebgl.Gl.getTextureCubeMapPositiveX,
+    _unsafeGetPXImage(state) |> WonderWebgl.GlType.imageElementToTextureSource,
+  );
+  _drawTexture(
+    gl,
+    gl |> WonderWebgl.Gl.getTextureCubeMapNegativeX,
+    _unsafeGetNXImage(state) |> WonderWebgl.GlType.imageElementToTextureSource,
+  );
+  _drawTexture(
+    gl,
+    gl |> WonderWebgl.Gl.getTextureCubeMapPositiveY,
+    _unsafeGetPYImage(state) |> WonderWebgl.GlType.imageElementToTextureSource,
+  );
+  _drawTexture(
+    gl,
+    gl |> WonderWebgl.Gl.getTextureCubeMapNegativeY,
+    _unsafeGetNYImage(state) |> WonderWebgl.GlType.imageElementToTextureSource,
+  );
+  _drawTexture(
+    gl,
+    gl |> WonderWebgl.Gl.getTextureCubeMapPositiveZ,
+    _unsafeGetPZImage(state) |> WonderWebgl.GlType.imageElementToTextureSource,
+  );
+  _drawTexture(
+    gl,
+    gl |> WonderWebgl.Gl.getTextureCubeMapNegativeZ,
+    _unsafeGetNZImage(state) |> WonderWebgl.GlType.imageElementToTextureSource,
+  );
 
   gl
   |> WonderWebgl.Gl.texParameteri(

diff --git a/src/service/atom/FileNameService.re b/src/service/atom/FileNameService.re
@@ -1,8 +1,8 @@
-let getFileExtName = fileName =>
-  switch ([%re {|/^.*(\.\w+)$/|}] |> Js.Re.exec(fileName)) {
+let getFileExtName = str =>
+  switch ([%re {|/^.*(\.\w+)$/|}] |> Js.Re.exec(str)) {
   | None => None
   | Some(result) =>
     let resultArr = Js.Re.matches(result);
 
-    resultArr[1] |. Some;
+    resultArr[1]->Some;
   };
diff --git a/src/service/atom/ImageService.re b/src/service/atom/ImageService.re
@@ -0,0 +1,17 @@
+let getMimeTypeByExtname = extname =>
+  switch (extname) {
+  | None
+  | Some(".png") => "image/png"
+  | Some(".jpg")
+  | Some(".jpeg") => "image/jpeg"
+  | mimeType =>
+    WonderLog.Log.fatal(
+      WonderLog.Log.buildFatalMessage(
+        ~title="getMimeTypeByExtname",
+        ~description={j|unknown image mimeType: $mimeType|j},
+        ~reason="",
+        ~solution={j||j},
+        ~params={j||j},
+      ),
+    )
+  };
diff --git a/src/service/primitive/texture/TextureFormatService.re b/src/service/primitive/texture/TextureFormatService.re
@@ -1,5 +1,21 @@
 open SourceTextureType;
 
+let getFormatByMimeType = mimeType =>
+  switch (mimeType) {
+  | "image/png" => SourceTextureType.Rgba
+  | "image/jpeg" => SourceTextureType.Rgb
+  | mimeType =>
+    WonderLog.Log.fatal(
+      WonderLog.Log.buildFatalMessage(
+        ~title="getFormatByMimeType",
+        ~description={j|unknown mimeType|j},
+        ~reason="",
+        ~solution={j||j},
+        ~params={j|mimeType: $mimeType|j},
+      ),
+    )
+  };
+
 let getGlFormat = (gl, format) =>
   switch (format) {
   | Rgb => gl |> WonderWebgl.Gl.getRgb

diff --git a/...service/state/sub/get_render_data/no_material_shader/GetSkyboxDataGetRenderDataService.re b/...service/state/sub/get_render_data/no_material_shader/GetSkyboxDataGetRenderDataService.re