Commit Graph

17466 Commits

Author SHA1 Message Date
Yun Hsiao Wu bf3b561403 render area affects viewport only (#9502) 2021-10-19 17:04:21 +08:00
GengineJS 271a4d88aa Implement the pipeline event callback and attachment scale listening (#9498)
* Implement the pipeline event callback and attachment scale listening

* Change the import path
2021-10-19 17:03:59 +08:00
Yun Hsiao Wu dbcb157efb misc gfx fixes (#3991)
* better hashing strat

* gfx: unify states hash

* vk: upload texture in multiple chunks if needed

* gfx: states lifecycle management
2021-10-19 14:14:46 +08:00
黄森斌 096cb7d16a modify animation graph i18n (#9495) 2021-10-18 15:02:44 +08:00
PP 45f7a7a591 remove event manager (#9493) 2021-10-15 19:30:42 +08:00
Leslie Leigh (李的序) 6583b7c780 Hide animation graph asset creation API in runtime (#9491) 2021-10-15 15:23:23 +08:00
minggo 57ea781a4a Merge pull request #3989 from cocos-creator/v3.3.2
merge V3.3.2
2021-10-15 11:00:45 +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 (李的序) 39adb27a3d Fix FBX animation frame rate (#9485)
* 0 fps

* modify i18n in fbx editing (#71)

Co-authored-by: 黄森斌 <arsen2010@126.com>
2021-10-14 18:03:25 +08:00
Leslie Leigh (李的序) 74dd46657d Animation graph variable: rename number to float (#9486)
* Animation graph variable: rename number to float

* Add name property to animation blend
2021-10-14 18:02:49 +08:00
ChiaNing 97fb689578 fix ui-static-batch crash on native (#9488) 2021-10-14 17:50:00 +08:00
jk20012001 99ba6505e4 Fix render-camera-to-model color display error (#9487)
* Fix render-camera-to-model color display error
Move materials to default-materials folder

* rename
2021-10-14 16:25:13 +08:00
Leslie Leigh (李的序) df9b5ccdce Remove transition by transition object (#9483) 2021-10-14 10:30:09 +08:00
ChiaNing 9e4bafcbdd fix custom material bug (#9482)
* fix custom material bug

* change material default value
2021-10-14 10:30:09 +08:00
Leslie Leigh (李的序) f34ffcbfbc Support module overrides without compiliation in dev mode (#9480)
* Support module overrides without compiliation in dev mode

* Update render-config.json
2021-10-14 10:30:08 +08:00
Leslie Leigh (李的序) 17dbf69312 Fix animation graph deserialize problem (#9481)
* Fix animation graph deserialize problem

* Build warns
2021-10-14 10:30:08 +08:00
jk20012001 39fdb46fcf Fix skybox texture display missing assets error (#9479)
Co-authored-by: pandamicro <lphuabin@gmail.com>
2021-10-14 10:30:08 +08:00
李吉林 5dbb1812f2 V3.4.0 occlusion query2 (#9475)
* occlusion query

* add supportQuery

* fix name for occlusion query

* remove redundant function

Co-authored-by: lijilin <jilin.li@cocos.com>
2021-10-14 10:30:08 +08:00
Myway cb172b9fc6 submit terrain lod and add terrain block visible property (#9474)
* submit terrain lod and add terrain block visible property

* rename some function and variable

* Update indent

* Fix ci

* revert render callback

* add render callback

* resolve conflicting

* resolve conflicting

Co-authored-by: pandamicro <lphuabin@gmail.com>
2021-10-14 10:30:08 +08:00
ChiaNing 4a60f0a513 fix image Stencil bug (#9478) 2021-10-14 10:30:01 +08:00
Kun Lin 8127b6da9d Update bloom (#9465)
* Update bloom

* Remove bloom pass for UI camera
2021-10-14 10:29:37 +08:00
jk20012001 e489c1c49e Revert clear color linear convert (#9477)
Fix create new scene display error
Fix RGBE macro not match with useIBL disabled
2021-10-14 10:29:37 +08:00
GengineJS a3ead42f70 webgl fbo zoom function (#9472) 2021-10-14 10:29:37 +08:00
ChiaNing 6f1c083ba4 fix renderData null bug (#9476) 2021-10-14 10:29:37 +08:00
Leslie Leigh (李的序) 81d41f5446 Refine dangling transition behaviour (#9466) 2021-10-14 10:29:37 +08:00
zheng han dd43bbb12a fix grid position (#9461) 2021-10-14 10:29:37 +08:00
lawrence-liuyue ab1db8f642 DeferredPipeline: enable shadowmap for main light (#9463)
* DeferredPipeline: enable shadowmap for main light

* Update deferred-pipeline-scene-data.ts
2021-10-14 10:29:37 +08:00
ChiaNing 26ce72983f fix contentSize bug when alpha is zero (#9434) 2021-10-14 10:29:37 +08:00
ChiaNing c7e432e50b fix trim bug (#9451) 2021-10-14 10:29:36 +08:00
CC9701 04c58f61ad Fix touch event error on vivo platform (#9467)
Fix touch event error on vivo platform find in some device with notch screen
2021-10-14 10:29:36 +08:00
GengineJS c59c7a83fb Modify texture format (#9462) 2021-10-14 10:29:36 +08:00
jk20012001 71892d4c22 Fix ambient data initialization error (#9464) 2021-10-14 10:29:36 +08:00
pandamicro 8e3eb9db05 Support HDR/LDR Light Sources (#9439)
* Added base rendering logic

* Hide using decorators Diffuse reflection map control and ApplyDiffuseMap whenever IBL is disabled

* Added HDR toggle to scene globals

* Fix bug when ApplyDiffuseMap is left checked when envmap is deleted & disable IBL when envmap is deleted

* Add changes to allow rendering the diffuse convolution map

* Added functions to permit setting sky and ground color (hemispheric lighting) from irradiance calculated from a set envmap. That is, when a diffuse reflection irradiance convolution is not used. Also code to discern LDR from HDR

* Various mods

* Permit independent Hemispheric Lighting parameters to be serialized for LDR/HDR

* Add HDR normalization

* Set HDR shader macro

* Modify Illiminance based on global LDR/HDR setting

* Add LDR/HDR versions for luminous flux

* Add distinct LDR/HDR for SpotLight/SphereLight luminous flux

* Adding LDR as the new serialized value, as HDR is assumed by default in previous versions

* Modified hemisphericc ambient light to assume HDR as default removing the necesesity for migration code

* HDR is on by default

* Fix directional light constructor removal

* HDR/LDR fixes for sphere, spot, and directional lights

* Fix the HDR/LDR mode switching on UseHDR toggle

* Switch UI to and from LDR/HDR envmap depending on HDR toggle state

* Make LDR envmap and diffusemap's serializable

* Partial Float32Array->Vec4 conversion

* Fixed passed Vec4() into UBO for skycolor and groundalbedo

* Fixed copy/paste error

* Fix ambient illumination passing into global UBO

* Modify UBOs to call correct luminance functions

* Modification to punctual lights

* Add missing dependency

* Fix HDR/LDR envmap/diffuse map initialization bug

* Add support for native engine

* update_hdr_skybox (#9230)

* update material preview when custom panel change (#9340)

* update material preview when custom panel change

fixed https://github.com/cocos-creator/3d-tasks/issues/8663

* update material preview when custom panel change

fixed https://github.com/cocos-creator/3d-tasks/issues/8663

* Update material.js

* Fix native light function invoke error

* Unify API naming in light

* Improve scene-globals code organization

* Update jsb apis

* Reverse getter setter for spotLight luminance

* Fix unexpectable result of toggle HDR and ApplyDiffuseMap options

* Remove fpScale, make deferred and forward uniform

* Fix skybox macro recompiling error

* Fix shader compiling errors
Fix unlit shader in HDR/LDR output

Co-authored-by: Jamie Anthony Morris <Jamie.Morris@cocos.com>
Co-authored-by: Jamie Anthony Morris <47879963+Jacksparrow2525@users.noreply.github.com>
Co-authored-by: jk20012001 <jkregister@163.com>
Co-authored-by: linshunjun <49218738+linshunjun@users.noreply.github.com>
Co-authored-by: zhangxin <59186205+chichinohaha@users.noreply.github.com>
2021-10-14 10:29:36 +08:00
PP bb815aa024 optimize web EVENT_TOUCH support (#9460) 2021-10-14 10:29:36 +08:00
PP f433551d1d support system feature query (#9428)
* support feature query in pal/system-info

* support sys.hasFeature and deprecate sys.capabilities

* remove deprecated usage

* support input feature query

update

* IMAGE_BITMAP

* INPUT_TOUCH

* WEBGL

* support WEB_VIEW, VIDEO_PLAYER, SAFE_AREA query

* rename INPUT_XXX  to EVENT_XXX

* support device-manager

update

update

update

* add NOTE

* export deviceManager from gfx

* fix circular dependency

* fix wechat devtools

update

* Revert "fix circular dependency"

This reverts commit ba8a6c0e2e4fa6b2015ae438a4c9a5da94b9bf46.

* Revert "export deviceManager from gfx"

This reverts commit 14b26ca0e3f6e0dce32c37bd668c65193dbd366f.

* Revert "support device-manager"

This reverts commit 010a910e56e1ee2fe9726629fca163fc24ed5b37.

# Conflicts:
#	pal/system-info/enum-type/feature.ts

* update

update

* use INPUT_TOUCH for sys.capabilities

* update
2021-10-14 10:29:36 +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
江战 90e6860e2f add skip_public_fields (#3987) 2021-10-14 09:48:03 +08:00
timlyeee 08f6d01a7c Fix ci auto bindings error (#3984) 2021-10-13 21:54:01 +08:00
Cocos Robot 8f098450d9 [ci skip][AUTO]: updating jsbinding automatically: bed27fcc (#3983)
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
2021-10-13 18:33:28 +08:00
mmyduckx b82e184f5d fix ios repeat restart crash (#3982) 2021-10-13 18:27:57 +08:00
李吉林 bed27fcccf V3.4.0 occlusion query2 (#3975)
* occlusion query
Co-authored-by: lijilin <jilin.li@cocos.com>
2021-10-13 18:21:03 +08:00
Kun Lin 528b9b0b99 Update bloom (#3970)
* Update bloom

* Remove bloom pass for UI camera
2021-10-13 16:59:31 +08:00
Yun Hsiao Wu 134914b53d fix buffer/texture info js binding (#3981) 2021-10-13 16:57:05 +08:00
jk20012001 33974aeaef Revert clear color linear conversion in HDR (#3979) 2021-10-13 16:27:13 +08:00
Cocos Robot 1949ffd686 [ci skip][AUTO]: updating jsbinding automatically: 8f8569f3 (#3980)
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
2021-10-13 16:21:53 +08:00
Yun Hsiao Wu 8f8569f39e gfx: better hashing strategies (#3969) 2021-10-13 16:03:58 +08:00
江战 606dd0f2f0 [ci] compile ios verbose (#3978)
* [v3.4.0] [ci] compile ios verbose (#3974
2021-10-13 14:54:53 +08:00
江战 70dae69670 [v3.4.0] [ci] compile ios verbose 2 (#3977)
* do not stop on compile error
2021-10-13 14:54:36 +08:00