Commit Graph

86 Commits

Author SHA1 Message Date
santy-wang 91c884362d Merge branch 'v3.6.2' of github.com:cocos-creator/engine into v3.6.1-sync 2022-10-11 20:12:14 +08:00
minggo 84c25f3a33 declare WrapMode in core/geometry/curve.ts (#12933)
* move WrapMode into core/geometry/curve.ts

* do not exmport WrapModeMask
2022-09-29 09:42:27 +08:00
AFeiYA 1c2a1ba38a Add srgb transform. (#12873) 2022-09-28 14:15:22 +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
santy-wang f33523227f sync v3.6.1 to develop 2022-09-19 14:00:54 +08:00
Leslie Leigh (李的序) fbe3b543c4 Fix adjustTransitionPriority in case of serialization (#12770)
* Fix adjustTransitionPriority in case of serialization

* Fix lint
2022-09-15 10:41:56 +08:00
santy-wang 7bbad4a0a4 Merge branch 'develop' of github.com:cocos-creator/engine into v3.6.1-sync 2022-09-14 11:47:58 +08:00
黄森斌 43a91b1099 [Optimize] tooltip i18n data add extension prefix name (#12741)
* tooltip add extension prefix name

* test case
2022-09-14 10:16:47 +08:00
minggo 7922834c0b move cocos/core/animation to cocos/animation (#12674) 2022-09-05 14:57:37 +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
Santy-Wang f3fbfeb3b1 fix particle-system deserialization (#12220) 2022-07-29 11:54:49 +08:00
黄森斌 67e9aa1f33 V3.6.0 allow multiple custom scripts exist in project with one same className (#11763)
* use getClassById instead of _getClassById

* use getClassId instead of _getClassId

* public cc.js.getClassId api

* allow className already exists, new one will replace old classObject

* create component use cid

* allow className exist when registing

* custom script className allow duplicated

* revert some comments

* preserve api and deprecate _getClassById and _getClassId

* revert some comments

* revert comment

* Update cocos/core/utils/js-typed.ts

Co-authored-by: PP <chinese1236@qq.com>

Co-authored-by: PP <chinese1236@qq.com>
2022-07-05 15:19:56 +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
Santy-Wang 5ae9dd67ce fix addPersistNode (#11689) 2022-06-24 11:25:41 +08:00
Santy-Wang 8ca3044cdf set persist node's hideFlags to DontSave when switch scene (#11627)
* set persist node's hideFlags to DontSave when switch scene

* refine log
2022-06-20 23:18:41 +08:00
Jare Guo b56376eed9 Slim CCClass: Clean some ES5 class implements (#11051)
* Slim CCClass: Remove deferred properties initializer. Simplify __ctors__ value.

* Slim CCClass: Remove unused mixins support

* update comment
2022-06-20 15:20:43 +08:00
Santy-Wang e87910e851 support get component with abstract class (#11561) 2022-06-16 20:28:55 +08:00
Santy-Wang f17ab5d950 cherry-pick ds branch (#11219)
* uniquify uuid of comp and node in prefab

* support component add/remove event

* use option to control id serialization
2022-05-25 18:43:25 +08:00
Jare Guo 92bb384dda Instantiate all FastDefined objects as value type (#11052)
* Instantiate FastDefined object as value type

* Optimize #11052

* Doc

* minor tweak

Co-authored-by: Leslie Leigh <leslieleigh@outlook.com>
2022-05-14 14:30:47 +08:00
Leslie Leigh (李的序) b1271e6370 Unit test on retrieving class id and class name (#10559) 2022-03-29 20:15:20 +08:00
Santy-Wang 98e52e3f16 output warning info when attached to the node has zero scaling (#10524)
* output warning info when attached to the node has zero scaling

* use approx instead
2022-03-26 22:23:29 +08:00
Leslie Leigh (李的序) e86ee1a247 @disallowAnimation should not imply visible (#10262) 2022-03-08 16:27:30 +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
santy-wang 7ffe1bc031 Merge branch 'v3.4.1' of https://gitlab.cocos.net/publics/engine into v3.5.0 2022-01-06 14:41:28 +08:00
Leslie Leigh (李的序) d97e453b07 Fix decorator order issue in standalone mode (#9911)
* Fix decorator order issue in standalone mode

* Apply

* Update
2022-01-05 23:30:21 +08:00
alpha f153b5cc1b fix Color.fromHex Bug (#9867) 2021-12-28 11:52:01 +08:00
santy-wang d3d84673d3 Merge branch 'v3.4.0' of https://gitlab.cocos.net/publics/engine into v3.5.0 2021-12-10 19:20:01 +08:00
ChiaNing 99bdb07378 Revert "mesh buffer cache add (#9728)"
This reverts commit 1c0db6414a.
2021-12-03 19:46:09 +08:00
santy-wang 01ceef90c1 Merge branch 'v3.4.0' of github.com:cocos-creator/engine into v3.5.0 2021-12-03 00:08:06 +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
santy-wang 6cde877e5b Merge branch 'v3.4.0' of https://gitlab.cocos.net/publics/engine into v3.5.0 2021-11-24 14:23:21 +08:00
Santy-Wang c08d69f664 introduce container manager (#9640)
* introduce pool manager

refine

refine

fix render mode

introduce pool manager

refine

* refine

* fix ci

* fix spine buffer

* add unit test

* add unit test 2
2021-11-22 23:23:19 +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
Leslie Leigh (李的序) d5154269e2 Fix log() takes not effect if debug mode <= verbose (#9681) 2021-11-18 12:00:24 +08:00
Santy-Wang 89f8cfbad3 optimize layer (#9658)
* optimize layer

* refine
2021-11-13 15:33:07 +08:00
PP 1abbc90c23 compability for PROPORTIONAL_TO_FRAME container strategy (#9642)
* support isProportionalToFrame field on screen-adapter

update

stash

* rename _setupContainer to _setupCanvas

* optimize view.setResolutionPolicy()

* remove TIME_OUT to handle resize event

* compability for PROPORTIONAL_TO_FRAME container strategy

comp

update

* add NOTE

* optimize 'window-resize'

resize

* deprecate game.frame && game.container

deprecate

game

* close screen.resolutionScale interface

close

* fix npm test

* fix view unit test

* space
2021-11-11 19:24:39 +08:00
Zhang mingzhen 9f77edb1f7 Add a method "getCompletePath()" to print complete path in hierarchy (#9536)
* Bump tmpl from 1.0.4 to 1.0.5 (#9357)

Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add a method "getCompletePath()" to print complete path in hierarchy#9203

(cherry picked from commit 9acba34514f43730494b548a7e9c22bf21a6d555)

* delete "getCompletePath()" in "BaseNode" and "Scene"

* Revert "Bump tmpl from 1.0.4 to 1.0.5 (#9357)"

This reverts commit 33375839a6.

* Optimize method name and supplement the annotations #9203

* optimize annotations

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Santy-Wang <wh19930829@qq.com>
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
2021-10-30 18:12:24 +08:00
Zhang mingzhen f6edc13da7 set active false if param is undefined or null (#9571)
* set active false if param is undefined #9397

* add condition that param is null and the unit test #9397

* ignore grammar error

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
2021-10-30 15:23:21 +08:00
PP f5511f4c87 Revert "Revert "optimize interface in screen module (#9176)"" (#9490)
This reverts commit b88d4845cc.
2021-10-15 10:21:04 +08:00
pandamicro b88d4845cc Revert "optimize interface in screen module (#9176)"
This reverts commit 4735476945.
2021-10-14 23:07:23 +08:00
PP 4735476945 optimize interface in screen module (#9176)
* optimize interface in screen module

* remove DPR calculating

* update screen-adapter init

* set screen.resolutionScale as 1 by default

* remove pixelRatio getter in system-info

* remove sys.windowPixelRatio access

* optimize screen.windowSize

update

* convertToCocosScreenSpace

* change resolution-change to window-resize

* fix native UI

update

update UI

update UI

* optimize screen init

* fix subContextView

* fix root resize

* fix precision issue on Metal render end

* sys.windowPixelRatio

* use warnID

* remove screen.convertToCocosScreenSpace

* put private property and method together after public ones

* warnID

* fix landScape on CocosPlay

* fix DPR on vivo platform

* fix CI
2021-10-14 22:16:34 +08:00
Leslie Leigh (李的序) f1f0fbaf16 [WIP] Feature: NewGenAnim (#9331)
* 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 d5dd5f32c9dbacb68c016ff8ba56d383c781a021)

* 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: 黄森斌 <arsen2010@126.com>
Co-authored-by: linshunjun <49218738+linshunjun@users.noreply.github.com>
2021-10-14 10:28:23 +08:00
Santy-Wang e8cf9a0ada export active-in-hierarchy-changed event (#9369) 2021-09-23 14:22:18 +08:00
Santy-Wang 75a22d4b98 support require component array (#9366)
* support require component array

* fix lint

* refine
2021-09-23 14:00:55 +08:00
Santy-Wang cf3e10b6c4 sync some unit test from 2.4 (#9321)
* add unit test

* add more unit test

* refine

* add test

* add more unit test

* add more unit test

* more change

* add commit

* add unit test

* commit package-lock.json

* revert some

* refine code

* add more test

* fix bugs

* fix bugs
2021-09-13 19:05:39 +08:00
PP 97b3657549 migrate input module out of platform (#9296)
* migrate input module out of platform

* revert EventKeyboard.isPressed deprecation

* fix CI
2021-09-07 15:24:43 +08:00
jiaxin.lai 9ccf2aa92b add vec2 cross override and unit test (#9250)
* vec2 cross override

* add unit test

* docs
2021-08-25 18:43:55 +08:00
minggo 732f7a7ffa do not shrink array when alloc and fix some logic error (#9218)
* do not shrink array when alloc
* add test case
2021-08-21 15:39:06 +08:00