Commit Graph

9506 Commits

Author SHA1 Message Date
cary 951deefdff Remove the dependency of the pipeline on the model. (#7207) 2020-08-25 15:00:14 +08:00
minggo 909fde2dc9 move RenderWindow to renderer/core (#7216) 2020-08-25 14:35:40 +08:00
minggo 035a632abb invoke Model.initialize() before being resued (#7201) 2020-08-24 11:43:43 +08:00
PP cd03651bc4 remove jsb module declaration in engine repo (#7143)
* remove jsb module declaration in engine repo

* ignore jsb check

* space
2020-08-21 18:50:28 +08:00
minggo b01997250c Add array pool and add more elements into shared memory (#7197)
* Add array pool and add more elements into shared memory

* use template parameter

* use template parameter

* don't use shared memory for director
2020-08-21 17:04:36 +08:00
pandamicro 2618dc6dbe Bump tfig@2.0.3 (#7198) (#7199)
Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>
2020-08-21 14:19:06 +08:00
pandamicro 12a1dda957 Merge pull request #7196 from pandamicro/merge1.2
Merge v1.2
2020-08-21 10:59:03 +08:00
pandamicro bfe63f4bd1 Merge remote-tracking branch 'origin/3d-v1.2' into merge1.2
# Conflicts:
#	cocos/core/game.ts
2020-08-21 10:48:52 +08:00
pandamicro 2fb448c934 Fix 2020-08-21 10:45:49 +08:00
Leslie Leigh (李的序) f289fa7a43 Bump tfig^2.0.2 (#7189) 2020-08-20 21:38:04 +08:00
JoneLau 50946d8bdb fixed the bug when the label's cachemode is char (#7191) 2020-08-20 21:30:04 +08:00
troublemaker52025 b8b1cdec71 repair general-vs.chunk (#7187) 2020-08-20 16:13:39 +08:00
cary aabdd1e323 Fix pipeline save error (#7167)
* Fix pipeline save error

* Fix the problem of shadow map.

* resave pipeline
2020-08-20 15:23:38 +08:00
cary c6da0c9054 Resave particle system prefab. (#7186) 2020-08-20 15:21:31 +08:00
cary e1e4cf49fc delete ccclass of ambient (#7184) 2020-08-20 00:25:48 +08:00
cary 745569d2af Fix pass error when use dynamic defines. (#7183) 2020-08-19 23:51:28 +08:00
cary c08d84d11e Revert scene global. (#7181)
* Revert scene global.

* fix ci
2020-08-19 23:41:38 +08:00
yinkaile da5c216874 sync #5195 (#7150) 2020-08-19 17:42:41 +08:00
JoneLau 25fc58102e fix fillrange not effect when the number is negative (#7173) 2020-08-19 17:41:02 +08:00
yinkaile 952648a780 3d v1.2 tween (#7176)
* sync #6265

* refine api doc

* fixed syntax
2020-08-19 17:40:04 +08:00
江战 03285946f5 iOS crash fix (#7180) 2020-08-19 17:36:05 +08:00
Myway 6b9398c2e7 terrain support custom effect (#7169)
Co-authored-by: Myway3D1 <404793124@qq.com>
2020-08-19 15:52:59 +08:00
PP 37b1671bce sync bug fix for EditBox from 2d branch (#7071)
* add type definition for setter in EditBox

* support browser type EDGE

* hide clear button of input on Edge Browser

* sync label node scale to dom input fontSize

* refine editbox placeholderLabel css-in-js

* refine editbox begin editing callback

* extend some method from parent class

update

* fix not resize browser size when editbox end editing

* fix editbox doesn’t fire ‘compositionend’ event on mobile

* fix maxLength for input of number type

* update

* remove some useless private properties

* use scale instead of _scale private property

* Revert "add type definition for setter in EditBox"

This reverts commit cdde7340e238925468381c20ca77b2d28699d627.
2020-08-19 14:34:16 +08:00
cary c24f5a77f3 Fix a problem of shadow map. (#7168) 2020-08-19 11:20:54 +08:00
yinkaile a3b3782aaa 3d v1.2 graphics (#7164)
* sync #5447 - fixed graphics square cap

* sync #6474 - support graphics antialiasing

* sync #5168

* revert unused code
2020-08-19 11:09:23 +08:00
JoneLau 2f9e094581 fixed multi-touch finger number distribution error (#7162) 2020-08-19 11:07:32 +08:00
Leslie Leigh (李的序) 4f2eff842d Full optimize decorators (#7166)
* Full optimize decorators

* Conflicts

* Rename immutable -> readOnly

* Update

* Update

* Update
2020-08-18 19:10:34 +08:00
cary 26c9fe3030 Move shadow info to pipeline. (#7159)
* Move shadow info to pipeline.

* fix ci

* modify shadow ubo update
2020-08-18 16:03:58 +08:00
Leslie Leigh (李的序) fbe2a06a76 Change type of Mesh.prototype.data as non-nullable (#7131)
* Change type of`Mesh.prototype.data` as non-nullable

* Optimize

* Optimize

* Optimize

* Optimize

* Optimize

* Lint
2020-08-18 14:38:02 +08:00
Leslie Leigh (李的序) 2c72cd0eab Fix decorator problems carried by PR 7002 (#7157) 2020-08-18 11:04:19 +08:00
cary a6c536ec38 Move global data of scene to pipeline. (#7109)
* Move global data of scene to pipeline.

* fix some code judgments.

* fix pipeline save error

* refine skybox and fog info

* fix planer shadow

* fix fog error

* delete setter of skybox and fog
2020-08-17 23:08:59 +08:00
JoneLau 173b1a52f5 ui vertex pixel alignment processing (#7138) 2020-08-17 23:05:03 +08:00
jiaxin.lai f3e7549628 Fix constant force (#7153)
* add reset accumulator to physics system

* fix constant force

* don`t initPhysicsSystem in EDITOR
2020-08-17 23:03:43 +08:00
pandamicro 07798f4068 @cocos/build-engine@3.0.4: force to make "cc.wait-for-ammo-instantiation" to be standalone (#7154) 2020-08-17 23:02:58 +08:00
SijieWang 519814d615 修复一些渲染相关的 bug (#7155) 2020-08-17 23:02:33 +08:00
cary 9d00a52c9c Add fault-tolerant handling for renderPipeline startup. (#7156) 2020-08-17 22:59:47 +08:00
SB 00a5d3a6ca @cocos/build-engine@3.0.4: force to make "cc.wait-for-ammo-instantiation" to be standalone 2020-08-17 19:20:31 +08:00
troublemaker52025 591be73b57 Shadow switch for 3d-v1.2 (#7142) 2020-08-17 18:43:58 +08:00
Yun Hsiao Wu 742989cce9 keep pipeline layouts for effect overrides (#7152) 2020-08-17 17:33:26 +08:00
Myway fd777b6a02 lighting map support instancing (#7149)
Co-authored-by: Myway3D1 <404793124@qq.com>
2020-08-17 16:32:15 +08:00
ChiaNing 1df7992abb runtime bug fix & vivo loadRuntime function remove (#7151) 2020-08-17 16:31:21 +08:00
ChiaNing 1cdc95853e UI sharedMaterial (#7112)
* ui update pass

* change UI default mat

* builtin effect fallback

* MaterialType fallback

* fix blendfunc

* updateBlendFunc for custom material

* fix mask & graphics comp

* useless code remove

* update code

* update stencil

* useless code remove

* useless remove

* graphics useless remove

* rebase

* UI sprite texture becomes local descriptor

* rename & add chunk

* update effect
2020-08-17 16:30:00 +08:00
Knox 85209df78e sync 2d richt text component (#7085) 2020-08-17 11:28:16 +08:00
Knox 1114adb909 update default-assets meta to v1.0.31 (#7148) 2020-08-17 10:23:18 +08:00
Jare Guo 1f056e586f Merge pull request #7136 from knoxHuang/3d-scrollview
sync 2d scrollview-view component
2020-08-17 09:57:17 +08:00
PP fceab6782d remove platform related code from engine (#7140) 2020-08-16 23:05:34 +08:00
PP e68cd34dbf ban runninng engine main loop in editor (#7098)
* ban runninng engine main loop in editor

* update
2020-08-16 23:05:25 +08:00
JoneLau 7ce7f6854e Revert "fixed multi-touch finger number distribution error (#7134)" (#7144)
This reverts commit 02c6fbd083.
2020-08-15 17:11:58 +08:00
Yun Hsiao Wu f45ea7928e fix shadow map generation (#7141) 2020-08-14 23:09:51 +08:00
ChiaNing bdb39fbe65 runtime platform fix (#7139) 2020-08-14 15:17:02 +08:00