Commit Graph

62 Commits

Author SHA1 Message Date
Leslie Leigh (李的序) be794583bb Optimize build-engine to not generate source map for NPM scripts (#7760)
* Optimize again


@cocos/build-engine@4.0.0-beta.1

* Update lock file

* Fix jail
2020-11-11 19:12:05 +08:00
Leslie Leigh (李的序) a3e1487375 Remove comments even in debug build; Suppress babel compact warnings. (#7755)
@cocos/build-engine@4.0.0-beta.0
2020-11-11 15:22:53 +08:00
Yun Hsiao Wu 32598c25cb switch to eslint (#7727)
* switch to eslint

* eslint: extends airbnb
2020-11-09 10:19:12 +08:00
Leslie Leigh (李的序) 5a50ef9e2c Fixture bump tfig@2.10.10 (#7675) 2020-11-02 18:57:40 +08:00
pandamicro b925dc7f62 Dynamic initialize shaders (#7647)
Co-authored-by: SB <leslieleigh@outlook.com>
2020-10-31 11:45:42 +08:00
pandamicro b67090be4f Revert "Dynamic initialize shaders (#7642)" (#7646)
This reverts commit e3577cf510.
2020-10-30 20:02:16 +08:00
Leslie Leigh (李的序) e3577cf510 Dynamic initialize shaders (#7642) 2020-10-30 19:24:33 +08:00
Jare Guo 64e435badd Merge remote-tracking branch 'gitlab/3d'
# Conflicts:
#	package-lock.json
2020-10-29 15:36:36 +08:00
Jare Guo 60782d9a5e bump package-lock.json 2020-10-29 15:31:16 +08:00
Leslie Leigh (李的序) d5e35a1823 Bump gift^2.0.9; Bump ts^4.0.5 (#7628) 2020-10-29 15:26:09 +08:00
Leslie Leigh (李的序) 5c3e8883b5 @cocos/build-engine@4.0.0-jsb.alpha.12: Fix wrong SUPPORT_JIT constant (#7616) 2020-10-28 17:29:19 +08:00
Leslie Leigh (李的序) f99240f664 @cocos/build-engine: add option to remove deprecated features (#7603) 2020-10-27 18:28:58 +08:00
Leslie Leigh (李的序) 9b4afb2983 @cocos/build-engine now accepts the loose option (#7601) 2020-10-27 11:10:30 +08:00
Leslie Leigh (李的序) 4262bf097a Bump @cocos/build-engine to 4.0.0-jsb.alpha.9 (#7594) 2020-10-27 09:13:26 +08:00
Leslie Leigh (李的序) 82f66b4e54 Add ccconfig.json for module overrides(alpha) (#7508) 2020-10-13 09:54:28 +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
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 938b70153a Update package-lock 2020-09-02 18:40:09 +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
pandamicro 3b66332823 Merge remote-tracking branch 'origin/3d-v1.1.1' into 3d-v1.2
# Conflicts:
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/animation/animation-state.ts
#	cocos/core/game.ts
#	cocos/core/gfx/webgl/webgl-commands.ts
#	cocos/core/pipeline/instanced-buffer.ts
#	cocos/core/pipeline/render-instanced-queue.ts
#	cocos/core/platform/event-manager/input-manager.ts
#	cocos/core/platform/view.ts
#	cocos/core/renderer/core/pass.ts
#	cocos/core/renderer/scene/planar-shadows.ts
#	cocos/core/splash-screen-webgl.ts
#	cocos/core/utils/profiler/profiler.ts
#	cocos/particle/renderer/trail.ts
#	cocos/terrain/terrain.ts
#	package-lock.json
#	package.json
#	predefine.ts
#	scripts/build-engine/package-lock.json
#	scripts/build-engine/package.json
#	scripts/build-engine/src/index.ts
2020-08-12 15:53:52 +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 (李的序) 59c46c66af Add platform macro for ByteDance (#6982) 2020-07-15 11:37:47 +08:00
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