feat(engine): update wonder.js version

Wonder-Technology · Jan 18, 2019 · 39abfae · 39abfae
1 parent b40eff5
commit 39abfae
Show file tree

Hide file tree

Showing 36 changed files with 364 additions and 138 deletions.
diff --git a/package.json b/package.json
@@ -69,11 +69,11 @@
     "wonder-bs-most": "^0.0.3",
     "wonder-commonlib": "0.2.23",
     "wonder-log": "^0.2.10",
-    "wonder.js": "1.0.0-alpha.24.1"
+    "wonder.js": "1.0.0-alpha.24.2"
   },
   "resolutions": {
     "wonder-log": "^0.2.10",
-    "wonder-webgl": "^0.0.5",
+    "wonder-webgl": "^0.0.6",
     "wonder-bs-sinon": "0.1.7",
     "component-classes": "1.2.5",
     "wonder-commonlib": "0.2.23",

diff --git a/publish/config/no_worker/job/init_jobs.json b/publish/config/no_worker/job/init_jobs.json
@@ -29,6 +29,9 @@
     {
         "name": "init_state"
     },
+    {
+        "name": "init_no_material_shader"
+    },
     {
         "name": "init_basic_material"
     },

diff --git a/publish/config/no_worker/job/loop_jobs.json b/publish/config/no_worker/job/loop_jobs.json
@@ -49,6 +49,9 @@
     {
         "name": "reallocate_cpu_memory"
     },
+    {
+        "name": "draw_outline"
+    },
     {
         "name": "render_imgui"
     }

diff --git a/publish/config/no_worker/pipeline/init_pipelines.json b/publish/config/no_worker/pipeline/init_pipelines.json
@@ -32,6 +32,9 @@
         {
           "name": "init_state"
         },
+        {
+          "name": "init_no_material_shader"
+        },
         {
           "name": "init_basic_material"
         },

diff --git a/publish/config/no_worker/pipeline/loop_pipelines.json b/publish/config/no_worker/pipeline/loop_pipelines.json
@@ -44,6 +44,9 @@
             {
                 "name": "front_render_light"
             },
+            {
+                "name": "draw_outline"
+            },
             {
                 "name": "render_imgui"
             }

diff --git a/publish/config/render/shader/shader_libs.json b/publish/config/render/shader/shader_libs.json
@@ -517,6 +517,61 @@
       }
     ]
   },
+  {
+    "name": "outline_expand",
+    "glsls": [
+      {
+        "type": "vs",
+        "name": "webgl1_outline_expand_vertex"
+      },
+      {
+        "type": "fs",
+        "name": "webgl1_outline_expand_fragment"
+      }
+    ],
+    "variables": {
+      "uniforms": [
+        {
+          "name": "u_outlineColor",
+          "from": "no_material_shader",
+          "field": "outlineExpand",
+          "type": "float3"
+        }
+      ]
+    }
+  },
+  {
+    "name": "outline_scaled_modelMatrix",
+    "glsls": [
+      {
+        "type": "vs",
+        "name": "modelMatrix_noInstance_vertex"
+      }
+    ],
+    "variables": {
+      "uniforms": [
+        {
+          "name": "u_mMatrix",
+          "field": "mMatrix",
+          "type": "mat4",
+          "from": "expand_model"
+        }
+      ]
+    }
+  },
+  {
+    "name": "outline_origin",
+    "glsls": [
+      {
+        "type": "vs",
+        "name": "webgl1_outline_origin_vertex"
+      },
+      {
+        "type": "fs",
+        "name": "webgl1_outline_origin_fragment"
+      }
+    ]
+  },
   {
     "name": "end",
     "variables": {

diff --git a/publish/config/render/shader/shaders.json b/publish/config/render/shader/shaders.json
@@ -154,5 +154,48 @@
         }
       ]
     }
+  ],
+  "no_material_shaders": [
+    {
+      "name": "outline_draw_origin_gameObjects",
+      "shader_libs": [
+        {
+          "type": "group",
+          "name": "top"
+        },
+        {
+          "name": "modelMatrix_noInstance"
+        },
+        {
+          "name": "outline_origin"
+        },
+        {
+          "type": "group",
+          "name": "end"
+        }
+      ]
+    },
+    {
+      "name": "outline_draw_expand_gameObjects",
+      "shader_libs": [
+        {
+          "type": "group",
+          "name": "top"
+        },
+        {
+          "name": "normal"
+        },
+        {
+          "name": "outline_scaled_modelMatrix"
+        },
+        {
+          "name": "outline_expand"
+        },
+        {
+          "type": "group",
+          "name": "end"
+        }
+      ]
+    }
   ]
 }
diff --git a/src/core/composable_component/header/utils/import/HeaderImportPackageUtils.re b/src/core/composable_component/header/utils/import/HeaderImportPackageUtils.re
@@ -208,7 +208,7 @@ let _init = allWDBGameObjectArrRef => {
   let editorState = StateEditorService.getState();
   let engineState = StateEngineService.unsafeGetState();
 
-  let engineState = engineState |> ShaderEngineService.clearShaderCache;
+  let engineState = engineState |> ShaderEngineService.clearInitShaderCache;
 
   let engineState = _reInitDefaultMaterials(editorState, engineState);
 

diff --git a/...om_component/addableComponent/ui/eventHandler/AddableComponentAddComponentEventHandler.re b/...om_component/addableComponent/ui/eventHandler/AddableComponentAddComponentEventHandler.re
@@ -4,7 +4,7 @@ open InspectorComponentType;
 
 module CustomEventHandler = {
   include EmptyEventHandler.EmptyEventHandler;
-  type prepareTuple = Wonderjs.GameObjectType.gameObject;
+  type prepareTuple = Wonderjs.GameObjectPrimitiveType.gameObject;
   type dataTuple = componentType;
   type return = unit;
 

diff --git a/...component/addableComponent/ui/eventHandler/AddableComponentRemoveComponentEventHandler.re b/...component/addableComponent/ui/eventHandler/AddableComponentRemoveComponentEventHandler.re
@@ -2,7 +2,7 @@ open InspectorComponentType;
 
 module CustomEventHandler = {
   include EmptyEventHandler.EmptyEventHandler;
-  type prepareTuple = Wonderjs.GameObjectType.gameObject;
+  type prepareTuple = Wonderjs.GameObjectPrimitiveType.gameObject;
   type dataTuple = componentType;
   type return = unit;
 

diff --git a/...Tree_Inspector/composable_component/renderGroup/meshRenderer/ui/MainEditorMeshRenderer.re b/...Tree_Inspector/composable_component/renderGroup/meshRenderer/ui/MainEditorMeshRenderer.re
@@ -2,7 +2,7 @@ open Wonderjs;
 
 type state = {
   drawMode: Js.Typed_array.Uint8Array.elt,
-  meshRenderer: GameObjectType.gameObject,
+  meshRenderer: GameObjectPrimitiveType.gameObject,
 };
 
 type action =

diff --git a/...composable_component/sceneTree_Inspector/eventHandler/SceneTreeNodeRenameEventHandlder.re b/...composable_component/sceneTree_Inspector/eventHandler/SceneTreeNodeRenameEventHandlder.re
@@ -2,7 +2,7 @@ open AppStore;
 
 module CustomEventHandler = {
   include EmptyEventHandler.EmptyEventHandler;
-  type prepareTuple = Wonderjs.GameObjectType.gameObject;
+  type prepareTuple = Wonderjs.GameObjectPrimitiveType.gameObject;
   type dataTuple = string;
   type return = unit;
 

diff --git a/...onents/composable_component/sceneTree/eventHandler/SceneTreeDragGameObjectEventHandler.re b/...onents/composable_component/sceneTree/eventHandler/SceneTreeDragGameObjectEventHandler.re
@@ -3,8 +3,8 @@ module CustomEventHandler = {
 
   type prepareTuple = unit;
   type dataTuple = (
-    Wonderjs.GameObjectType.gameObject,
-    Wonderjs.GameObjectType.gameObject,
+    Wonderjs.GameObjectPrimitiveType.gameObject,
+    Wonderjs.GameObjectPrimitiveType.gameObject,
   );
   type return = unit;
 

diff --git a/...ft_components/composable_component/sceneTree/eventHandler/SceneTreeDragWDBEventHandler.re b/...ft_components/composable_component/sceneTree/eventHandler/SceneTreeDragWDBEventHandler.re
@@ -3,8 +3,8 @@ module CustomEventHandler = {
 
   type prepareTuple = unit;
   type dataTuple = (
-    Wonderjs.GameObjectType.gameObject,
-    Wonderjs.GameObjectType.gameObject,
+    Wonderjs.GameObjectPrimitiveType.gameObject,
+    Wonderjs.GameObjectPrimitiveType.gameObject,
   );
   type return = unit;
 

diff --git a/...nts/composable_component/sceneTree/eventHandler/SceneTreeSelectCurrentNodeEventHandler.re b/...nts/composable_component/sceneTree/eventHandler/SceneTreeSelectCurrentNodeEventHandler.re
@@ -3,7 +3,7 @@ open UpdateStore;
 module CustomEventHandler = {
   include EmptyEventHandler.EmptyEventHandler;
   type prepareTuple = unit;
-  type dataTuple = Wonderjs.GameObjectType.gameObject;
+  type dataTuple = Wonderjs.GameObjectPrimitiveType.gameObject;
   type return = unit;
 
   let handleSelfLogic = ((store, dispatchFunc), (), uid) => {

diff --git a/src/core/composable_component/mainEditor/eventHandler/MainEditorDragWDBEventHandler.re b/src/core/composable_component/mainEditor/eventHandler/MainEditorDragWDBEventHandler.re
@@ -2,7 +2,7 @@ module CustomEventHandler = {
   include EmptyEventHandler.EmptyEventHandler;
 
   type prepareTuple = unit;
-  type dataTuple = Wonderjs.GameObjectType.gameObject;
+  type dataTuple = Wonderjs.GameObjectPrimitiveType.gameObject;
   type return = unit;
 
   let handleSelfLogic = ((store, dispatchFunc), (), wdbGameObjectUid) => {

diff --git a/src/engine/config/no_worker/job/init_jobs.json b/src/engine/config/no_worker/job/init_jobs.json
@@ -35,6 +35,9 @@
     {
         "name": "init_state"
     },
+    {
+        "name": "init_no_material_shader"
+    },
     {
         "name": "init_basic_material"
     },

diff --git a/src/engine/config/no_worker/job/loop_jobs.json b/src/engine/config/no_worker/job/loop_jobs.json
@@ -52,6 +52,9 @@
     {
         "name": "render_imgui"
     },
+    {
+        "name": "draw_outline"
+    },
     {
         "name": "prepare_render_scene_view"
     },

diff --git a/src/engine/config/no_worker/pipeline/init_pipelines.json b/src/engine/config/no_worker/pipeline/init_pipelines.json
@@ -38,6 +38,9 @@
       {
         "name": "init_state"
       },
+      {
+        "name": "init_no_material_shader"
+      },
       {
         "name": "init_basic_material"
       },

diff --git a/src/engine/config/no_worker/pipeline/loop_pipelines.json b/src/engine/config/no_worker/pipeline/loop_pipelines.json
@@ -74,6 +74,9 @@
             {
                 "name": "front_render_light"
             },
+            {
+                "name": "draw_outline"
+            },
             {
                 "name": "render_imgui"
             },

diff --git a/src/engine/config/render/shader/shader_libs.json b/src/engine/config/render/shader/shader_libs.json
@@ -517,6 +517,61 @@
       }
     ]
   },
+  {
+    "name": "outline_expand",
+    "glsls": [
+      {
+        "type": "vs",
+        "name": "webgl1_outline_expand_vertex"
+      },
+      {
+        "type": "fs",
+        "name": "webgl1_outline_expand_fragment"
+      }
+    ],
+    "variables": {
+      "uniforms": [
+        {
+          "name": "u_outlineColor",
+          "from": "no_material_shader",
+          "field": "outlineExpand",
+          "type": "float3"
+        }
+      ]
+    }
+  },
+  {
+    "name": "outline_scaled_modelMatrix",
+    "glsls": [
+      {
+        "type": "vs",
+        "name": "modelMatrix_noInstance_vertex"
+      }
+    ],
+    "variables": {
+      "uniforms": [
+        {
+          "name": "u_mMatrix",
+          "field": "mMatrix",
+          "type": "mat4",
+          "from": "expand_model"
+        }
+      ]
+    }
+  },
+  {
+    "name": "outline_origin",
+    "glsls": [
+      {
+        "type": "vs",
+        "name": "webgl1_outline_origin_vertex"
+      },
+      {
+        "type": "fs",
+        "name": "webgl1_outline_origin_fragment"
+      }
+    ]
+  },
   {
     "name": "end",
     "variables": {