canvas should use design resolution size #34
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Squashed commits: [edaaa1b] fix computing position of standalone widget
jareguo
added a commit
that referenced
this pull request
Dec 11, 2015
canvas should use design resolution size
Closed
YunHsiao
pushed a commit
to YunHsiao/engine
that referenced
this pull request
Jan 10, 2019
node from component
sunnylanwanjun
pushed a commit
to sunnylanwanjun/engine
that referenced
this pull request
Jul 17, 2019
Fix init error of create node dynamic and light component.
SantyWang
pushed a commit
that referenced
this pull request
Apr 15, 2021
* [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 <[email protected]> * 完成 sprite-editor 九宫格编辑的联调 (#5) * 增加容错 * 完成 sprite-editor 的编辑联调 * add audio-clip inspector (#6) Co-authored-by: SijieWang <[email protected]> * create effect-header inspector (#7) Co-authored-by: SijieWang <[email protected]> * 增加 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * Add render flow inspector (#12) * add renderer-flow * not use requestAnimationFrame Co-authored-by: SijieWang <[email protected]> * add text inspector (#14) Co-authored-by: SijieWang <[email protected]> * add video-clip inspector (#17) Co-authored-by: SijieWang <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * add slider inspector (#30) * add slider inspector * format html * Update slider.js Co-authored-by: SijieWang <[email protected]> * add sphere light inspector (#31) * add sphere light * format html * Update sphere-light.js Co-authored-by: SijieWang <[email protected]> * add safe-area inspector (#27) * add safe-area inspector * format html * Update safe-area.js Co-authored-by: SijieWang <[email protected]> * add sprite inspector (#33) * add sprite inspector * format html Co-authored-by: SijieWang <[email protected]> * add terrain inspector (#34) * add terrain inspector * update format * format html Co-authored-by: SijieWang <[email protected]> * add scroll view inspector (#28) * add scroll view inspector * format html * Update scroll-view.js Co-authored-by: SijieWang <[email protected]> * add skeletal animation inspector (#29) Co-authored-by: SijieWang <[email protected]> * add spot light inspector (#32) * add spot light inspector * format * format html Co-authored-by: SijieWang <[email protected]> * add toggle inspector (#36) * add toggle inspector * format html * format html Co-authored-by: SijieWang <[email protected]> * add particle-system inspector (#38) * add particle-system inspector rotation的xyz修改会出现错误，需要帮助 * format html Co-authored-by: SijieWang <[email protected]> * Add batched skinning model inspector (#40) * add batched-skinning-model insepctor * Update batched-skinning-model.js * Update components.js Co-authored-by: SijieWang <[email protected]> * add button inspector (#42) * add button inspector * format html * format and don't change displayname Co-authored-by: SijieWang <[email protected]> * Add layout inspector (#43) * Add layout inspector * format html Co-authored-by: SijieWang <[email protected]> * Add web view inspector (#44) * add webview inspector 我不清楚如何在自己修改dump得时候如何通知 * Update webview.js 使用了hack的方法发出了change-dump * format html Co-authored-by: SijieWang <[email protected]> * add particle system 2d inspector (#45) Co-authored-by: SijieWang <[email protected]> * add widget inspector (#47) Co-authored-by: SijieWang <[email protected]> * 检查了几种资源的编辑 (#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 <[email protected]> Co-authored-by: 黄森斌 <[email protected]> Co-authored-by: zhangxin <[email protected]> Co-authored-by: 媛媛 <[email protected]> Co-authored-by: zhangxin <[email protected]>
SantyWang
pushed a commit
that referenced
this pull request
Oct 11, 2021
* 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 d5dd5f3) * 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: 黄森斌 <[email protected]> Co-authored-by: linshunjun <[email protected]>
pandamicro
pushed a commit
that referenced
this pull request
Oct 14, 2021
* 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 d5dd5f3) * 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: 黄森斌 <[email protected]> Co-authored-by: linshunjun <[email protected]>
dumganhar
pushed a commit
to dumganhar/cocos-engine
that referenced
this pull request
Oct 21, 2021
Merge v3.4
LinYunMo
added a commit
to LinYunMo/engine
that referenced
this pull request
Dec 29, 2021
* Revert "Use appendIndices in fillBuffers" This reverts commit 0600e26. * the quickest version * pass renderScene * batch * change batcher update Co-authored-by: pandamicro <[email protected]>
pandamicro
added a commit
that referenced
this pull request
Jan 7, 2022
* VB cache add（only simple） * sliced add * after rebase * Extract BufferAccessor from MeshBuffer * Refactor for linear buffer accessor * Support simple sprite * Fix initialization issues * Fix simple sprite rendering * Rough adaptation * tweaks * Fix LinearBufferAccessor's appendBuffers * Cleanup mesh buffer codes * Reorganize ia allocation * Middleware adaptation & Particle 2d adaptation (#31) * Middleware adaptation * particle-2d adaptation * Initial implementation of static vb accessor * Complete static vb accessor * Improve static vb accessor * Ensure MeshBuffer.byteOffset * Fix record batch process in static vb accessor * Fix vb reset * simple & simple label add (#32) * Meshbuffer static length (#33) * set ib only first time * Meshbuffer static length * Some name refactor * remove RenderData.vData * Improve buffer update logics * Use appendIndices in fillBuffers * The quickest version（simple & label can render） (#34) * Revert "Use appendIndices in fillBuffers" This reverts commit 0600e26. * the quickest version * pass renderScene * batch * change batcher update Co-authored-by: pandamicro <[email protected]> * Move ia record logic from accessor to batcher * Make vertexFormat sourced from render data * sliced & bar-filled (#35) * radial-filled & tiled & label (#36) * radial-filled & tiled * bmfont & char label * function change * name change * Remove uvDirty fixes Fix uv update for sprite * Reduce mesh buffer setDirty * uv fix * Format label * Refactor color and cascade opacity mechanism * Fix empty render data or chunk absent issue * fix some uv (#37) * Fix non stop allocation issue in static vb accessor * fix bmfont richText & remove uiComponent (#38) * fix bmfont uv * fix richText & remove ui Component * Fix mesh render data batching * Small fix * Update for spine * Formatting jsb spine and editor * middle ware & particle 2d (#39) * motion-streak * dragon Bones add * tiled map unsafe change * particle-2d add * function name change * some function change (#40) * Fix RenderData pool usage * Fix merge issue * fix misc bug (#41) * Native adaptation for spine and dragonbones with MeshRenderData * misc fix (#42) * Improvements * Fix ci and improvements Co-authored-by: ChiaNing <[email protected]>
dogeFu
pushed a commit
to dogeFu/cocos-engine
that referenced
this pull request
Mar 30, 2022
hana-alice
pushed a commit
to hana-alice/engine
that referenced
this pull request
Jul 6, 2022
Update web deferred pipeline and shadowmap
PatriceJiang
added a commit
to PatriceJiang/engine
that referenced
this pull request
May 24, 2023
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
for https://github.com/fireball-x/fireball/issues/870