Commit Graph

285 Commits

Author SHA1 Message Date
Santy-Wang abb8222ec9 Merge pull request #9223 from cocos-creator/v3.3.1
sync V3.3.1
2021-08-21 14:26:32 +08:00
Santy-Wang 69d7e74d19 Merge pull request #9222 from cocos-creator/v3.3.0
sync V3.3.0
2021-08-21 14:25:48 +08:00
Yun Hsiao Wu f09a8e4449 fix webgl uniform array upload (#9202) 2021-08-20 11:26:47 +08:00
Leslie Leigh (李的序) 16ca1acee5 Upgrade internal primitives.fbx to use newer FBX importer (#9188) 2021-08-18 13:48:51 +08:00
黄森斌 eaf15b9d55 fix javascript initial data changed without modified (#9196) 2021-08-17 17:50:13 +08:00
Santy-Wang 93889feac4 Merge pull request #9187 from cocos-creator/v3.3.0
sync V3.3.0
2021-08-16 17:19:58 +08:00
jk20012001 a6dfddc780 Fix spotlight shadow formerge (#9177)
* fix spotlight shadow matrix, lineardepth, selfbias error (#8483)

* Spotlight shadows: Added depthbias in viewspace units

* Remove now unnecessary UBO constants

* Add support for directional lights

* fix spotlight shadow matrix, lineardepth, selfbias error (#8483)

* Fix Spotlight light leaking in backface and compiling error

* fix dirlightview matrix error

* more accuracy for spotlight shadow bias

* Fix face normal bias

* Fix DirLight Soft/Soft2X

* improve performance for ShadowUBO divid op

* remove spotshadow linear mode(can't work with new shadow bias), fix spotshadow linear mode

* fix spot shadow linear mode

* directional light packing mode and disable linear mode

* compiled effects

Co-authored-by: Jamie Anthony Morris <Jamie.Morris@cocos.com>
2021-08-16 14:50:41 +08:00
pandamicro 3f615ab647 Add dt threshold (#9181)
* Add dt threshold

* Fix ci

* Fix game.step and add time unit comments

* Fix adjusted frame time
2021-08-14 23:22:03 +08:00
黄森斌 8c4e850df4 fix resizeObserver loop limit exceeded (#9159) 2021-08-11 14:30:04 +08:00
pandamicro 248d674c2a Update effects (#9149) 2021-08-06 22:16:45 +08:00
cary 333e39d100 Fix sort scene crash of metal for IOS platform. (#9144)
* Fix sort scene crash of metal for IOS platform.

* merge branch
2021-08-06 18:18:47 +08:00
黄森斌 6c53d88327 V3.3.0 add scene-2d template for 2d project (#9145)
* add scene-2d template

* Update editor/assets/default_file_content/ts

Co-authored-by: SijieWang <itharbors@outlook.com>

Co-authored-by: SijieWang <itharbors@outlook.com>
2021-08-06 11:28:46 +08:00
Leslie Leigh (李的序) a40115e6d7 Unify animation event interfaces (#9101)
* Unify animation event interfaces

* update event edit (#27)

# Conflicts:
#	editor/inspector/assets/fbx/event-editor/editor.js

Co-authored-by: 媛媛 <yuanyuan1497@foxmail.com>
2021-08-05 10:58:24 +08:00
媛媛 2f8c25ceff Add speed option to fbx interface (#9119) 2021-08-05 10:57:25 +08:00
媛媛 5e548337e0 [3.3-2] Fix some event edit bugs (#9090)
* fix add event params failed

* fix new clips edit event

* update

* 修复 fbx 面板与动画编辑器事件编辑同步
2021-08-04 11:41:57 +08:00
Leslie Leigh (李的序) 5b41c11fc7 Update asset metadata (#9110) 2021-08-03 10:26:38 +08:00
jk20012001 db8560be08 Remove SpecularIntensity in StandardSurface struct (#9099)
* RGBE Use High Precision Decoder

* Remove SpecularIntensity in StandardSurface struct

* Fix Merge Conflict

* Remove SpecularIntensity in StandardSurface struct

* Remove SpecularIntensity in StandardSurface struct
2021-07-30 15:53:40 +08:00
jk20012001 5c9a6b3a6b RGBE Use High Precision Decoder (#9089) 2021-07-29 16:34:57 +08:00
zxx43 699c29ca1b V3.3 rotation fix (#9076)
* fix rotation of VerticalBillboard & HorizontalBillboard

* combine the same condition
2021-07-27 19:35:05 +08:00
Leslie Leigh (李的序) 1facbeeb2f Export all CCON stuffs in to cc/editor/serialization (#9060) 2021-07-24 18:19:24 +08:00
zxx43 7a2dda149d Particle rotation fix (#8920)
* fix rotation bug

* fix circular dependency

* add R2D constant & reuse renderMode

* fix r2d

* remove mat3 import

* remove error import

* add some remarks & simplify some statements

* sync gpu with cpu render

* fromEuler use degree

* remove useless statements

* fix spell problem

* sync shader with cpu

* update build shader

* fix some spell bug
2021-07-23 22:17:18 +08:00
cary ca61c1f479 Update deferred lighting effect. (#9037) 2021-07-23 14:24:09 +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
黄森斌 56377bab71 V3.3.0 when create typescript asset , predefined some variales (#9024)
* add ts template Predefined variables

* change variable name
2021-07-22 17:04:21 +08:00
zxx43 a17dbe28db V3.3 fix range bug & modify default alpha key to 0 & FrameOverTime mode to curve (#8981)
* fix range bug & modify default gradient alpha key to 0 & TextureAnimation FrameOverTime mode to curve

* set default alpha to 255
2021-07-21 13:40:40 +08:00
zhangxin 590b4339e9 Fixed multiple selection error, changed the multiple selection style (#9022) 2021-07-20 20:47:18 +08:00
zhangxin f60655fb5d Added a public method to get the name from dump, changed the comment of the public method, and added the icon style of label. (#9010)
* 增加了一个公用方法从dump中获取名称,更改了一下公用方法的注释,新增了label的图标样式

* Update label.js

* add tooltip of font ,update pr, add utils function

* update inspector of label, i18n of label

* update line-height

* Fixed multiple selection error, changed the multiple selection style

* Revert "Fixed multiple selection error, changed the multiple selection style"

This reverts commit b5e7dce659d339a23f065c1a1fa529c2a3b8c251.
2021-07-20 17:33:03 +08:00
黄森斌 afdf2e9fb9 update prefab meta files (#9012) 2021-07-20 13:22:07 +08:00
zhangxin c6d97a0cd7 Allow custom effects to customize the inspector displayed in the material (#8988)
* 允许自定义 effect 自定义在 material 展示的 inspector

* Add protocol judgment. updateCustomInspector Add parameters. Clear the src of the custom panel when updatePasses
2021-07-19 11:22:01 +08:00
ChiaNing a70f818ffa update builtin UI texture wrapMode (#8986) 2021-07-16 11:52:55 +08:00
pandamicro 9849fdd1f4 Add some object flags (#8987)
* Support number key in EventTarget

* Add replicated and clientLoad

* Update main license

* Fix ci

* Fix ci

* Fix ci

* Fix ci

* Move object getter setter to functional style API

* Adjust

* Add SERVER_MODE constant
2021-07-15 19:41:08 +08:00
黄森斌 e4c5e354fe modify hideInEditor to editor.hide (#8979) 2021-07-15 14:56:55 +08:00
黄森斌 712ce4c79a update internal db prefab meta (#8980) 2021-07-15 14:51:07 +08:00
Leslie Leigh (李的序) 705c977fc9 Binary serialization (#8946)
* Binary serialization

* Update snapshots

* Update

* rename option ccon -> useCCON

* Missing script

* encodeCCONJson: chunks -> chunkURLs

* Update

* (de)serializeSymbol -> (de)serializeTag;

* CustomizedSerializable -> CustomSerializable

* _deserializePrimitiveObject -> _fillPlainObject

* Unify CCClass CCClassConstructor

* encodeCCONJson -> parseCCONJson

* Custom serializable

* Move (de)serializeSuper(This) from context into global

* property -> read(write)Property; (de)serializeThis(Super) -> (read)writeThis(Super)

* CI and lint

* Mock cc env
2021-07-15 10:21:25 +08:00
troublemaker52025 9854f33225 fix shadow problem for v3.3.0 (#8916) 2021-07-14 09:26:38 +08:00
santy-wang 4c92a4ba5e Merge branch 'v3.1.2' of https://gitlab.cocos.net/publics/engine into v3.3-validate 2021-07-12 17:42:21 +08:00
troublemaker52025 2714fe6dbe fix low phone do not support vector property self-multiplication for… (#8957)
* fix  low phone do not support vector property self-multiplication for v3.1.2

* update
2021-07-12 17:06:24 +08:00
黄森斌 c74b511686 optimize calculate speed edit multiple materials (#8959) 2021-07-12 16:58:34 +08:00
黄森斌 de26cffbe4 [Bug] optimize 3d particle edit (#8907) 2021-06-29 15:57:09 +08:00
santy-wang c5dd05fbf1 Merge branch 'v3.1.2' of github.com:cocos-creator/engine into v3.3-merge 2021-06-28 14:40:34 +08:00
troublemaker52025 80655bee84 add SOFT_2X sampler for Native PCF shadow v3.1.2 (#8888)
* add SOFT_2X sampler for Native PCF shadow v3.1.2

* update
2021-06-25 14:49:46 +08:00
linshunjun 176e23e847 update_AO_SPECULAR_LINEAR-VERTEX-COLOR v3.3 (#8875)
* update_AO_SPECULAR_LINEAR-VERTEX-COLOR v3.3

* Delete_Comment
2021-06-25 14:01:56 +08:00
黄森斌 8e38d3b8c7 [Bug] fixed widget multiple selections edit (#8879) 2021-06-25 09:25:01 +08:00
troublemaker52025 c356e37ac2 add Native Pcf for v3.1.2 (#8867)
* add Native Pcf for v3.1.2

* fix circular dependency

* update

* delete x25 sample

* rename Hard & Soft,default sampler use Filter.POINT

* add TODO
2021-06-24 16:59:09 +08:00
黄森斌 a40e8a96c2 when change effect reset technique index with 0 (#8851) 2021-06-21 15:52:04 +08:00
黄森斌 0e0fbd0d74 optimise sprite-editor data update (#8826) 2021-06-18 14:05:31 +08:00
zhangxin 28a13b75be Optimize the logic for panel updates (#8824)
* Optimize the logic for panel updates

Update only the elements related to the modified content

* Update particle-system.js
2021-06-17 12:55:24 +08:00
santy-wang 51d80d3815 Merge branch 'v3.1.2' of https://gitlab.cocos.net/publics/engine into v3.3-merge 2021-06-16 17:37:10 +08:00
媛媛 a78343fa11 [3.3-1] add animation event editor to fbx/gltf (#8669)
* add animation event editor to fbx/gltf

* update

* fix review
2021-06-15 12:35:54 +08:00
黄森斌 1e0c9b37b5 fix material pass switch checkbox bug (#8711) 2021-06-14 22:37:18 +08:00