minggo
802a1f0959
Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
...
Conflicts:
cocos/core/utils/x-deprecated.ts
cocos/physics/bullet/instantiated.ts
cocos/physics/framework/components/character-controllers/character-controller.ts
cocos/render-scene/scene/shadows.ts
cocos/rendering/render-shadow-map-batched-queue.ts
cocos/spine/lib/instantiated.ts
cocos/spine/lib/spine-define.ts
cocos/spine/skeleton.ts
native/cocos/editor-support/spine-wasm/AtlasAttachmentLoaderExtension.cpp
native/cocos/editor-support/spine-wasm/spine-skeleton-instance.cpp
native/cocos/editor-support/spine-wasm/spine-skeleton-instance.h
native/cocos/editor-support/spine-wasm/spine-type-export.cpp
native/cocos/editor-support/spine-wasm/spine-wasm.cpp
native/external-config.json
2023-07-12 16:02:10 +08:00
ChiaNing
8d235204de
add renderRoot2d help ( #15644 )
2023-07-07 12:01:58 +08:00
PP
b8a96f0080
fix type in debug.ts ( #15426 )
...
* fix type in debug.ts
2023-06-14 11:33:00 +08:00
PP
509d73b27d
merge branch v3.8.0-aot ( #15421 )
...
* PR1: add explicit function return type (#15311 )
* PR4: add explicit function return type (#15314 )
* [ci skip][AUTO]: Automated code generating update: 8843bfe54cd3f8e6f84432948716c8d130ecb233 (#15314 ) (#15357 )
Co-authored-by: cocos-robot <cocos-robot@cocos.com >
* add function return type
* fix version checking
* fix return type
---------
Co-authored-by: Cocos Robot <48829427+cocos-robot@users.noreply.github.com >
Co-authored-by: cocos-robot <cocos-robot@cocos.com >
2023-06-13 18:08:45 +08:00
pandamicro
c8d3be08a3
Fix issues in Node.updateWorldTransform and UITransform.getBoundingBoxTo[World] ( #15273 )
...
* Fix transform update issue when only rotation is set to root node
* Fix UITransform.getBoundingBoxTo and UITransform.getBoundingBoxToWorld
* Improve API and test
* Fix native Node::updateWorldTransform
* Fix UITransform.getBoundingBoxTo
* Fix getBoundingBoxTo by ensuring one time rect transform
* Ignore zero sized rect for bounding box calculation
* Improve API doc
2023-06-07 11:10:28 +08:00
minggo
a22d16bbe6
Merge branch 'v3.7.3' into merge_v3.7.3
2023-04-24 11:26:58 +08:00
zxx43
fbbdab53a4
use getSharedMaterial to replace getMaterial ( #14814 )
...
* use getSharedMaterial to replace getMaterial
* call getSharedMaterial directly
* modify note
2023-04-19 11:07:46 +08:00
ChiaNing
36750fb4b2
spriteRenderer sort bug ( #14785 )
2023-04-18 10:19:02 +08:00
黄森斌
eefa3401ea
fix bug: some enum props of material show error interface ( #14767 )
2023-04-13 16:39:46 +08:00
ChiaNing
281bf038ea
remove blendFactor deprecated in UIRenderer ( #14777 )
2023-04-11 19:14:54 +08:00
minggo
60fa48ba7c
make UIRenderer._srcBlendFactor protected ( #14685 )
...
* make UIRenderer._srcBlendFactor public
2023-03-30 14:44:12 +08:00
minggo
37f89f4cb0
make UIRenderer._renderData as protected ( #14677 )
...
* make UIRenderer._renderData as public
2023-03-29 11:07:13 +08:00
PP
e01ac3ee05
add tracking issue for TODO item ( #14638 )
...
* issue 14637
* issue 14640: animation module
* issue 14642: serialize deserialize hack
* issue 7519: pal/image
* issue 14643: dynamic inject
* mark as NOTE
* issue 14644: native only
* issue 7512: pal/fs
2023-03-23 16:42:46 +08:00
PP
fa51b804b5
remove and ban @ts-expect-error ( #14572 )
...
* remove ts-expect-error usage in engine
* deprecate Scheduler interface
* remove JavaScriptCore
* set some engineInternal public property as getter setter
* fix build-declaration
* fix releaseManager export name conflict
* update scriptEngineType
* fix and update some comment
* remove w_mat, w_pos, w_rot, w_scale
* update renderer
* fix setRootBufferDirty not binding on native
* optimize floatToHashString
* mark NOTE
2023-03-20 13:48:26 +08:00
santy-wang
0a81bf445e
Merge branch 'develop' of github.com:cocos-creator/engine into v3.7.2
2023-03-13 16:51:47 +08:00
PP
386ec2895a
[cherry-pick] AOT-3: optimize uinstrict code ( #14315 ) ( #14523 )
...
* AOT: optimize uinstrict code
- mark some unstrict code as TODO
- remove some unstrict code
* update comment
* remove ts-check
# Conflicts:
# cocos/2d/framework/deprecated.ts
# cocos/asset/assets/image-asset.jsb.ts
# cocos/asset/assets/texture-base.ts
# cocos/core/assets/image-asset.ts
# cocos/core/math/rect.ts
# cocos/core/scene-graph/scene-globals.jsb.ts
# cocos/native-binding/impl.ts
# cocos/scene-graph/node-dev.ts
# cocos/scene-graph/scene-globals.ts
# exports/sorting.ts
2023-03-10 13:36:45 +08:00
ChiaNing
82f11e00a1
update ui vb when renderFlag change by color ( #14405 )
2023-03-01 17:50:15 +08:00
王凯鹏
ecaafc853d
[Bug] fix tween color cause console error in editor preview ( #14412 )
...
* [Bug]fix tween color console error in editor preview
* [Bug] 调整修改方式
2023-03-01 14:42:58 +08:00
ChiaNing
b603baae23
Improve api doc (2d&UI) ( #13898 )
...
* Improve api doc (2d&UI)
* remove @internal
* msic
* remove eracut
* update doc
* Update
* fix
* misc
2023-02-08 14:25:48 +08:00
pandamicro
afd22296b4
MIT license update and to new year 2023 ( #13927 )
...
* Cpp MIT license update and to date
* TS MIT license update and to date
2022-12-28 11:25:12 +08:00
ChiaNing
3d3847f2d9
fix ui transform recursion bug ( #13848 )
2022-12-19 16:14:34 +08:00
ChiaNing
0f815a5244
fix UI material instance bug ( #13583 )
...
* fix UI material instance bug
* use less remove
* change
Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com >
2022-12-06 10:34:58 +08:00
Zhang mingzhen
07c64eefdf
Renderable2D is deprecated, set removed as false ( #13485 )
...
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com >
2022-11-23 11:46:45 +08:00
minggo
83a2717fac
Fix module import ( #13140 )
...
* fix core module import style
* import murmurhash2_32_gc from core module
* do not export visibleRect
2022-10-25 16:38:38 +08:00
minggo
95a76235b6
Adjust some files ( #12910 )
...
`cocos/core` should not depend other modules, so move some files out of `cocos/core`:
- move some files from `cocos/core` to `cocos/game`
- director.ts
- splash-screen.ts
- game.ts
- move `cocos/core/root.ts` to `cocos/root.ts` as there is not better module to contain `root.ts`.
- move `cocos/core/platform/view.ts` to `cocos/ui/view.ts` as screen related logic is moved to `cocos/core/platform/screen.ts`
2022-09-28 09:34:35 +08:00
minggo
0d7c5c8f56
move cocos/core/scene-graph to cocos/scene-graph ( #12868 )
...
* move `cocos/core/scene-graph` to `cocos/scene-graph`
* move some files in `cocos/core/components` to `cocos/scene-graph`:
- component.ts
- component-event-handler.ts
- component-event-handler-schema.ts
* move some files in `cocos/core/components` to `cocos/misc`:
- missing-script.ts
- model-renderer.ts
- renderer.ts
- camera-component.ts
* move `cocos/core/components/system.ts` to ``cocos/core/system.ts``
2022-09-26 11:02:22 +08:00
minggo
bd0fcc67c4
move cocos/core/pipeline to cocos/rendering ( #12797 )
...
* move cocos/core/pipeline to cocos/rendering
2022-09-16 16:10:26 +08:00
林玮
785fd91511
Add multi-windows support ( #12243 )
...
Co-authored-by: bofeng.song <bofeng.song@chukong-inc.com >
2022-09-15 14:55:44 +08:00
minggo
4261ccae76
move cocos/core/renderer to cocos/render-scene ( #12729 )
...
* move cocos/core/renderer to cocos/render-scene
* fix compiling error on native
2022-09-09 18:19:06 +08:00
minggo
2f10f48c15
adjust some folders ( #12712 )
...
move cocos/core/asset-manager to cocos/asset/asset-manager
move cocos/core/assets to cocos/asset/assets
merge cocos/core/builtin to cocos/asset/asset-manager
2022-09-07 18:45:54 +08:00
minggo
aba9fdb63f
Merge branch 'v3.6.1' into merge_v3.6.1
2022-09-02 20:08:18 +08:00
ChiaNing
482b20ea47
Mask Refactoring ( #12636 )
...
* first version mask
* image stencil material fix
* misc fix
* type change fix
* export fix
* some native code
* native fix
* use less remove
* remove isForMask
* material change
* delate sprite frame
* use less remove
* misc fix
* ci
* mate updte
* de
Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com >
2022-09-02 10:17:44 +08:00
Zhang mingzhen
2879bb044b
add deprecated tag of "Renderable2D" ( #12606 )
...
* add deprecated tag
* move it to 2d
* supplement other 2d deprecated tags
* fix CI
* add policy description
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com >
2022-09-01 10:17:11 +08:00
minggo
c5c7b987ea
move cocos/core/gfx to cocos/gfx ( #12559 )
...
* move cocos/core/gfx to cocos/gfx
2022-08-26 17:51:46 +08:00
Zhang mingzhen
7bbce32970
static drawinfo should be reset when flushing assembler ( #12333 )
...
* static drawinfo should be reset when flushing assembler
* add reset drawinfo method
* revert mistake
* fix mistakes
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com >
2022-08-04 22:14:23 +08:00
ChiaNing
5e5c037e7b
fix label vertex color bug ( #12306 )
...
Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com >
2022-08-03 17:06:47 +08:00
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