Commit Graph

221 Commits

Author SHA1 Message Date
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 91ba93c7f1 update internal effect names (#7744) 2020-11-10 11:36:25 +08:00
Yun Hsiao Wu 32598c25cb switch to eslint (#7727)
* switch to eslint

* eslint: extends airbnb
2020-11-09 10:19:12 +08:00
GengineJS 645357ef48 [Feature] Support editbox under gameview (#7710) 2020-11-05 18:55:25 +08:00
Jare Guo a0d5508779 simplify attribute implements (sync #5040) (#7679) 2020-11-05 17:37:56 +08:00
Santy-Wang eca57fdca8 sync 2d (#7703)
* sync 2d

* fix ci

* refine
2020-11-05 15:51:51 +08:00
GengineJS 0c42a3d14e [Feature] profiler adapts to gameView (#7695) 2020-11-04 17:53:02 +08:00
jiaxin.lai a3a2e7a7c2 tweaks of deprecated&tween due to loose mode (#7671)
* disable enumerable deprecated property

* add some filtering to tween
2020-11-02 16:28:23 +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
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
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
Jare Guo 64e435badd Merge remote-tracking branch 'gitlab/3d'
# Conflicts:
#	package-lock.json
2020-10-29 15:36:36 +08:00
Yun Hsiao Wu c60a6ed251 pre-rotation adaptation: dynamics (#7625)
handle runtime orientation chanegs too
2020-10-29 13:45:16 +08:00
Jare Guo b7c56393d5 Merge remote-tracking branch 'fireball/3d' into 3d-v1.2
# Conflicts:
#	EngineErrorMap.md
#	cocos/core/assets/image-asset.ts
#	cocos/core/data/class.ts
#	cocos/core/data/deserialize.ts
#	package.json
2020-10-28 18:37:39 +08:00
Knox 37fec6341f sync 2d (Update the url links) (#7613) 2020-10-28 17:06:27 +08:00
Yun Hsiao Wu a318283a41 fix pre-rotation adaptation (#7607) 2020-10-28 10:28:21 +08:00
Leslie Leigh (李的序) f99240f664 @cocos/build-engine: add option to remove deprecated features (#7603) 2020-10-27 18:28:58 +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
Yun Hsiao Wu 40d959e718 gfx: pre-rotation on android (#7586) 2020-10-26 10:31:17 +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 54021a9bb0 Update PR 2020-10-19 12:02:48 +08:00
Leslie Leigh (李的序) 114746ec50 Remove es5 cc class (#7504)
* Remove empty comments

* Remove CCClass() style class declaration

* Optimize
2020-10-19 11:51:37 +08:00
Jare Guo da6ec26b52 fix sync instantiate-jit (#7550)
* Refine type define

* Fix TypedArray instantiation in Prefab (sync commit 0361c4eb4fe09021b8cecb8d2122fa05220e68fa)

* resign instantiate-jit #5114
2020-10-16 23:41:58 +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
黄森斌 91dd63d12b component in prefab node add __prefab attr (#7521)
* prefab component add __prefab.fileId

* Editor add CompPrefabInfo to a new component

* do not create legacyCC._CompPrefabInfo
2020-10-15 23:06:27 +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
minggo df0efdc74a clip more JS codes on native (#7520) 2020-10-14 09:42:32 +08:00
minggo 249d4cd6fb use native Device (#7511) 2020-10-12 18:30:08 +08:00
minggo 3539745c14 use native Texture/TextureInfo/TextureViewInfo on native platforms (#7498) 2020-10-10 18:28:16 +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
Jare Guo 0b1fa249da bug fixes and sync remain codes
fuck
2020-09-28 16:37:24 +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
Jare Guo 17e327bf28 support new serialization at runtime 2020-09-27 19:25:00 +08:00
pandamicro 4b84548381 Finish core API translation (#7397) 2020-09-17 00:06:19 +08:00
Yun Hsiao Wu b2d9249dae fix circular refs (#7354) 2020-09-10 15:19:38 +08:00
Yun Hsiao Wu 9dc5a20a9a fix pass handle type check (#7348) 2020-09-09 18:02:02 +08:00
Leslie Leigh (李的序) afad4b3e72 Fix migration (#7283) 2020-09-02 19:26:59 +08:00
Leslie Leigh (李的序) 610aff1c51 Fix js.setClassAlias error (#7278) 2020-09-02 17:00:35 +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
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
Yun Hsiao Wu ba8e49eff8 more adaptations (#7205) 2020-08-24 12:02:27 +08:00
Knox 85209df78e sync 2d richt text component (#7085) 2020-08-17 11:28:16 +08:00
Yun Hsiao Wu dfc3d141f2 GFX Descriptor Set (#7101)
* gfx: descriptor sets

* gfx: descriptor set, singular

* better structure

* adapt upper layers: first pass

finally all compiler errors cleared.

OKAY IT'S HAPPENING EVERYBODY STAY THE ****ING CALM

* adapt upper layers: second pass

THERE AND BACK AGAIN

* unified light pass & shadow shader

* gfx: descriptor set & pipeline layout

* light pass: better structure

* light pass: dynamic uniform

* even more type checking for memory pools

* Fix particleSystem and lineComponent.

* delete comment

* guard pool init param

* Fix trail module error.

* delete space

* light pass: instancing & batching support

* don't polyfill gfx stuff inside EffectAsset

* better light pass structure

* fix spot light culling

Co-authored-by: caryliu <caryliu1999@gmail.com>
2020-08-13 18:21:15 +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
Leslie Leigh (李的序) 0c5debbc15 Doc for js.array.* (#7089) 2020-08-12 23:27:39 +08:00