Commit Graph

52 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
jiaxin.lai 86f761c05f 3d rigidbody refactor (#7635)
* hack of visible decorator

* tweaks

* disable node chain

* using setType instead isKinematic

* fix ammo rigid body

* disable scaling of terrain shape

* twaks

* update default prefab to 1.1.22

* docs

* renaming & deprecated

* docs
2020-10-30 19:03:12 +08:00
jiaxin.lai 3c17cb9e1e refactor collision matrix (#7538)
* refactor collision matrix

* add deprecated

* tweaks
2020-10-28 14:15:20 +08:00
Leslie Leigh (李的序) f99240f664 @cocos/build-engine: add option to remove deprecated features (#7603) 2020-10-27 18:28:58 +08:00
jiaxin.lai 4cc4808072 correct the name of physics material (#7597)
* correct the name of PhysicsMaterial

* tweaks
2020-10-27 18:25:57 +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
Yun Hsiao Wu d61330ee03 discrete descriptor set layout bindings (#7536)
* allow discrete descriptor set layout bindings

* specialize local DS layout

* fix binding indices mapping

* fix shadows

* UI: update buffer after device.acquire

* update shadow phase name

* ext blend minmax support

* fix splash screen on native
2020-10-20 15:08:17 +08:00
coulsonwang af31f258ee fix sphere invalid buffer pool handle (#7529) 2020-10-15 10:29:44 +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
jiaxin.lai 17866af905 tweaks tooltip of isTrigger (#7485) 2020-10-10 14:17:41 +08:00
ChiaNing 15a1806d18 API doc format change (#7456) 2020-09-28 16:52:52 +08:00
GengineJS 4b64c9615e [Feature] physicsSystem class adds GameView mode (#7375) 2020-09-15 10:27:38 +08:00
Leslie Leigh (李的序) 4e56acb851 Fix missed cc.* (#7282)
* Fix missed `cc.*`

* Fix
2020-09-02 19:04:38 +08:00
jiaxin.lai 3933474f3e change default mask value of collision matrix (#7277) 2020-09-02 15:32:48 +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
jiaxin.lai d727090b72 fix auto simulation (#7264)
* fix auto simulation

* sync only once if accumulator not enough

* tweaks
2020-09-01 23:00:51 +08:00
jiaxin.lai 8ff8363eac Using physics group (#7259)
* using physics group

* tweaks

* rename

* remove time reset

* rename

* change emit events order
2020-09-01 10:20:11 +08:00
Leslie Leigh (李的序) 4f2eff842d Full optimize decorators (#7166)
* Full optimize decorators

* Conflicts

* Rename immutable -> readOnly

* Update

* Update

* Update
2020-08-18 19:10:34 +08:00
jiaxin.lai f3e7549628 Fix constant force (#7153)
* add reset accumulator to physics system

* fix constant force

* don`t initPhysicsSystem in EDITOR
2020-08-17 23:03:43 +08:00
Leslie Leigh (李的序) 7d944f0813 Optimize physics selector (#7082)
* Optimize physics selector

* CI

* Update
2020-08-13 18:32:31 +08:00
Leslie Leigh (李的序) 26df6fb1c0 Optimize editor decorators (#7002) 2020-08-05 10:36:52 +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 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
Leslie Leigh (李的序) 3b31edae67 Fix once bug (#6889) 2020-06-17 12:01:11 +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
jiaxin.lai d328964501 revert 'optimize contact data' (#6776) 2020-05-28 19:02:23 +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
Leslie Leigh (李的序) ac3406082f Implements EventTarget in a better way (#6571)
* Implements EventTarget in a better way

* Fix

* Update

* Use Object instead of empty class

* Comment

* Revert "Use Object instead of empty class"

This reverts commit 3d41c70064d74c10a7b5ece2da5593ca9e8ac877.

* Eventful -> Eventify
2020-05-21 16:48:17 +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
jiaxin.lai 718eeff2bc fix trigger sync of node chian (#6665)
* fix trigger sync of node chian

* docs
2020-05-11 17:20:54 +08:00
jiaxin.lai 1e876bcd2a fix spell for physics module (#6624) 2020-04-28 14:37:12 +08:00
jiaxin.lai 90015565a0 fix some system ID (#6592)
* fix some system ID

* docs
2020-04-21 19:13:57 +08:00
jiaxin.lai 44844fdb94 fix get body of rigid body (#6578)
* fix get body of rigid body

* make event optional in trigger&collision callback

* fix apply local force/impulse of ammo
2020-04-20 18:42:54 +08:00
jiaxin.lai 5530c72706 minor refactor physics framework (#6518)
* refactor framework

* tweaks
2020-04-13 16:25:55 +08:00
jiaxin.lai d78e1018e7 capsule collider refactor (#6484)
* capsule collider refactor

* add deprecated
2020-04-07 11:42:23 +08:00
jiaxin.lai 7bcb4cc352 en api docs of physics (#6467)
* add en api docs of  physics module

* docs for physics

* docs

* tweaks

* tweaks

* wording
2020-04-05 16:20:11 +08:00
黄森斌 5aaae03612 components add @help for editor show document url (#6428) 2020-03-26 18:42:08 +08:00
jiaxin.lai aa0eb1bdaf cylinder collider (#6416)
* stash

* stash

* stash

* stash

* fix z direction

* impl cannon cylinder

* stash

* stash

* stash

* fix memory leak

* update @cocos/ammo

* add error map

* update package-lock

* tweaks
2020-03-25 18:35:27 +08:00
jiaxin.lai a4af34630f integrate trimesh shape of ammo & cannon (#6232)
* stash

* cannon impl

* ammo mesh collider

* finish ammo mesh collider

* cannon trimesh shape

* tweaks

* tweaks

* tweaks

* update @cocos/ammo &  @cocos/cannon

* fix ci

* naming norm

* use config object

* renaming

* naming norm

* naming norm

* tweaks

* stash

* stash

* stash

* add error map

* export impl

* update package-lock

* export impl of world

* tweaks
2020-03-15 19:41:16 +08:00
jiaxin.lai 905716cecd add hit normal to ray result (#6258)
* add hit normal to ray result

* tweaks
2020-03-11 15:59:33 +08:00
Leslie Leigh (李的序) 284aa38d25 Build time constants (#6256)
* consts

* Bump @cocos/build-engine version

* Fix

* Upload @cocos/build-engine

* Rm scripts/build-engine/.gitignore
2020-03-11 14:05:22 +08:00
jiaxin.lai 7d180508a5 fix unit test (#6259) 2020-03-02 19:34:07 +08:00
jiaxin.lai 4d5d3ad8af enable physics raycast's mask filter (#6144)
* add mask filter to physics raycast

* enable physics raycast's mask filter
2020-02-13 17:42:53 +08:00
jiaxin.lai 576be92838 rename geom-utils to geometry (#6161) 2020-02-13 10:08:57 +08:00
jiaxin.lai 344d1eebde Ammo-capsule (#6159)
* stash

* stash

* stash

* update @cocos/ammo to 1.0.1

* tweaks

* tweaks
2020-02-12 18:58:02 +08:00
jiaxin.lai 0ab3bc878e fix preview when physics module not include (#6142) 2020-02-11 23:28:35 +08:00
jiaxin.lai efa6d15535 api doc tweaks of constant-force (#6140) 2020-02-10 11:00:11 +08:00
jiaxin.lai 6e092ad307 Tweaks of tween&physics (#6036)
*  tweaks of Tween api document

* fix export of ConstantForce
2020-01-08 12:53:19 +08:00
jiaxin.lai 21cc4351c6 builtin_capsule_collider (#5970)
* add bouding capsule

* add builtin capsule collider

* add apater for capsule shape

* fix circular dependency

* fix typing

* fix capsule_capsule algorithm

* api doc tweaks

* fix ci
2019-12-27 18:11:44 +08:00