Commit Graph

24 Commits

Author SHA1 Message Date
Leslie Leigh (李的序) 07fd9e3e4f Optimize CI (#6985) 2020-07-15 09:45:18 +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
jiaxin.lai 41c1191117 update @cocos/cannon to 1.1.1 (#6885) 2020-06-16 18:59:57 +08:00
Leslie Leigh (李的序) daee998c13 Bump tfig to ^1.2.5 (#6831) 2020-06-05 15:36:09 +08:00
Leslie Leigh (李的序) ae097582cd Bump tfig@1.2.4 (#6742) 2020-05-26 11:19:03 +08:00
jiaxin.lai 40f545faa8 update @cocos/cannon to 1.1.0(fix collison event) (#6612) 2020-04-24 17:44:38 +08:00
jiaxin.lai 5530c72706 minor refactor physics framework (#6518)
* refactor framework

* tweaks
2020-04-13 16:25:55 +08:00
Leslie Leigh (李的序) aba3d15953 Reduce @babel/plugin-transform-classses (#6465) 2020-04-01 12:52:39 +08:00
Leslie Leigh (李的序) 6a8f15fa52 Solve @babel/core version problem (#6422) 2020-03-26 16:34:33 +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
Yun Hsiao Wu 45d182308b GPU instancing support (#6300)
* instancing works

* misc opts

* material.setproperty typing

* baked skinning model instancing works

* fix isNormalized

* custom chunk rules injection framework

* profiler instance count

* seperate custom joint textures

* fix joint mapped buffers

* WebGL 1 doesn't allow int attributes

* should rebuild instances after pso change

* set instance attribute

* constants naming
2020-03-12 10:21:19 +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 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 f27d80d337 update cannon version to 1.0.5 (#5955) 2019-12-25 12:27:51 +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
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
Lelie Leight (李的序) 62a3ed7b2b Scripting 2.0-Part 1 (#5781)
* Scripting 2.0-Part 1

* Bump typescript to 3.7.2

* use event for EditorExtends

* update
2019-12-11 17:39:47 +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 f30a4b7b2d update @cocos/cannon to 1.0.2 (#5621)
- fix trigger exit overlap tick may not execute
2019-10-25 16:27:13 +08:00
jiaxin.lai 44e6915279 update cannon.js source to @cocos/cannon (#5573) 2019-10-21 16:37:00 +08:00
jiaxin.lai 3e28aeb310 - update cannon version to cc1.0.2 (#5545)
- emit events after transform sync in cannon physics
2019-10-21 12:00:45 +08:00
Lelie Leight (李的序) 80f8be21f7 Bump package gift (#5544) 2019-10-15 16:07:19 +08:00
Lelie Leight (李的序) 4bbcae7c33 Initialize package-lock.json (#5439) 2019-09-23 16:54:21 +08:00