@dcl/protocol 1.0.0-3283499202.commit-26829d1 → 1.0.0-3328852000.commit-4edc0df

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/package.json +2 -2
  2. package/proto/decentraland/common/texture.proto +34 -0
  3. package/proto/decentraland/sdk/components/material.proto +6 -23
  4. package/proto/decentraland/sdk/components/pointer_events_result.proto +1 -1
  5. package/proto/decentraland/sdk/components/{pointer_events.proto → pointer_hover_feedback.proto} +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dcl/protocol",
3
- "version": "1.0.0-3283499202.commit-26829d1",
3
+ "version": "1.0.0-3328852000.commit-4edc0df",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -25,5 +25,5 @@
25
25
  "out-ts",
26
26
  "public"
27
27
  ],
28
- "commit": "26829d118abd2bb68ac1f2090f34870174c16bb6"
28
+ "commit": "4edc0dfd5b49598bd032fea97a2d1b8b8c6ee46b"
29
29
  }
package/proto/decentraland/common/texture.proto ADDED
@@ -0,0 +1,34 @@
1
+ syntax = "proto3";
2
+ package decentraland.common;
3
+
4
+ enum TextureWrapMode {
5
+ TWM_REPEAT = 0;
6
+ TWM_CLAMP = 1;
7
+ TWM_MIRROR = 2;
8
+ TWM_MIRROR_ONCE = 3;
9
+ }
10
+
11
+ enum TextureFilterMode {
12
+ TFM_POINT = 0;
13
+ TFM_BILINEAR = 1;
14
+ TFM_TRILINEAR = 2;
15
+ }
16
+
17
+ message Texture {
18
+ string src = 1;
19
+ optional TextureWrapMode wrap_mode = 2; // default = TextureWrapMode.Clamp
20
+ optional TextureFilterMode filter_mode = 3; // default = FilterMode.Bilinear
21
+ }
22
+
23
+ message AvatarTexture {
24
+ string user_id = 1;
25
+ optional TextureWrapMode wrap_mode = 2; // default = TextureWrapMode.Clamp
26
+ optional TextureFilterMode filter_mode = 3; // default = FilterMode.Bilinear
27
+ }
28
+
29
+ message TextureUnion {
30
+ oneof tex {
31
+ Texture texture = 1; // default = null
32
+ AvatarTexture avatar_texture = 2; // default = null
33
+ }
34
+ }
package/proto/decentraland/sdk/components/material.proto CHANGED
@@ -3,23 +3,11 @@ syntax = "proto3";
3
3
  package decentraland.sdk.components;
4
4
 
5
5
  import "decentraland/common/colors.proto";
6
+ import "decentraland/common/texture.proto";
6
7
  import "decentraland/sdk/components/common/id.proto";
7
8
 
8
9
  option (common.ecs_component_id) = 1017;
9
10
 
10
- enum TextureWrapMode {
11
- TWM_REPEAT = 0;
12
- TWM_CLAMP = 1;
13
- TWM_MIRROR = 2;
14
- TWM_MIRROR_ONCE = 3;
15
- }
16
-
17
- enum TextureFilterMode {
18
- TFM_POINT = 0;
19
- TFM_BILINEAR = 1;
20
- TFM_TRILINEAR = 2;
21
- }
22
-
23
11
  enum MaterialTransparencyMode {
24
12
  MTM_OPAQUE = 0;
25
13
  MTM_ALPHA_TEST = 1;
@@ -29,19 +17,14 @@ enum MaterialTransparencyMode {
29
17
  }
30
18
 
31
19
  message PBMaterial {
32
- message Texture {
33
- string src = 1;
34
- optional TextureWrapMode wrap_mode = 2; // default = TextureWrapMode.Clamp
35
- optional TextureFilterMode filter_mode = 3; // default = FilterMode.Bilinear
36
- }
37
-
38
- optional Texture texture = 1; // default = null
20
+ optional decentraland.common.TextureUnion texture = 1; // default = null
21
+
39
22
  optional float alpha_test = 2; // default = 0.5. range value: from 0 to 1
40
23
  optional bool cast_shadows = 3; // default = true
41
24
 
42
- optional Texture alpha_texture = 4; // default = null
43
- optional Texture emissive_texture = 5; // default = null
44
- optional Texture bump_texture = 6; // default = null
25
+ optional decentraland.common.TextureUnion alpha_texture = 4; // default = null
26
+ optional decentraland.common.TextureUnion emissive_texture = 5; // default = null
27
+ optional decentraland.common.TextureUnion bump_texture = 6; // default = null
45
28
 
46
29
  optional decentraland.common.Color3 albedo_color = 7; // default = white;
47
30
  optional decentraland.common.Color3 emissive_color = 8; // default = black;
package/proto/decentraland/sdk/components/pointer_events_result.proto CHANGED
@@ -4,7 +4,7 @@ package decentraland.sdk.components;
4
4
 
5
5
  import "decentraland/sdk/components/common/id.proto";
6
6
  import "decentraland/sdk/components/common/input_action.proto";
7
- import "decentraland/sdk/components/pointer_events.proto";
7
+ import "decentraland/sdk/components/pointer_hover_feedback.proto";
8
8
  import "decentraland/sdk/components/raycast_result.proto";
9
9
 
10
10
  option (common.ecs_component_id) = 1063;
package/proto/decentraland/sdk/components/{pointer_events.proto → pointer_hover_feedback.proto} RENAMED
@@ -2,8 +2,8 @@
2
2
 
3
3
  package decentraland.sdk.components;
4
4
 
5
- import "decentraland/sdk/components/common/input_action.proto";
6
5
  import "decentraland/sdk/components/common/id.proto";
6
+ import "decentraland/sdk/components/common/input_action.proto";
7
7
 
8
8
  option (common.ecs_component_id) = 1062;
9
9
 
@@ -14,7 +14,7 @@ enum PointerEventType {
14
14
  PET_HOVER_LEAVE = 3;
15
15
  }
16
16
 
17
- message PBPointerEvents {
17
+ message PBPointerHoverFeedback {
18
18
  message Info {
19
19
  optional common.InputAction button = 1; // default=InputAction.ANY
20
20
  optional string hover_text = 2; // default='Interact'