Skip to content

Commit 98ce8c7

Browse files
authored
Merge branch 'protocol-squad' into lights
2 parents 98b05a6 + 0207676 commit 98ce8c7

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

proto/decentraland/common/texture.proto

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,17 @@ message VideoTexture {
3131
optional TextureFilterMode filter_mode = 3; // default = FilterMode.Bilinear
3232
}
3333

34+
message UiCanvasTexture {
35+
uint32 ui_canvas_entity = 1;
36+
optional TextureWrapMode wrap_mode = 2; // default = TextureWrapMode.Clamp
37+
optional TextureFilterMode filter_mode = 3; // default = FilterMode.Bilinear
38+
}
39+
3440
message TextureUnion {
3541
oneof tex {
3642
Texture texture = 1; // default = null
3743
AvatarTexture avatar_texture = 2; // default = null
3844
VideoTexture video_texture = 3; // default = null
45+
UiCanvasTexture ui_texture = 4;
3946
}
40-
}
47+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
syntax = "proto3";
2+
3+
import "decentraland/sdk/components/common/id.proto";
4+
package decentraland.sdk.components;
5+
6+
option (common.ecs_component_id) = 1203;
7+
8+
import "decentraland/common/colors.proto";
9+
10+
// The UiCanvas component can be attached to a ui root entity to specify properties of the ui texture.
11+
message PBUiCanvas {
12+
uint32 width = 1;
13+
uint32 height = 2;
14+
15+
optional decentraland.common.Color4 color = 3; // default = (0.0, 0.0, 0.0, 0.0) / transparent
16+
}

0 commit comments

Comments
 (0)