Commit Graph

266 Commits

Author SHA1 Message Date
Jare Guo 4e08e87e4d fix ci 2020-09-28 19:00:04 +08:00
ChiaNing 15a1806d18 API doc format change (#7456) 2020-09-28 16:52:52 +08:00
Leslie Leigh (李的序) abf46aaed3 Bump rollup@2.26.6(fixed); bump @cocos/build-engine@3.0.8 (#7382) 2020-09-15 18:11:37 +08:00
Leslie Leigh (李的序) c47a88b18c Bump rollup; @cocos/build-engine 3.0.6 (#7379) 2020-09-15 15:56:01 +08:00
Leslie Leigh (李的序) ef6b9c63b4 Bump gift@2.0.8 (#7364) 2020-09-11 12:13:55 +08:00
minggo 6e71962fb9 merge v1.2 2020-09-10 11:41:20 +08:00
Leslie Leigh (李的序) 3422c13b61 Bump gift@2.0.7 (#7331) 2020-09-08 14:55:37 +08:00
minggo e4bd687cc1 update build engine to ignore wedding out engine codes (#7309) 2020-09-04 16:10:42 +08:00
minggo cfdb88be41 update build engine version to 3.1.0-alpha.2 (#7288)
* update build engine version to 3.1.0-alpha.2

* update build engine verson
2020-09-03 12:39:37 +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
Leslie Leigh (李的序) bc5b531191 Add decorator @editable @serializable (#7178) 2020-09-02 11:44:12 +08:00
minggo 4f21401492 import pipeline instead (#7218)
* import pipeline instead

* simplify codes

* add jsb index.ts

* simplify codes

* fix circular dependency

* change build engine version

* change build-engine version

* jsb -> nr
2020-08-31 09:56:40 +08:00
Leslie Leigh (李的序) 0c5c52e3be Support tsconfig.compilerOptions.paths (#7234) 2020-08-27 16:31:57 +08:00
minggo 035a632abb invoke Model.initialize() before being resued (#7201) 2020-08-24 11:43:43 +08:00
pandamicro 2618dc6dbe Bump tfig@2.0.3 (#7198) (#7199)
Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>
2020-08-21 14:19:06 +08:00
Leslie Leigh (李的序) f4e16d0785 Bump tfig@2.0.3 (#7198) 2020-08-21 14:15:11 +08:00
Leslie Leigh (李的序) f289fa7a43 Bump tfig^2.0.2 (#7189) 2020-08-20 21:38:04 +08:00
Leslie Leigh (李的序) 1cdacdee80 @cocos/build-engine 3.0.3(1.2 + ByteDance support) (#7129) 2020-08-13 15:56:14 +08:00
Leslie Leigh (李的序) d0c276c941 @cocos/build-engine@3.0.2(bug fix update) (#7087)
* @cocos/build-engine@3.0.2(bug fix update)

* Update
2020-08-07 10:47:42 +08:00
Leslie Leigh (李的序) 419f8c0286 @cocos/build-engine for 1.2 (#6735)
* Build engine V3.0.0

Ammo.js wasm support; Multi-module engine support; Remove physics macros
Lock

* 3.0.1
2020-08-06 10:26: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
Leslie Leigh (李的序) 07fd9e3e4f Optimize CI (#6985) 2020-07-15 09:45:18 +08:00
Leslie Leigh (李的序) a46d629a1b Remove npm script build-rollup (#6899) 2020-06-18 16:26:26 +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
ChiaNing 673518c724 update package.json for api doc (#6856) (#6857)
(cherry picked from commit 95deee57a2)
2020-06-11 16:07:02 +08:00
ChiaNing 95deee57a2 update package.json for api doc (#6856) 2020-06-11 15:38:43 +08:00
Leslie Leigh (李的序) daee998c13 Bump tfig to ^1.2.5 (#6831) 2020-06-05 15:36:09 +08:00
pandamicro 1cefb4e04c Fix native rAF and cAF (#6792)
* Fix native rAF and cAF

* Update version
2020-05-31 14:50:51 +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 (李的序) 744812c4e5 Bump @cocos/build-engine to 2.0.0 (#6444) 2020-03-30 12:22:56 +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
Leslie Leigh (李的序) e8cd8ddf4b Bump @cocos/build-engine from 1.0.8 to 1.0.9 to update typescript support (#6397) 2020-03-23 19:08:56 +08:00
Leslie Leigh (李的序) ebf45b15ae Bump eslint; Optimize an error string; Add assert functions (#6398)
* Bump eslint; Optimize an error string; Add assert functions

* Add comment

* Add license
2020-03-23 19:08:16 +08:00
Leslie Leigh (李的序) 74e6eb02a2 Bump @babel/preset-env to 7.9.0; Bump @cocos/build-engine from 1.0.7 to 1.0.8 (#6392) 2020-03-23 15:42:58 +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
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
Leslie Leigh (李的序) a83db4c8ad Fix npm problem (#6168) 2020-02-13 17:47:03 +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
Leslie Leigh (李的序) 01b79164cb Remove unnecessary NPM dependencies and gulp logic; bump gulp to fit Node v12+; Use @cocos/build-engine (#6121) 2020-02-12 16:28:09 +08:00
Leslie Leigh (李的序) 679f2fdf9b Bump NPM dependencies. (#6091) 2020-01-14 15:44:57 +08:00
Leslie Leigh (李的序) 7bdbab1deb Fix bug in IIFE build (#6033)
* Fix bug in IIFE build

* Add 'module' to build engine help

* Rename dev build target name
2020-01-06 10:56:44 +08:00
Leslie Leigh (李的序) 0cdea956e0 Build-engine: optimize CommonJS build; add options to show progress of build (#6027) 2020-01-04 11:24:29 +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