Commit Graph

53 Commits

Author SHA1 Message Date
cary 0a1356a816 Compatible with non-ReadOnly parameters. (#9160) 2021-08-15 22:01:41 +08:00
ChiaNing b4d2b3e7c1 fix canvas off bug (#9128) 2021-08-04 16:09:22 +08:00
ChiaNing 48bf90d61d fix canvas targetTexture bug (#9116)
* fix canvas targetTexture bug

* resize camera by event

* name change
2021-08-04 12:01:55 +08:00
ChiaNing aef1c2038d fix sprite opacity change bug when start zero (#9057) 2021-07-23 18:54:06 +08:00
Santy-Wang 00367f39e1 support auto-finalization in editor (#9008)
* support auto-finalization in editor

* refine

* refine

* handle global variable

* refine

* fix bug

* refine

* use debug instead
2021-07-23 15:10:40 +08:00
ChiaNing 33725d600f fix rich Text opacity bug (#8985)
* fix rich Text opacity bug

* update opacity use currOpacity
2021-07-18 17:34:08 +08:00
PP d7067c29c8 deprecate interface in View module && support pal/screenManager (#8836)
* remove BrowserGetter

* deprecated view.adjustViewportMeta

* deprecate view.enableAutoFullScreen and view.isAutoFullScreenEnabled

* remove view._adjustSizeKeepCanvasSize

* remove view._convertMouseToLocation, view._convertTouchWidthScale and view._convertTouchesWithScale

* remove view._originalDesignResolutionSize

* deprecate cc.winSize and cc.visibleRect

update

* access local winSize

* access local visibleRect

* deprecate view.getVisibleOrigin view.getVisibleOriginInPixel

* Revert "deprecate view.getVisibleOrigin view.getVisibleOriginInPixel"

This reverts commit 1ae9e1d5c51d8c701eaa2e4a65cd4c17e5f6d971.

* Revert "deprecate cc.visibleRect"

* optimize screen module

update

* update

update

* optimize deprecation info

* rename pal/system to pal/systemInfo

* update pal/systemInfo access in engine layer

* support pal/screenManager

* update pal/screenManager access in engine layer

* fix bug

* optimize deprecation info

* fix auto fullscreen

* fix ci

* fix ci

* update change request

update

update

* fix CI
2021-07-09 18:57:03 +08:00
santy-wang c5dd05fbf1 Merge branch 'v3.1.2' of github.com:cocos-creator/engine into v3.3-merge 2021-06-28 14:40:34 +08:00
ChiaNing cbf7090542 sprite fillbuffer cache & sprite misc change when set spf (#8876)
* sprite fillbuffer cache & sprite misc change when set spf

* misc fix

* remove Rect Dirty & add uiTransformDirty

* remove getHash
2021-06-25 13:57:24 +08:00
minggo 424232493e Merge pull request #8777 from minggo/merge_v3.1.2
Merge v3.1.2
2021-06-09 14:12:21 +08:00
PP 4914116834 optimize SystemEventType and NodeEventType (#8678)
* remove recomendation for usage of string type of event

* deprecate KEY_DOWN KEY_UP event

* support SystemEventType.KEYBOARD_DOWN && SystemEventType.KEYBOARD_UP

* deprecate some useless properties

* implement keyboard pal

* remove SystemEventType toString()

update

* fix instantiating EventTouch

* optimize deprecated info

* support native keyboard KEYBOARD_DOWN event

* remove usage of event code

* fix deprecating pure value properties

* optimize deprecating Event type

* optimize deprecating getEventCode()

update

* optimize deprecating eventType

* optimize deprecating isPressed

* optimize deprecating keybaord event

* optimize deprecating rawEvent

* Revert "fix deprecating pure value properties"

This reverts commit 60d586532496fa1f422f05c54a922b86d1dc96ee.

* fix deprecate pure value properties

* Revert "fix deprecate pure value properties"

This reverts commit a83f1725fedfbd7af445892912aacab8e8502147.

* fix deprecating pure value property

* update

updaate

* deprecate some EventType enum in SystemEventType and NodeEventType

* optimize

* update

update

* update

* update

* fix CI

* fix CI

* fix Circular dependency

* fix Circular dependency
2021-06-07 19:06:29 +08:00
minggo 9f2a83330d merge v3.1.2 2021-06-07 16:01:03 +08:00
cary f37099c294 Change the parameter of the math library to Readonly. (#8765)
* Change the parameter of the math library to Readonly.

* fix ci

* fix ci

* fix ci

* fix ci

* fix ci

* delete pool
2021-06-04 17:36:15 +08:00
zxx43 e1f5d7393a V3.1.2 optimization #7487 (#8743)
* optimize fillBuffers & updateWorldTransform

* modify _updateWorldAlpha & invalidateChildren

* 3d should consider parent rotation, so use the Vec3.transformMat4 function

* remove if check null

* remove if check
2021-06-02 11:25:40 +08:00
ChiaNing b6352f6bd1 fix node sort bug when value same (#8568) 2021-04-27 15:23:30 +08:00
ChiaNing 00aca35ef2 fix some deprecated value warn (#8553) 2021-04-25 21:08:58 +08:00
ChiaNing f1735ee251 fix ui opacity bug on some type (#8549) 2021-04-25 20:27:29 +08:00
zheng han 2949226876 remove priority visible decorator (#8546) 2021-04-25 16:18:03 +08:00
ChiaNing b7ff216502 fix priority bug when scene change (#8531) 2021-04-23 16:46:43 +08:00
ChiaNing 217bc4c4e6 fix opacity bug (#8504) 2021-04-20 18:01:18 +08:00
ChiaNing b49b50d829 ui priority deprecated (#8477) 2021-04-19 10:30:14 +08:00
ChiaNing edfaa4ad64 UI opacity Refactoring (#8384)
* UI opacity Refactoring

* add dirty flag

* fix bmfont

* change for update
2021-04-16 19:03:41 +08:00
zhefeng.zhang 8d4b4590f0 fixed setMaterial incorrect code (#8415)
* fixed setMaterial incorrect code

* Revert "fixed setMaterial incorrect code"

This reverts commit 6c41e3aed27ad2e5b717c79cdfd7ea0cbcfdfd27.

* correction code
2021-04-16 18:37:32 +08:00
ChiaNing b89c07f2ef UITransform priority change (#8435)
* UITransform priority change

* better version

* update

* name change

* name change
2021-04-15 13:38:35 +08:00
mmyduckx 24359b0b85 fix native spine premultiliedAlpha bug (#8396)
* fix native spine premultiliedAlpha bug

* ci
2021-03-25 13:42:32 +08:00
pandamicro 5005752386 Merge remote-tracking branch 'origin/develop' into v3.1
# Conflicts:
#	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/core/gfx/define-class.ts
#	cocos/core/gfx/define.ts
#	cocos/core/gfx/webgl/webgl-buffer.ts
#	cocos/core/gfx/webgl2/webgl2-buffer.ts
#	cocos/core/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/planar-shadow-queue.ts
#	cocos/core/pipeline/render-additive-light-queue.ts
#	cocos/particle/renderer/particle-system-renderer-data.ts
#	editor/assets/chunks/cc-shadow-map-fs.chunk
#	editor/assets/chunks/shading-standard.chunk
2021-03-18 18:33:35 +08:00
Santy-Wang d9f7793971 merge v3.0.1 2021-03-18 16:39:41 +08:00
ChiaNing 05134e29bf BlendState deprecate (#8361)
* BlendState deprecate

* tips change
2021-03-18 14:30:59 +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
mmyduckx eefc5e8b61 2d module support zh/en UItooltip (#8332) 2021-03-07 16:35:20 +08:00
pandamicro c5d4c5c08e Merge remote-tracking branch 'origin/v3.0.0' into device-proof
# Conflicts:
#	cocos/3d/assets/morph-rendering.ts
#	cocos/core/builtin/builtin-res-mgr.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/core/pipeline/index.jsb.ts
#	cocos/core/pipeline/planar-shadow-queue.ts
#	cocos/core/pipeline/render-additive-light-queue.ts
#	cocos/core/pipeline/shadow/shadow-flow.ts
#	cocos/particle/renderer/trail.ts
#	cocos/physics/ammo/polyfill-atob.ts
#	editor/assets/effects/builtin-spine-two-colored.effect.meta
#	jest.config.js
#	platforms/native/engine/jsb-pipeline.js
#	tests/general/sealed-global-variables.json
2021-02-07 18:33:59 +08:00
Yun Hsiao Wu 5a02d3f1d0 structure 2021-02-03 17:51:22 +08:00
ChiaNing bb9125e07f Change component menu (#8249)
* Change component menu

* update
2021-02-03 11:11:42 +08:00
ChiaNing d3347dde1c fix ui blendhash default value bug (#8220) 2021-01-27 18:32:23 +08:00
ChiaNing b05dc98cea Fix ui pass hash calculation method (#8217)
* fix ui pass hash calculation method

* useless remove

* bug fix

* hash change

* hash change
2021-01-27 18:15:32 +08:00
PP bdae8e370d cache camera priority in event listener (#8216)
* Revert "cache first render camera (#8215)"

This reverts commit 4cdb7043c9.

* cut down touch move callback

* cache camera priority in event listener

* Revert "cut down touch move callback"

This reverts commit 19da61e3f16c3d1c14c1e8111b0da98b4997dea4.

* fix esLint
2021-01-27 15:56:56 +08:00
PP 4cdb7043c9 cache first render camera (#8215)
* cache first render camera

* fix esLint

* fix esLint

* update var name
2021-01-27 12:50:11 +08:00
troublemaker52025 797b00b3c5 fix webView Render bug (#8198) 2021-01-25 12:43:17 +08:00
pandamicro 5f8047d1aa Manual merge v1.2.1 branch (#8186)
* fix ui transform setContentSize (#7686)

* fix ui transform setContentSize

* update

* update

* update

* update remark
# Conflicts:
#	cocos/core/scene-graph/deprecated.ts

* Tweeks

Co-authored-by: yeshao2069 <yezi636shao@163.com>
2021-01-21 20:00:46 +08:00
cary b3f6bb99b6 Fix recycle reference of node event processor. (#8134)
* Fix recycle reference of node event processor.

* fix eslint ci
2021-01-18 14:55:07 +08:00
pandamicro c6dad8c494 Merge render scene and improve naming for 2d render (#8142)
* format and tweek

* Refactor renderer: UI to 2D naming

* refactor root.ui to root.batcher2D

* Refactor UIBatchView to BatchView2D

* Fix issues

* Merge UI render scene to main render scene

* Improve camera scene check in forward pipeline

* Fix eslint ci

* skip js files
2021-01-15 11:43:09 +08:00
ChiaNing a3986052dc Circular reference fix (#8128) 2021-01-12 18:09:43 +08:00
ChiaNing fa2057deb4 RenderRoot2d comp add (#8120)
* RenderRoot2d comp add

* name change

* require UITransform on renderRoot
2021-01-12 14:55:17 +08:00
cary 9d20701c2d Fix the penetration of click events when Mask nesting. (#8109) 2021-01-09 18:00:44 +08:00
Leslie Leigh (李的序) 9bd9baac12 Eslint autofix all (#8108)
* Eslint autofix all

* Manual fix
2021-01-09 11:41:10 +08:00
ChiaNing 96e632fb4f UI Memory Leak fix (#8081)
* UI Memory Leak fix

* update
2021-01-06 15:10:16 +08:00
ChiaNing b1e8b91a8c layout bug fix when child change (#8070)
* layout bug fix when child change

* use event emit

* Revert "use event emit"

This reverts commit 7ba377ab7c0a16d9e3640484afcb5e706aa06a81.
2021-01-06 15:09:49 +08:00
cary b6a54f830b Fix canvas error in editor. (#8065)
* Fix canvas error in editor.

* refine code
2020-12-31 15:21:23 +08:00
pandamicro 84f2b5b742 Fix ui canvas event priority and deprecation (#8062)
* Fix UI event priority sorting issue

* Fix canvas deprecation

* Fix ci

* Fix ci

* Fix eslint
2020-12-31 13:45:15 +08:00
troublemaker52025 8b2c2b1248 Revert canvas (#8031)
* revert canvas

* fix CI error

* update

* fix ci error

* update

* deprecated canvas about camera method

* update

* use renderTarget to update camera value

* update

* keep renderMode calculation is correct
2020-12-30 22:39:01 +08:00