feat(拼接模式): fix code and uml: add pbr material

Author: yyc-git

doc/TODO.org

@@ -340,7 +340,12 @@ finish TODO
 
 
 
+* TODO fix: add PBRMaterial
 
+1,3,4
+2
+
+_getAllFakeGameObjects return 2 gameObjects
 
 
 * TODO 前言

packages/拼接模式/article.md

@@ -7,6 +7,8 @@
 ## 需求
 
 
+TODO 介绍材质种类，功能
+
 我们需要实现一个材质系统，默认支持方向光，并且能选择性地支持贴图、Instance(一种批量渲染的技术)
 
 
@@ -16,6 +18,9 @@
 
 如上图所示，一个材质使用一个Shader，一个Shader有一套GLSL，即一个顶点着色器的GLSL和一个片元着色器的GLSL
 
+
+TODO 8套GLSL
+
 一种实现的方案是为选择性支持的每个功能都写一套GLSL，也就是一共写4套GLSL，它们支持的功能分别是：
 [支持方向光，支持贴图，支持Instance]
 [支持方向光，支持贴图，不支持Instance]
@@ -530,9 +535,13 @@ GLSL Chunk是多个小块的GLSL代码文件，由引擎给出
 引擎需要进行预处理，在gulp任务中调用ChunkConverter，将所有的GLSL Chunk合并为一个Merged GLSL Chunk
 Merged GLSL Chunk是一个可被调用的Typescript或者Rescript文件
 
+TODO Send Data是多个
 
 Send Data是获得和发送顶点数据和Uniform数据的数据，如Send Data包括了getData函数和sendData函数，前者返回要发送的数据，后者发送数据
 
+
+TODO Target GLSL是多个
+
 Target GLSL是支持某些功能的一套GLSL，相当于之前的BasicMaterialShaderGLSL（Add Define），两者的区别是Target GLSL没有预定义的宏，它只有支持的功能的GLSL，没有其它的分支
 
 
@@ -541,6 +550,10 @@ Target GLSL是支持某些功能的一套GLSL，相当于之前的BasicMaterialS
 
 Engine是引擎的门户，负责封装API给Client
 
+<!-- TODO rename InitMaterialShader to InitBasicMaterialShader -->
+<!-- TODO add InitPBRMaterialShader? -->
+TODO 合并为InitMaterialShader
+
 InitMaterialShader负责初始化材质的Shader，具体包括下面的步骤：
 通过调用ChunkHandler的buildGLSL函数，按照GLSL Config将GLSL Chunk中对应的小块GLSL拼接为Target GLSL，然后使用它创建材质的Shader；
 通过调用ChunkHandler的getSendData函数，从GLSL Config中获得Send Data
@@ -564,8 +577,7 @@ Render负责渲染
 
 ## 给出代码
 
-TODO continue
-
+TODO fix
 首先，我们看下用户的代码
 然后，我们看下创建EngineState的代码
 然后，我们看下创建场景的代码

packages/拼接模式/role_abstract/role_abstract.drawio

@@ -1 +1 @@
-<mxfile host="Electron" modified="2023-04-27T02:18:20.869Z" agent="5.0 (Macintosh; Intel Mac OS X 11_4_0) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.6.13 Chrome/89.0.4389.128 Electron/12.0.7 Safari/537.36" etag="nijkbdqupBokco0TUPg-" version="14.6.13" type="device"><diagram id="smxkf3WdtkahfNl1DTkC" name="第 1 页">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</diagram></mxfile>
+<mxfile host="Electron" modified="2023-04-27T09:03:38.986Z" agent="5.0 (Macintosh; Intel Mac OS X 11_4_0) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.6.13 Chrome/89.0.4389.128 Electron/12.0.7 Safari/537.36" etag="Mok6hlzM0dqKhdjGmmBt" version="14.6.13" type="device"><diagram id="smxkf3WdtkahfNl1DTkC" name="第 1 页">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</diagram></mxfile>

packages/拼接模式/story_before/story_before.drawio

@@ -1 +1 @@
-<mxfile host="Electron" modified="2023-04-27T00:25:19.729Z" agent="5.0 (Macintosh; Intel Mac OS X 11_4_0) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.6.13 Chrome/89.0.4389.128 Electron/12.0.7 Safari/537.36" etag="9e7phfxWuU8oBg-B38xE" version="14.6.13" type="device"><diagram id="aFtpn4q2CuxT0qsXSHBK" name="第 1 页">7Vlbl6I4EP41PHYfCALy6AV79xzn7Oz0w848RoiQ3UjcEFvdX78JFDdB7Wkv7cP4YqqSVJKqry4Jhj1Z7V4EXidfeESYgcxoZ9hTAyHL8Tz1pzl74FjILDixoBHwasYr/Y8Asxy2oRHJWgMl50zSdZsZ8jQloWzxsBB82x625Ky96hrHpMN4DTHrcv+ikUwK7hB5Nf83QuOkXNly/aJnhcvBcJIswRHfNlh2YNgTwbksWqvdhDCtvVIvxbzZkd5qY4Kk8j0TltPFn8tsMZskroP8Bdok34ZPll2IecNsAyc2kMuUwPGSK7lq23IPunD/3fCy4ynLLTVSA2y03tWdqhXn/4FjjCeG7xiBa/i2MQxKuWqHhWgYWCinWgUpPa11c7NiM4FXqjneJlSS1zUONX+rkKZ4iVwxRVm6GwyjQaM6SnMMTNgsoMpG1XJNrYEi34iQZNdggRZfCF8RKfZqCPQ6PlgUMO2bQG9rgHgO8JIGOOwBMDGAMq5k13ZTDTDdz5ixx4oHaiWRwjWQXMiExzzFLKi5Y8E3aUT0Mlpx9Zg552vQ9N9Eyj2oE28kb9shk1iUyrZcxSBp1CJ3VH6Hsbr9Qy/17AA13cHKObEH4qi9Mr4RITmhE1CBPvdJqwrCsKRvbX/vsxBM/cpp7hiABtcftNBgmejAykorMZEwremgh5Ksc5KKM3ck5ZCpTvRxFKEOiiaMEliriaWGzW/gX/bwwL9889ls/FDH2yyvx9vcmznb4DOcS+lT7L+XLqKJhvtosvafnNo3qa9EUHV4IipmyzE7jvtxr3MgR+eYPzHOu7Z3XmRS50wWLFPVz2VG1J8ZkYtXOoOxLjUlS7xhsmK2J7Q20UmjBXshDjnZGqcfz+NjnNHwC1bQoZi9qhKGiJf567yxi0K+e3pzR3J8uGdUuYWwzyf5ReFA80XFwOE/ce5Wf2ykEkPKLAQ4dq4TjVyvHY1c3+7EnwHqiT+WfasA5D0IWkdRpOYpzGrl/4Lsw0DWst6DWfOumB0+RIV6u7xX3lfPJj7LeqjM5/+yCwy8+n3hsiLT7BgmSOM80N61GD+83jxcMe59Bl7P3XQjnCW5fAD3SL9EKTLlOuZrzozqc154xb1+LOm/mVpWGRYABd6hPY/cca91M7X60sc1agUjGBjjmTEK8mcq1faPlgk9KJvjBWFtZGBG41SXCcqY+ro11q5GQ8xG0LGiUVSAkKjN4UUuT8NgrZWXq9MZG860FxgnXaDj1NWrKKxiNB8e+5zdfEauM2xZunxa+iiCyrDhtmfw5TIjt4GK/0kJrPTxkOFMFaAtN3+817EydNz/op5PVcrC+8YAAP/xCFSVq4ePYzV8CpnvnD8c3jeCoW4+v9ZDu4paUx3EAk9HsNHwvTeaB4pgZRV6cQR7UtUJstx2CEOXhbA7xKzu+/3vKZU9F9k7V3/+oFP9deo923HvWe91H6m/kfT+mnF9rx2Pqg+bzVLYHVxFNYqsvxMWoKs/t9rB/w==</diagram></mxfile>
+<mxfile host="Electron" modified="2023-04-27T06:04:14.650Z" agent="5.0 (Macintosh; Intel Mac OS X 11_4_0) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.6.13 Chrome/89.0.4389.128 Electron/12.0.7 Safari/537.36" etag="SF6WbUYw2a9CtIwY-8US" version="14.6.13" type="device"><diagram id="aFtpn4q2CuxT0qsXSHBK" name="第 1 页">7Vpbk6o4EP41PM4pEiTCoxdm9lTN1M6ltvbsY5QI7CJxIY66v34TCEIAxTOCemrGF0kn6STdX1/SoBmT5fYhxiv/ibok1KDubjVjqkEIDBPwP0HZZRQb6RnBiwNXDioIb8F/RBLzYevAJYkykFEasmClEuc0isicKTQcx3SjDlvQUF11hT1SI7zNcVin/hm4zM+oFhwW9N9I4Pn5ygDZWc8S54PlSRIfu3RTIhmOZkxiSln2tNxOSCiEl8slm3d/oHe/sZhE7JQJi+nsZZHM7ic+MqE9g2v/1boDRsbmHYdreWINopAzHC8o58u3zXZSFujfNc077pJUUyM+wICrbdHJn7z03zG18USzTc1Bmm1olpPz5TvMWMuBmXD2q0Aup5V4XC/D+xgv+eN44weMvK3wXNA3HGic5rNlyFtAdEvFCNDwjlwdA11uVqLKgPvlylKTgnwnMSPbEklK8YHQJWHxjg+RvaYtNZpDWpftTQGQoSlpfgkcxkASsQSlt+dd6I0/SNX9jBobtFgRK3E5rmWTxsynHo1w6BTUcUzXkUvEMkJwxZhHSldS0n8TxnZSnHjNqKqHhOE4FzZAnEAiV2luA/ZDjhXPf4mlvpmyNd3KldPGTjYO6iuh63hOjshEikCc+6hWYxJiFryr9t6kITn1mQapYUg0IHugoAHosKJlLhWPMDmtbKBVTqCNU3bmGqcUMvsTfRxFsIaiSRgQuVYZSyWd92BfhlWxL1v/ppd+sGZtYNhgbag3Yxtcw7i4POPdj9xERKNkPqJZ2E/a2pVbzyQO+OFJvCcqhlkz3I9bnSljdIr5I+OGXVvnWSo1W6JgHqp+LjLC5sgIEV6KCBbWW1OywOuQ7YnqBGUTtTCakWdxlZKscPTxOD7GSTB/whw6AQ7feApD4ofHt8fSLjL+6PjmDsT4+S4MuFnERnuQn2UG9DjbE/D8Hy81q9/XjLMheRSSODa78UZoqHojZBs1/zOADf4HGH05oOGNoHXkunwex6wQ/hdkbwayAJyCWf2imLVuIkPtL+7l99XWwAfATUU++0svcmDn94VT9fJ98+JZXuKA55c/NuYTC8z31zwj+TVyzLaLX6Nku9NnowCvalX5Lktm5UReGiYvepWqXk5v7io1vAbM2+Dq4sRP+UvXNBJ1RN6MqIjYgnIfiHOeWaDoPhI01xUAyJ26RMGwqs8DFYqu6gqgKfh3kelpzkAb32sjJy0y8mf7YJLXgLJHPCOhigwcBl4kkjyuTHFZHgtTC+Y4HMmOZeC6GQgJ3xyepfwEDFZCeKk4zbFmThuBcdQEaka9r2nLVbRy2bjJ2PVvEJmWoum8MPhRBO2L9uoMulgkpB+o2FdKP3Ibn4c44dcHxcxvr7aZu47Ll1nSqVxYeFcaIMF/2APtLxvV0mYBn4znifMt67IeDNbjeVevSbjXmgon5gyFBxtZp95Hb8iD5XeIsz3YHc9OIECqC4PnubAL+Kz625fvUcAayhAXzv7sQS37q+V7hokume/VXzG8kujykkH2UPVHANZFA9CgH9E03lfQNQJfa1RrSX6VTLkx1LTGt14ubycmwsAwe4sjjedqq9z2kgjfRhg5OTqoiDlsK0fyYACqr1LPiyF5eAJqZEIVDp2EmMYDW9dwDh1kxV27hBPqPkYXruMDCW7FswBwJMHtChZNxdtPkpV26U6sFneiW2bF8s/0J/07jOaU9Hn8em5C2iD3mjWfnJAC/ZIZaaOgPsu3HJ34YHghH3yWRutXjK9vOTIuNfP/5V6Ln+V9EKoUoWCD9+nvU47DlnIDYL3RTzk+OWIBOAmyXX3JwZvF5+hZJlJ81G84/wM=</diagram></mxfile>

packages/拼接模式/story_improve/story_improve.drawio

@@ -1 +1 @@
-<mxfile host="Electron" modified="2023-04-27T02:25:01.307Z" agent="5.0 (Macintosh; Intel Mac OS X 11_4_0) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.6.13 Chrome/89.0.4389.128 Electron/12.0.7 Safari/537.36" etag="ZRAoxcDlcH3vDCQ99SZ4" version="14.6.13" type="device"><diagram id="9Ot8Pq0Yye77UVq_hXBB" name="第 1 页">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</diagram></mxfile>
+<mxfile host="Electron" modified="2023-04-27T08:14:15.957Z" agent="5.0 (Macintosh; Intel Mac OS X 11_4_0) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.6.13 Chrome/89.0.4389.128 Electron/12.0.7 Safari/537.36" etag="8PoFGB5CCjk8UgISaKLQ" version="14.6.13" type="device"><diagram id="9Ot8Pq0Yye77UVq_hXBB" name="第 1 页">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</diagram></mxfile>

packages/撤销重做模式/article.md

@@ -8,7 +8,7 @@
 
 我们在编辑器中实现了Move操作，该操作会操作编辑器的子系统，更新它们的数据
 
-现在需要编辑器的撤销和重做，其中撤销就是能够撤销编辑器最近的操作，恢复子系统的数据为操作前的数据；
+现在需要实现编辑器的撤销和重做，其中撤销就是能够撤销编辑器最近的操作，恢复子系统的数据为操作前的数据；
 重做就是能够重新执行最近撤销的操作，再次更新子系统的数据