Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

type2writer:add FLOAT3 to Color case for compatiblity #12962

Merged
merged 2 commits into from
Oct 8, 2022
Merged

type2writer:add FLOAT3 to Color case for compatiblity #12962

merged 2 commits into from
Oct 8, 2022

Conversation

mmyduckx
Copy link
Contributor

Re: ##12941

Changelog

Continuous Integration

This pull request:

  • needs automatic test cases check.

    Manual trigger with @cocos-robot run test cases afterward.

  • does not change any runtime related code or build configuration

    If any reviewer thinks the CI checks are needed, please uncheck this option, then close and reopen the issue.

Compatibility Check

This pull request:

  • changes public API, and have ensured backward compatibility with deprecated features.
  • affects platform compatibility, e.g. system version, browser version, platform sdk version, platform toolchain, language version, hardware compatibility etc.
  • affects file structure of the build package or build configuration which requires user project upgrade.
  • introduces breaking changes, please list all changes, affected features and the scope of violation.

@github-actions
Copy link

Interface Check Report

This pull request does not change any public interfaces !

@yiwenxue yiwenxue mentioned this pull request Sep 30, 2022
Closed
@dumganhar dumganhar merged commit 57811da into cocos:v3.6.2 Oct 8, 2022
SantyWang added a commit that referenced this pull request Oct 12, 2022
@SantyWang @Zhmz
@LIUYIa @fqamic @minggo @nianba23 @star-e @hana-alice @mmyduckx @xubing0906 @dumganhar @bofeng-song @dogodo-cc @zhakesi @cocos-robot @PatriceJiang @jk20012001 @timlyeee @PPpro @oahc09 @chichinohaha @troublemaker52025 @CC9701 @zxx43 @arsen2010 @yyycggg @AFeiYA
sync v3.6.2 to develop
23455e7 
* when checking useSystemFont, the fontFamily should appear (#12684)

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>

* remove rebundant useLocalData (#12640)

(cherry picked from commit 7cca981)

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>

* Modify version number (#12726)

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

* fix builtin asset hot-reload (#12736)

* improve: move xr init to infrastructure (#12765)

* improve: move xr init to infrastructure

* fix: move initxr, before gfx

* fix: format warning

* [Feature] build template add config file (#12701)

* part of build template add config json for creating build templates and version checks for each platform

* update default template version

* add RenderQueue custom ability to classic pipeline (#12760)

* Wgpu 3.6.2 WGPU_CI_ON  (#12731)

* fix okhttp onClosing not call close (#12783)

* fix transparency, emissive and  specularfactor with dcc effects (#12798)

* reverse occlusion parameter in effects (#12795)

* [native] Fix getting wrong value of globals.ambient.skyLightingColor (#12810)

* refine:  remove unneeded code (#12808)

* feat: update meta files (#12807)

* middleware2d components rendering in native mode (#12788)

* middleware2d components rendering in native mode

* support spine/dragonbones set enable batch

* support spine rendering in batching mode

* get batcher2d instance from root

* process about with type conversion

* fix some code style

* use material hash to merge draw batch

* deal with fill z

* fix dragonbones fill z

* remove some code no used any more

* refactoring some code

* modify some code

* add free memory

* fix clang-tidy

* delete mesh-buffer-layout in destructor

* byte alignment

* [ci skip][AUTO]: Automated code generating update: 88c3a7f  (#12788) (#12818)

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

* simplify (#12782)

* [code] move decode32 to unpack.chunk (#12823)

* [Optimize] Cache current time for audio player in minigame. (#12814)

* Cache current time for minigames

* Save current time as private member

* Make cache time changed in callback

* update cache time to abort middle state for seek

* LogRemote upgrade configuration protocol (#12833)

* update config

* Update LogRemote.cpp

* update default_skybox and sun direction (#12811)

* fix submeshes have different instancing options (#12786)

* [ci skip][AUTO]: Automated code generating update: 3200403  (#12786) (#12871)

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

* spine/dragonbones support batch mode in web platform (#12847)

* spine/dragonbones support batch mode in web platform

* set data hash 0 in commitMiddleware

* optimizate merge draw batch for middleware

* keep commitIA in batcher2d

* modify deprecated about commitIA

* feat: support webgpu on build-engine (#12627)

* feat: support webgpu

* build-engine-feat: support building external asset

* update

* Publish @cocos/build-engine@4.4.0-webgpu.0

* fix tiled merge draw call with sprite (#12877)

* fix:CC_ASSERT(!_currentApp.expired()); (#12844)

application has destroyed when WebSocketServer process callback in game thread

* [Bug fix] remove the player of the audio source when its clip is set to null  (#12865)

* remove player when the audio source's clip is set to null

* fix binary format spine load crash (#12894)

* wgpu: remove reinit on same object (#12799)

* add i18n for skybox (#12899)

* 3.6.2 fix android orientation crash (#12885)

* do not cache argument in global space

* add doc

* add a comment for readAttachment (#12902)

* If it is preview, replace overrideUuid  directly (#12905)

* sort the attributes (#12904)

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>

* add i18n for shadow (#12906)

* update default-skybox and sun direction (#12917)

* fix:WebSocket connection to 'ws://XXXX/' failed: A server must not mask any frames that it sends to the client. (#12882)

* remove USE_BATCHING (#12892)

* fix a native middleware blend problem (#12914)

* migrated remove USE_BATCHING (#12895)

* [feature] support output bullet.wasm on  runtime based platform which the using of wasm api is more similar with weixin (#12881)

* V3.6.2 fix particle crash (#12913)

* fix native crash

* revert to pointer

* revert

* do not use reference

* if PREVIEW load cce scripts before loadProjectBundles (#12916)

* If it is preview, replace overrideUuid  directly

* load cce scripts before loadProjectBundles

* Update game.ts

* Update game.ts

* Update game.ts

* Update game.ts

* fix download url request not encode space (#12826)

* Export texture info for wgpu WGPU_CI_ON (#12926)

* export texture info for wgpu

* missing js file

* update external config

Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com.com>

* fix: build-engine (#12929)

* richtext addChild optimization (#12928)

* 1. remove rebundant invoking
2. ttf canvas texture resizes to width and height as (1,1)

* remove start() and move it to onLoad()

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>

* fix animation asset on inspector preview bug (#12900)

* optimize label component editing

* fix animation asset on inspector preview bug

* optimize i18n break words

* update node-executable by env (#12930)

* Fix: toDataURL is not supported for this content on iPhone 7p (#12830)

* Fix: toDataURL is not supported for this content on iPhone 7p

* Add srgb transform. (#12873)

* add localCfg.cmake (#12932)

* _loadCCEScripts  will be browser-preview only  (#12925)

* _loadCCEScripts  will be browser-preview only

* add comment

* a compatible way of data copy & default buffer size for uniform buffer (#12935)

* a compatible way of data copy & default buffer size for uniform buffer

* update external config

* [fix] default scene ambient and dirlight color (#12955)

* sync readme for wgpu (#12966)

* [fix] specularIntensity is invalid with builtin-standard (#12971)

* [native] type2writer:add FLOAT3 to Color case for compatiblity (#12962)

* V3.6.2 format return null error fix (#12973)

* add i18n for model (#12985)

* fix potential mem leak (#12995)

* [fix] camera clear flag is skybox but skybox is disabled #13589 (#12964)

* [fix] shader compilation error with CC_DEVICE_SUPPORT_FLOAT_TEXTURE=0 (#13015)

* fix import

* sync tojs to swig about middleware and 2d module (#4)

* sync tojs to swig about scene module (#5)

* remove Model::getInstancedAttributeBlock

Co-authored-by: Zhang mingzhen <32831993+Zhmz@users.noreply.github.com>
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
Co-authored-by: LIUYIa <102024185+LIUYIa@users.noreply.github.com>
Co-authored-by: liuyi <liuyi@cocos.com>
Co-authored-by: fqamic <fqamic@vip.qq.com>
Co-authored-by: minggo <nudtzxm@gmail.com>
Co-authored-by: changhua <39176194+changhua0118@users.noreply.github.com>
Co-authored-by: hyde zhou <zlzhou.sh@outlook.com>
Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com>
Co-authored-by: mmyduckx <308303735@qq.com>
Co-authored-by: 徐兵 <49358166+xubing0906@users.noreply.github.com>
Co-authored-by: James Chen <dumganhar@gmail.com>
Co-authored-by: bofeng-song <bofeng.song@chukong-inc.com>
Co-authored-by: 袁炜海 <35713518+dogodo-cc@users.noreply.github.com>
Co-authored-by: zhakesi <liqiao@cocos.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: 江战 <40414978+PatriceJiang@users.noreply.github.com>
Co-authored-by: jk20012001 <jkregister@163.com>
Co-authored-by: timlyeee <43355299+timlyeee@users.noreply.github.com>
Co-authored-by: PP <chinese1236@qq.com>
Co-authored-by: oahc09 <oahc09@gmail.com>
Co-authored-by: zhangxin <59186205+chichinohaha@users.noreply.github.com>
Co-authored-by: troublemaker52025 <troublemaker52025@outlook.com>
Co-authored-by: CC9701 <73738313+CC9701@users.noreply.github.com>
Co-authored-by: zxx43 <zxx43@hotmail.com>
Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com.com>
Co-authored-by: 黄森斌 <arsen2010@126.com>
Co-authored-by: ycg <1670543365@qq.com>
Co-authored-by: AFeiYA <386665678@qq.com>
Co-authored-by: zhakesi <zhakesi@foxmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@minggo minggo minggo approved these changes

@dumganhar dumganhar dumganhar approved these changes

@star-e star-e star-e approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mmyduckx @minggo @dumganhar @star-e