Skip to content

Commit

Permalink
feat(asset-bundle): fix generate single rab: added light material sho…
Browse files Browse the repository at this point in the history 
…uldn't add to basic material resource data
  • Loading branch information
@yyc-git
yyc-git committed Jun 1, 2019
1 parent d1fc979 commit b149ac7
Show file tree
Hide file tree
Showing 2 changed files with 151 additions and 122 deletions.
14 changes: 1 addition & 13 deletions ...osable_component/header/atom_component/asset_bundle/HeaderAssetBundleGenerateSingleRAB.re
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,6 @@ module Method = {
let value = ValueNodeSelectTreeService.getValue(nodeData);

switch (ValueNodeSelectTreeService.getType(nodeData)) {
| "texture" => (
basicMaterials,
lightMaterials,
_addResourceData(
textures,
value,
HeaderAssetBundleType.convertValueToTextureData,
),
geometrys,
scriptEventFunctionDataArr,
scriptAttributeDataArr,
)
| "basicMaterial" => (
_addResourceData(basicMaterials, value, value =>
value
Expand All @@ -142,7 +130,7 @@ module Method = {
)
| "lightMaterial" => (
basicMaterials,
_addResourceData(basicMaterials, value, value =>
_addResourceData(lightMaterials, value, value =>
value
|> HeaderAssetBundleType.convertValueToMaterialData
|> _getMaterialComponentFromMaterialData
Expand Down
259 changes: 150 additions & 109 deletions test/unit/composable_component/header/Header_assetBundle_generateSingleRAB_test.re
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,120 +197,161 @@ let _ =
})
);

describe("add lightMaterial contained textureData to textures", () =>
testPromise(
"if selectTree->textures not has selectTree->lightMaterials contained textureData, resourceData->textures should has them",
() => {
describe("test resource data->material data", () => {
describe(
"add light material contained textureData to textures", () =>
testPromise(
"if selectTree->textures not has selectTree->lightMaterials contained textureData, resourceData->textures should has them",
() => {
let addedMaterialNodeId1 =
MainEditorAssetIdTool.getNewAssetId();
MainEditorAssetHeaderOperateNodeTool.addMaterial();

let addedMaterialNodeId2 =
MainEditorAssetIdTool.getNewAssetId();
MainEditorAssetHeaderOperateNodeTool.addMaterial();

let addedFolderNodeId1 =
MainEditorAssetIdTool.getNewAssetId();
MainEditorAssetHeaderOperateNodeTool.addFolder();

MainEditorAssetTreeTool.Select.selectFolderNode(
~nodeId=addedFolderNodeId1,
(),
);

MainEditorAssetUploadTool.loadOneTexture(
~imgName="image1.png",
~imgSrc=Base64Tool.buildFakeBase64_1(),
(),
)
|> then_(uploadedTextureNodeId1 =>
MainEditorAssetUploadTool.loadOneTexture(
~imgName="image2.png",
~imgSrc=Base64Tool.buildFakeBase64_2(),
(),
)
|> then_(uploadedTextureNodeId2 => {
MainEditorLightMaterialForAssetTool.dragAssetTextureToMap(
~currentNodeId=addedMaterialNodeId2,
~textureNodeId=uploadedTextureNodeId2,
~material=
MainEditorAssetMaterialNodeTool.getMaterialComponent(
~nodeId=addedMaterialNodeId2,
(),
),
(),
);

let selectTree =
HeaderAssetBundleTool.GenerateSingleRAB.buildSelectTreeForGenerateSingleRAB
|> StateLogicService.getStateToGetData
|> SelectTreeTool.setSelectForSelectTree(
true,
MainEditorAssetMaterialNodeTool.getMaterialName(
~nodeId=addedMaterialNodeId2,
(),
),
)
|> SelectTreeTool.setSelectForSelectTree(
true,
MainEditorAssetTextureNodeTool.getTextureName(
~nodeId=uploadedTextureNodeId1,
(),
),
);

let (
basicMaterials,
lightMaterials,
textures,
geometrys,
scriptEventFunctionDataArr,
scriptAttributeDataArr,
imageDataMap,
) =
HeaderAssetBundleTool.GenerateSingleRAB.generateSingleRABResourceData(
selectTree,
)
|> StateLogicService.getStateToGetData;

let editorState = StateEditorService.getState();
(lightMaterials, textures)
|> expect
== (
[|
MainEditorAssetMaterialNodeTool.getMaterialComponent(
~nodeId=addedMaterialNodeId2,
(),
),
|],
[|
HeaderAssetBundleTool.GenerateSingleRAB.buildTextureData(
MainEditorAssetTextureNodeTool.getTextureComponent(
uploadedTextureNodeId1,
editorState,
),
MainEditorAssetTextureNodeTool.getTextureImageDataIndex(
uploadedTextureNodeId1,
editorState,
),
),
HeaderAssetBundleTool.GenerateSingleRAB.buildTextureData(
MainEditorAssetTextureNodeTool.getTextureComponent(
uploadedTextureNodeId2,
editorState,
),
MainEditorAssetTextureNodeTool.getTextureImageDataIndex(
uploadedTextureNodeId2,
editorState,
),
),
|],
)
|> resolve;
})
);
},
)
);

describe("fix bug", () =>
test(
"added light material shouldn't add to basic material resource data",
() => {
let addedMaterialNodeId1 =
MainEditorAssetIdTool.getNewAssetId();
MainEditorAssetHeaderOperateNodeTool.addMaterial();

let addedMaterialNodeId2 =
MainEditorAssetIdTool.getNewAssetId();
MainEditorAssetHeaderOperateNodeTool.addMaterial();
let selectTree =
HeaderAssetBundleTool.GenerateSingleRAB.buildSelectTreeForGenerateSingleRAB
|> StateLogicService.getStateToGetData
|> SelectTreeTool.setSelectForSelectTree(
true,
MainEditorAssetMaterialNodeTool.getMaterialName(
~nodeId=addedMaterialNodeId1,
(),
),
);

let addedFolderNodeId1 = MainEditorAssetIdTool.getNewAssetId();
MainEditorAssetHeaderOperateNodeTool.addFolder();

MainEditorAssetTreeTool.Select.selectFolderNode(
~nodeId=addedFolderNodeId1,
(),
);

MainEditorAssetUploadTool.loadOneTexture(
~imgName="image1.png",
~imgSrc=Base64Tool.buildFakeBase64_1(),
(),
)
|> then_(uploadedTextureNodeId1 =>
MainEditorAssetUploadTool.loadOneTexture(
~imgName="image2.png",
~imgSrc=Base64Tool.buildFakeBase64_2(),
(),
)
|> then_(uploadedTextureNodeId2 => {
MainEditorLightMaterialForAssetTool.dragAssetTextureToMap(
~currentNodeId=addedMaterialNodeId2,
~textureNodeId=uploadedTextureNodeId2,
~material=
MainEditorAssetMaterialNodeTool.getMaterialComponent(
~nodeId=addedMaterialNodeId2,
(),
),
(),
);

let selectTree =
HeaderAssetBundleTool.GenerateSingleRAB.buildSelectTreeForGenerateSingleRAB
|> StateLogicService.getStateToGetData
|> SelectTreeTool.setSelectForSelectTree(
true,
MainEditorAssetMaterialNodeTool.getMaterialName(
~nodeId=addedMaterialNodeId2,
(),
),
)
|> SelectTreeTool.setSelectForSelectTree(
true,
MainEditorAssetTextureNodeTool.getTextureName(
~nodeId=uploadedTextureNodeId1,
(),
),
);

let (
basicMaterials,
lightMaterials,
textures,
geometrys,
scriptEventFunctionDataArr,
scriptAttributeDataArr,
imageDataMap,
) =
HeaderAssetBundleTool.GenerateSingleRAB.generateSingleRABResourceData(
selectTree,
)
|> StateLogicService.getStateToGetData;

let editorState = StateEditorService.getState();
(lightMaterials, textures)
|> expect
== (
[|
MainEditorAssetMaterialNodeTool.getMaterialComponent(
~nodeId=addedMaterialNodeId2,
(),
),
|],
[|
HeaderAssetBundleTool.GenerateSingleRAB.buildTextureData(
MainEditorAssetTextureNodeTool.getTextureComponent(
uploadedTextureNodeId1,
editorState,
),
MainEditorAssetTextureNodeTool.getTextureImageDataIndex(
uploadedTextureNodeId1,
editorState,
),
),
HeaderAssetBundleTool.GenerateSingleRAB.buildTextureData(
MainEditorAssetTextureNodeTool.getTextureComponent(
uploadedTextureNodeId2,
editorState,
),
MainEditorAssetTextureNodeTool.getTextureImageDataIndex(
uploadedTextureNodeId2,
editorState,
),
),
|],
)
|> resolve;
})
);
},
)
);
let (
basicMaterials,
lightMaterials,
textures,
geometrys,
scriptEventFunctionDataArr,
scriptAttributeDataArr,
imageDataMap,
) =
HeaderAssetBundleTool.GenerateSingleRAB.generateSingleRABResourceData(
selectTree,
)
|> StateLogicService.getStateToGetData;

basicMaterials |> expect == [||];
})
);
});

describe("test resource data->geometrys", () =>
testPromise("test", () =>
Expand Down

0 comments on commit b149ac7

Please sign in to comment.