Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[no merge, no review] sdk7 adaption layer #5641

Draft
wants to merge 5 commits into
base: dev
Choose a base branch
from
Draft

[no merge, no review] sdk7 adaption layer #5641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e6caa6
sdk7 adaption layer
kuruk-mm Aug 27, 2023
5bcc776
use sdk6 for global scenes
kuruk-mm Aug 27, 2023
bb76a87
process empty parcel as sdk6 scene
kuruk-mm Aug 28, 2023
a105dfc
fix
kuruk-mm Sep 2, 2023
7f2d41a
Merge branch 'dev' into test/sdk7-adaption-layer
kuruk-mm Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions browser-interface/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion browser-interface/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion ...-interface/packages/shared/scene-loader/genesis-city-loader-impl/emptyParcelController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ export class EmptyParcelController {
type: EntityType.SCENE,
metadata,
version: 'v3'
}
},
emptyParcel: true
}
}
}
1 change: 1 addition & 0 deletions browser-interface/packages/shared/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ export type LoadableScene = {
readonly isGlobalScene?: boolean
readonly isPortableExperience?: boolean
readonly useFPSThrottling?: boolean
readonly emptyParcel?: boolean
}

export type SceneSpawnPoint = {
Expand Down
8 changes: 4 additions & 4 deletions browser-interface/packages/shared/world/SceneWorker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<any>(scenePort, RpcSceneControllerServiceDefinition)

Expand Down