Commit Graph

9390 Commits

Author SHA1 Message Date
minggo acaeed4e4e RenderView remove dependence of Root (#7034) 2020-08-05 09:36:18 +08:00
Knox 644632a58d Fix label.string cannot be set to null or undefined. (#7069) 2020-08-04 17:11:33 +08:00
PP a34d288178 remove properties in EditBox (#7066)
* remove properties in EditBox component

* reorder display

* remove alwaysOnTop on editbox impl
2020-08-04 14:16:30 +08:00
Yun Hsiao Wu afeb83e9a6 native pools (#7028) 2020-08-04 14:14:56 +08:00
PP f9a6fd59b2 error when design resolution is invalid (#7063) 2020-08-03 19:17:53 +08:00
Knox 73add8a51b sync 2d color toHEX api (#7062) 2020-08-03 19:17:26 +08:00
jiaxin.lai 65b0478c69 v1.2 new physics features (#7037)
* 3d v1.1.1-exp physics expriment (#6787)

* activate when not awake (#6781)

* activate when not awake

* cannon too

* off event listener when onDestroy

* add clearVelocity & clearForces

* add CC_CONFIG to ammo\cannon

* add convex mesh & reuse mesh

* cache enable false by default

* terrain collider

* cone collider

* fix scale of ammo box & sphere

* simple collider

* add worldBounds & boundingSphere to collider

* add clear*** to rigid body

* enhance physics material

* enhance event

* plane collider

* stash

* tweaks

* update @cocos/ammo to v1.0.7-beta.1

* typing

* enchance update shape dynamic

* absolute scale cannon-box

* expose allowsleep

* fix warning of generate declaration

* remove physics_builtin

* DO NOT MERGE

* Better reuse

* Correct construct and deconstruct

* avoid ammo memory leaks

* minor refactor contact data

* fix cannon terrain tileSize

* stash

* optimize auto wakeup

* [Ammo] fix update by re add

* 400~

* overwrite ArrayCollisionMatrix.prototype.reset

* Export enum by namespace

* stash

* fix remove child shape of btCompound

* fix event with CCD

* dynamic instantiate

* STASH

* add group to rigid body

* update attachedRigidBody of collider in editor

* stash physics config

* tweaks of ammo config

* stash

* stash

* collision matrix

* stash

* rename deltaTime to fixedTimeStep

* group mask collider

* allow get mask

* set default group to Layers.Enum.DEFAULT

* add group change fallback

* cannon collision matrix

* fix

* update @cocos/ammo to 1.0.7-beta.2

* more prop

* fix

* disable on 1.1.1-exp

* tweaks

* fix circular dependency

* tweaks

* rename simple to simplex

* rename collider -> colliders

* stash

* ammo p2p

* hinge constraint

* adapt cannon p2p pivotB

* ammo p2p setPivotB

* constraint

* tweaks

* remove macro of physics

* refactor physics selector

* import ammo from ammo-instantiated

* update @cocos/ammo

* update @cocos/cannon
2020-08-03 11:00:07 +08:00
cary deb892b4f6 Pipeline refactoring. (#6999)
* Pipeline refactoring.

* delete import

* Fix some formatting issues.

* modify serialization of pipeline

* delete asset

* delete some api

* delete stage asset

* refine base pipeline

* fix ci error

* delete render context

* fix ci

* delete renderQueue from base class

* add base line

* add pipeline type

* modify frametime to pipeline

* delete root time

* modify type to tag

* revert change of frametime

* add initialize return
2020-08-03 10:36:49 +08:00
Leslie Leigh (李的序) aeced26917 Solve duplicated menu issue (#6973) 2020-08-02 14:53:31 +08:00
PP 3ed7c48523 remove polyfill in engine (#7045) 2020-08-01 17:43:46 +08:00
PP a30032e38a fix resize widget on orientation changed (#7056) 2020-08-01 17:37:55 +08:00
SijieWang 0678150d85 Prevent tampering with clickEvent.componentId data (#7052) 2020-07-31 16:57:33 +08:00
Knox 0ffa00f2cc add safe area component for 3d-tasks/issues/3760 (#7020)
* add safe area component for 3d-tasks/issues/3760

* refine

* add cc.SafeAreaComponent to sealed-global-variables.json

* add canvas-resize event
2020-07-31 08:46:49 +08:00
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