From df6e37dc4ebac0995539bf5cf0481bfce075dc60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leslie=20Leigh=20=28=E6=9D=8E=E7=9A=84=E5=BA=8F=29?= Date: Wed, 6 Jan 2021 16:36:46 +0800 Subject: [PATCH] Add physics framework/physics 2d framework feature (#8086) --- cc.config.json | 6 ++++-- modules.json | 47 ----------------------------------------------- 2 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 modules.json diff --git a/cc.config.json b/cc.config.json index 9d27c026a4..36a68d5a36 100644 --- a/cc.config.json +++ b/cc.config.json @@ -3,14 +3,16 @@ "base": { "modules": [ "base" ] }, "gfx-webgl": { "modules": [ "gfx-webgl" ] }, "gfx-webgl2": { "modules": [ "gfx-webgl2" ] }, - "3d": { "modules": [ "3d" ]}, - "2d": { "modules": [ "2d" ]}, + "3d": { "modules": [ "3d" ] }, + "2d": { "modules": [ "2d" ] }, "ui": { "modules": [ "ui", "2d" ] }, "particle": { "modules": [ "particle" ] }, "particle-2d": { "modules": [ "particle-2d" ] }, + "physics-framework": { "modules": [ "physics-framework" ] }, "physics-cannon": { "modules": [ "physics-cannon", "physics-framework" ] }, "physics-ammo": { "modules": [ "physics-ammo", "physics-framework", "wait-for-ammo-instantiation" ] }, "physics-builtin": { "modules": [ "physics-builtin", "physics-framework" ] }, + "physics-2d-framework": { "modules": [ "physics-2d-framework" ] }, "physics-2d-box2d": { "modules": [ "physics-2d-box2d", "physics-2d-framework" ] }, "physics-2d-builtin": { "modules": [ "physics-2d-builtin", "physics-2d-framework" ] }, "intersection-2d": { "modules": [ "intersection-2d" ] }, diff --git a/modules.json b/modules.json deleted file mode 100644 index e1757c3e76..0000000000 --- a/modules.json +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - "id": "base", - "name": "base", - "locked": true, - "entries":[], - "dependencies": [] - }, - { - "id": "ui", - "name": "ui", - "entries":[ - "/resources/3d/engine/cocos/3d/ui/index.ts" - ], - "dependencies": [] - }, - { - "id": "physics", - "name": "physics", - "entries":[], - "dependencies": [] - }, - { - "id": "particle", - "name": "particle", - "entries":[], - "dependencies": [] - }, - { - "id": "primitive", - "name": "primitive", - "entries":[], - "dependencies": [] - }, - { - "id": "animation", - "name": "animation", - "entries":[], - "dependencies": [] - }, - { - "id": "wechat", - "name": "wechat", - "entries":[], - "dependencies": [] - } -]