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
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
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
Santy-Wang
00367f39e1
support auto-finalization in editor ( #9008 )
...
* support auto-finalization in editor
* refine
* refine
* handle global variable
* refine
* fix bug
* refine
* use debug instead
2021-07-23 15:10:40 +08:00
Leslie Leigh (李的序)
6d10f68ef8
AnimationCurve ( #8409 )
...
* AnimationCurve
* Mark curve frame values as uniquelyReferenced
* Adjust modules
* Update
* Manually implements KeyframeCurve.iterator
* TargetPath
* Update
* Fix BUG
* Fix
* Add size track
* Update
* Fix size; unit tests
* fix split animation (#24 )
* CCONB animation clip; Remove integer track/channel/curve
* Optimize key shared curves
* Remove keyframecurve.empty
* Exotic animation
* Fix unit tests
* start/end -> left/right
* Curve range rename
* Easing methods
* Fix untyped track
* Fix
* fix upgradUnTypedTracks (#26 )
* Rename
.interpMode -> .interpolationMode
RealInterpMode -> RealInterpolationMode
QuaternionInterpMode -> QuaternionInterpolationMode
ExtrapMode -> ExtrapolationMode
.preExtrap -> .preExtrapolation
.postExtrap -> .postExtrapolation
QuaternionCurve -> QuatCurve
QuaternionKeyframeValue -> QuatKeyframeValue
* Update pre/post extrap
* Optimize-1
* Optimize-2
* Eliminate for-of
* Mark deprecateds
* Hide RealKeyframeValue/QuatKeyframeValue Constructor
* Fix quat keyframe value name
* Error ID
* Fix RealKeyframeValue editor extras
* Elimanate for-of forEach
Co-authored-by: zheng han <sunstar198941@gmail.com >
2021-07-23 11:26:55 +08:00
stanleyljl
b4d653aeb3
swap setMaterialInstance parameters ( #9021 )
...
* swap setMaterialInstance parameters
* add warnID for setMaterialInstance
Co-authored-by: lijilin <jilin.li@cocos.com >
2021-07-20 21:11:55 +08:00
cary
cc9b75eaad
Add custom material processing and pipeline type for pipeline. ( #8418 )
...
* Add custom material processing and pipeline type for pipeline.
* fix ci
* delete pipelinetype and add deferred pipeline scene data
* rename mat
* fix forward error
* modify native adapter
2021-07-14 17:08:04 +08:00
Santy-Wang
75f10acbb7
sync v3.1.2 ( #8794 )
...
* Do not modify local descriptor set v3.1.2 (#8773 )
* delete local descriptorSet for v3.1.2
* update
* V3.1.2 zxx43 particle (#8784 )
* fix https://github.com/cocos-creator/3d-tasks/issues/7421
* remove temp params & add create function to onFocusInEditor
* restrict particle system object count
* print error msg
* Add globalDSManager for v3.1.2 (#8727 )
* update
* update
* update
* update
* delete for of
* update
* update
Co-authored-by: troublemaker52025 <troublemaker52025@outlook.com >
Co-authored-by: zxx43 <zxx43@hotmail.com >
2021-06-09 16:04:16 +08:00
Yun Hsiao Wu
d8890c558f
optimize WebGLCmdFuncBindStates ( #8705 )
2021-05-26 12:36:19 +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
minggo
99d5f8f96c
support max pass up to 8 ( #8510 )
2021-04-21 16:53:55 +08:00
troublemaker52025
05a72cdee1
Delete private node for v3.1 ( #8382 )
...
* delete private node
# Conflicts:
# cocos/core/scene-graph/private-node.ts
* update
* Alias of Node
* update
* dont use enum ALL
* fix bug for editor
* update
* update
* update
* Retaining deprecated objects
* update
* update
* update
* using warnID and update EngineErrorMap.md
2021-04-08 17:47:05 +08:00
pandamicro
92d5e8934d
Add deprecation for replaced 2D render APIs ( #8143 )
2021-01-15 13:55:42 +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
ChiaNing
fa2057deb4
RenderRoot2d comp add ( #8120 )
...
* RenderRoot2d comp add
* name change
* require UITransform on renderRoot
2021-01-12 14:55:17 +08:00
pandamicro
9b75d50b1b
Improve game mainLoop safety ( #7796 )
...
* Improve game mainLoop safety
* Fix ci
* Fix ci
* Fix game pause state set
* Fix game init timing
* Fix camera component imports
* Fix eslint warnings
* allow dangling underscores
* Fix more warning
2020-12-22 18:19:40 +08:00
ChiaNing
f3d62ce258
mask invert bug fix & uiComp check ( #7758 )
...
* mask invert bug fix
* uiComp check
2020-11-11 19:13:37 +08:00
Jare Guo
676c267150
remove RawAsset (sync #6286 ) ( #7697 )
2020-11-08 22:45:15 +08:00
Jare Guo
a0d5508779
simplify attribute implements (sync #5040 ) ( #7679 )
2020-11-05 17:37:56 +08:00
ChiaNing
6ed0e81cca
new UI custom material & use hash check merge ( #7649 )
...
* new UI custom material & use hash check merge
* update
* update
* apidoc
2020-10-31 13:34:15 +08:00
Jare Guo
e2b740dd15
Finally merge runtime deserializer & asset manager ( #7648 )
...
* sync asset-manager
refine
refine
refine
* change director
* refine
* fix bugs
* commit
* refine and fix bugs
* refine docs
* fix bugs
* merge
* fix bugs
* fix bugs
* merge
* sync jsb-adapter
* fix ci
* adapt preloading process for new Deserializer
* adapt preloading process for new Deserializer
* fix bugs
* minor fix
* dump dependency of SpriteFrame explicitly (sync #6938 )
* dump dependency of SpriteFrame explicitly (sync #6938 )
* remove unused variable
* exporting should trigger uuid compression in serializer
* refine
* fix ci
Co-authored-by: Santy-Wang <wh19930829@qq.com >
2020-10-30 20:51:58 +08:00
Jare Guo
b7c56393d5
Merge remote-tracking branch 'fireball/3d' into 3d-v1.2
...
# Conflicts:
# EngineErrorMap.md
# cocos/core/assets/image-asset.ts
# cocos/core/data/class.ts
# cocos/core/data/deserialize.ts
# package.json
2020-10-28 18:37:39 +08:00
