Commit Graph

57 Commits

Author SHA1 Message Date
江战 3eee6dfd4b 3.3 js message queue (#8991) 2021-07-16 15:20:31 +08:00
minggo 9fffa5d782 get delta time from cc.game (#8967) 2021-07-13 15:17:22 +08:00
mmyduckx ec7a87afa3 add spine&db system && optimize system priority (#8866)
* add spine&db system && optimize system priority

* refine spine/db system

* fix misspelling

* refine

* remove errorID

* remove errorID
2021-06-29 16:59:52 +08:00
PP 960dc20334 compability with AudioClip method since deprecated on v3.1.0 (#8905) 2021-06-29 10:33:13 +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
santy-wang e58499bb3f Merge branch 'v3.2.0' of https://gitlab.cocos.net/publics/engine into v3.3-merge 2021-06-22 16:59:04 +08:00
mmyduckx 4d3418484a fix native spine slot bug (#8859) 2021-06-22 15:57:49 +08:00
mmyduckx 4eba23a7f0 fix spine blendmode in native (#8834) 2021-06-17 12:54:27 +08:00
cary 4305e4c132 Modify the memory pool and remove the deprecated code. (#8776) 2021-06-10 09:06:35 +08:00
minggo 424232493e Merge pull request #8777 from minggo/merge_v3.1.2
Merge v3.1.2
2021-06-09 14:12:21 +08:00
Zeqiang Li ac09bea040 remove nativeSize() interface (#8745) 2021-06-09 09:54:46 +08:00
cary 7a265315b2 merge node change of v3.1.2 (#30) 2021-06-08 15:39:43 +08:00
Yun Hsiao Wu 35e4cb81ec take over native device initialization (#8767) 2021-06-07 11:10:17 +08:00
mmyduckx a224d5384b fix remove imageAsset._texture usage for db/spine (#8742) 2021-06-01 14:25:11 +08:00
jiaxin.lai 83c09dbbef support getAABB and get bounding sphere in jsb (#8710) 2021-05-25 19:11:33 +08:00
jiaxin.lai f01c3b3053 override physx instantiate in jsb (#8709)
* fix set damping

* override physx instantiate in jsb
2021-05-25 18:41:41 +08:00
jiaxin.lai eac556ddab physx optimize and multi thread in bytedance (#8706)
* sync damping

* stash

* tweaks

* sync damping

* tweaks

* physx muti thread

* tweaks

* tweaks

* tweaks

* tweaks

* sync native physx dampings

* add end of frame to director

* tweaks
2021-05-25 15:45:40 +08:00
mmyduckx 93491a40f2 remove ImageAsset._texture usage for spine & dragonbones (#8658)
* change spine texture only to use texture2d

* remove ImageAsset._texture usage
2021-05-24 15:01:48 +08:00
Santy-Wang 68896f6cfa Merge pull request #8700 from cocos-creator/v3.1.1
merge V3.1.1
2021-05-21 15:48:53 +08:00
江战 2a2719a79c HarmonyOS support (#8679) 2021-05-21 15:42:37 +08:00
PP ad24ca70c7 update deprecated usage of sy API (#8684) 2021-05-18 13:31:27 +08:00
PP 420c9f59d4 support system.getSafeAreaEdge() (#8654)
* support system.getSafeAreaEdge()

* remove legacy adapter

* remove code

* update
2021-05-17 18:12:13 +08:00
PP 856120f52d fix undefined element in caches array on v3.1.1 (#8663) 2021-05-12 10:23:21 +08:00
jiaxin.lai 9fd927c2f1 fix jsb-physics require canditions (#8637) 2021-05-06 20:29:13 +08:00
jiaxin.lai ff37cc95fd fix sync node transform on native (#8558)
* fix sync node transform

* sync node dirty only if in jsb

* tweaks
2021-04-26 21:32:05 +08:00
jiaxin.lai 28d62c8393 native physx (#8455)
* Stash

* add plane/capsule shape

* add syncTo/FromNativeTransform

* support trigger/collision events

* set rigid body property on enable

* group distinguish between serialized  and lowlevel

* support trimesh-shape/mass-center

* fix cone/cylinder direction

* support cylinder/cone shape

* tweaks of pmtl

* fix setMesh

* support terrain

* support raycast

* support revolute joint

* support distance joint

* tweaks

* add some API docs

* tweaks

* optimize book and unBook

* tweaks

* tweaks
2021-04-19 20:21:29 +08:00
Zeqiang Li a409acc7e0 native engine msaa (#8470) 2021-04-17 14:05:39 +08:00
Santy-Wang 2f8090ba7f move importBundleEntry to factory (#8339) 2021-04-16 15:39:32 +08:00
PP 9bb4c4f8ea support pal/system (#8441)
* support pal/app

update

update

* remove 'QQ_PLAY' and 'FB_PLAYABLE_ADS'

* rename system

update

* rename Language

* update

* update

* bind function in Game.ts

* rename system

* support system.getBatteryLevel()

* support pal/system on native

* support pal/system on minigame

* update

* fix esLint

* fix Circular dependency

* fix esLint

* use math/Size
2021-04-15 11:00:54 +08:00
PP e345039c86 fix audio loading (#8449)
* fix audio loading

* fix  audio loading in minigame
2021-04-14 14:50:41 +08:00
PP cd7e644694 implement audio on pal (#8255)
* Update logo in README

* add pal/audio

* deprecate property

* support wechat  game AudioPlayer

* unify minigame interface

* optimize module name

* support  native audio

# Conflicts:
#	@types/jsb.d.ts

* add runtime platform

* fix module

* support build native virtual module

update

update

* update module name

* remove jsb-audio.js

* revert @rollup/plugin-alias

* add quickCompiler field in cc.config.json

* fix audio can't stop when paused

* fix esLint & ci

* fix ci

update

* update ccConfigJson

* add NOTE

* readonly maxAudioChannel

* add description for interface OneShotAudio

* volume range

* range for seeking

* loadNative return Promise<unknown>

* remove quickCompile field in cc.config.json

Co-authored-by: pandamicro <lphuabin@gmail.com>
Co-authored-by: Jare Guo <jareguo@users.noreply.github.com>
2021-03-25 14:30:13 +08:00
Yun Hsiao Wu a99d078f46 adapt native gfx layer changes (#8350)
* fix precompile combinations

* remove memory pool type hacks

* sync gfx defines
2021-03-19 16:24:36 +08:00
pandamicro 5005752386 Merge remote-tracking branch 'origin/develop' into v3.1
# Conflicts:
#	cocos/core/builtin/effects.ts
#	cocos/core/builtin/shader-sources/glsl1.ts
#	cocos/core/builtin/shader-sources/glsl3.ts
#	cocos/core/builtin/shader-sources/glsl4.ts
#	cocos/core/gfx/define-class.ts
#	cocos/core/gfx/define.ts
#	cocos/core/gfx/webgl/webgl-buffer.ts
#	cocos/core/gfx/webgl2/webgl2-buffer.ts
#	cocos/core/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/planar-shadow-queue.ts
#	cocos/core/pipeline/render-additive-light-queue.ts
#	cocos/particle/renderer/particle-system-renderer-data.ts
#	editor/assets/chunks/cc-shadow-map-fs.chunk
#	editor/assets/chunks/shading-standard.chunk
2021-03-18 18:33:35 +08:00
mmyduckx 19bae97854 fix native dragonbones bug (#8343) 2021-03-10 17:31:00 +08:00
mmyduckx 5df2f13fe5 Fix native node active (#8323)
* fix native node active bug

* comment remove
2021-03-04 17:27:47 +08:00
mmyduckx 0513d8bf2a fix native spine/dragonbones node move bug & node active bug (#8265)
* Revert "Fix node move (#8177)" and Fix node move bug

* refine jsb

* fix node active bug
2021-02-23 19:53:11 +08:00
pandamicro c5d4c5c08e Merge remote-tracking branch 'origin/v3.0.0' into device-proof
# Conflicts:
#	cocos/3d/assets/morph-rendering.ts
#	cocos/core/builtin/builtin-res-mgr.ts
#	cocos/core/builtin/effects.ts
#	cocos/core/builtin/shader-sources/glsl1.ts
#	cocos/core/builtin/shader-sources/glsl3.ts
#	cocos/core/builtin/shader-sources/glsl4.ts
#	cocos/core/pipeline/index.jsb.ts
#	cocos/core/pipeline/planar-shadow-queue.ts
#	cocos/core/pipeline/render-additive-light-queue.ts
#	cocos/core/pipeline/shadow/shadow-flow.ts
#	cocos/particle/renderer/trail.ts
#	cocos/physics/ammo/polyfill-atob.ts
#	editor/assets/effects/builtin-spine-two-colored.effect.meta
#	jest.config.js
#	platforms/native/engine/jsb-pipeline.js
#	tests/general/sealed-global-variables.json
2021-02-07 18:33:59 +08:00
Yun Hsiao Wu b216ad14d4 device agent adapt 2021-02-03 17:48:03 +08:00
cary f1ab9a7ecb Extracts the shared content of the pipeline. (#8187)
* Extracts the shared content of the pipeline.

* add createDefaultPipeline export
2021-01-25 17:41:00 +08:00
minggo 71cc6f06d5 sort cameras correctly (#8196) 2021-01-25 11:52:30 +08:00
mmyduckx 093cee855e Fix node move (#8177)
* Fix node-move bug in 2d-rendering-in-3d testcase

* Fix node-move bug in 2d-rendering-in-3d testcase (update)

* Fix node-move bug in 2d-rendering-in-3d testcase v2
2021-01-23 10:41:48 +08:00
江战 c44752ebf8 fix jsb.reflection (#8172) 2021-01-21 16:10:15 +08:00
Knox 6af2c71167 fix video player and web view bug (#8144)
1.video player stop invalid
2.web view not display
2021-01-15 14:58:46 +08:00
pandamicro c6dad8c494 Merge render scene and improve naming for 2d render (#8142)
* format and tweek

* Refactor renderer: UI to 2D naming

* refactor root.ui to root.batcher2D

* Refactor UIBatchView to BatchView2D

* Fix issues

* Merge UI render scene to main render scene

* Improve camera scene check in forward pipeline

* Fix eslint ci

* skip js files
2021-01-15 11:43:09 +08:00
cary 1c2ae0231e Fix unused buffer upload and buffer memory leap. (#8074)
* Fix unused buffer upload and buffer memory leap.

* fix release error

* fix ci

* add dirty reset

* fix window declaration

* delete byteoffset reset
2021-01-12 15:37:39 +08:00
Knox 52891d3489 Fix the problem that web view is not displayed (#8101) 2021-01-11 11:34:13 +08:00
mmyduckx 2093e07d73 fix empty scene bug & dragonbones rendering bug (#8080) 2021-01-06 09:43:28 +08:00
minggo dfdc1978a3 Revert "skip copy buffer when middleware buffer was empty (#8067)" (#8068)
This reverts commit 1eb82c7fb4.
2020-12-31 17:30:56 +08:00
owen 1eb82c7fb4 skip copy buffer when middleware buffer was empty (#8067) 2020-12-31 16:40:29 +08:00
Yun Hsiao Wu d2bb41a1d7 adapt gfx changes (#8019) 2020-12-28 17:23:06 +08:00