Commit Graph

128 Commits

Author SHA1 Message Date
ChiaNing 985f4fd94c Fix pass hash when blend change (#12294)
Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
2022-08-02 16:05:24 +08:00
ChiaNing f8fb03e9af remove blend state on ui render (#12228)
* remove blend state on ui render

* tiledGourp updateBlendFunc hack

Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
2022-07-29 11:54:28 +08:00
ChiaNing c538fd6d18 change Renderable2d name (#12213)
* change Renderable2d name

* misc

Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
2022-07-27 14:25:14 +08:00
Santy-Wang 52cd47fa08 optimize frame animation performance (#12209)
* optimize frame animation performance

* refine code
2022-07-27 10:21:13 +08:00
minggo ccb5fb97e0 prevent adding more than one rendering component to a node (#12121) 2022-07-21 14:47:13 +08:00
Santy-Wang 2ae2d94b93 optimize performance (#12080)
* optimize performance

* fix binding

* fix bugs

* fix bugs

* fix crash

* remove useless func

* fix ci

* fix ci

* fix ci
2022-07-21 11:50:43 +08:00
Santy-Wang ddfa13e4cf optimize a bit jsb call (#12065) 2022-07-19 11:36:25 +08:00
Zhang mingzhen 1fd70ef5e7 UIOpacity and UIRenderer recursion bug (#12015)
* optimize JSB sync in every frame

* opacity bug, enabled doesn't sync to native

* UIOpacity and UIRenderer recursion

* avoid parameters are undefined

* resolve circular dependency

* exclude UIMeshRenderer in setEntityColorDirtyRecursively

* exclude UIMeshRenderer in UIOpacity setEntityLocalOpacityDirtyRecursively

* blend hash should put into passdirty

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
2022-07-18 15:42:02 +08:00
ChiaNing 1bf931f29b fix graphics update material crash (#12038)
Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
2022-07-16 17:19:00 +08:00
ChiaNing 4534698708 mask _updateBuiltinMaterial overload (#12033)
* mask update material overload

* function change

Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
2022-07-16 13:35:12 +08:00
ChiaNing 6b64c7e8da Remove custom Material flag (#12021)
* Remove custom Material flag

* remove commit model material

Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
2022-07-16 09:36:32 +08:00
ChiaNing eeb210d55b fix ui render custom material bug (#11989)
Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
2022-07-14 17:28:27 +08:00
Santy-Wang 945e715a9c restructure life cycle (#11971)
* restructure life cycle

* fix bugs

* optimize

* remove some code

* refine

* fix dragonbone custom material

* fix particle crash

* changed to CCAssert

Co-authored-by: liqiao <liqiao@cocos.com>
2022-07-14 16:33:30 +08:00
Zhang mingzhen 731d703648 Mask to native bug fix (#11913)
* mask inverted bug fix

(cherry picked from commit dc695c992983042ca7af3ac91051db40049dfbd1)

* sync customMaterial for commitIA of middleware in native

* fix CI

* remove abundant mask code

* add nolint

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
2022-07-11 13:43:56 +08:00
Zhang mingzhen b32830a3e8 V3.6.0 batcher2d to native (#11592) 2022-07-08 17:10:48 +08:00
Santy-Wang 7bc135e1c7 adjust initialization process (#11143)
* adjust init process

* fix bugs

* restructure

* tweak

* delete useless code

* fix ci

* support more platform and fix some bugs

* mark internal

* tweak

* add docs

* add docs and little adjustment

* fix bugs

* adjust decorator execute order

fix mesh error

* fix bugs

* revert some change

* revert auto-generated code

* revert auto-generated code
2022-07-03 21:16:09 +08:00
ChiaNing 6ca746e64e Sprite Renderer add (#11634)
* Revert "Revert "First Version Sprite Renderer(Rect mode) (#10592)" (#11626)"

This reverts commit abc8f47b6f.

* bug fix & doc add

* add mesh check

* function name change

Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
2022-06-23 12:46:15 +08:00
ChiaNing abc8f47b6f Revert "First Version Sprite Renderer(Rect mode) (#10592)" (#11626)
This reverts commit d7d9c6cce7.
2022-06-20 20:22:53 +08:00
ChiaNing d7d9c6cce7 First Version Sprite Renderer(Rect mode) (#10592)
* First Version Sprite Renderer

* Serialize Vertices

* remove

* Sorting Layer & Sorting Order add

* fix for trim mode

* SpriteFrame inspector change

* Revert "Sorting Layer & Sorting Order add"

This reverts commit ca000ad79dadc4d09707a06c4514abdb6ab0fc6f.

* misc fix

* format change

* import change

* useless builtin res remove

* misc fix

Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
2022-06-20 17:35:50 +08:00
PP ef3c839838 ban UI hitTest on renderTexture (#11299) 2022-06-20 10:07:14 +08:00
pandamicro 8864f2f4c7 Merge remote-tracking branch 'cocos-for-editor/v3.5.2' into merge3.5
# Conflicts:
#	cocos/core/components/renderer.ts
#	cocos/core/global-exports.ts
#	cocos/core/renderer/core/render-scene.ts
#	cocos/core/renderer/core/render-window.ts
#	cocos/core/renderer/scene/index.ts
#	cocos/core/root.ts
#	cocos/core/scene-graph/scene-globals.ts
#	package.json
2022-06-09 15:20:30 +08:00
minggo 7814949998 Merge branch 'v3.5.1' into v3.6.0_merge_v3.5.1 2022-05-24 11:53:57 +08:00
pandamicro dba83c270d Fix multi blank lines (#11116) 2022-05-17 11:56:06 +08:00
ChiaNing 045e6430cb add base-Renderer and separate & rename renderableComp (#10903)
* add base-Renderer and separate & rename renderableComp

* rename

* some fix

* misc fix

* format change

* file name change & api doc add

Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
2022-05-09 17:44:56 +08:00
ChiaNing 28b6503087 fix some ui api doc (#10969)
* fix some ui api doc

* update

Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
2022-05-06 19:22:34 +08:00
Leslie Leigh (李的序) 5fd18f942b Fix missed links (#10938) 2022-05-06 10:10:36 +08:00
Santy-Wang 23de9188ba V3.5 docs (#10898)
* adjust api docs and delete useless annotation

* delete useless annotation
2022-04-27 15:22:22 +08:00
ChiaNing 968ab9d71a fix some api doc (#10868)
* fix some api doc

* add misc
2022-04-25 21:15:19 +08:00
ChiaNing 6ce58a2eb0 API Doc link change (#10845) 2022-04-25 10:30:52 +08:00
PP d749bbe1c4 remove legacyPublic tag (#10702) 2022-04-08 19:41:20 +08:00
minggo be735449af Revert "remove some deprecated api (#10656)" (#10694)
This reverts commit a1b1fc5a09.
2022-04-08 11:51:06 +08:00
minggo a1b1fc5a09 remove some deprecated api (#10656)
* remove some deprecated api
2022-04-07 16:31:02 +08:00
ChiaNing 240decee5f customMaterial disallow animation (#10601) 2022-03-31 15:30:58 +08:00
ChiaNing 864535baab fix opacity bug when active false (#10595) 2022-03-30 17:52:22 +08:00
PP 5ef14f649f remove help decorator on non-component class (#10503) 2022-03-25 16:25:30 +08:00
PP 96f3bd00e3 fix pointer event when camera.orthoHeight changed (#10496)
* deprecated uiTransform.isHit with hitTest method

* use hitTest instead of isHit

* add type info

* update
2022-03-25 13:53:09 +08:00
Santy-Wang ab82e1b42d remove hidden (#10414)
* remove hidden

* fix typo

* fix unit-test

* turn on auto fix
2022-03-22 15:11:16 +08:00
zhakesi 1f4e10a0c8 fix spine/dragonbones opacity update (#10349)
* fix spine/dragonbones opacity update

* fix use ui-opacity with spine on editor

Co-authored-by: zhakesi <zhakesi@foxmail.com>
2022-03-21 19:51:34 +08:00
ChiaNing 44b78f0a89 fix opacity dirty bug when parent change (#10416) 2022-03-21 19:13:51 +08:00
Zhang mingzhen 9c37363b69 use approx instead of === (#10357)
* use approx instead of ===

* remove rebundant as
2022-03-16 13:39:11 +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
ChiaNing e378c85ab1 fix canvas camera resize bug in editor (#10164)
* fix canvas camera resize bug in editor

* event off
2022-02-28 14:25:10 +08:00
pandamicro 2ba83f18a4 Ensure RenderData.clear won't break usability (#10177)
* Cleanup Renderable2D onDestroy and destroyRenderData

* Ensure RenderData.clear won't break usability

* Remove quad render data

* Fix Skeleton.destroyRenderData

* Small tweak

* Fix ci

* Add protection to buffer accessor size calculation

* Cleanup spine & dragonbones code

* Improve DragonBones draw list management

* Fix currRenderData state issue
2022-02-25 14:56:54 +08:00
pandamicro 50a43e18e4 Shared vb accessor for spine (#10077)
* Robust updateOpacity in batcher & cleanup code

* Support Batcher2D commitIA

* Support customized buffer size for StaticVBAccessor

* Reorganize RenderData logic and prepare spine refactor

* spine realTimeTraverse using dedicated accessor

* Support spine clipping

* Fix updateOpacity in batcher 2d

* Support Spine cache mode

* Fix ci

* Use different accessor for tint spine

* Update effect

* Fix native spine and dagonbones IA range issue

* Fix spine tint accessor registartion

* Revert darkColor default value

* Fix spine accessor switching issue and render data init issue

* Shared vb accessor for dragonbones (#44)

* Shared vb accessor for dragonbones

* fix code style

* add explanation why need resize render data in realTimeTraverse

Co-authored-by: zhakesi <liqiao@cocos.com>
2022-02-18 15:24:59 +08:00
ChiaNing 2bae6537f5 fix renderData update bug when renderable2d not render (#10101) 2022-02-14 18:41:46 +08:00
ChiaNing 8f87cbd483 useless UI_GPU code delete (#10048) 2022-01-25 19:14:41 +08:00
santy-wang 995f5b2d41 Merge branch 'v3.4.2' of https://gitlab.cocos.net/publics/engine into v3.5-merge 2022-01-24 15:56:49 +08:00
pandamicro bd3c30fd4c BufferAccessor refactor for Batcher2D (#9802)
* 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 0600e26f7eee277c820c3097b1f48f79fcf60890.

* the quickest version

* pass renderScene

* batch

* change batcher update

Co-authored-by: pandamicro <lphuabin@gmail.com>

* 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 <sun.cloud.mo@gmail.com>
2022-01-07 15:43:04 +08:00