Skip to content

Commit 3869a88

Browse files
leanmendozaleanmendoza
authored
Merge branch 'main' into protocol-squad
2 parents 61ce678 + ea61304 commit 3869a88

File tree

4 files changed

+103
-8
lines changed

4 files changed

+103
-8
lines changed

‎proto/decentraland/realm/about.proto

Lines changed: 64 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
syntax = "proto3";
22
package decentraland.realm;
33

4+
import "decentraland/common/border_rect.proto";
5+
import "decentraland/common/vectors.proto";
6+
47
message AboutResponse {
58
bool healthy = 1;
69
AboutConfiguration configurations = 2;
@@ -10,10 +13,65 @@ message AboutResponse {
1013
optional BffInfo bff = 6;
1114
bool accepting_users = 7;
1215

16+
// @deprecated This message was never used but it's still here for compatibility reasons
1317
message MinimapConfiguration {
14-
bool enabled = 1;
15-
optional string data_image = 2;
16-
optional string estate_image = 3;
18+
reserved 1;
19+
reserved "enabled";
20+
reserved 2;
21+
reserved "data_image";
22+
reserved 3;
23+
reserved "estate_image";
24+
}
25+
26+
message MapConfiguration {
27+
// whether the minimap should be rendered
28+
bool minimap_enabled = 1;
29+
30+
// the union of all rects here represents the places where that MAY have scenes
31+
// - all the other parcels are considered as empty, up to the explorer to decide if they're walkable or not
32+
// - the contained square is determined by points:
33+
// - top-left with minX, maxY
34+
// - bottom-left with minX, minY
35+
// - top-right with maxX, maxY
36+
// - bottom-right with maxX, maxY
37+
// Note: the coordinate system used is the Cartesian coordinate system, where the y-axis increases upwards,
38+
// not the screen coordinate system, where the origin is at the top-left corner and the y-axis increases downwards.
39+
repeated decentraland.common.BorderRect sizes = 2;
40+
41+
// ImageViewWithZoomLevel uses a description to render the minimap
42+
// using different images with different zoom levels.
43+
// When `version='v1'`:
44+
// - The description allows the explorer to form the URL:
45+
// url(x,y,zoom_level) = `{base_url}/{zoom_level}/{x},{y}{suffix_url}`
46+
// - The given URL is for an image where the pixel `0,0` for the image `0,0` always
47+
// points to the top-left contained square.
48+
// - The `zoom_level=1` is to a ratio of 3.2 pixel per parcel, this means in a 32x32 pixel square
49+
// you get 10x10 parcels.
50+
// - Each increase of zoom level, double the ratio pixel per parcels.
51+
message ImageViewWithZoomLevel {
52+
// options: ['v1']
53+
string version = 1;
54+
optional string base_url = 2;
55+
optional string suffix_url = 3;
56+
optional decentraland.common.Vector2 top_left_offset = 4;
57+
}
58+
59+
// ParcelView uses a description to render the minimap
60+
// using a image where each pixel is a parcel and each pixel
61+
// has the metadata to make a representation (using a shader or image-generation client-side)
62+
// When `version='v1'`:
63+
// - The pixel `0,0` is the top-left contained square
64+
// - The image has to be at least of contained square pixels size
65+
// - The metadata inside each pixel follows the generated with the atlas server https://github.com/decentraland/atlas-server/blob/af371f2a59745a1f50b0b0b2382984288c4ae891/src/adapters/mini-map-renderer.ts#L27
66+
message ParcelView {
67+
// options: `v1`
68+
string version = 1;
69+
optional string image_url = 2;
70+
}
71+
72+
optional ImageViewWithZoomLevel satellite_view = 5;
73+
optional ParcelView parcel_view = 6;
74+
optional ImageViewWithZoomLevel thumbnail_view = 7;
1775
}
1876

1977
message SkyboxConfiguration {
@@ -26,13 +84,15 @@ message AboutResponse {
2684
uint32 network_id = 2;
2785
repeated string global_scenes_urn = 3;
2886
repeated string scenes_urn = 4;
29-
optional MinimapConfiguration minimap = 5;
87+
reserved 5;
88+
reserved "minimap";
3089
optional SkyboxConfiguration skybox = 6;
3190

3291
// A content server to be used to load the parcels around the user. Uses the POST /entities/active endpoint
3392
// to continously fetch the parcels around the users. if null, then the default content server will be used
3493
// if == "" then the city_loader will be disabled and the scenes_urn will be used to load the world
3594
optional string city_loader_content_server = 7;
95+
optional MapConfiguration map = 8;
3696
}
3797

3898
message ContentInfo {

‎proto/decentraland/sdk/components/avatar_attach.proto

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import "decentraland/sdk/components/common/id.proto";
66

77
option (common.ecs_component_id) = 1073;
88

9-
// The AvatarAttach component automatically repositions an Entity to maintain the same position and
10-
// rotation relative to some part of an avatar, called the "anchor point". The Entity
9+
// The AvatarAttach component automatically repositions an Entity to maintain the same position and
10+
// rotation relative to some part of an avatar, called the "anchor point". The Entity
1111
// will follow this anchor as it moves.
1212
//
13-
// The Entity's own Transform is overridden by this component. To offset position and adjust scale,
13+
// The Entity's own Transform is overridden by this component. To offset position and adjust scale,
1414
// add a child to the anchored Entity and set a Transform on it instead.
1515
//
1616
// AvatarAnchorPointType indicates which part of the avatar the Entity must follow.
@@ -21,7 +21,8 @@ message PBAvatarAttach {
2121

2222
// AvatarAnchorPointType determines the part of the avatar's body that anchors the Entity.
2323
enum AvatarAnchorPointType {
24-
AAPT_POSITION = 0;
24+
// @deprecated consider parenting to `engine.PlayerEntity`, this will attach to player position with an arbitrary offset
25+
AAPT_POSITION = 0;
2526
AAPT_NAME_TAG = 1;
2627
AAPT_HEAD = 4;
2728
AAPT_NECK = 5;

‎proto/decentraland/sdk/development/local_development.proto

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
syntax = "proto3";
2+
3+
package decentraland.sdk.development;
4+
5+
// ts code & main.crdt updates
6+
message UpdateScene {
7+
string scene_id = 1;
8+
}
9+
10+
enum UpdateModelType {
11+
UMT_CHANGE = 0;
12+
UMT_REMOVE = 1;
13+
}
14+
15+
// .glb & .gltf model udpates
16+
message UpdateModel {
17+
string scene_id = 1;
18+
string src = 2;
19+
string hash = 3;
20+
UpdateModelType type = 4;
21+
}
22+
23+
message WsSceneMessage {
24+
oneof message {
25+
// direction: scene -> explorer
26+
UpdateScene update_scene = 1;
27+
UpdateModel update_model = 2;
28+
}
29+
}

‎public/sdk-development.proto

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
syntax = "proto3";
2+
3+
package decentraland.sdk.development;
4+
5+
import public "decentraland/sdk/development/local_development.proto";

0 commit comments

Comments
 (0)