Commit Graph

95 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 8d2ef1fe51 fix skybox effect (#7740)
* fix skybox

* fix subMesh.iaInfo
2020-11-09 17:55:55 +08:00
Yun Hsiao Wu 32598c25cb switch to eslint (#7727)
* switch to eslint

* eslint: extends airbnb
2020-11-09 10:19:12 +08:00
Knox 594ea62016 sync 2d pr (#7698)
1.https://github.com/cocos-creator/engine/pull/7081
2.https://github.com/cocos-creator/engine/pull/7329
2020-11-05 17:23:28 +08:00
Yun Hsiao Wu 3e8b6ec771 raw object pool (#7683)
* raw object pool

* fix worldToScreen

* fix mesh.merge on native

* inline some adaptation computations

* enable scissor tests by default
2020-11-05 10:56:59 +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
jiaxin.lai 1d1a158640 delete deprecated of divide (#7660) 2020-10-31 19:41:08 +08:00
Yun Hsiao Wu c60a6ed251 pre-rotation adaptation: dynamics (#7625)
handle runtime orientation chanegs too
2020-10-29 13:45:16 +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
Yun Hsiao Wu 40d959e718 gfx: pre-rotation on android (#7586) 2020-10-26 10:31:17 +08:00
pandamicro f31968e999 Merge remote-tracking branch 'origin/3d' into 3d
# Conflicts:
#	cocos/core/platform/sys.ts
2020-10-22 11:52:25 +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 585625004b add fromAngleZ for angle (sync #4585) (#7512) 2020-10-21 17:44:04 +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
yinkaile 96a735b2ff 3d v1.2 physics 2d (#7357)
* Squashed commit of the following:

add physics 2d

* @@ -205,9 +205,6 @@ export class b2PhysicsWorld implements IPhysicsWorld {

revert box2d version

* add mask param to raycast

* refine code
2020-10-12 11:49:49 +08:00
pandamicro 27e36c1179 Merge remote-tracking branch 'origin/3d-v1.1' into 3d-v1.2
# Conflicts:
#	cocos/core/math/quat.ts
#	cocos/core/math/rect.ts
2020-09-28 17:55:37 +08:00
ChiaNing 15a1806d18 API doc format change (#7456) 2020-09-28 16:52:52 +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
ChiaNing 8fab463514 quat set bug fix (#7261) 2020-09-01 13:50:43 +08:00
SB f0882d6272 Optimize some documents 2020-08-06 17:23:06 +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
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
ChiaNing 372a0b5733 mat4 translate bug fix (#6932) 2020-06-28 10:39:39 +08:00
pandamicro b2830f5271 Merge remote-tracking branch 'origin/3d-v1.1.1' into 3d
# Conflicts:
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/3d/framework/light-component.ts
#	cocos/core/3d/framework/model-component.ts
#	cocos/core/animation/animation-state.ts
#	cocos/core/assets/image-asset.ts
#	cocos/core/data/object.ts
#	cocos/core/event/callbacks-invoker.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/platform/event-manager/events.ts
#	cocos/core/primitive/primitive.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/renderer/scene/render-scene.ts
#	cocos/core/root.ts
#	cocos/core/scene-graph/node-event-processor.ts
#	cocos/core/splash-screen-webgl.ts
#	cocos/particle/index.ts
#	cocos/terrain/terrain.ts
#	exports/base.ts
2020-06-17 14:47:36 +08:00
pandamicro 1349990fb8 Fix Color.set API (#6865)
* AudioClip & AudioPlayer playOneShot volume default value

* revert changes

* revert changes

* Color 类型定义错误

* Fix ci

Co-authored-by: k8w <me@k8w.io>
2020-06-12 12:18:14 +08:00
Yun Hsiao Wu 69db70a910 Merge remote-tracking branch 'origin/3d' into 3d 2020-06-03 16:22:00 +08:00
SijieWang a9f3969245 Merge remote-tracking branch 'cocos-for-editor/3d-v1.1.1' into 3d
# Conflicts:
#	cocos/audio/assets/clip.ts
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/3d/framework/batched-skinning-model-component.ts
#	cocos/core/3d/framework/editor-camera-component.ts
#	cocos/core/3d/framework/index.ts
#	cocos/core/3d/framework/model-component.ts
#	cocos/core/animation/animation-clip.ts
#	cocos/core/animation/animation-manager.ts
#	cocos/core/animation/animation-state.ts
#	cocos/core/animation/skeletal-animation-component.ts
#	cocos/core/animation/skeletal-animation-state.ts
#	cocos/core/assets/mesh.ts
#	cocos/core/assets/simple-texture.ts
#	cocos/core/assets/sprite-frame.ts
#	cocos/core/assets/texture-base.ts
#	cocos/core/data/class-decorator.ts
#	cocos/core/data/instantiate.ts
#	cocos/core/event/event-target.ts
#	cocos/core/game.ts
#	cocos/core/load-pipeline/CCLoader.ts
#	cocos/core/load-pipeline/plist-parser.ts
#	cocos/core/load-pipeline/unpackers.ts
#	cocos/core/load-pipeline/url.ts
#	cocos/core/math/deprecated.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/scene-graph/base-node.ts
#	cocos/core/scene-graph/scene-globals.ts
#	cocos/terrain/terrain.ts
#	predefine.ts
2020-06-03 13:25:42 +08:00
Yun Hsiao Wu 69c88434a4 Merge branch '3d-gfx' into 3d 2020-06-02 17:59:07 +08:00
jiaxin.lai 48ce494926 physics optimization (#6768)
* fix cannon shape center update

* add isA to differentiate the contact data

* sync optimize

* quat typing

* fix body sleeping state

* remove event after destroy

* typing

* fix time reset

* set mass default to 1

* skipBackFaces by default

* tweaks for ammo world step

* continue if sleeping

* checking before wake up

* Annotation specifications

* tweaks

* rename isA to isBodyA

* renaming
2020-05-28 13:39:15 +08:00
Yun Hsiao Wu 4629448659 skeletal animation: handle duplicated keys (#6769) 2020-05-27 18:34:54 +08:00
Yun Hsiao Wu c16393974f quat.prototype.slerp (#6764) 2020-05-27 17:47:57 +08:00
Yun Hsiao Wu 6df0bb5388 instance buffer: skip empty buffers (#6761) 2020-05-27 15:19:37 +08:00
Yun Hsiao Wu 4bed4fb6d1 fix quat.slerp (#6760) 2020-05-27 14:48:35 +08:00
Yun Hsiao Wu b42de567af fix skinning model pose calc when missing joint nodes (#6721)
* fix skinning model pose calc when missing joint nodes

* fix camera.worldToScreen when world pos is behind near plane

* fix batched skinning model material instantiation
2020-05-25 18:05:52 +08:00
Leslie Leigh (李的序) 5e2adea787 Rename internal usages of global variable 'cc' into 'legacyGlobalExpo… (#6680)
* Rename internal usages of global variable 'cc' into 'legacyGlobalExports'

* Fix CI

* Rename 'legacyGlobalExports' -> 'legacyCC'
2020-05-14 15:46:45 +08:00
ChiaNing 22c13ad2fd math lib api translate (#6495)
* en api for math

* update

* update

* update

* fix

* fix

* update

* param update
2020-05-09 12:47:29 +08:00
pandamicro e849b7f3c6 Merge remote-tracking branch 'origin/3d-v1.1' into 3d-gfx
# Conflicts:
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/game.ts
#	cocos/core/gfx/webgl/webgl-commands.ts
#	cocos/core/gfx/webgl2/webgl2-commands.ts
#	cocos/core/math/mat4.ts
#	cocos/core/renderer/scene/camera.ts
#	cocos/core/splash-screen-webgl.ts
#	cocos/core/splash-screen.ts
2020-04-28 17:06:07 +08:00
Yun Hsiao Wu 338738430d projection matrix gfx adaptations (#6540)
* fix batched buffer resize

* projection matrix gfx adaptations
2020-04-13 21:26:34 +08:00
Yun Hsiao Wu 89a43b50e8 camera FOV axis (#6501)
* fov axis

* deprecation
2020-04-07 17:49:52 +08:00
ChiaNing 2c16f2119f math lib global value remove (#6446) 2020-03-30 13:48:56 +08:00
Leslie Leigh (李的序) 9a6c49dd70 Add declare modifier to math classes (#6445)
* Add `declare` modifier to math classes

* Fix
2020-03-30 12:22:32 +08:00
Yun Hsiao Wu 31715a725a fix quat.rotate (#6396) 2020-03-23 16:47:19 +08:00
jiaxin.lai 216cb739b4 fix set of color & clear color (#6383)
* fix set of color & clear color

* add protect

* tweaks
2020-03-20 19:16:42 +08:00
ChiaNing 5b5183b2a6 mat4 translate bug fix (#6371) 2020-03-19 15:43:26 +08:00
Yun Hsiao Wu edd1189518 flexible skinning model (#6131)
* flexible skinning model

* skinning shader works on non-skinning models

* more opts

* UBO default values

* more opts

* update default joint

* more opts

* more opts

* unified skeletal animation component

* misc opts

* fix batched skinning model

* fix mesh interfaces

* texture buffer pool alignment

* move switch to skeletal animation component

* in-shader joint offset

* minor
2020-02-26 11:32:38 +08:00
pandamicro b44dcc1115 Merge pull request #6220 from cocos-creator/3d-v1.0.4
Merge 3d v1.0.4
2020-02-25 10:12:28 +08:00