Commit Graph

17466 Commits

Author SHA1 Message Date
JoneLau 2fab58c210 fixed single touch,always keeping only one finger message (#7230)
* fixed single touch,always keeping only one finger message

* updated
2020-08-31 19:14:25 +08:00
minggo fc55b39311 fix binding issue 2020-08-31 17:43:06 +08:00
coulsonwang 7feb3f299f fix pipeline binding 2020-08-31 16:37:46 +08:00
江战 360e8ba5ec skip old template name (#2741) 2020-08-31 15:13:02 +08:00
PP b738d9b78c sync bug fix for Button component from 2d branch (#7179)
* reset to normal data when change button transition

* support color changed event on Editor

update

# Conflicts:
#	cocos/core/components/ui-base/ui-render-component.ts

* refine button target

update

* refine button zoomScale tip

* unregister event listeners on old target when target changed

* check button._originalScale validity

* update originalScale when target transform chanaged

* do finishing transition after update finished

* fix button state setting

* udpate
2020-08-31 12:26:08 +08:00
cary e0df589214 export _Deserializer for adapter (#7256) 2020-08-31 11:48:33 +08:00
cary 95ab0362a7 Add serialized data synchronization for pipeline. (#7236)
* Add pipeline jsb binding.

* Add serialized data synchronization for pipeline.

* fix ci

* delete legacy

* fix ci

* delete legacy forwardPipeline
2020-08-31 11:34:06 +08:00
cary a86ff9b4d8 Add serialized data synchronization for pipeline. (#2736) 2020-08-31 11:17:45 +08:00
minggo 783937aa0a Update binding generator (#2739) 2020-08-31 10:45:03 +08:00
CocosRobot 738f7269f7 [ci skip][AUTO]: updating jsbinding automatically (#2738) 2020-08-31 10:25:14 +08:00
minggo 4f21401492 import pipeline instead (#7218)
* import pipeline instead

* simplify codes

* add jsb index.ts

* simplify codes

* fix circular dependency

* change build engine version

* change build-engine version

* jsb -> nr
2020-08-31 09:56:40 +08:00
coulsonwang 8010648089 Fix metal descriptor set (#2729) 2020-08-31 09:37:05 +08:00
coulsonwang de380ae677 fix native pipeline (#2734) 2020-08-31 09:32:13 +08:00
cary b10d536323 Fix ambient skyColor invalidation. (#7244) 2020-08-30 21:57:43 +08:00
Yun Hsiao Wu 18574abab4 misc fixes (#7245)
* fix IBL mip level

* fix decode include order

* better UBO size calc

* fix PSO manager hashing
2020-08-30 21:51:36 +08:00
cary e14c3af72b Revert the previous changes of pipeline. (#7248) 2020-08-30 21:50:16 +08:00
CocosRobot 7bd82918a6 [AUTO][ci skip]: updating cocos2dx_files.json (#2735) 2020-08-28 18:01:57 +08:00
cary b2eb500d47 Add pipeline jsb binding. (#2722)
Co-authored-by: minggo <nudtzxm@gmail.com>
2020-08-28 17:48:37 +08:00
minggo 07d4798896 get global/local descriptor set layout from define.ts (#7243) 2020-08-28 17:32:56 +08:00
CocosRobot 36a7844945 [AUTO][ci skip]: updating cocos2dx_files.json (#2731) 2020-08-28 15:47:03 +08:00
minggo b08407c501 remove CC/cc prefix for file names (#2728) 2020-08-28 15:23:29 +08:00
Yun Hsiao Wu be21e64f15 fix instanced buffers hashing (#7240) 2020-08-28 11:47:28 +08:00
troublemaker52025 c99525cb7f Repair shadow matrix for 3d-v1.2 (#7223)
* calculate sphere

* calculate shadowCamera matirx

* update

* add pcf shadow

* update

* Modify shadowUI style

* Solve the error

* use else if

* add pcf sampler to x25 times
2020-08-28 11:14:16 +08:00
Yun Hsiao Wu c451c8a4e8 bindless textures (#7231)
* bindless textures

* unified pass UBOs

* remove gl.getActiveUniform in WebGL2
2020-08-28 10:18:34 +08:00
Knox b8d0026694 sync #3d-tasks/issues/3962 (#7232)
* sync #3d-tasks/issues/3962

https://github.com/cocos-creator/engine/pull/5598
https://github.com/cocos-creator/engine/pull/6575
https://github.com/cocos-creator/engine/pull/6333
https://github.com/cocos-creator/engine/pull/4003
https://github.com/cocos-creator/engine/pull/4240
https://github.com/cocos-creator/engine/pull/5444
https://github.com/cocos-creator/engine/pull/5178
https://github.com/cocos-creator/engine/pull/5656
https://github.com/cocos-creator/engine/pull/5672
https://github.com/cocos-creator/engine/pull/3515
https://github.com/cocos-creator/engine/pull/3617
https://github.com/cocos-creator/engine/pull/3802
https://github.com/cocos-creator/engine/pull/4152

* refine code
2020-08-27 19:51:43 +08:00
Leslie Leigh (李的序) 0c5c52e3be Support tsconfig.compilerOptions.paths (#7234) 2020-08-27 16:31:57 +08:00
zhefeng.zhang 700c67f14f sync #6710 (#7165) 2020-08-27 10:53:51 +08:00
zhefeng.zhang ec566ce2d5 sync #6076 (#7161) 2020-08-27 10:53:09 +08:00
zhefeng.zhang 7256f34bc4 sync #6002 (#7160) 2020-08-27 10:51:40 +08:00
zhefeng.zhang 3048de3707 sync #5952 (#7158) 2020-08-27 10:51:10 +08:00
zhefeng.zhang 517e5c5cc7 sync #1936 (#2712) 2020-08-27 10:30:12 +08:00
Leslie Leigh (李的序) ed43580de7 Update gulp (#7219)
* Update gulp/build-engine

* Fix npx
2020-08-27 10:25:08 +08:00
cary 1959818148 Remove the dependency of the pipeline on the model. (#7222)
* Remove the dependency of the pipeline on the model.

* fix api error
2020-08-27 10:22:04 +08:00
Knox 3336dba8f9 Revert scrollview and page view content change (#7229) 2020-08-27 10:01:34 +08:00
CocosRobot ce66b91918 [AUTO][ci skip]: updating cocos2dx_files.json (#2725) 2020-08-26 18:34:41 +08:00
Yun Hsiao Wu e7ef53bd50 fix decode header (#7225) 2020-08-26 18:29:21 +08:00
minggo a3217c16dd remove CCRefPtr.h (#2724) 2020-08-26 18:21:30 +08:00
minggo 85a6f2a999 make model is intialized before reused (#7221) 2020-08-26 11:46:35 +08:00
GengineJS e3009ff771 [Modify] Export RenderingSubMesh class (#7220) 2020-08-25 18:13:07 +08:00
cary 951deefdff Remove the dependency of the pipeline on the model. (#7207) 2020-08-25 15:00:14 +08:00
Yun Hsiao Wu d0fd7eb720 even more type check for buffer pools (#7214) 2020-08-25 14:38:49 +08:00
minggo 909fde2dc9 move RenderWindow to renderer/core (#7216) 2020-08-25 14:35:40 +08:00
Yun Hsiao Wu ca23166ebf remove GFXStatus (#2719) 2020-08-25 14:34:37 +08:00
minggo 4d889c7ae7 use CC_DEBUG instead (#2718) 2020-08-25 11:58:13 +08:00
CocosRobot dddd881bdd [ci skip][AUTO]: updating jsbinding automatically (#2717) 2020-08-25 11:17:18 +08:00
zheng han 2185a6fc03 change "cc.PlanarShadowInfo" to "cc.ShadowsInfo" (#7215)
* change  "cc.PlanarShadowInfo"  to  "cc.ShadowsInfo"

* change "planarShadow" to "shadows"
2020-08-25 11:10:23 +08:00
coulsonwang e39071ab8d Metal Descriptor set (#2716)
* Metal Descriptor set

* remove setVertexBytes usage
2020-08-25 11:09:02 +08:00
Knox 40c686748f fix calculate final Position X bug for layout component (#7194) 2020-08-25 10:17:45 +08:00
Knox 578f01e90c improve scroll view component (#7213)
* improve scroll view component

* improve pagel view component
2020-08-25 10:02:48 +08:00
cary 7eacd78c0d Merge planar shadow and shadow map. (#7185)
* Merge planar shadow and shadow map.

* fix comment

* modify shadows name

* fix ci
2020-08-24 20:21:08 +08:00