Commit Graph

33 Commits

Author SHA1 Message Date
袁炜海 b718018467 [Bug] feat: keep group display order (#11081) 2022-05-14 18:31:16 +08:00
黄森斌 5d96fb551d [Optimize] reset-property from unknown type (#10687)
* reset-property from unknown type

* 自动渲染的属性根据其他定义的前后来显示位置
2022-04-08 10:55:00 +08:00
袁炜海 69c46a3a27 feat: sync inspector 3.6 to 3.5 (#10397)
* feat: sync inspector 3.6 to 3.5

* sync inspector edit

Co-authored-by: arsen2010 <arsen2010@126.com>
2022-03-21 15:38:08 +08:00
santy-wang 10349e567d Merge branch 'v3.4.2' of https://gitlab.cocos.net/publics/engine into v3.5.0 2022-03-08 10:21:39 +08:00
黄森斌 4f05432c23 Displayorder is removed from the edit template and is taken over completely by the decorator (#10165) 2022-03-02 21:14:37 +08:00
pandamicro 1446db89e7 Merge branch 'v3.4.2' into v3.5.0
# Conflicts:
#	cocos/2d/components/sprite.ts
#	cocos/2d/framework/ui-transform.ts
#	cocos/2d/renderer/render-uniform-buffer.ts
#	cocos/core/builtin/effects.ts
#	cocos/core/builtin/shader-sources/glsl1.ts
#	cocos/core/builtin/shader-sources/glsl3.ts
#	cocos/core/builtin/shader-sources/glsl4.ts
#	cocos/dragon-bones/ArmatureDisplay.ts
#	cocos/spine/skeleton.ts
#	editor/assets/chunks/cc-sprite-fs-gpu.chunk
#	editor/assets/chunks/cc-sprite-fs-gpu.chunk.meta
#	editor/assets/chunks/cc-sprite-vs-gpu.chunk
#	editor/assets/chunks/cc-sprite-vs-gpu.chunk.meta
#	editor/assets/default_skybox.meta
#	editor/assets/effects/builtin-sprite-gpu.effect.meta
2022-02-28 17:24:02 +08:00
黄森斌 f4291fd035 Properties default to display positions in the order in which they are defined (#10155) 2022-02-22 21:27:32 +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
zhangxin 38896d0db8 fix regenerate bounding box ,auto expand renderCulling's selection when checkbox is enable (#9763)
fix regenerate bounding box
- redraw bounding gizmo after regenerate bounding box

auto expand renderCulling's selection when checkbox is enable
2021-12-06 15:41:08 +08:00
甜甜的泥土 a6396fa454 fix: fixed the "resizeobserver loop limit exceeded" error (#9754)
* fix: fixed the "resizeobserver loop limit exceeded" error

* feat: throttle the ResizeObserver

* Update editor/inspector/components/widget.js

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

Co-authored-by: SijieWang <itharbors@outlook.com>
2021-12-04 12:18:18 +08:00
zhangxin f3d04f76c0 Refactor particle system render culling (#9613)
* enableCulling to data Culling

* Update particle-system.js
2021-11-03 23:52:14 +08:00
zhangxin 7a312441ef Change the content of the panel, fix the multi-selection situation, remove the inputflag (#9426)
* Change the content of the panel, fix the multi-selection situation, remove the inputflag

Change panel content
-The ui-prop that uses this tag sets the disabled of the content-slot to the marked dump.value
- add particle-system show bounds button
- add Regenerate bounding box button
-When culling is not turned on, disable the elements in the enableCulling
catergory

Fix multiple selection
-showBounds adapts to the case of multiple selections, when changing, it sends message for each component
-The Regenerate bounding box button will be set to disabled according to the selected component enableCulling
-Fix the ui-checkbox missing invalid judgement in ui-section header
-Fix the problem that ui-prop is not set dump.values to each component when multiple-selection

Remove inputflag
-No panel uses this mark, remove the related code

* Update editor/inspector/components/particle-system.js

* Update editor/inspector/components/particle-system.js

Co-authored-by: SijieWang <itharbors@outlook.com>
2021-09-29 22:53:38 +08:00
zhangxin 42cce3f8eb replace utils function ,update "sortProp" function (#9425)
* replace utils function ,update  "sortProp" function

replace utils function
-  "getCustomPropElements" -> "updateCustomPropElements"
this function is use to render custom node

update  "sortProp" function
- item may be null

* Update particle-system.js
2021-09-29 22:23:51 +08:00
zhangxin 590b4339e9 Fixed multiple selection error, changed the multiple selection style (#9022) 2021-07-20 20:47:18 +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
黄森斌 de26cffbe4 [Bug] optimize 3d particle edit (#8907) 2021-06-29 15:57:09 +08:00
黄森斌 8e38d3b8c7 [Bug] fixed widget multiple selections edit (#8879) 2021-06-25 09:25:01 +08:00
zhangxin 28a13b75be Optimize the logic for panel updates (#8824)
* Optimize the logic for panel updates

Update only the elements related to the modified content

* Update particle-system.js
2021-06-17 12:55:24 +08:00
黄森斌 e3c7f9c436 fix edit some assets can not record its expand state (#8696)
* texture-cube charater

* fix some asset files cache-expand bug
2021-05-20 18:30:04 +08:00
zhangxin e85aa4b1c3 add .eslintrc.js to editor ,and fix (#8653) 2021-05-12 16:36:57 +08:00
黄森斌 e5b16e3f2d V3.1 [editor] fix inspector edit some component undo bug (#8618)
* fix inspector edit some component undo bug

* update fbx meta file in internal-db
2021-04-30 17:02:30 +08:00
黄森斌 da4cc3c967 V3.1 [editor] fix inspector edit particle2d bug (#8584)
* fix inspector edit particle-2d bug

* update multiple edit particle-2d

* update edit materila one style
2021-04-29 10:58:11 +08:00
zhangxin cba7bcbc17 use uuid.valuse instead of dump.values (#8587)
* use uuid.valuse instead of dump.values

* use const instead of let
2021-04-29 10:47:59 +08:00
zhangxin 849f1a400f inspector allow multiple select particle system (#8574)
- fix  ui-section's header's dump  ,
- hide invalid content
2021-04-28 10:26:46 +08:00
黄森斌 377ece22e2 fix inspector edit widget bug (#8565)
* fix inspector edit widget bug

* inspector edit fbx add resize observer
2021-04-27 09:54:53 +08:00
zhangxin c6db8bdb14 [editor] fix particle-system's inspector ui bug (#8559)
* fix particle-system

Using replacechildren function will causes event issues in the UI.
So replace it

* use while loop instead of for loop
2021-04-26 22:01:39 +08:00
zhangxin d9664f219f [Editor] fix widget inspector bug (#8562)
* vue use exports.methods ,Do not use dump.values

in order to debug,
vue use exports.methods .
 There is no dump.values now
so use the values of dump.value[key]

* update format
2021-04-26 21:59:51 +08:00
zhangxin 2221eee6ae Reuse the node according to the key (#8534)
Reuse the node according to the key
2021-04-23 21:54:16 +08:00
zhangxin f5efe292ea [Editor] fix widget's inspector bug (#8525)
* fix widget bug

1 use vue.min.js instead of  vue.js.
    - remove vue's tips.
2、 use an invisible <ui-prop> element to dispatch "change-dump"

* fix format
2021-04-23 17:04:58 +08:00
黄森斌 90da785348 V3.1 optimise inspector edit asset (#8513)
* optimise inspector edit fbx animation

* fix inspector render-texture edit bug

* optimise inspector edit asset

* inspector edit asset not use fs-extra

* optimise inspector asset preview
2021-04-22 10:25:54 +08:00
zhangxin a488b96f13 fix error (#8465)
The UI-section will automatically be hidden under the showFlag
2021-04-18 15:38:21 +08:00
zhangxin 23ae14d51a replace Chinese with English (#8464)
* replace Chinese with English

* Modify the description
2021-04-16 17:45:55 +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