Commit Graph

58 Commits

Author SHA1 Message Date
pandamicro dba83c270d Fix multi blank lines (#11116) 2022-05-17 11:56:06 +08:00
Santy-Wang ab82e1b42d remove hidden (#10414)
* remove hidden

* fix typo

* fix unit-test

* turn on auto fix
2022-03-22 15:11:16 +08:00
Leslie Leigh (李的序) 93b856b98e Make animation module optional (#10257) 2022-03-10 11:55:11 +08:00
Leslie Leigh (李的序) 626f55f050 Fix spine typing (#9942)
* Fix constructor missing

* Replace ლ as _

* Update

* Update
2022-01-07 13:18:23 +08:00
Knox fa0f403503 Fix onPaused naming error in video player code (#9733)
* Fix onPaused naming error in video player code

* add deprecated in video

* refine code

* refine code

* refine code..
2021-11-26 16:31:58 +08:00
jiaxin.lai 5c6567f59e bullet physics optimization (#9311)
* stash

* stash

* stash

* use @cocos/bullet

* rename

* stash

* update constraint

* naming

* naming

* naming

* naming

* fix

* use compound by default

* stash

* fix

* rename and raycast

* refactor

* add state optimazation

* tweaks

* tweaks

* stash

* rename

* wechat wasm file path

* using promise

* remove @cocos/ammo

* i18n bullet(ammo.js) -> bullet

* tweaks

* update @cocos/build-engine to 4.2.11

* fix sync

* fix autosleep mechanism

* fix stability test

* fix destroy bullet world

* tweaks

* update @cocos/bullet to 1.0.0

* fix

* delete
2021-09-10 16:35:56 +08:00
PP 97b3657549 migrate input module out of platform (#9296)
* migrate input module out of platform

* revert EventKeyboard.isPressed deprecation

* fix CI
2021-09-07 15:24:43 +08:00
Yun Hsiao Wu 4cf1350fe0 gfx: swapchain refactor (#9030)
* update effect.hideInEditor

* swapchain refactor

* webgl multi draw

* implicit depth/stencil format

* native adapt

* explicit resizable texture

* DrawInfo in InputAssembler

* device cached states

* sync defines

* gfx: empty backend

* update playground

* remove profiler camera

* update effect types

* fix pass.resetUniform
2021-08-31 19:40:50 +08:00
jiaxin.lai 4cda45bfd9 physics unit-test and features base 3.3 (#9027)
* support ccd

* clearState after change type

* fix Instantiate rigid body with custom group

* add some extra functions

* update physics libs

* tweaks rigid body component

* add EVENT_UPDATE to PhysicsMaterial

* tweaks

* support switch physics backend

* remove redundant constants

* add config & min volume size

* update @cocos/physx to 1.0.4

* fix destroy cannon world

* correct init if manual construct physics system

* disable log info in test

* add some physics unit test

* add physics unit test

* make the config optional

* add runInEditor to selector

* pack physx js libs by default

* fix

* STASH

* stash

* tweaks

* rename

* update test

* support query trigger

* update @cocos/ammo to 1.1.6

* fix raycast with query trigger in physx

* raycast test with query trigger

* rename

* docs

* fix calculate local inertia (#8956)

* rename

* delete

* allow generate mesh/terrain collider at runtime

* tweaks

* use sap by default

* update @cocos/ammo to  1.1.8

* update @cocos/physx to 1.0.7

* update @cocos/cannon to 1.2.8

* update package-lock

* add ccd test

* remove config

* rename

* fix 2d phy sys typing

* support global allow sleep toggle for bullet

* tweaks

* use naive broadphase by default

* rename

* docs

* tweaks

* add missing jugement
2021-07-22 15:52:18 +08:00
Yun Hsiao Wu 6d5cf2112a unify forward/deferred material (#8267) 2021-02-22 15:56:30 +08:00
jiaxin.lai a1963ca9b1 support switch body type at phsyx (#8167)
* support switch body type at phsyx

* tweaks

* fix ci
2021-01-23 17:30:15 +08:00
PP 52bf6ff194 fix atob undefined (#8090)
* fix atob undefined

* fix lint

* remove atob in physics-ammon.ts
2021-01-08 10:18:19 +08:00
jiaxin.lai fadf3d9b00 support dynamic select physics backend (#8048)
* support dynamic select physics backend

* skip physics ray group

* fix eslint

* lint
2020-12-30 15:47:06 +08:00
jiaxin.lai d169d90713 support constraints auto-scaling (#8015)
* lint

* cannon constraint support auto-scaling

* fix kinematic/static body

* tweaks

* remove onLoad that was not necessary

* ammo constraint support auto-scaling

* physx joint refactor

* using fastRemoveAt
2020-12-25 16:36:18 +08:00
Santy-Wang ad4bff3988 Restructure Module (#7968)
* module restructure

* refine

* restructure module

* merge

* revert

* fix ci

* update import path of unit-test

* split 2d and ui

* add more module

* change audio adapter

* rename primitive

* config wechat plugin

* merge

* add category config

* merge

* merge
2020-12-24 19:07:26 +08:00
jiaxin.lai 0dc393b884 3d physx (#8005)
* support physx physics engine

* tweaks

* stash contact event

* update @cocos/physx

* basic event impl

* stash

* support BYTEDANCE

* stash

* stash

* fix inertia

* PhysX mesh collider

* PhysX static trimesh geometry

* PhysX terrain collider

* add kinematic

* bytedance plane collider

* bytedance v2

* support trigger

* bytedance triangle mesh support

* raycast filter

* raycast support

* stash all

* stash

* center of mass

* stash

* stash fixed joint

* stash

* stash

* physx hinge joint

* physx distance joint

* tweaks

* tweaks

* bytedance raycast

* tweaks

* update mass

* tweaks

* tweaks

* joint

* stash

* bytedance adapters

* tweaks

* stash

* apply force/impulse

* add updateEventListener

* Fixed some loose usage

* add getShapeFlags/getShapeMaterials

* tweaks

* optimize bytedance adapter

* fix isStaticsOrKinematic

* support cylinder & cone

* contact normal

* update @cocos/physx to 1.0.0-beta.5

* rigid body tweaks

* add syncAfterEvents

* hinge constraint

* filter static - static

* ammo refactor

* cannon refactor

* ammo p2p constraint refactor

* update @cocos/ammo to 1.0.8

* lint ammo

* more lint

* docs

* tweaks

* avoid direct use globalThis
2020-12-24 13:45:03 +08:00
江战 1bff13636c [3.0] rename dragonbones to dragon-bones (#7984)
* rename dragonbones -> dragon-bones

* add files
2020-12-18 18:29:03 +08:00
Leslie Leigh (李的序) 6e547e22fb Revert spine's export; optimize StatsQuery (#7982)
* Revert spine's export; optimize StatsQuery

* Update version
2020-12-18 11:48:21 +08:00
Leslie Leigh (李的序) ee894076d5 build-engine API changes from "entry" to "feature"-based (#7957)
* build-engine API changes from "entry" to "feature"-based

* Bump version
2020-12-16 11:17:35 +08:00
jiaxin.lai d26aaea1fd optimize cannon physics (#7911)
* cannon raycast skip back faces by default

* update @cocos/cannon to 1.2.0

* tweaks
2020-12-12 14:33:12 +08:00
江战 1acfbd1c70 [3.0] add DragonBones (#7831) 2020-11-20 09:31:07 +08:00
江战 63bf61315e [3.0] Spine support (#7765)
* add spine support

* recompile effects

* fix init

* save

* log error

* recompile effects
2020-11-12 15:01:33 +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
江战 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
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
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
Knox 04cb888694 rename webview to web-view (#7502)
* rename webview to web-view

* refine code
2020-10-12 11:36:14 +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
Knox 2d1acb58e9 sync 2d webview (#7318) 2020-09-08 14:19:42 +08:00
pandamicro 31e8d0f342 Fix issues 2020-09-02 23:43:36 +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
Knox 3d9cd319ee add video player component (#7226)
* add video player component

* refine code

* refine code

* refine code

* refine code

* refine code

* refine code

* refine code
2020-09-02 15:42:33 +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
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
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
Leslie Leigh (李的序) 583f1e941e Integrate ammo.js of WebAssembly edition (#6872)
* Ammo initiantiation

* Add to division-config

* Fix

* Fix
2020-06-28 12:20:21 +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 d2a06683b7 add atob polyfill for ammo (#6442)
* add atob polyfill for ammo

* add note
2020-03-30 10:39:20 +08:00
jiaxin.lai 87c6b9bda4 Ammo-Wrapper (#5954)
* basic physics abstract spec

* spec tweaks

* stash

* cannon refactor

* builtin refactor

* cannon wrapper & framework tweaks

* hiding, wait for 1.0.3

* delete unneed code

* export CANNON

* rebase

* rename stash

* rename I-rigid-body to i-rigid-body

* stash

* stash

* cannon refactor

* cannon wrapper & framework tweaks

* remve unneeded code

* wrap,....hack

* demo impl

* stash

* stash, complete dynamics update

* dynamic update center

* stash, size + center

* tweaks, fix share trigger shape

* tweaks

* stash

* ammo events stash

* tweaks

* stash

* complete ammo events

* tweaks

* stash

* body property, stash

* body , stash...

* tweaks

* tweaks

* tweaks

* ammo tweaks

* stash

* stash

* tweaks

* tweaks

* stash,complete tirgger,body、 ghost etc.

* tweaks

* remove unneeded code

* fix api of angluar velocity

* physic material for single body for now

* ray test stash

* stash

* update ammo version

* impl raycast

* impl group mask

* update ammo version

* update ammo package

* add onDestroy to ammo rigid body

* add protected for temporary

* fix allow sleep

* remove unneed code

* shape tweaks

* stash

* rename spahe to shape

* tweaks

* fix damping

* adapt

* reset state after disable & enable

* export ammo.js

* Revert "cannon wrapper & framework tweaks"

This reverts commit e59ea98c0bd8c23b23e9ee428ddce45d0271f1eb.

* update @cocos/ammo version

* fix applyLocalTorque

* tweaks

* beta version

* fix import i-rigid-body

* delete unused file

* Specification function name
2019-12-25 17:34:12 +08:00
jiaxin.lai 1d14c0bc93 refactor_tween (#5794) (#5943)
* refactor_tween (#5794)

* copy from master branch cocos2d actions

* tweaks & stash

* tweaks

* stash

* stash

* tweaks

* fix repeatForever init

* fix repeat、repeatForever、reverseTime

* add elastic out in to easing

* add typing

* add adapter & checker;
add api doc;

* tweaks

* fix tween number

* tweaks

* tweaks

* remove tween.js

* rename actions to tween

* export Tween

* allow mutiple remove action

* using new api

* remove deprecated from tween

* add deprecated to tweenUtil

* fix ci test
2019-12-23 16:22:48 +08:00
Yun Hsiao Wu 10c49e68f6 [chore] misc opts (#5898)
* pipeline linter fix

* instance support

* reuse render obejcts

* fix ci

* fix model ID
2019-12-18 14:35:34 +08:00
jiaxin.lai 1a99b886b6 refactor physics framework & wrapper (#5667)
* basic physics abstract spec

* spec tweaks

* stash

* cannon refactor

* builtin refactor

* cannon wrapper & framework tweaks

* cannon wrapper import tweaks

* remve unneeded code

* group mask tweaks

* hiding, wait for 1.0.3

* builtin tweaks

* delete unneed code

* export CANNON

* update @cocos/cannon to 1.0.3

* using hasTigger property

* fix remove cannon body

* rebase

* update cannon version to 1.0.4

* rename stash

* rename I-rigid-body to i-rigid-body
2019-12-13 16:00:22 +08:00
Yun Hsiao Wu f47cea1422 better playground framework (#5805)
* better playground framework

* remove redundant memops

* minor

* linter

* restore memops
2019-11-29 13:26:34 +08:00
jiaxin.lai 300609e748 impl physics raycast (#5403)
* impl physics raycast

* - remove raycastAny
- rename raycastAll to raycast
- rename raycastAllResults to raycastResults
2019-10-21 15:25:46 +08:00
jiaxin.lai 04196b2039 implement physic material (#5308) 2019-09-03 01:39:07 -05:00
pandamicro 9d7c05c896 Important fixes for module division (#5293)
* Fix Pipeline static pipes

* Fix audio exports

* Add core deprecated
2019-08-30 15:57:38 +08:00
pandamicro 9f89b0ef24 New module division (#5285)
* Temp

* temp

* move ui core

* Arrange ui and terrain

* Fix import path for all modules except core

* Move primitives into core

* Fix debug.getError

* Move audio-downloader to audio module

* export game from game.ts

* Migrate load-pipeline to ts

* Fix core modules and cleanup

* Move animation into core

* Fix module exports

* Fix director issue

* Remove most cc.director usage

* Fix ts issues

* Fix issues for unit test and editor running

* Revert removing deprecated import

* tweaks

* tweaks

* Fix ci

* Fix ci

* Add modules in module division

* Upgrade coordinates-converts-utils
2019-08-30 11:35:22 +08:00
ChiaNing 7d872ad7d0 api doc modify (#5239) 2019-08-23 17:38:57 +08:00
Leslie Leigh d32badbed8 module division - v2 (#5104)
* module division - v2

* update

* remove motion path helper

* update typing

* update

* mark webgl api as required
2019-08-07 20:33:14 -05:00