fix(api): fix CoordinateAPI->convertWorldToScreen: change result to o…

…ption
Wonder-Technology · May 9, 2019 · 9dd6c50 · 9dd6c50
1 parent 8567055
commit 9dd6c50
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/src/api/CoordinateAPI.re b/src/api/CoordinateAPI.re
@@ -10,4 +10,5 @@ let convertWorldToScreen =
     cameraProjection,
     (worldX, worldY, worldZ, screenWidth, screenHeight),
     state,
-  );
+  )
+  |> Js.Nullable.fromOption;
diff --git a/src/service/state/main/coordinate/CoordinateMainService.re b/src/service/state/main/coordinate/CoordinateMainService.re
@@ -22,13 +22,14 @@ let convertWorldToScreen =
     |> Vector4Service.transformMat4Tuple((worldX, worldY, worldZ, 1.));
 
   w < 0. ?
-    ((-100.), (-100.)) :
+    None :
     {
       let (x, y, z) as ndcSpacePos = (x /. w, y /. w, z /. w);
 
       (
         Js.Math.round((x +. 1.) /. 2. *. screenWidth),
         Js.Math.round((1. -. y) /. 2. *. screenHeight),
-      );
+      )
+      ->Some;
     };
 };
diff --git a/src/service/state/main/data/StateDataMainType.re b/src/service/state/main/data/StateDataMainType.re
@@ -305,7 +305,7 @@ and apiRecord = {
       (component, state) => GameObjectPrimitiveType.gameObject,
     "convertWorldToScreen":
       (int, int, (float, float, float, float, float), state) =>
-      (float, float),
+      Js.Nullable.t((float, float)),
     "getRenderWorkerCustomData":
       state => CustomWorkerDataType.customDataFromRenderWorkerToMainWorker,
   },

diff --git a/test/unit/api/CoordinateAPI_test.re b/test/unit/api/CoordinateAPI_test.re
@@ -16,7 +16,7 @@ let _ =
     describe("convertWorldToScreen", () =>
       describe("convert world coordinate to screen coordinate", () => {
         let _test =
-            (localPosition, (worldX, worldY, worldZ), (screenX, screenY)) => {
+            (localPosition, (worldX, worldY, worldZ), screenCoordinate) => {
           let screenWidth = 1000.;
           let screenHeight = 2000.;
           let (
@@ -61,24 +61,32 @@ let _ =
             (worldX, worldY, worldZ, screenWidth, screenHeight),
             state,
           )
-          |> expect == (screenX, screenY);
+          |> expect == screenCoordinate;
         };
 
         test("test1", () =>
-          _test((0., 1., 1.), (0., 0., 0.), (500., 1000.))
+          _test(
+            (0., 1., 1.),
+            (0., 0., 0.),
+            Js.Nullable.return((500., 1000.)),
+          )
         );
         test("test2", () =>
-          _test((0., 0., 1.), (1., 0.5, 0.), (2232., 134.))
+          _test(
+            (0., 0., 1.),
+            (1., 0.5, 0.),
+            Js.Nullable.return((2232., 134.)),
+          )
         );
 
         describe("fix bug", () =>
           describe(
             "if world coordinate is in the reverse direction, screen coordinate should be out of screen",
             () =>
             test(
-              "if the w(the coordinate(x,y,z,w) after perspective transform) < 0.0, set screen coordinate to be (-100.0, -100.0)",
+              "if the w(the coordinate(x,y,z,w) after perspective transform) < 0.0, set screen coordinate to be undefined",
               () =>
-              _test((0., 0., 1.), (0., 0., 100.), ((-100.), (-100.)))
+              _test((0., 0., 1.), (0., 0., 100.), Js.Nullable.undefined)
             )
           )
         );