Commit Graph

9377 Commits

Author SHA1 Message Date
PP 339554141a Revert "sync view code (#7042)" (#7049)
* Revert "sync view code (#7042)"

This reverts commit c2b46ae343.

* update
2020-07-31 08:38:23 +08:00
PP c2b46ae343 sync view code (#7042) 2020-07-30 09:35:42 +08:00
PP 66e4933d69 Object.getOnwPropertyDescriptors polyfill for baidu browser (#7040) 2020-07-30 09:34:48 +08:00
coulsonwang a43d408a89 fix shadow render texture usage (#7025) 2020-07-24 13:54:55 +08:00
Yun Hsiao Wu 606c5d21fa fix gfx texture info naming (#6998)
* fix gfx texture info naming

* move instanced/bathced buffer out from pass
2020-07-24 11:31:43 +08:00
zheng han de4b2f9d83 update effects (#7022) 2020-07-23 16:17:50 +08:00
pandamicro 40bcf73f60 Remove useless macros (#7016) 2020-07-23 10:32:30 +08:00
pandamicro 43017a05c0 Update effects (#7014) 2020-07-22 15:19:24 +08:00
troublemaker52025 d26ce6b78b Add Shadow map (#6972)
* add easy shadow

* update

* update

* manage pso

* manage psoCI array

* solve a bug

* Optimization

* depth test is not accurate

* Conflict resolution

* Conflict resolution

* solve pr

* optimization

* update

* optimization

* optimization
2020-07-21 18:42:33 +08:00
GengineJS 72f14dc806 [Feature] Adding isPlaying judgement to support the function of gameview (#6990)
* [Modify] the systemevent adds the function of isplaying judgment

* [Feature] the ui adds the function of isplaying judgment

* [Modify] Add GameView environment

* [Optimize] Optimize the gameView conditions

* [Optimize] Complement the gameView environment
2020-07-21 17:36:07 +08:00
Leslie Leigh (李的序) 8f1a22812a Fix Mesh.prototype.readAttribute, Mesh.prototype.copyAttribute (#6988) 2020-07-20 08:44:50 +08:00
lsybblll 83d7133c4c fix audio sometimes not work in wkwebview (#6987)
fix audio wich use player-web sometimes not work in wkwebview

场景:打包web-mobile,在ios的wkwebview中加载。
问题1:预加载音频时,this._context.state为running,但是播放的时候this._context.state为interrupted。
问题2:切到后台再切回,this._context.state为interrupted。
解决方案:如果在播放的时候,如果状态为interrupted,强制resume一下。
相关信息:https://github.com/goldfire/howler.js/pull/928
2020-07-19 16:04:36 +08:00
Yun Hsiao Wu a0d4480f55 command buffer interface update (#6991) 2020-07-17 13:55:58 +08:00
ChiaNing cd59c4dbf3 device bug fix for runtime (#6986)
* device bug fix for runtime

* update
2020-07-15 11:24:39 +08:00
Leslie Leigh (李的序) 07fd9e3e4f Optimize CI (#6985) 2020-07-15 09:45:18 +08:00
Leslie Leigh (李的序) 939f49ba04 Morph support on devices that lack texture-float feature (#6937)
* Morph support without texture-float

* Update

* Update

* Update

* Typo

* Update effect
2020-07-14 14:29:43 +08:00
Myway 2c0905c5e5 update lighting map when onGlobalPipelineStateChanged (#6967) 2020-07-12 21:33:04 +08:00
Leslie Leigh (李的序) 2d21364587 Throw the error instead of return null in instantiate and addComponent (#6940)
* Throw the error instead of return null in instantiate and addComponent

* Update
2020-07-10 15:03:11 +08:00
Yun Hsiao Wu 2777122b1f refactor render texture (#6942) 2020-07-10 14:23:22 +08:00
黄森斌 4d8c00f60b setParent firstly send oldParent change message (#6968) 2020-07-09 18:26:34 +08:00
minggo 7cf61b7f41 Use PipelineGlobal to store root and device (#6962) 2020-07-09 10:25:12 +08:00
minggo afe39525a3 Pipeline refactor (#6960)
* put some logic into root

* simplify codes
2020-07-08 13:08:03 +08:00
minggo 5bd8fd2992 remove rebuild() (#6958) 2020-07-08 11:28:38 +08:00
pandamicro 7b711a11a5 Merge pull request #6954 from pandamicro/3d
Merge 3d-v1.1.1
2020-07-06 16:22:29 +08:00
pandamicro 9fd32ee805 Merge branch '3d-v1.1.1' into 3d
# Conflicts:
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/director.ts
#	cocos/core/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/render-pipeline.ts
#	cocos/core/pipeline/render-queue.ts
#	cocos/core/pipeline/render-view.ts
#	cocos/core/splash-screen-webgl.ts
2020-07-06 15:58:46 +08:00
pandamicro c3bfb0b3a7 Cleanup import 2020-07-06 15:43:28 +08:00
ChiaNing 32a3a65a79 initDevice bug fix (#6950)
* initDevice bug fix

* fix for gfx branch
2020-07-06 12:12:17 +08:00
ChiaNing 8655207fd5 text-utils bug fix (#6944) 2020-07-06 12:11:50 +08:00
ChiaNing 1c54beb91a sys browser type add (#6939)
* sys browser type add

* change JSB
2020-07-06 11:31:46 +08:00
Leslie Leigh (李的序) 9b2b7779a9 Type-only namespaces should be 'declare' (#6947) 2020-07-03 18:45:22 +08:00
Yun Hsiao Wu 6e9185aa70 update effect (#6927) 2020-06-29 20:39:15 +08:00
minggo 4a1871bec8 InstancedBuffer removes dependence of Pass (#6936) 2020-06-28 18:35:26 +08:00
minggo f012db64ff BatchedBuffer removes dependence of Pass (#6934) 2020-06-28 18:01:30 +08:00
Leslie Leigh (李的序) 583f1e941e Integrate ammo.js of WebAssembly edition (#6872)
* Ammo initiantiation

* Add to division-config

* Fix

* Fix
2020-06-28 12:20:21 +08:00
Yun Hsiao Wu 33c3c841d7 fix material hash calculation (#6933) 2020-06-28 11:55:21 +08:00
ChiaNing 372a0b5733 mat4 translate bug fix (#6932) 2020-06-28 10:39:39 +08:00
jiaxin.lai c03ee7a4b9 fix cannon memory leak (#6928) 2020-06-24 18:05:43 +08:00
Yun Hsiao Wu 4401e9fb2e remove PipelineLayout/CommandAllocator (#6919)
* remove gfx pipeline layout

* remove gfx command allocator
2020-06-24 15:16:30 +08:00
ChiaNing 78add057d7 game resume bug fix (#6925)
* game  resume bug fix

* update
2020-06-24 14:07:06 +08:00
Leslie Leigh (李的序) 4e208bb970 Handle the case of zero delta time on iOS (#6926) 2020-06-24 12:57:58 +08:00
jiaxin.lai 4c9067b394 adapt splash screen time if it is undefined (#6924) 2020-06-24 11:30:17 +08:00
ChiaNing 7d646b9f90 ASTC support (#6918)
* ASTC support

* update
2020-06-23 18:29:06 +08:00
JoneLau 7fa501ffcb fixed the problem of graphics component scene error when the script is changed (#6922) 2020-06-23 17:19:06 +08:00
pandamicro e9ef6426f6 Animation document (#6921)
* Doc

* Merge branch 'DocAnimation' of https://github.com/shrinktofit/engine into 3d-v1.1.1

# Conflicts:
#	cocos/core/animation/animation-component.ts

# Conflicts:
#	cocos/core/animation/animation-clip.ts
#	cocos/core/animation/animation-component.ts

Co-authored-by: Unknown <leslieleigh@outlook.com>
2020-06-23 14:40:59 +08:00
coulsonwang b2e8653974 fix GFX_DRAW_INFO_SIZE (#6914) 2020-06-23 13:56:06 +08:00
jiaxin.lai 9293903ceb splash screen adapt for alipay&cocos play (#6903)
* fix alipay android splash screen

* adapt for cocos play new version

* do not stash ccSettings

* add cocosplay verision branch

* tweaks

* remove unnecessary frame adapt
2020-06-23 11:53:13 +08:00
pandamicro dbf4519339 Properly deprecate UI related API in Node (#6754)
* Properly deprecate UI related API in Node

* UI transform property access fix

* UI transform property access fix for widget
2020-06-23 11:44:43 +08:00
Yun Hsiao Wu 8e19a4332d fix node.setWorldScale (#6917) 2020-06-22 15:46:56 +08:00
Yun Hsiao Wu c2de06b878 gfx: queue.isAsync (#6906) 2020-06-22 15:15:58 +08:00
pandamicro 95813e2a92 API translation for core/pipeline (#6753)
* API translation for core/pipeline

* Complete

* Improve
2020-06-18 23:05:55 +08:00