Commit Graph

51 Commits

Author SHA1 Message Date
pandamicro
dba83c270d Fix multi blank lines (#11116) 2022-05-17 11:56:06 +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
Zhang mingzhen
436eb46fa4 add wrapmode settings (#10754)
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
2022-04-14 19:02:40 +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
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
ChiaNing
bd89a7bc1a protect when texture insert to atlas (#10214) 2022-03-03 10:01:24 +08:00
Santy-Wang
b57b805e8b Revert "fix fuzzy text on high resolution displays (#9888)" (#10157)
This reverts commit 24f74e178c.
2022-02-22 23:06:10 +08:00
Santy-Wang
2aed94a34f Revert "change DPR to 1 when BMfont (#10154)" (#10156)
This reverts commit c27b2d34b6.
2022-02-22 23:02:02 +08:00
ChiaNing
c27b2d34b6 change DPR to 1 when BMfont (#10154) 2022-02-22 19:20:04 +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
ankye sheng
24f74e178c fix fuzzy text on high resolution displays (#9888)
* fix fuzzy text on high resolution displays

* modify devicePixelRatio scale factor and fix eslint

modify devicePixelRatio scale factor and fix eslint

fix eslint error

fix fuzzy text on high resolution displays

modify devicePixelRatio scale factor and fix eslint

modify devicePixelRatio scale factor and fix eslint

fix eslint error

fix fuzzy text on high resolution displays

modify devicePixelRatio scale factor and fix eslint

modify devicePixelRatio scale factor and fix eslint

fix eslint error

fix fuzzy text on high resolution displays

fix fuzzy text on high resolution displays

modify devicePixelRatio scale factor and fix eslint

modify devicePixelRatio scale factor and fix eslint

fix eslint error

fix fuzzy text on high resolution displays

fix rebase 3.4.2 ,limit dpr 1 or 2

fix font min dpr

fix font min dpr

fix fuzzy text on high resolution displays

modify devicePixelRatio scale factor and fix eslint

modify devicePixelRatio scale factor and fix eslint

fix eslint error

fix fuzzy text on high resolution displays

Merge branch 'v3.4.1' of github.com:ankye/engine into v3.4.1

modify devicePixelRatio scale factor and fix eslint

modify devicePixelRatio scale factor and fix eslint

fix eslint error

fix fuzzy text on high resolution displays

modify devicePixelRatio scale factor and fix eslint

modify devicePixelRatio scale factor and fix eslint

fix eslint error

fix fuzzy text on high resolution displays

fix fuzzy text on high resolution displays

modify devicePixelRatio scale factor and fix eslint

modify devicePixelRatio scale factor and fix eslint

fix eslint error

fix fuzzy text on high resolution displays

fix rebase 3.4.2 ,limit dpr 1 or 2

fix font min dpr

fix eslint error

fix fuzzy text on high resolution displays

fix fuzzy text on high resolution displays

modify devicePixelRatio scale factor and fix eslint

modify devicePixelRatio scale factor and fix eslint

fix eslint error

fix fuzzy text on high resolution displays

Co-authored-by: shengxiehua <shengxiehua@soulapp.cn>
2022-02-16 10:09:22 +08:00
ChiaNing
8f87cbd483 useless UI_GPU code delete (#10048) 2022-01-25 19:14:41 +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 0600e26f7e.

* 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
ChiaNing
34b1b70431 fix bmfont line width bug (#9793)
* fix bmfont line width bug

* Fix CI

* fix CI
2021-12-13 16:25:23 +08:00
ChiaNing
99bdb07378 Revert "mesh buffer cache add (#9728)"
This reverts commit 1c0db6414a.
2021-12-03 19:46:09 +08:00
ChiaNing
3673752872 Revert "fix mesh buffer cache update bug (#9734)"
This reverts commit f1c8e2528a.
2021-12-03 19:45:55 +08:00
ChiaNing
f1c8e2528a fix mesh buffer cache update bug (#9734) 2021-11-26 14:01:52 +08:00
ChiaNing
1c0db6414a mesh buffer cache add (#9728)
* UI MeshBuffer Cache add

* support hierarchy changed event

* notify upper

* use Dirty by Hierarchy Changed

* PR fix

* Fix CI

* fix CI

* support hierarchy changed event & function name change

* function name change

* comment add

* type change

Co-authored-by: santy-wang <wh19930829@qq.com>
2021-11-25 21:25:16 +08:00
ChiaNing
0173699089 Add renderData cache & simplify merge check (#9651)
* Add renderData cache & simplify merge check

* move function

* remove material id

* change dirty name

* fix CI
2021-11-19 18:21:02 +08:00
zhakesi
fed044e8fb optimize opacity update (#9679)
* optimize opacity update

* remove _cacheAlpha

* modify code style

* Update cocos/core/scene-graph/node-ui-properties.ts

* Update cocos/core/scene-graph/node-ui-properties.ts

* 1. supplement unit test case
2. supplement default dirty parameter

(cherry picked from commit 7e62d265ffbc8566e92bfcc10c1f9eb68e081487)

Co-authored-by: Santy-Wang <wh19930829@qq.com>
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
2021-11-19 17:35:19 +08:00
ChiaNing
cbc142f89c fix label memory leak when destroy (#9677)
* fix label memory leak when  destroy

* function move
2021-11-17 17:15:19 +08:00
ChiaNing
4a60f0a513 fix image Stencil bug (#9478) 2021-10-14 10:30:01 +08:00
ChiaNing
c7e432e50b fix trim bug (#9451) 2021-10-14 10:29:36 +08:00
ChiaNing
24fe3ff784 UI GPU dirven add (#9378)
* uniform

* uniform buffer add

* add dummy IA

* first working version

* misc & data structure optimize

* fix webGL1 bug

* rebase on 3.3

* add maxQuadPerDrawcall by device
现在每个DC能绘制的数量由设备返回的 uniform 数量上限决定

* add index

* index bug fix

* sliced ia add(Not finish)

* change mat4 to vec4

* change stride num

* new vec4PreUI finish

* misc fix

* size & anchor dirty add

* bug fix

* add UICapacityDirty

(cherry picked from commit 417e10c8d3422363d80828539b110b93ee4d3cb1)

* static buffer cache version

(cherry picked from commit 1ffe7e7943cdf9af085aeda5ca218c3442fa9119)

* static buffer update version

(cherry picked from commit 964d9cb5b3230963b2a535acac99a34cde7eb63c)

* cache localbuffer

(cherry picked from commit 641b956def64023e0d47be66bc0c0a37ef1e9791)

* fix setPosition event & fix DS release

* weak sliced & filp tiled mode add

* fix tiled y

* fix sliced bug

* ugly but work filled type add

* update effect

* filled mode effect

* shader fix

* RenderData dirty for render data update

* revert fillbuffer

* misc fix

* support label bmfont by meshBuffer

* fix sliced bug & commit Model

* fixed some render dirty flag bug

* cut code by macro.UI_GPU_DRIVEN

* cut code by UI_GPU_DRIVEN Macro on build

* cut file by UI_GPU_DRIVEN

* I-batcher interface add

* remove render queue cache

* file name change

* file name change

* after merge

* fix for v3.4

* useless remove

* fix texture rotation

* fix sliced when atlas rotation

* useless code remove

* native bind

* update effect

* fix DynamicOffsets bind bug

* PR review fix

* effect encapsulation

* change chunk

* update effect

* update shader

* remove color in fs

* move code

* fix UBO buffer bug

* fix ubo count to 10

* fix vk bind
2021-09-29 22:32:33 +08:00
ChiaNing
a7716e4347 fix Fix label outline artifact on web platforms (#9307) 2021-09-09 15:32:19 +08:00
ChiaNing
2f861cd38d fix mesh Buffer vertexCount Bug (#9155) 2021-08-09 18:29:16 +08:00
Santy-Wang
9d23637f06 delete useless code (#8601)
* delete useless code

* refine format and fix typo
2021-07-09 14:38:04 +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
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
587c40dc31 add char mode warn when size too big & sprite dirty bug (#8595)
* add char mode warn when size too big & sprite dirty bug

* update
2021-04-29 16:38:25 +08:00
ChiaNing
122c354bfd fix label alpha bug (#8572) 2021-04-28 10:27:09 +08:00
ChiaNing
00aca35ef2 fix some deprecated value warn (#8553) 2021-04-25 21:08:58 +08:00
ChiaNing
d86feb9eae name change (#8554) 2021-04-25 21:08:33 +08:00
ChiaNing
f1735ee251 fix ui opacity bug on some type (#8549) 2021-04-25 20:27:29 +08:00
Yun Hsiao Wu
8d2c784fb4 fix text fill style (#8499) 2021-04-20 16:32:23 +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
ChiaNing
00b304674b Fix label artifact on web platforms (#8442)
* Fix label artifact on web platforms

* update for one

* add notice
2021-04-14 13:32:45 +08:00
ChiaNing
24e9e573f0 fix richText maxWidth bug (#8345)
* fix richText maxWidth bug

* add notice
2021-03-11 19:12:47 +08:00
zhefeng.zhang
29bc42e0ba sync pr 7501 & 7914 (#7915)
* sync pr 7501 & 7914

* fixed when use two tiled sprite

* 解决冲突

* Revert "解决冲突"

This reverts commit 8cd4cd9c2d.

* refine code

* refine cod

* 资源下载任务创建统一使用create接口 (#8266)

* upload

* upload

* correction code

* Revert "correction code"

This reverts commit b794b5a54f.

* refine code

Co-authored-by: QinSheng <1053128593@qq.com>
2021-03-03 15:00:34 +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
Leslie Leigh (李的序)
9bd9baac12 Eslint autofix all (#8108)
* Eslint autofix all

* Manual fix
2021-01-09 11:41:10 +08:00
ChiaNing
0a6a007c0f add canvas pool length settings (#8093)
* add canvas pool length settings

* name change
2021-01-07 14:13:06 +08:00
李学武
8e7d11f66d _nodeContentSize should copy value (#8043)
Co-authored-by: lixuewu <lixuewu@17paipai.com>
2021-01-06 15:35:16 +08:00
JoneLau
cc84d2af46 activate model before drawing to avoid the user from filling the data without the node being activated (#8053) 2020-12-30 19:51:57 +08:00
pandamicro
b6c2ae7db9 Refactor Graphics impl.getRenderData to getRenderDataList (#8042) 2020-12-29 11:45:31 +08:00
JoneLau
47334c9c84 fix the problem that mask data is delayed to be updated by one frame (#8039)
* fix the problem that mask data is delayed to be updated by one frame

* fix ci
2020-12-29 10:29:48 +08:00
ChiaNing
b85a367309 fix label bug (update UV when texture change) (#8041)
* fix label bug (update UV when texture change)

* Circular reference fix
2020-12-28 20:41:22 +08:00
ChiaNing
66555423da ui pass refactoring (#8024)
* ui pass refactoring

* native fix & blend hash update

* doc update
2020-12-26 18:42:14 +08:00
ChiaNing
4461eb1d12 DynamicAtlas support (#8017)
* DynamicAtlas support

* CI fix
2020-12-26 14:28:30 +08:00