Commit Graph

78 Commits

Author SHA1 Message Date
黄森斌 9be0225770 fix help document url 404 error (#11131) 2022-05-20 14:40:05 +08:00
黄森斌 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
pandamicro 1318f71c65 Improve some docs and wrong manual links (#11098) 2022-05-14 19:35:37 +08:00
troublemaker52025 fc646f9da6 Add the Chinese interpretation of luminous_flux for v3.5.0 (#10869) 2022-04-26 18:29:29 +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
Leslie Leigh (李的序) 732d75fc3b Marionette feature i18n (#10550)
* Marionette feature i18n

* Update
2022-03-28 19:26:31 +08:00
黄森斌 ea9dceeb1b V3.5.0 enable readonly material can be edited (#10518)
* 初步增加克隆只读资源界面

* 编辑节点模式下克隆只读资源时节点里的数据同步替换

* add stopPropagation

Co-authored-by: SijieWang <itharbors@outlook.com>
2022-03-27 13:53:31 +08:00
袁炜海 4f91740690 feat: add i18n config (#10517)
* feat: add i18n config

* feat: add inpsector i18n
2022-03-26 22:41:22 +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
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
Zhang mingzhen 8d3c975116 Rich text v align v3.5 #9984 new (#10340)
* add vertical alignment attribute

(cherry picked from commit fc4013e4016203c9ff13c3fb55ab24d8f6afdd82)

* set vertical alignment

(cherry picked from commit 60afa526e215c6e599560683427701baf42595c8)

* distinguish hAlign and vAlign

(cherry picked from commit 010e097b5c862a8373e860f01c1104b6396f81ba)

* use as instead of instanceof

* reorder attributes

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
2022-03-15 16:27:30 +08:00
Leslie Leigh (李的序) 93b856b98e Make animation module optional (#10257) 2022-03-10 11:55:11 +08:00
troublemaker52025 273fa0162e Change planar shadow func name v3.5.0 (#10174)
* change planarShadow func name for v3.5.0

* update

* Modify semantics

* delete @range slide
2022-03-03 17:53:00 +08:00
袁炜海 f7922ccb33 feat: add assets document link (#9823) 2021-12-17 13:23:03 +08:00
jk20012001 c8aeb5908f Add scene panel component help url and item tooltips (#9783)
* 增加场景面板help和tooltips

* 增加场景面板help和tooltips

* update tooltips

* Apply suggestions from code review

Co-authored-by: yufang.wu <2435731537@qq.com>

* Apply suggestions from code review

Co-authored-by: yufang.wu <2435731537@qq.com>

Co-authored-by: yufang.wu <2435731537@qq.com>
2021-12-09 18:58:22 +08:00
李吉林 a3cfa05bcf typo (#9772) 2021-12-06 18:11:58 +08:00
李吉林 3238227647 add tooltip for octree culling (#9770)
* add tooltip for octree culling

* change tooltip

* change English tooltip

* change tooltip
2021-12-06 17:51:49 +08:00
黄森斌 731fe833bd change animation graph button text (#9746) 2021-12-02 23:04:54 +08:00
Zhang mingzhen 60cae28a26 Optimize label serialization of "spacingX" and "underlineHeight" on v3.4 (#9628)
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
2021-11-05 14:07:09 +08:00
zxx43 fbdc0ef287 add renderCulling tool tip (#9619) 2021-11-04 23:16:14 +08:00
zxx43 b12d9cac59 Fix tooltip mistake (#9603)
* fix doc mistake

* modify some description

Co-authored-by: pandamicro <lphuabin@gmail.com>
2021-11-04 00:13:47 +08:00
zxx43 02094d319c Change enable culling to render culling & replace enable culling as data culling (#9611)
* remove enable culling & use render culling instead

* fix setter
2021-11-03 23:52:33 +08:00
ChiaNing ab711df60b cut batcher-2d file by cc.config (#9587)
* cut batcher-2d file by cc.config

* name fix
2021-11-02 11:43:57 +08:00
Leslie Leigh (李的序) 4ca70507b2 Prefer local time span (#9593) 2021-11-01 19:16:39 +08:00
zxx43 ee950e4b93 Particle tooltip (#9492)
* add tooltips for particle system

* refine particle tool tips

* change some descriptions

* Update editor/i18n/zh/localization.js

Co-authored-by: yufang.wu <2435731537@qq.com>

* refine some statements

Co-authored-by: yufang.wu <2435731537@qq.com>
2021-10-30 22:08:29 +08:00
Zhang mingzhen 1448c55ab7 update tooltips of "cocos/2d" and "cocos/ui"#9163 (#9489)
* Update tooltips of sprite-frame and texture(#9163)

* Supplement some tooltips and annotations of som attributes in folder "cocos/2d/component" and "cocos/ui"

* Optimize some tooltips according to comments of PR

* optimize tooltips according to comment at 2021/10/19

(cherry picked from commit fe3d0a910fe11489521c46656343483a502594c3)

* fix "anisotropy" interpretation.It emphasizes threshold instead of just amount.

(cherry picked from commit d06a8c3d6b2d4205a9a51dc769d32ae1eb707b9a)

* optimize tooltips according to EricCorleone's comment at 2021/10/19

(cherry picked from commit df7044bb73a0e1b1dc1f9e946a45d96bc839b00e)

* optimize tooltips according to Xunyi0's comment at 2021/10/20

(cherry picked from commit 6b42df5c69d12a74adee44bc9add2c27e6064c9f)

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
2021-10-25 11:49:58 +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
zhangxin 33944c7c34 show tips when no model (#9435)
* show tips when no model

* update i18n
2021-10-04 15:50:41 +08:00
ChiaNing ab4f952ade GPUDriven i18n add (#9438) 2021-09-30 20:02:27 +08:00
zhangxin 32d0e60156 hide model when fbx mutiple-select (#9400) 2021-09-30 11:39:50 +08:00
jiaxin.lai 5c6567f59e bullet physics optimization (#9311)
* stash

* stash

* stash

* use @cocos/bullet

* rename

* stash

* update constraint

* naming

* naming

* naming

* naming

* fix

* use compound by default

* stash

* fix

* rename and raycast

* refactor

* add state optimazation

* tweaks

* tweaks

* stash

* rename

* wechat wasm file path

* using promise

* remove @cocos/ammo

* i18n bullet(ammo.js) -> bullet

* tweaks

* update @cocos/build-engine to 4.2.11

* fix sync

* fix autosleep mechanism

* fix stability test

* fix destroy bullet world

* tweaks

* update @cocos/bullet to 1.0.0

* fix

* delete
2021-09-10 16:35:56 +08:00
媛媛 5e548337e0 [3.3-2] Fix some event edit bugs (#9090)
* fix add event params failed

* fix new clips edit event

* update

* 修复 fbx 面板与动画编辑器事件编辑同步
2021-08-04 11:41:57 +08:00
zhangxin f60655fb5d Added a public method to get the name from dump, changed the comment of the public method, and added the icon style of label. (#9010)
* 增加了一个公用方法从dump中获取名称,更改了一下公用方法的注释,新增了label的图标样式

* Update label.js

* add tooltip of font ,update pr, add utils function

* update inspector of label, i18n of label

* update line-height

* Fixed multiple selection error, changed the multiple selection style

* Revert "Fixed multiple selection error, changed the multiple selection style"

This reverts commit b5e7dce659d339a23f065c1a1fa529c2a3b8c251.
2021-07-20 17:33:03 +08:00
zhangxin c6d97a0cd7 Allow custom effects to customize the inspector displayed in the material (#8988)
* 允许自定义 effect 自定义在 material 展示的 inspector

* Add protocol judgment. updateCustomInspector Add parameters. Clear the src of the custom panel when updatePasses
2021-07-19 11:22:01 +08:00
黄森斌 f6a63f2c99 V3.3 set promoteSingleRootNode of fbx asset (#8756)
* texture-cube charater

(cherry picked from commit dca6ddf38571858be284a9ec6e4adcf456ffe1e1)

* revert texture-cube change

(cherry picked from commit d0cce40800d36977abeae9d43352a8890a2e1421)

* set promoteSingleRootNode of fbx asset

(cherry picked from commit d3be3c4707a5db624094e5558ae45604e0e5ae26)
2021-06-09 15:24:10 +08:00
Leslie Leigh (李的序) 37d4f4aadf Add morph normals import setting (#8749) 2021-06-02 13:56:38 +08:00
zhangxin e85aa4b1c3 add .eslintrc.js to editor ,and fix (#8653) 2021-05-12 16:36:57 +08:00
黄森斌 4c9f83bf5e make animationBakeRate of fbx prop editable (#8457) 2021-04-16 15:27:09 +08:00
SijieWang 122e5687c0 [Move] Move the Inspector template to the engine (#8300)
* [Feature] 将 inspector 模版移动到引擎

* 支持 material 的渲染

* 增加 assets 的 i18n 文案; 修改 scene 编辑 (#1)

* 添加 i18n 的 assets 配置

* 增加 assets 的 i18n 文案

* 增加只读样式

* 初步添加 image 类型的几个资源编辑

* 初步完成 image 编辑

* image 增加 i18n 文案

* 完成 sprite-frame 属性编辑

* 回退修改

* 完成 sprite-frame 除九宫格编辑外的功能

* 添加 texture 资源编辑

* 调整图片显示

* 调整 ui-image 使用时背景透明的样式

* Add inspector typescript (#2)

* inspector增加typescript

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

* 修复多选的样式

* Update typescript.js

全部设置为英文注释

* Update typescript.js

去掉了多余的替换

* update style

* Add javascript inspector (#4)

* create javascript inspector

* 修复样式,完善代码

* Update javascript.js

分而治之
不再把变量写在全局上

* Update javascript.js

优化代码
- 减少多余的层级
- 在update的时候加了一层判断
- 删掉多余的$

* create javascript inspector

* 修复样式,完善代码

* Update javascript.js

分而治之
不再把变量写在全局上

* Update javascript.js

优化代码
- 减少多余的层级
- 在update的时候加了一层判断
- 删掉多余的$

* update i18n of inspector,update inspector of javascript

- 将代码结构优化了一下
    - 将不是公用的方法放在了各自元素的update方法上
    - 调用_onPluginStateChanged 的时候将会update所有ui元素
- 将样式优化了一下
    - 取消没必要的缩进

* Update javascript.js

* add tooltip

Co-authored-by: SijieWang <itharbors@outlook.com>

* 完成 sprite-editor 九宫格编辑的联调 (#5)

* 增加容错

* 完成 sprite-editor 的编辑联调

* add audio-clip inspector (#6)

Co-authored-by: SijieWang <itharbors@outlook.com>

* create effect-header inspector (#7)

Co-authored-by: SijieWang <itharbors@outlook.com>

* 增加 footer 和 header 功能

* 分离 image 显示 (#16)

* Add json inspector (#3)

* add json inspector

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

* 修复 inspector json多选的样式

* Update json.js

修改注释全部为英文

* Update json.js

去掉了多余的代码

* update style

* add json inspector

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

* 修复 inspector json多选的样式

* Update json.js

修改注释全部为英文

* Update json.js

去掉了多余的代码

* update style

* Add era texture cube inspector (#8)

* create inspector of erp-texture-cube

* Update erp-texture-cube.js

* add i18n ,make code better

* add i18n ,support multi-select

* effect 资源的编辑 (#15)

* 增加容错

* 完成 sprite-editor 的编辑联调

* 初步显示 effect 资源

* 完成 effect 的编辑

Co-authored-by: SijieWang <itharbors@outlook.com>

* add inspector of particle (#10)

* add inspector of particle

It is not clear how to import other inspectors,
for example, here we need to import the texture inspector

* add tooltip

Co-authored-by: SijieWang <itharbors@outlook.com>

* Create prop.js (#18)

* Create prop.js

* Update prop.js

* Update prop.js

* add getCustomPropElements function

* Update prop.js

* Update prop.js

* add description

* add label-atlas inspector (#9)

* add label-atlas inspector

* Update label-atlas.js

去掉了多余的层级,直接使用this.$.xxx
每次更改元素属性的时候都会调用一次update

* add i18n

* Update label-atlas.js

调用update\ready方法前判断方法是否存在

* Update label-atlas.js

增加了对只读状态的判断

* fixed i18n

* update i18n

add i18n to all label

* allow multi select

* Update label-atlas.js

fix getInvalid

* remove useless update

Co-authored-by: SijieWang <itharbors@outlook.com>

* add physics-meterial inspector (#11)

* add physics-meterial inspector

* fixed wrong code

* Update physics-material.js

* hide content when multiselect

* add render-texture inspector (#13)

* add render-texture inspector

* Update tsconfig.json

Co-authored-by: SijieWang <itharbors@outlook.com>

* Add render flow inspector (#12)

* add renderer-flow

* not use requestAnimationFrame

Co-authored-by: SijieWang <itharbors@outlook.com>

* add text inspector (#14)

Co-authored-by: SijieWang <itharbors@outlook.com>

* add video-clip inspector (#17)

Co-authored-by: SijieWang <itharbors@outlook.com>

* Add page view inspector (#25)

* add page view inspector

* add page view inspector

* remove empty line

* add page view inspector

* remove empty line

* 完成 fbx 的编辑 (#20)

* fbx 内部模块拆分

* 调通 model 模块

* 完成预览分离及显示的调试

* 添加 material fbx 模块的编辑

* 材质图片的编辑

* 初步 fbx animation 编辑界面

* 完成了 fbx animation 编辑

* 添加 gltf 编辑

* 更新中文 fbx 文案

* 合并

Co-authored-by: SijieWang <itharbors@outlook.com>

* add video player inspector (#37)

* 检查并调整部分 assets 资源的编辑 (#39)

* audio 支持多选显示

* effect 补充部分元素 readonly 状态

* sprite-frame 增加 九宫格编辑按钮的 disabled 状态

* 图片多选情况下不显示 edit 按钮和预览面板

* 补充 mesh 文件预览

* 补充 2d particle 编辑

* 补充 physics-material 的编辑

* 补充 typescript 编辑

* 修改 javascript 的编辑

* 添加 gltf-skeleton 预览

* 修改 text 文件编辑

* 修改 erp-textrue-cube 编辑;修改 image sub ui-panel 的数据引用

* add texture-cube inspector (#19)

* add texture-cube inspector

目前无法监听width变化

* Update texture-cube.js

update style

* listen confirm event instead of change event

* Update assets.js

Co-authored-by: SijieWang <itharbors@outlook.com>

* add prefab-link inspector ,creat i18n of components 's inspector (#24)

* add prefab-link inspector ,creat i18n of components

* Update prefab-link.js

* format html

* add polygon collider2d inspector (#23)

* add polygon collider2d inspector

* remove useless update

* Update polygon-collider.js

* Update polygon-collider.js

format

* format html

Co-authored-by: SijieWang <itharbors@outlook.com>

* add inspector of rich text (#26)

* add inspector of rich text

* Update rich-text.js

* Update components.js

* dormat html

* Update rich-text.js

Co-authored-by: SijieWang <itharbors@outlook.com>

* add slider inspector (#30)

* add slider inspector

* format html

* Update slider.js

Co-authored-by: SijieWang <itharbors@outlook.com>

* add sphere light inspector (#31)

* add sphere light

* format html

* Update sphere-light.js

Co-authored-by: SijieWang <itharbors@outlook.com>

* add safe-area inspector (#27)

* add safe-area inspector

* format html

* Update safe-area.js

Co-authored-by: SijieWang <itharbors@outlook.com>

* add sprite inspector (#33)

* add sprite inspector

* format html

Co-authored-by: SijieWang <itharbors@outlook.com>

* add terrain inspector (#34)

* add terrain inspector

* update format

* format html

Co-authored-by: SijieWang <itharbors@outlook.com>

* add scroll view inspector (#28)

* add scroll view inspector

* format html

* Update scroll-view.js

Co-authored-by: SijieWang <itharbors@outlook.com>

* add skeletal animation inspector (#29)

Co-authored-by: SijieWang <itharbors@outlook.com>

* add spot light inspector (#32)

* add spot light inspector

* format

* format html

Co-authored-by: SijieWang <itharbors@outlook.com>

* add toggle inspector (#36)

* add toggle inspector

* format html

* format html

Co-authored-by: SijieWang <itharbors@outlook.com>

* add particle-system inspector (#38)

* add particle-system inspector

rotation的xyz修改会出现错误,需要帮助

* format html

Co-authored-by: SijieWang <itharbors@outlook.com>

* Add batched skinning model inspector (#40)

* add batched-skinning-model insepctor

* Update batched-skinning-model.js

* Update components.js

Co-authored-by: SijieWang <itharbors@outlook.com>

* add button inspector (#42)

* add button inspector

* format html

* format and don't change displayname

Co-authored-by: SijieWang <itharbors@outlook.com>

* Add layout inspector (#43)

* Add layout inspector

* format html

Co-authored-by: SijieWang <itharbors@outlook.com>

* Add web view inspector (#44)

* add webview inspector

我不清楚如何在自己修改dump得时候如何通知

* Update webview.js

使用了hack的方法发出了change-dump

* format html

Co-authored-by: SijieWang <itharbors@outlook.com>

* add particle system 2d inspector (#45)

Co-authored-by: SijieWang <itharbors@outlook.com>

* add widget inspector (#47)

Co-authored-by: SijieWang <itharbors@outlook.com>

* 检查了几种资源的编辑 (#46)

* 添加 texture-cube 的编辑

* 修改 video 预览

* 修改 render-texture 编辑

* 增加 render-pipeline 编辑

* 补充 label-atlas 编辑

* 修复节点复用时的事件绑定

* add texture to auto atlas (#49)

* add texture to auto atlas

* 修改带下划线变量名

* 继续部分资源编辑调整 (#48)

* 补充 teture-cube 的赋值

(cherry picked from commit 5a3c9a8ef1d1313922197ae04ba27cff81d4c474)

* 修改 render-pipeline 编辑

(cherry picked from commit e34418074ddd271941663e57c210b98f4d73f7f7)

* 修改 chunk 文件编辑

* 修改代码显示的相关文件

* 调整代码类显示效果

* 调整剩余三个文件中的 _asset 写法,去掉下划线

* 合并 image 编辑的代码

* 回退 json 代码的输出修改

* 调整 node component 编辑 (#50)

* 增加 setReadonly 工具函数

* 注册的组件按字母排序,以便剔除重复注册

* 新的节点组件编辑模式

* 增加 cc.Layout 编辑

* cc.PageView 没有额外交互不需要自定义编辑

* 修改 cc.RichText 编辑

* 修改 cc.ScrollView 编辑

* 取消 cc.Slider 自定义编辑

* 修改 cc.Toggle 编辑

* 增加一个基类,减少重复代码

* 修改 cc.SphereLight 编辑

* 修改 cc.WebView 编辑

* 修改 cc.VideoPlayer 编辑

* 修改 cc.SpotLight 编辑

* 修改 cc.Terrain 编辑

* 检查多选后属性值是否一致

* 修改 cc.SafeArea 编辑

* 修改 cc.PolygonCollider2D 编辑

* 修改 batched-skinning-model 编辑

* 回退一处修改;添加 displayOrder 100 的注释

* 回退一处修改

* Update particle-system.js

修正了显示的内容

* Update particle-system.js

* 修改 cc.ParticleSystem2D 编辑

* Update particle-system.js

* Update particle-system.js

* 修改属性同行的样式;增加 emitterMode 值切换其他属性显示

* 去掉 cc.SkeletalAnimation 编辑模板

Co-authored-by: zhangxin <13622872688@163.com>

Co-authored-by: 黄森斌 <arsen2010@126.com>
Co-authored-by: zhangxin <59186205+chichinohaha@users.noreply.github.com>
Co-authored-by: 媛媛 <yuanyuan1497@foxmail.com>
Co-authored-by: zhangxin <13622872688@163.com>
2021-04-15 18:18:56 +08:00
Zeqiang Li 0218c98143 Particle system tooltop translation (#8358)
* half completed translation

* Tooltip translation

* add renderable2D

* comment CPU-supported-only features
2021-03-15 18:49:51 +08:00
jiaxin.lai 47938b21d2 add physics i18n (#8334)
* add physics i18n

* ammo.js -> bullet(ammo.js)

* tweaks
2021-03-15 16:36:57 +08:00
ChiaNing 2d869577a5 UI module support zh/en UItooltip (#8335)
* UI module support zh/en UItooltip

* change sub-context file name

* remove white space

* update
2021-03-13 13:04:34 +08:00
mmyduckx eefc5e8b61 2d module support zh/en UItooltip (#8332) 2021-03-07 16:35:20 +08:00
jiaxin.lai 6728263167 update physics group during runtime (#8148)
* update physics group during runtime

* change default to ammo

* add physx module

* add physics_physx i18n
2021-01-16 11:36:28 +08:00
媛媛 e318e60827 support label and description for categories (#8022)
* support category

* remove module-division

* update

* revert .fbx.meta
2020-12-25 15:53:34 +08:00