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
jk20012001
25c4949ce5
[fix] camera clear flag is skybox but skybox is disabled #13589 ( #12964 )
2022-10-11 18:56:55 +08:00
ChiaNing
2afd02e711
sorting component add ( #12465 )
...
* sorting component add
* menu add
* change sorting layer type to enum
* import fix
* name change
* sorting init
* fix init
* update priority on editor
* add enum index
* sort fix
* api doc add
* remove export to cc
* doc change
* protect
* warn id
Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com >
2022-09-15 10:15:33 +08:00
ChiaNing
2f1567bb7d
mask interface deprecated ( #12667 )
...
* mask interface deprecated
* fix
* warn add
* warnid
* msic
2022-09-09 16:34:43 +08:00
Santy-Wang
1844a35fc9
support asset-overriding ( #12632 )
...
* support asset-overriding
* output some debug info
* refine some code
* fix typo
2022-09-02 10:38:46 +08:00
zxx43
d8f09ea57d
3.6.1 trail buffer insufficient space fix ( #12567 )
...
* enlarge trail buffer
* add warning information
* use warn id instead
2022-09-01 23:49:17 +08:00
zxx43
6678c378ee
V3.6.0 particle material log ( #12249 )
...
* add warning message when change particle material
* use error id instead
* change to log
* change to warning
* Apply suggestions from code review
Co-authored-by: pandamicro <lphuabin@gmail.com >
2022-07-28 17:44:53 +08:00
Santy-Wang
629d788596
Output friendly information about effect name ( #12137 )
...
* Output friendly information about effect name
* Apply suggestions from code review
Co-authored-by: pandamicro <lphuabin@gmail.com >
2022-07-21 23:05:53 +08:00
PP
7f41b05cfe
support top level deprecate check ( #11630 )
...
* support __checkObsolete__
update
update deprecate info
update
fix ci
fix ci
update
* rename interface
* cache namespace proxy
* move deprecate info to version deprecated
* consider undefined Proxy
2022-07-01 11:55: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 20755f9ec5jkregister@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: d823cbba1f#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
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
江战
42c583665e
3.6 native template version validation ( #11589 )
2022-06-18 18:53:18 +08:00
troublemaker52025
387b994f91
Add CSM for v3.6.0 ( #11120 )
...
* Add CSM for v3.6.0
* fix CI error
* fix Ci error 2
* Limit soft shadow sampling range
* update
* add soft 5x PCF
* add warn ID
* sync CSM to native engine
* fix CI error
* add Performance Mode
* fix ci error
* fix ci error 2
* fix ci error 3
* add precisely tailored
* use CC_SHADOWMAP_FORMAT
* update
* Modify default parameters
* sync to native engine
* revert config file
* fix ci error
* modify pr problem
* fix CI error
* fix ci error
* sync to js engine
* fix ci error
* fix cc_shadowMap not binding
* fix vulkan shadow effect error
* build effect
* fix ci error
* modify review
* fix ci error
* fix ci error 2
* delete unused interfaces
* fix ci error
* update
* update 2
* fix ci error
* delete csmDebugMode
* build effect
* use csmLeve to shadowCascadeLevel
* update
2022-06-07 14:30:49 +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
minggo
84c27e7f71
Merge branch 'v3.5.0' into v3.6.0_merge_v3.5
2022-04-24 13:41:27 +08:00
jk20012001
34711f9a65
fix #10808 Diffuse map not applied after removing env map and reset them ( #10813 )
...
* fix #10808
show warning message when diffuse map resource is missing
* code style
* code style
* code style
* add error message
* code style
2022-04-20 18:49:38 +08:00
jk20012001
d4fbe4f017
toggle hdr mode and without diffusemap file, show warnings and fix to… ( #10805 )
...
* toggle hdr mode and without diffusemap file, show warnings and fix to right lighting type
* use warnID instead of plain text
* code style
2022-04-19 17:57:11 +08:00
李吉林
f195f7dd2d
add spline ( #10684 )
...
* add spline
2022-04-11 15:49:20 +08:00
minggo
a6bf766170
Merge branch 'v3.5.0' into v3.6_merge_v3.5
2022-03-29 18:26:40 +08:00
Leslie Leigh (李的序)
0a67669190
Animation state bugfix ( #10558 )
2022-03-29 11:33:47 +08:00
Yiwen
718ea8ee3f
Add a method to select mipmap range for Texture2D and TextureCube. ( #10500 )
...
* Add a feature to select mipmap range to image asset.
* fix format
* fix format
* modify comments, remove uncessary methods
* finx comments.
* fix logic problem
* fix mipmap range problems
* Add validation information incase someone wants to generate mipmap for compressed texture
* remove some validations to make gfx bakend clear
* fix a stupid typo
* Add validation information for setMipRange
* use assertID to validate the mipmap range
2022-03-27 13:52:24 +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
李吉林
d793157a71
add dynamic mesh ( #10291 )
...
* add dynamic mesh
* Mesh init refactor
* fix geometry renderer bug
* dynamic mesh review update
* MeshUtils refactor
* do not export createDynamicMesh
2022-03-16 16:55:49 +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
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
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
Zhang mingzhen
9e63a71a87
remove deprecated ( #10007 )
...
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com >
2022-01-18 14:26:43 +08:00
ChiaNing
fea3f70dbc
protect meshBuffer max vertex count ( #10005 )
...
* protect meshBuffer max vertex count
* format change
2022-01-17 18:50:20 +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 0600e26f7elphuabin@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
zhakesi
a2bb27f2e4
fix readpixels ( #9900 )
...
* fix function readPixels height setting
* add paramter to receive pixel data for readPixels.
* use errorID
* modify error description
* fix import { errorID }
2021-12-30 14:16:30 +08:00
Zhang mingzhen
de78f6c7a8
optimization: set same value attribute v3.5 ( #9744 )
...
* return process when same value attributes are assigned
* add warn log in ErrorMap
* optimize upper character
* remove warn when same texture is assigned
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com >
2021-12-21 17:20:41 +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
李吉林
f68fa14be3
add geometry renderer ( #9776 )
2021-12-07 18:13:30 +08:00
ChiaNing
99bdb07378
Revert "mesh buffer cache add ( #9728 )"
...
This reverts commit 1c0db6414a
2021-12-03 19:46:09 +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
Zhang mingzhen
083918f92b
console exception if comp'node is null ( #9723 )
...
* output error when node of comp is null #9214
(cherry picked from commit 2d8ac7809462a29d8ccemingzhen.zhang@cocos.com >
2021-11-25 10:08:12 +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
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
PP
1ed2a9833e
optimize screen adaption on Web platform ( #9580 )
...
* optimize screen._init
* support WindowType on Web platform
* optimize fullscreen adaption
* optimize frame resize
update
* set timeout to handle screen event
* fix esLint
* fix esLint
* fix spelling
* fix number type
* EVENT_TIMEOUT
* fix esLint
* revert naming 'OrientationMap'
2021-11-01 00:01:49 +08:00
Yun Hsiao Wu
3493f0c02f
fix camera pre-rotation adaptation ( #9534 )
...
* fix camera pre-rotation adaptation
* more consistent wrap modes
2021-10-26 15:29:12 +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
Yun Hsiao Wu
427ff1254c
instance buffer allow different strides ( #9329 )
2021-09-16 17:39:37 +08:00
Leslie Leigh (李的序)
62d695c04e
Suppress warns when baking skeletal curves in AnimationClip ( #9147 )
2021-08-06 16:03:04 +08:00
Leslie Leigh (李的序)
3a52b35f3c
Optimize CCON related messages ( #9122 )
2021-08-04 10:02:53 +08:00
