Skip to content

Commit

Permalink
Merge pull request #124 from decentraland/refactor/composite
Browse files Browse the repository at this point in the history 
refactor: composite
  • Loading branch information
@cazala
cazala authored Dec 2, 2024
2 parents 926ddc8 + 2a4c0ed commit 31c411f
Show file tree
Hide file tree
Showing 2,655 changed files with 51,023 additions and 20,027 deletions.
477 changes: 315 additions & 162 deletions package-lock.json
View file

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"build:js": "sdk-commands build",
"build:lib": "tsc --project tsconfig.lib.json",
"build:catalog": "ts-node --project tsconfig.scripts.json ./scripts/catalog.ts",
"build": "npm run build:js && npm run build:lib && npm run build:catalog"
"build": "npm run build:js && npm run build:lib && npm run build:catalog",
"migrate": "ts-node --project tsconfig.scripts.json ./scripts/migrate.ts"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -54,6 +55,8 @@
"dependencies": {
"@dcl-sdk/utils": "^1.2.8",
"@dcl/js-runtime": "7.5.2",
"@types/glob": "^8.1.0",
"glob": "^11.0.0",
"mitt": "^3.0.1"
},
"prettier": {
Expand Down
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/a_blue/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "A Blue",
"category": "decorations",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/A_Blue.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/A_Blue.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/a_red/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "A Red",
"category": "decorations",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/A_Red.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/A_Red.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/arcade_machine_black/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "Arcade Machine - Black",
"category": "furniture",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/Arcade_Machine_Black.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/Arcade_Machine_Black.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/arcade_machine_blue/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "Arcade Machine - Blue",
"category": "furniture",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/Arcade_Machine_Blue.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/Arcade_Machine_Blue.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/arcade_machine_green/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "Arcade Machine Green",
"category": "furniture",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/Arcade_Machine_Green.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/Arcade_Machine_Green.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/arcade_machine_red/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "Arcade Machine Red",
"category": "furniture",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/Arcade_Machine_Red.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/Arcade_Machine_Red.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/armchair_a/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "Armchair A",
"category": "furniture",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/Armchair_A.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/Armchair_A.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/armchair_b/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "Armchair B",
"category": "decorations",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/Armchair_B.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/Armchair_B.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/armchair_c/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "Armchair C",
"category": "furniture",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/Armchair_C.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/Armchair_C.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/armchair_d/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "Armchair D",
"category": "furniture",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/Armchair_D.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/Armchair_D.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/arrow_sign/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "Arrow Sign",
"category": "decorations",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/Arrow_Sign.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/Arrow_Sign.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/aston_martin/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "Aston Martin",
"category": "decorations",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/Aston_Martin.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/Aston_Martin.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/b_blue/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "B Blue",
"category": "decorations",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/B_Blue.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/B_Blue.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/b_red/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "B Red",
"category": "decorations",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/B_Red.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/B_Red.glb"
}
}
}
}
]
}
}
18 changes: 14 additions & 4 deletions packs/cyberpunk/assets/bar_black/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "Bar Black",
"category": "decorations",
"tags": [],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/Bar_Black.glb"
}
"composite": {
"version": 1,
"components": [
{
"name": "core::GltfContainer",
"data": {
"0": {
"json": {
"src": "{assetPath}/Bar_Black.glb"
}
}
}
}
]
}
}
Loading

0 comments on commit 31c411f

Please sign in to comment.