Commit Graph

252 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
hyde zhou 5b37954c7f [develop] change custom builder setup procedure (#12990) 2022-10-09 16:14:59 +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
Leslie Leigh (李的序) db3a56fa1e Fix primitive.scale (#12836)
* Fix primitive.scale

* Test

* Tweak
2022-09-21 14:49:41 +08:00
Santy-Wang d6f38f3606 Merge pull request #12824 from cocos/v3.6.1
sync V3.6.1 to v3.6.2
2022-09-20 17:59:33 +08:00
santy-wang f33523227f sync v3.6.1 to develop 2022-09-19 14:00:54 +08:00
Zeqiang Li f5c4dee6db Wgpu 3.6.2 WGPU_CI_ON (#12731) 2022-09-16 10:20:52 +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 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 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
mmyduckx 2ea6e9b148 Remove base node related logics (#11977) 2022-08-23 17:34:36 +08:00
Leslie Leigh (李的序) 427bd20885 Fix animation mask api (#12380) 2022-08-11 11:57:20 +08:00
Santy-Wang f3fbfeb3b1 fix particle-system deserialization (#12220) 2022-07-29 11:54:49 +08:00
Leslie Leigh (李的序) aca3336745 Feat: animation graph - support absolute destination start time (#12162)
* Feat: animation graph - support absolute destination start time

* Update
2022-07-29 11:08:39 +08:00
Leslie Leigh (李的序) 8f929823f4 Optimize embedded player/event evaluation in animation state (#12186)
* Optimize embedded player evaluation in animation state

* update

* Skip wrap info calculation in certain cases in animation state

* Tweak

* Tweak

* Fix  test
2022-07-27 10:56:26 +08:00
Ling Zhan 811ed11bfa default physics material useing internal asset : default-physics-mate… (#11855)
* default physics material useing internal asset : default-physics-material.pmtl. todo: Project Setting's physics material config need to use this asset too. (#12662)

* support set default physics material value from project setting panel. It will effect the packaging processing, and scene loading(todo). this value will not be saved to default-physics-material.pmtl.

* fix physics-system unit test failure: physics system 's constructAndRegister() will directly init default physics material if the default physics material asset is ready

* minor modification of PhysicsSystem::_updateMaterial
2022-07-21 10:37:15 +08:00
Leslie Leigh (李的序) 4d7ca24948 Handle destination start time on empty transitions (#12007) 2022-07-15 17:05:08 +08:00
Santy-Wang ecb8d5f706 Avoid tick multiple times (#11991) 2022-07-14 17:55:50 +08:00
Leslie Leigh (李的序) 87d947c727 Property handle zero duration animation clips(2rd fix) (#11925) 2022-07-11 16:44:35 +08:00
Leslie Leigh (李的序) 22d0fa730b Properly handle zero duration clips (#11879) 2022-07-07 15:25:51 +08:00
zxx43 80697b676c fix unit test material warning (#11874) 2022-07-07 10:10:15 +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
Leslie Leigh (李的序) eaddf1dab7 Handle twice embedded player evaluations occur in difference animation iteration (#11836) 2022-07-05 10:50:32 +08:00
Santy-Wang dab024b47b fix stop pacer failed (#11835) 2022-07-04 17:24:24 +08:00
Leslie Leigh (李的序) e6dfd98840 Optimize morph animation (#11728) 2022-07-04 15:40:45 +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
Leslie Leigh (李的序) d4a3be4f23 Animation graph transition interruption (#11566)
* Transition interruption

* Add more tests

* Add

* Self transition interruption test

* Update

* Tweak

* Tweak
2022-07-01 13:47:02 +08:00
Leslie Leigh (李的序) 7037907b53 Improve rename variable unit test (#11666) 2022-06-24 18:25:05 +08:00
pandamicro 12072ffc62 Merge v3.5.1 zqb branch to v3.6 (#11637)
* support asset property preview (#11017)

(cherry picked from commit 85769cf8f81459b5ad98ccab4138420009572a32)

* show mesh asset thumbnail (#10981)

* V3.5.1 noise particle (#11003)

* add cpu & gpu noise for particle

* add some params & change particle noise shader

* change shader

* add cpu noise particle

* add noise preview

* run generation when preview

* revert shaders

* remove unused statements

* add particle noise module

* change noise preview interface

* add invisible to remap

* remove get deltaTime

* set noiseModule private

* fix eslint

* feat: add noise preview (#11260)

* [Optimize] asset editing undo (#10779)

* edit render-pipeline

* support renderpipeline undo

* optimize material editing undo

* reset last record data

* temporary not support animation-mask undo

* support animation-mask edit undo

* animation mask remove _jointMasks

* Animation clip embedded players (#11320)

* Animation clip subregions

* Log

* Test

* Eval

* Update

* Update

* No longer use animation state to implement clip motion

* Clear subregions

* Fix

* Mark subregion as editor extendable

* Animation clip subregion player path

* fix isnan(0.0) with webgl1.0 (#11262)

* fix isinf(0.0)==true with webgl1.0

* code style

* fix specular params with surface toon (#11265)

* code format and add sliders for parameters (#11266)

* Broadcasting of animation state\'s speed

* Fix

* Rename

* Update

* Fix

* Revert "No longer use animation state to implement clip motion"

This reverts commit 20755f9ec525b27b5b9a515c8dd687349aa4c637.

* Revert some exotic changes

* Update docs

Co-authored-by: jk20012001 <jkregister@163.com>
Co-authored-by: 徐兵 <49358166+xubing0906@users.noreply.github.com>

* fix skinning model split (#11378)

* fix skinning model split

* rename function _resizeMaxJointForDS

Co-authored-by: zhakesi <zhakesi@foxmail.com>

* [ci skip][AUTO]: Automated genbindings update: d823cbba1f7ce8284da28458c26534da2e033961  (#11378) (#11383)

Co-authored-by: cocos-robot <cocos-robot@cocos.com>

* use stop emitting instead (#11381)

* add stop emitting api

* use stop emitting instead

* Update cocos/particle/particle-system.ts

Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>

Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>

* fix: imageData fault tolerance (#11374)

* fix: imageData fault tolerance

* chore: when data is an empty array,stop the function

* material  undo updating effects list (#11409)

* modify noise module ui (#11433)

* use visible decorator to control the visibility of property (#11438)

* fix joints data with value nan (#11489)

* V3.5.2 CI Android NDK  set version to 21 (#11448) (#11492)

* Minor improvement

* Fix format

* Fix particle culler

* Improve particle culler

* Manually migrate joint data upload with texture in skinning model

* Update shaders for skinning model based on joint texture

* fis native skinning model with realtime-texture mode (#45)

Co-authored-by: zhakesi <zhakesi@foxmail.com>

* fix clangtidy (#46)

* Small tweaks

* modify code struct for skinning model (#47)

* modify code struct for skinning model

* update skinning chunk

Co-authored-by: 黄森斌 <arsen2010@126.com>
Co-authored-by: zxx43 <zxx43@hotmail.com>
Co-authored-by: 袁炜海 <35713518+dogodo-cc@users.noreply.github.com>
Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>
Co-authored-by: jk20012001 <jkregister@163.com>
Co-authored-by: 徐兵 <49358166+xubing0906@users.noreply.github.com>
Co-authored-by: zhakesi <liqiao@cocos.com>
Co-authored-by: zhakesi <zhakesi@foxmail.com>
Co-authored-by: Cocos Robot <48829427+cocos-robot@users.noreply.github.com>
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
Co-authored-by: Santy-Wang <wh19930829@qq.com>
Co-authored-by: zhangxin <59186205+chichinohaha@users.noreply.github.com>
Co-authored-by: 江战 <40414978+PatriceJiang@users.noreply.github.com>
2022-06-24 15:10:45 +08:00
Santy-Wang 5ae9dd67ce fix addPersistNode (#11689) 2022-06-24 11:25:41 +08:00
Leslie Leigh (李的序) 46b4d5e34b Animation graph add method to rename variables (#11659)
* Animation graph add method to rename variables

* Fix test
2022-06-23 11:58:20 +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
Leslie Leigh (李的序) e0555d536f Animation graph transition priority (#11555) 2022-06-20 14:28:18 +08:00
Leslie Leigh (李的序) d87a3f34ad Animation graph transition destination start (#11160)
* Animation graph transition offset

* Unit test

* Rename offset as destination start

* Rename
2022-06-20 10:12:34 +08:00
Leslie Leigh (李的序) 5b7e958651 Add AnimationController.getLayerWeight (#11380) 2022-06-20 09:59:33 +08:00
zxx43 766d086fbb V3.6.0 add particle material test case (#11597)
* add particle material test case

* add game stop
2022-06-18 14:10:07 +08:00
Leslie Leigh (李的序) c279004513 Activation/Inactivation should resume/pause animation (#11510) 2022-06-18 11:02:48 +08:00
Leslie Leigh (李的序) 58e25f18ee Animation graph negative speed (#11549)
* Animation graph negative speed

* Update doc
2022-06-17 10:15:32 +08:00
Santy-Wang e87910e851 support get component with abstract class (#11561) 2022-06-16 20:28:55 +08:00
PP 4531e180b2 publish build-engine 4.3.10 (#11478)
* publish build-engine 4.3.9 && support native API docs

update lock

update

* publish 3.4.10: fix generating comment on top level of namespace

* fix test CI
2022-06-14 22:31:51 +08:00
PP 1c737b91fd optimize Constants in engine (#11464)
* publish build-engine 4.3.5

* update build-engine deps

* remove default-constants.ts

ds

remove de

* delete consts.d.ts

* support build-const workflow

* remove EXPORT_TO_GLOBAL

* update comment

* fix interface-check

* update comment
2022-06-14 16:14:34 +08:00
minggo f07d3f3bda Merge branch 'v3.5.1-ds' into v3.6.0_merge_v3.5.1-ds 2022-06-07 15:02:34 +08:00
Leslie Leigh (李的序) 423ce5fa6b Improve error messages on animation clip track binding failure (#11224)
* Improve error messages on animation clip track binding failure

* lint
2022-06-06 13:34:57 +08:00