diff --git a/browser-interface/package-lock.json b/browser-interface/package-lock.json index b9fbab8e95..a6ad5e6cd3 100644 --- a/browser-interface/package-lock.json +++ b/browser-interface/package-lock.json @@ -18,7 +18,7 @@ "@dcl/legacy-ecs": "^6.11.11", "@dcl/protocol": "^1.0.0-5812097343.commit-8025576", "@dcl/rpc": "^1.1.1", - "@dcl/scene-runtime": "7.0.6-20230809174058.commit-2408927", + "@dcl/scene-runtime": "https://sdk-team-cdn.decentraland.org/@dcl/scene-runtime/branch/feat/sdk7-adaption-layer/dcl-scene-runtime-7.0.6-20230827001758.commit-6c356fb.tgz", "@dcl/schemas": "^9.1.1", "@dcl/single-sign-on-client": "^0.0.12", "@dcl/urn-resolver": "^2.2.0", @@ -599,9 +599,10 @@ } }, "node_modules/@dcl/scene-runtime": { - "version": "7.0.6-20230809174058.commit-2408927", - "resolved": "https://registry.npmjs.org/@dcl/scene-runtime/-/scene-runtime-7.0.6-20230809174058.commit-2408927.tgz", - "integrity": "sha512-Bgk1D+m3yADSRThxk6HNJtOIlE0PQsmnyEqacH25cDUx7lsoXJCjoKCRyY+CnJn2JKHn536cGvI6SiZDTJO5MQ==" + "version": "7.0.6-20230827001758.commit-6c356fb", + "resolved": "https://sdk-team-cdn.decentraland.org/@dcl/scene-runtime/branch/feat/sdk7-adaption-layer/dcl-scene-runtime-7.0.6-20230827001758.commit-6c356fb.tgz", + "integrity": "sha512-ikyqz1OfbQUF2zDP3AnG8r03VClUvrCZrWNqjgq5xkrttpejAxbD9TH7GQXOPhpuks7/+/FLN2DN2i70WgJ2uA==", + "license": "Apache-2.0" }, "node_modules/@dcl/schemas": { "version": "9.1.1", @@ -10497,9 +10498,8 @@ } }, "@dcl/scene-runtime": { - "version": "7.0.6-20230809174058.commit-2408927", - "resolved": "https://registry.npmjs.org/@dcl/scene-runtime/-/scene-runtime-7.0.6-20230809174058.commit-2408927.tgz", - "integrity": "sha512-Bgk1D+m3yADSRThxk6HNJtOIlE0PQsmnyEqacH25cDUx7lsoXJCjoKCRyY+CnJn2JKHn536cGvI6SiZDTJO5MQ==" + "version": "https://sdk-team-cdn.decentraland.org/@dcl/scene-runtime/branch/feat/sdk7-adaption-layer/dcl-scene-runtime-7.0.6-20230827001758.commit-6c356fb.tgz", + "integrity": "sha512-ikyqz1OfbQUF2zDP3AnG8r03VClUvrCZrWNqjgq5xkrttpejAxbD9TH7GQXOPhpuks7/+/FLN2DN2i70WgJ2uA==" }, "@dcl/schemas": { "version": "9.1.1", diff --git a/browser-interface/package.json b/browser-interface/package.json index 82bae890b6..aad5aa00ce 100644 --- a/browser-interface/package.json +++ b/browser-interface/package.json @@ -64,7 +64,7 @@ "@dcl/legacy-ecs": "^6.11.11", "@dcl/protocol": "^1.0.0-5812097343.commit-8025576", "@dcl/rpc": "^1.1.1", - "@dcl/scene-runtime": "7.0.6-20230809174058.commit-2408927", + "@dcl/scene-runtime": "https://sdk-team-cdn.decentraland.org/@dcl/scene-runtime/branch/feat/sdk7-adaption-layer/dcl-scene-runtime-7.0.6-20230827001758.commit-6c356fb.tgz", "@dcl/schemas": "^9.1.1", "@dcl/single-sign-on-client": "^0.0.12", "@dcl/urn-resolver": "^2.2.0", diff --git a/browser-interface/packages/shared/scene-loader/genesis-city-loader-impl/emptyParcelController.ts b/browser-interface/packages/shared/scene-loader/genesis-city-loader-impl/emptyParcelController.ts index 7d3d29992e..3fe1c6fb1c 100644 --- a/browser-interface/packages/shared/scene-loader/genesis-city-loader-impl/emptyParcelController.ts +++ b/browser-interface/packages/shared/scene-loader/genesis-city-loader-impl/emptyParcelController.ts @@ -42,7 +42,8 @@ export class EmptyParcelController { type: EntityType.SCENE, metadata, version: 'v3' - } + }, + emptyParcel: true } } } diff --git a/browser-interface/packages/shared/types.ts b/browser-interface/packages/shared/types.ts index 4200f6a887..a3652e6b66 100644 --- a/browser-interface/packages/shared/types.ts +++ b/browser-interface/packages/shared/types.ts @@ -189,6 +189,7 @@ export type LoadableScene = { readonly isGlobalScene?: boolean readonly isPortableExperience?: boolean readonly useFPSThrottling?: boolean + readonly emptyParcel?: boolean } export type SceneSpawnPoint = { diff --git a/browser-interface/packages/shared/world/SceneWorker.ts b/browser-interface/packages/shared/world/SceneWorker.ts index 540608d6f6..6e63a0e267 100644 --- a/browser-interface/packages/shared/world/SceneWorker.ts +++ b/browser-interface/packages/shared/world/SceneWorker.ts @@ -154,10 +154,10 @@ export class SceneWorker { defaultLogger.error('Invalid scene metadata', loadableScene.entity.metadata, Scene.validate.errors) } - const IS_SDK7 = - loadableScene.entity.metadata.runtimeVersion === '7' || - !!loadableScene.entity.metadata.ecs7 || - !!loadableScene.entity.metadata.sdk7 + // All the scenes are a SDK7 Scene, the SDK6 Scenes are going to use the SDK7 Adaption Layer that is implemented in the SceneRuntime + const globalScene = loadableScene.isGlobalScene || false + const emptyParcel = loadableScene.emptyParcel || false + const IS_SDK7 = !globalScene || !emptyParcel // global scenes, still are sdk6, not included in the adapter const rpcSceneControllerService = codegen.loadService(scenePort, RpcSceneControllerServiceDefinition)