Commit Graph

85 Commits

Author SHA1 Message Date
minggo a705618093 Cache CanvasRenderingContext2D properties as possbile (#7749)
* cache CanvasRenderingContext2D properties

* cache CanvasRenderingContext2D attributes

* cache CanvasRenderingContext2D properties

* create canvas with default widht/height

* fix typo
2020-11-10 19:13:33 +08:00
zhefeng.zhang f8474892f8 fixed tiledTypeSprite error (#7748) 2020-11-10 19:01:09 +08:00
pandamicro b162e21a93 Update license and API language declaration (#7750)
* Update licenses

* Update license for audio

* Update license for core/3d

* Update license for animation, assets, asset-manager, components, data

* update license for event, geometry, gfx

* update license for core modules

math, memop, pipeline, platform, primitive, renderer, scene-graph, utils, value-types

* Update license for core

* Update license for particle and particle-2d

* Update license for particle part2

* Update license for physics and physics-2d

* Update license for all modules in cocos

* Update license for exports

* Fix API doc language declaration
2020-11-10 17:36:31 +08:00
Yun Hsiao Wu 32598c25cb switch to eslint (#7727)
* switch to eslint

* eslint: extends airbnb
2020-11-09 10:19:12 +08:00
pandamicro 3068956648 Refactor gfx module naming convention (#7663)
* Remove GFX prefix in gfx module

* Full deprecation for old GFX APIs

* export gfx module

* Fix issues and make deprecated exports backward compatible

* Adaptation in engine modules for gfx

* Fix ci

* fix ci
2020-11-02 09:49:50 +08:00
JoneLau 000dd93438 remove errors caused by useless code (#7654) 2020-10-31 19:52:44 +08:00
Santy-Wang 7b025ff721 sync 2d (#7658)
* sync

* sync 2d

* refine
2020-10-31 18:12:10 +08:00
ChiaNing 6ed0e81cca new UI custom material & use hash check merge (#7649)
* new UI custom material & use hash check merge

* update

* update

* apidoc
2020-10-31 13:34:15 +08:00
cary 0df72ac1e2 Fix the label wrapping problem. (#7651) 2020-10-31 11:46:24 +08:00
Jare Guo e2b740dd15 Finally merge runtime deserializer & asset manager (#7648)
* sync asset-manager

refine

refine

refine

* change director

* refine

* fix bugs

* commit

* refine and fix bugs

* refine docs

* fix bugs

* merge

* fix bugs

* fix bugs

* merge

* sync jsb-adapter

* fix ci

* adapt preloading process for new Deserializer

* adapt preloading process for new Deserializer

* fix bugs

* minor fix

* dump dependency of SpriteFrame explicitly (sync #6938)

* dump dependency of SpriteFrame explicitly (sync #6938)

* remove unused variable

* exporting should trigger uuid compression in serializer

* refine

* fix ci

Co-authored-by: Santy-Wang <wh19930829@qq.com>
2020-10-30 20:51:58 +08:00
pandamicro 04920fa804 Made CanvasPool a singleton (#7645) 2020-10-30 19:04:00 +08:00
cary 65a1cf4a24 Add label shadow and synchronize Label's optimization changes. (#7626)
* Add label shadow and synchronize Label's optimization changes.

* fix comment

* fix opacity
2020-10-30 16:19:43 +08:00
江战 a933edb94f Merge TiledMap from 2.x (#7610)
* Save all

* fix uv

* fix object groups

* fix tintcolor

* add method modifier

* tslint

* replace ccCOlor

* add import warning

* rename

* add comments

* add comments

* update zlib

* Save

* pixel offset

* update tests/general/sealed-global-variables.json

* exclude from cc

* remove _walkGen

* update setScale & setRotationFromEuler
2020-10-30 10:35:52 +08:00
Knox 37fec6341f sync 2d (Update the url links) (#7613) 2020-10-28 17:06:27 +08:00
JoneLau 351b6480e4 add image stencil in mask (#7598)
* add image stencil in mask

* update
2020-10-28 12:13:53 +08:00
cary eaa0da71cc Synchronize some changes of 2d engine. (#7608) 2020-10-28 12:08:24 +08:00
cary 6bcc7933a9 Add motion streak and particle 2d. (#7588)
* Add motion streak and particle 2d.

* fix buffer error

* modify comment error

* fix ci

* fix comment

* modify some comment
2020-10-27 11:48:17 +08:00
ChiaNing b10e8c5bcd DescriptorSet Cache add (#7591)
* DescriptorSet Cache add

* commitComp function format change

* api in texture-base remove
2020-10-26 16:13:41 +08:00
pandamicro 6101d772a2 Merge remote-tracking branch 'origin/3d-v1.2' into 3d
# Conflicts:
#	EngineErrorMap.md
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/data/decorators/property.ts
#	cocos/core/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/forward/scene-culling.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/renderer/scene/shadows.ts
#	cocos/core/renderer/ui/mesh-buffer.ts
#	cocos/core/renderer/ui/ui-vertex-format.ts
#	cocos/core/scene-graph/scene-globals.ts
#	cocos/terrain/terrain.ts
#	cocos/ui/assembler/graphics/webgl/graphics-assembler.ts
#	cocos/ui/components/graphics.ts
#	editor/assets/default_prefab/3d/Capsule.prefab.meta
#	editor/assets/default_prefab/3d/Cone.prefab.meta
#	editor/assets/default_prefab/3d/Cube.prefab.meta
#	editor/assets/default_prefab/3d/Cylinder.prefab.meta
#	editor/assets/default_prefab/3d/Plane.prefab.meta
#	editor/assets/default_prefab/3d/Quad.prefab.meta
#	editor/assets/default_prefab/3d/Sphere.prefab.meta
#	editor/assets/default_prefab/3d/Torus.prefab.meta
#	editor/assets/default_prefab/Camera.prefab.meta
#	editor/assets/default_prefab/Terrain.prefab.meta
#	editor/assets/default_prefab/effects/Particle System.prefab.meta
#	editor/assets/default_prefab/light/Directional Light.prefab.meta
#	editor/assets/default_prefab/light/Sphere Light.prefab.meta
#	editor/assets/default_prefab/light/Spot Light.prefab.meta
#	editor/assets/default_prefab/ui/Button.prefab.meta
#	editor/assets/default_prefab/ui/Canvas.prefab.meta
#	editor/assets/default_prefab/ui/EditBox.prefab.meta
#	editor/assets/default_prefab/ui/Label.prefab.meta
#	editor/assets/default_prefab/ui/Layout.prefab.meta
#	editor/assets/default_prefab/ui/Mask.prefab.meta
#	editor/assets/default_prefab/ui/ProgressBar.prefab.meta
#	editor/assets/default_prefab/ui/ScrollView.prefab.meta
#	editor/assets/default_prefab/ui/Slider.prefab.meta
#	editor/assets/default_prefab/ui/Sprite.prefab.meta
#	editor/assets/default_prefab/ui/Toggle.prefab.meta
#	editor/assets/default_prefab/ui/ToggleContainer.prefab.meta
#	editor/assets/default_prefab/ui/Widget.prefab.meta
2020-10-21 18:35:11 +08:00
Jare Guo 0319477911 fix decorator warning of ValueTypes (#7553)
* fix decorator warning of ValueTypes (sync #6285)

* refresh copyright
2020-10-21 16:31:41 +08:00
Jare Guo 2cdc3d1b8b Refine EngineErrorMap and sync 2D changes (#7542)
* refine Color.toCSS/toHex (sync #6216 #6207)

* refine component.resetInEditor (sync #6244)

* Revert "Improve error maps (#5527)"

This reverts commit 224cea23ab.

# Conflicts:
#	EngineErrorMap.md
#	cocos/core/assets/sprite-frame.ts

* Revert "Component rename for new standard and 2d compatibility (#7103)"

This reverts commit 3240dba206.

# Conflicts:
#	EngineErrorMap.md

* Remove some old deprecations (sync #6271)
2020-10-16 10:55:32 +08:00
Jare Guo a0a992de5d remove asserts from addChild & sync 2D changes (#7479)
* remove asserts from addChild

* expose js._registeredClassIds & js._registeredClassNames (sync #3174)

To unload scripts dynamically.
Also revert part of changes from https://github.com/cocos-creator/engine/pull/3204/files#diff-cabe5229c3c6e31339220008e54fe853L421

* remove unused code (sync #3174)

* minor tweak (sync #3421)

* should not invoke component if destroy() called before node activating (sync #3430)

* node should removed and destroyed with scene (sync #3456 #3483)

* fix WebGL detection on Android browsers (sync #3510)

* remove redundant right shift for bitwise operation (sync #3754)

* fix label blur when using dark font color (sync #3949)

* refine tooltip of Block Input Event (sync #4053)

* fix IE/Edge exception when output log/warn before engine initialization(sync #4447, #4500)

* sync class, attribute (#4689, #4712, #4781, #4712)

* fix loading unknown texture format (sync #4820)

* prefer toLowerCase to toLocaleLowerCase + sync #5114

* optimize bezier calculation (sync #5155)

* fix potential memory leak in scene-editor (sync #5643)

* fix _posDirty error of Mask on native platform (sync #6168)
2020-10-15 17:28:14 +08:00
JoneLau 69e65b848a adjust the Graphics structure to support continuous data filling (#7524)
* Revert "adjust the Graphics structure to support continuous data filling (#7523)"

This reverts commit b86f3ccec1.

* adjust the Graphics structure to support continuous data filling (#7359)
2020-10-14 22:35:54 +08:00
JoneLau b86f3ccec1 adjust the Graphics structure to support continuous data filling (#7523) 2020-10-14 11:54:15 +08:00
minggo df0efdc74a clip more JS codes on native (#7520) 2020-10-14 09:42:32 +08:00
zheng han c8a4884d1a 3d physics 2d gizmo (#7493)
* add mask param to raycast

* refine code

* 1. add some decorator
2. export earcut

* add dashed line

* revert mainLoop modify

Co-authored-by: 2youyou2 <501251991@qq.com>
2020-10-12 15:50:07 +08:00
pandamicro 7481303268 Merge branch '3d-v1.2' into 3d
# Conflicts:
#	cocos/core/3d/framework/camera-component.ts
#	cocos/core/assets/mesh.ts
#	cocos/core/components/component-event-handler.ts
#	cocos/core/game.ts
#	cocos/core/gfx/webgl/webgl-commands.ts
#	cocos/core/gfx/webgl2/webgl2-commands.ts
#	cocos/core/pipeline/define.ts
#	cocos/core/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/instanced-buffer.ts
#	cocos/core/pipeline/render-pipeline.ts
#	cocos/core/pipeline/shadow/shadow-flow.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/renderer/scene/shadows.ts
#	cocos/core/renderer/scene/skybox.ts
#	cocos/core/splash-screen.ts
#	cocos/ui/components/button.ts
#	cocos/ui/components/editbox/edit-box-impl.ts
#	editor/assets/primitives.fbx
#	package-lock.json
#	package.json
2020-09-30 18:01:33 +08:00
ChiaNing 15a1806d18 API doc format change (#7456) 2020-09-28 16:52:52 +08:00
JoneLau 1398ad4b1c fixed vb initialization and submit twice (#7460) 2020-09-28 16:50:38 +08:00
Yun Hsiao Wu c2e3de2caa GFX: public interfaces (#7444)
* public interfaces: render pass, IA, PSO

* public interfaces: Queue, Sampler, Shader, DSLayout

* public interfaces: DS, CB, Texture, Buffer, Device

* public interfaces: other supporting structs

* fix framebuffer state cache
2020-09-28 11:32:47 +08:00
zhefeng.zhang 221014f454 sync #5924 (#7208)
Co-authored-by: zhefeng.zhang <35944775+Jno1995@users.noreply.github.com>
2020-09-27 18:07:02 +08:00
Yun Hsiao Wu b021a20722 submit once per frame (#7401) 2020-09-18 13:38:19 +08:00
JoneLau c4606c8643 adjust the Graphics structure to support continuous data filling (#7359) 2020-09-13 23:33:07 +08:00
pandamicro 1d2a82d957 Merge branch '3d-v1.2' into merge1.2
# Conflicts:
#	cocos/core/3d/framework/mesh-renderer.ts
#	cocos/core/components/ui-base/ui-renderable.ts
#	cocos/core/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/forward/scene-culling.ts
#	cocos/core/pipeline/render-additive-light-queue.ts
#	cocos/core/pipeline/render-stage.ts
#	cocos/core/pipeline/shadow/shadow-flow.ts
#	cocos/core/renderer/core/memory-pools.ts
#	cocos/core/renderer/scene/camera.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/renderer/scene/render-scene.ts
#	cocos/core/root.ts
#	cocos/particle/billboard.ts
#	cocos/terrain/terrain.ts
#	cocos/ui/components/button.ts
#	package-lock.json
#	package.json
#	tests/general/sealed-global-variables.json
2020-09-02 18:39:09 +08:00
pandamicro 3240dba206 Component rename for new standard and 2d compatibility (#7103)
* Rename ui related components

* Rename files

* Remove Useless errors

* Fix sealed names

* Fix sealed global variables

* Fix circular reference

* Refactor more component names

* Rename particle and animation related component

* export scene and models sub module in renderer

* Rename ModelComponents to Model

* Refactor LightComponents to Light

* Refactor CameraComponent to Camera

* Refactor ConstraintComponents to Constraint and rename physics comps

* Cleanup and fix issues

* Small fixes

* Refactor Model to MeshRenderer

* Final touch

* Fix data class export

* Better deprecation to cover all old usage

* Simpler and better deprecation with js.setClassAlias

* Fix ci

* Fix editor issue
2020-09-02 15:31:49 +08:00
Leslie Leigh (李的序) bc5b531191 Add decorator @editable @serializable (#7178) 2020-09-02 11:44:12 +08:00
zhefeng.zhang 7256f34bc4 sync #6002 (#7160) 2020-08-27 10:51:40 +08:00
minggo 85a6f2a999 make model is intialized before reused (#7221) 2020-08-26 11:46:35 +08:00
minggo 035a632abb invoke Model.initialize() before being resued (#7201) 2020-08-24 11:43:43 +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
JoneLau 50946d8bdb fixed the bug when the label's cachemode is char (#7191) 2020-08-20 21:30:04 +08:00
yinkaile da5c216874 sync #5195 (#7150) 2020-08-19 17:42:41 +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
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
pandamicro bc06db685c Merge remote-tracking branch 'origin/3d-v1.2' into 3d-v1.2 2020-08-13 11:24:00 +08:00
pandamicro 8d142e42a9 Optimize some documents (#7092)
* Optimize some documents

* Update

* Update

* Update
2020-08-12 23:27:53 +08:00
PP d95e9930cc fix delay load ttf font bug (#7095) 2020-08-12 23:15:44 +08:00
pandamicro 3b66332823 Merge remote-tracking branch 'origin/3d-v1.1.1' into 3d-v1.2
# Conflicts:
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/animation/animation-state.ts
#	cocos/core/game.ts
#	cocos/core/gfx/webgl/webgl-commands.ts
#	cocos/core/pipeline/instanced-buffer.ts
#	cocos/core/pipeline/render-instanced-queue.ts
#	cocos/core/platform/event-manager/input-manager.ts
#	cocos/core/platform/view.ts
#	cocos/core/renderer/core/pass.ts
#	cocos/core/renderer/scene/planar-shadows.ts
#	cocos/core/splash-screen-webgl.ts
#	cocos/core/utils/profiler/profiler.ts
#	cocos/particle/renderer/trail.ts
#	cocos/terrain/terrain.ts
#	package-lock.json
#	package.json
#	predefine.ts
#	scripts/build-engine/package-lock.json
#	scripts/build-engine/package.json
#	scripts/build-engine/src/index.ts
2020-08-12 15:53:52 +08:00
SB f0882d6272 Optimize some documents 2020-08-06 17:23:06 +08:00
PP aaf542be76 remove browserType for minigame (#6970)
* remove browserType for wechatgame

* optimize booting in subContext

update
2020-07-12 22:42:52 +08:00