Commit Graph

97 Commits

Author SHA1 Message Date
黄森斌 8540874d56 [Feature] fbx editing template add smart material convesion property (#11101)
* editing fbx add property smart material

* 优化文案

* update smart material i18n config

* update i18n

* modify fbx edit

* change getConfig position
2022-05-16 16:33:28 +08:00
袁炜海 fa40be3065 [Bug] feat: update file path (#11069) 2022-05-14 10:21:34 +08:00
黄森斌 48f562040f v3.5.1 import animation mask data from gltf (#11033)
* import animation mask data from gltf

* fix assets snapshot error
2022-05-12 10:49:55 +08:00
黄森斌 04d93514ec fix didnt initial preview material (#10877) 2022-04-25 21:25:01 +08:00
黄森斌 56b4f6268f add excludeNames for cacheData (#10876) 2022-04-25 20:12:33 +08:00
黄森斌 53079bfdfe fix bug: edit material didnt use initial data (#10874) 2022-04-25 19:56:51 +08:00
黄森斌 58739f0051 [Bug] fix animation-mask edit bug (#10865) 2022-04-25 15:01:54 +08:00
黄森斌 51d3e02e32 [Bug](inspector) fix asset undo bug (#10795)
* fix asset undo bugs

* modify i18n
2022-04-18 17:29:28 +08:00
徐兵 b64ff3dd61 remove bakeOfflineMipmaps (#10742) 2022-04-13 11:51:36 +08:00
黄森斌 2d0976a530 [Feature] support editing assets can undo redo (#10657)
* 初步添加 assets 编辑 undo 机制

* 支持大部分 meta 型资源;物理材质;材质的 undo

* 测试通过;除 renderpipeline 的编辑需要重构
2022-04-08 10:55:31 +08:00
王凯鹏 28e35aed03 [Editor] show pipelineStates in inspector (#10586)
(cherry picked from commit f1a2c28cc3c64a3dcb96bf13892c137040cd0cc5)
2022-04-08 10:32:42 +08:00
黄森斌 e529d6c381 optimize assets editing interface (#10531) 2022-03-27 21:12:11 +08:00
袁炜海 4f91740690 feat: add i18n config (#10517)
* feat: add i18n config

* feat: add inpsector i18n
2022-03-26 22:41:22 +08:00
袁炜海 495016bf01 feat: add markdown render (#9821)
Co-authored-by: SijieWang <itharbors@outlook.com>
2022-03-26 15:12:10 +08:00
袁炜海 35529038e2 fix: There is no need to execute updatePreview in the ready lifecycle (#10466) 2022-03-26 15:11:25 +08:00
黄森斌 380e87c33d [Optimize] edit fbx importer of legacy options (#10471)
* edit fbx legacy importer

* Update editor/inspector/assets/fbx/fbx.js

Co-authored-by: SijieWang <itharbors@outlook.com>
2022-03-26 15:04:35 +08:00
zhangxin 749226eefb [Bug] add fix alpha transparency artifact options and fix bug (#10419)
* add fix alpha transparency artifact options and fix bug

add fix alpha transparency artifact options

fix bug
- Fixed an issue where events were registered more than once

* Non-transparent channels or RGBE channels are not allowed

* Update image.js

* revert set hidden to set style
2022-03-25 19:07:40 +08:00
黄森斌 a2501a368e [Optimize] optimize material editing using cache prop-value (#10376)
* 调整材质编辑中的数据缓存方式

* useCache
2022-03-23 10:19:57 +08:00
黄森斌 72eadcc873 [Optimize] optimize fault compatibility (#10439) 2022-03-23 10:18:31 +08:00
Leslie Leigh (李的序) b87c185333 Marionette: layer, mask, auto trigger, pass through state (#10179)
* Marionette/3.5.0 Initial Commit

* Auto trigger default value

* import skeleton 改为选择 fbx 文件

* Rename passthrough -> empty

* Refactor Auto Trigger (#81)

* Refactor auto trigger

* Lint

* Optimize

* Update

* Migrate triggers (#82)

* Fix merge problems

* Optimize

* Optimize

Co-authored-by: arsen2010 <arsen2010@126.com>
2022-03-22 15:05:45 +08:00
SijieWang 4cabeed1ee [Feature] imageAsset: add bakeOfflineMipmaps (#10404)
Co-authored-by: Sijie <devhacker520@hotmail.com>
2022-03-22 10:38:41 +08:00
santy-wang 7ffe1bc031 Merge branch 'v3.4.1' of https://gitlab.cocos.net/publics/engine into v3.5.0 2022-01-06 14:41:28 +08:00
SijieWang c392e019a2 [Feature] Prefab: Support the persistent (#9884)
Co-authored-by: Sijie <devhacker520@hotmail.com>
2022-01-05 23:28:41 +08:00
santy-wang 2355247db0 Merge branch 'v3.4.1' of github.com:cocos-creator/engine into v3.5.0 2021-12-17 11:06:22 +08:00
袁炜海 f0342e184a add inspector/node & inspector/assets panels (#9711)
* add inspector/node & inspector/assets panels

* feat: build ts with target es2020

* style: delete empty line

* style: delete useless code

* style: delete useless code
2021-12-15 10:15:00 +08:00
媛媛 ba1c5ecdc8 fix image save meta (#9799) 2021-12-13 15:19:42 +08:00
zheng han d453b608ec add default speed (#9768) 2021-12-06 19:11:41 +08:00
zheng han 32619ffe8f fix wrapMode bug (#9755) 2021-12-04 12:15:20 +08:00
zheng han b51691592c fix wrapMode and speed setting preview (#9712) 2021-11-24 16:45:00 +08:00
黄森斌 02f5afaecf v3.4 fix fbx edit animation clip bugs (#9700)
* fix fbx edit animation clip bugs

* update commends

* fix fps update

Co-authored-by: yanOO1497 <yuanyuan1497@foxmail.com>
2021-11-24 15:40:50 +08:00
黄森斌 9e4182c8d1 texture-cube drag image can exchange value (#9685) 2021-11-21 16:50:39 +08:00
SijieWang 7510ca3ddb [Bug] Fixed an issue where renderTexture data could not be modified (#9692) 2021-11-21 16:47:37 +08:00
SijieWang 8c9955a163 [Inspector] Reduce calls to the storage meta interface (#9690)
* [Inspector] Reduce calls to the storage meta interface

* [Bug] Fixed invalid animation range Settings
2021-11-19 18:53:34 +08:00
黄森斌 d4adceac25 fix material preview bug (#9684) 2021-11-19 15:21:12 +08:00
zhangxin 4f40ae2fef add quote-props rules and eslint fix (#9656) 2021-11-13 17:44:58 +08:00
黄森斌 1a03cd1f0b fix render-texture edit (#9635) 2021-11-10 23:02:27 +08:00
Leslie Leigh (李的序) 1aa683493f Fix prefer local time span default value display (#9597) 2021-11-02 11:48:39 +08:00
Leslie Leigh (李的序) 4ca70507b2 Prefer local time span (#9593) 2021-11-01 19:16:39 +08:00
黄森斌 82a3d64adc modify render-texture editing (#9578) 2021-10-30 22:04:11 +08:00
黄森斌 8945ed437a open animation graph by asset-db (#9530) 2021-10-27 16:35:07 +08:00
黄森斌 096cb7d16a modify animation graph i18n (#9495) 2021-10-18 15:02:44 +08:00
Leslie Leigh (李的序) 39adb27a3d Fix FBX animation frame rate (#9485)
* 0 fps

* modify i18n in fbx editing (#71)

Co-authored-by: 黄森斌 <arsen2010@126.com>
2021-10-14 18:03:25 +08:00
Leslie Leigh (李的序) f1f0fbaf16 [WIP] Feature: NewGenAnim (#9331)
* NewGenAnim

* Fix/Optimize simple directional blending

* Class transition by type (#29)

* Transition & Gradient transition (#30)

* The default ExitCondition should be 1.0

* Do correct graph eval

* Fix PoseSubgraph connect() signature order (#31)

* Graph defaults test (#32)

* Conditions (#33)

* Trigger (#34)

* Transition should only be considered when satemachine exited (#35)

* Add layer.name (#36)

* Fix some behaviours; add API to query poses and transition (#37)

Fix single frame exit condition behaviours; Fix pose -> subgraph behaviours

* Support self transition; refactor sub state machine implementation (#38)

* Temp

* Flat whole layer statemachine

* Add test for test reset triggers

* Allow self transition

* Self transition test

* Fix deserialize (#39)

* update animgraph template (#40)

* The inheritance of any state (#41)

* StateMachine events (#42)

* Fix state machine events; Allow multiple transitions between two nodes (#43)

* Transition priority test (#44)

* Optimize variable bind (#45)

* Fix variable bind errors (#46)

* Expose blend algorithm to editor (#47)

* Cont (#48)

* update animgraph template (#49)

* update animgraph template

* update animgraph template

* Pose speed (#50)

* blend tree add EditorExtendable data (#51)

* Correct pose blend duration (#52)

* Export some types (#53)

* animation pose EditorExtendable (#54)

(cherry picked from commit d5dd5f32c9dbacb68c016ff8ba56d383c781a021)

* Implement clone() (#55)

* Fix trigger condition serialization (#56)

* Add variable type: integer (#57)

* Optimize 0 weight case (#58)

* Relative duration (#59)

* update_hdr_skybox (#9230)

* Rename.. (#60)

* Optimize animation blend item export (#61)

* Fix Type (#62)

* modify aniamtion graph template data (#63)

* modify aniamtion graph template data

* add animation graph component template

* Fix serialize issue (#64)

* Optimize (#65)

* Remove MotionState.startRatio, loop (#66)

* Update (#67)

* Fix circular reference (#68)

* CR (#69)

* Fix exit time greater than 1 (#70)

Co-authored-by: 黄森斌 <arsen2010@126.com>
Co-authored-by: linshunjun <49218738+linshunjun@users.noreply.github.com>
2021-10-14 10:28:23 +08:00
zhangxin 33944c7c34 show tips when no model (#9435)
* show tips when no model

* update i18n
2021-10-04 15:50:41 +08:00
zhangxin d5fd85ed40 update material preview when custom panel change (#9340)
* update material preview when custom panel change

fixed https://github.com/cocos-creator/3d-tasks/issues/8663

* update material preview when custom panel change

fixed https://github.com/cocos-creator/3d-tasks/issues/8663

* Update material.js
2021-09-30 16:37:20 +08:00
zhangxin 32d0e60156 hide model when fbx mutiple-select (#9400) 2021-09-30 11:39:50 +08:00
黄森斌 2d192edb60 Retain the previously modified data when switching pass (#9173) 2021-09-30 10:24:52 +08:00
zhangxin 16873bb759 Select the previously selected animation (#9401)
* Select the previously selected animation

* if selected splitInfo not exists select last splitInfo

* Deleting a selected animation will select the previous animation

* If select an animation that does not exist, the zeroth animation will be selected

* Update animation.js

* AnimationInfos may be null,so add judgement
2021-09-29 14:32:31 +08:00
黄森斌 6c83c322d2 fix image-preview style bug (#9409) 2021-09-28 09:00:03 +08:00
黄森斌 375500098e allow fbx preview show other model (#9392) 2021-09-26 18:47:51 +08:00