feat(script-component): add script component logic(draft); add "add s…

…cript event function" logic(draft);
Wonder-Technology · Apr 3, 2019 · af77d66 · af77d66
1 parent 5185889
commit af77d66
Show file tree

Hide file tree

Showing 27 changed files with 1,685 additions and 149 deletions.
diff --git a/.cz-config.js b/.cz-config.js
@@ -35,6 +35,7 @@ module.exports = {
     { name: "event" },
     { name: "engine" },
     { name: "camera" },
+    { name: "script-component" },
     { name: "transform" },
     { name: "state" },
     { name: "component" },

diff --git a/...set/composable_component/header/eventHandler/AssetHeaderAddScriptAttributeEventHandler.re b/...set/composable_component/header/eventHandler/AssetHeaderAddScriptAttributeEventHandler.re
@@ -22,7 +22,7 @@ module CustomEventHandler = {
         );
 
     let editorState =
-      ScriptAttributeNodeAssetEditorService.addScriptNodeToAssetTree(
+      ScriptAttributeNodeAssetEditorService.addScriptAttributeNodeToAssetTree(
         targetTreeNode,
         ScriptAttributeNodeAssetService.buildNode(
           ~nodeId=newNodeId,

diff --git a/...composable_component/header/eventHandler/AssetHeaderAddScriptEventFunctionEventHandler.re b/...composable_component/header/eventHandler/AssetHeaderAddScriptEventFunctionEventHandler.re
@@ -22,7 +22,7 @@ module CustomEventHandler = {
         );
 
     let editorState =
-      ScriptEventFunctionNodeAssetEditorService.addScriptNodeToAssetTree(
+      ScriptEventFunctionNodeAssetEditorService.addScriptEventFunctionNodeToAssetTree(
         targetTreeNode,
         ScriptEventFunctionNodeAssetService.buildNode(
           ~nodeId=newNodeId,

diff --git a/...sable_component/renderGroup/material/eventHandler/MainEditorChangeMaterialEventHandler.re b/...sable_component/renderGroup/material/eventHandler/MainEditorChangeMaterialEventHandler.re
@@ -22,17 +22,6 @@ module CustomEventHandler = {
       ) => {
     let editorState = StateEditorService.getState();
 
-    /* let editorState =
-       switch (materialNodeId) {
-       | None => editorState
-       | Some(materialNodeId) =>
-         MaterialNodeIdMapAssetEditorService.setNodeId(
-           targetMaterial,
-           materialNodeId,
-           editorState,
-         )
-       }; */
-
     let editorState =
       materialNodeId
       |> OptionService.eitherWithNoData(

diff --git a/...nt/sceneTree_Inspector/composable_component/renderGroup/material/ui/MainEditorMaterial.re b/...nt/sceneTree_Inspector/composable_component/renderGroup/material/ui/MainEditorMaterial.re
@@ -177,6 +177,66 @@ module Method = {
         )
       );
   };
+
+  let renderSelectMaterial =
+      (languageType, {state, send}: ReasonReact.self('a, 'b, 'c)) =>
+    <div className="inspector-item">
+      <div
+        className="item-header"
+        title={
+          LanguageUtils.getInspectorLanguageDataByType(
+            "material-material-describe",
+            languageType,
+          )
+        }>
+        {DomHelper.textEl("Material")}
+      </div>
+      <div className="item-content">
+        <div className="inspector-select">
+          <div
+            className="select-name" onClick={_e => send(ShowMaterialGroup)}>
+            {
+              DomHelper.textEl(
+                NodeNameAssetLogicService.getMaterialNodeName(
+                  ~material=state.currentMaterial,
+                  ~type_=state.materialType,
+                  ~engineState=StateEngineService.unsafeGetState(),
+                ),
+              )
+            }
+          </div>
+          <div className="select-img" onClick={_e => send(ShowMaterialGroup)}>
+            <img src="./public/img/select.png" />
+          </div>
+        </div>
+      </div>
+    </div>;
+
+  let renderMaterialGroup =
+      (currentSceneTreeNode, {state, send}: ReasonReact.self('a, 'b, 'c)) =>
+    <div className="select-component-content">
+      <div className="select-component-item">
+        <div className="select-item-header">
+          {DomHelper.textEl("Material")}
+        </div>
+        <div className="select-item-body">
+          {
+            ReasonReact.array(
+              showMaterialAssets(
+                send,
+                currentSceneTreeNode,
+                state.currentMaterial,
+                state.materialType,
+              ),
+            )
+          }
+        </div>
+      </div>
+      <div
+        className="select-component-bg"
+        onClick={_e => send(HideMaterialGroup)}
+      />
+    </div>;
 };
 
 let component = ReasonReact.reducerComponent("MainEditorMaterial");
@@ -219,65 +279,6 @@ let reducer =
     )
   };
 
-let _renderSelectMaterial =
-    (languageType, {state, send}: ReasonReact.self('a, 'b, 'c)) =>
-  <div className="inspector-item">
-    <div
-      className="item-header"
-      title={
-        LanguageUtils.getInspectorLanguageDataByType(
-          "material-material-describe",
-          languageType,
-        )
-      }>
-      {DomHelper.textEl("Material")}
-    </div>
-    <div className="item-content">
-      <div className="inspector-select">
-        <div className="select-name" onClick={_e => send(ShowMaterialGroup)}>
-          {
-            DomHelper.textEl(
-              NodeNameAssetLogicService.getMaterialNodeName(
-                ~material=state.currentMaterial,
-                ~type_=state.materialType,
-                ~engineState=StateEngineService.unsafeGetState(),
-              ),
-            )
-          }
-        </div>
-        <div className="select-img" onClick={_e => send(ShowMaterialGroup)}>
-          <img src="./public/img/select.png" />
-        </div>
-      </div>
-    </div>
-  </div>;
-
-let _renderMaterialGroup =
-    (currentSceneTreeNode, {state, send}: ReasonReact.self('a, 'b, 'c)) =>
-  <div className="select-component-content">
-    <div className="select-component-item">
-      <div className="select-item-header">
-        {DomHelper.textEl("Material")}
-      </div>
-      <div className="select-item-body">
-        {
-          ReasonReact.array(
-            Method.showMaterialAssets(
-              send,
-              currentSceneTreeNode,
-              state.currentMaterial,
-              state.materialType,
-            ),
-          )
-        }
-      </div>
-    </div>
-    <div
-      className="select-component-bg"
-      onClick={_e => send(HideMaterialGroup)}
-    />
-  </div>;
-
 let render =
     (
       (uiState, dispatchFunc),
@@ -288,10 +289,11 @@ let render =
     LanguageEditorService.unsafeGetType |> StateLogicService.getEditorState;
 
   <article key="MainEditorMaterial" className="wonder-inspector-material">
-    {_renderSelectMaterial(languageType, self)}
+    {Method.renderSelectMaterial(languageType, self)}
     {
       state.isShowMaterialGroup ?
-        _renderMaterialGroup(currentSceneTreeNode, self) : ReasonReact.null
+        Method.renderMaterialGroup(currentSceneTreeNode, self) :
+        ReasonReact.null
     }
     <div className="material-value">
       <Select