@dcl/protocol 1.0.0-13589257140.commit-dc6f088 → 1.0.0-13819135826.commit-d5f22b8

package/proto/decentraland/sdk/components/mesh_renderer.proto

@@ -5,13 +5,11 @@ import "decentraland/sdk/components/common/id.proto";
 option (common.ecs_component_id) = 1018;
 
 // The MeshRenderer component renders a basic geometric shape for an Entity. It can be a cube, a 
-// plane, a sphere or a cylinder.
+// plane, a sphere, a cylinder, or a Gltf mesh.
 //
 // The cube and plane variants can include a UV texture mapping, so specific areas of a material 
 // texture are rendered on different faces of the shape. They are serialized as a sequence of 2D
 // `float` coordinates, one for each corner of each side of each face.
-//
-// More complex shapes require the use of a `GltfContainer` component.
 message PBMeshRenderer {
     
     // BoxMesh renders a prism shape.
@@ -34,10 +32,17 @@ message PBMeshRenderer {
     message SphereMesh {
     }
 
+    // A mesh from a Gltf.
+    message GltfMesh {
+        string gltf_src = 1; // the GLTF file path as listed in the scene's manifest.
+        string name = 2;  // the name of the mesh asset
+    }
+
     oneof mesh {
         BoxMesh box = 1;
         SphereMesh sphere = 2;
         CylinderMesh cylinder = 3;
         PlaneMesh plane = 4;
+        GltfMesh gltf = 5;
     }
 }

package/proto/decentraland/sdk/components/primary_pointer_info.proto

@@ -0,0 +1,25 @@
+syntax = "proto3";
+package decentraland.sdk.components;
+
+import "decentraland/common/vectors.proto";
+import "decentraland/sdk/components/common/id.proto";
+option (common.ecs_component_id) = 1209;
+
+message PBPrimaryPointerInfo {
+  optional PointerType pointer_type = 1;
+  // in pixels
+  optional decentraland.common.Vector2 screen_coordinates = 2;
+  // in pixels
+  optional decentraland.common.Vector2 screen_delta = 3;
+  // ray direction that can be used with the primary camera origin for
+  // raycasting from the cursor into the world
+  optional decentraland.common.Vector3 world_ray_direction = 4;
+}
+
+enum PointerType {
+  POT_NONE = 0;
+  POT_MOUSE = 1;
+  POT_PAD = 2;
+  POT_TOUCH = 3;
+  POT_WAND = 4;
+}

package/proto/decentraland/sdk/components/spotlight.proto

@@ -0,0 +1,21 @@
+syntax = "proto3";
+package decentraland.sdk.components;
+
+import "decentraland/sdk/components/common/id.proto";
+option (common.ecs_component_id) = 1205;
+
+// defines a spotlight.
+// spotlights are point lights that emit light only in a cone around the transform's forward direction.
+// add this component together with the PBLight component to transform a point light into a spotlight.
+// note that spotlights do not model any internal reflections / focus, they only restrict the area of effect.
+// so for e.g. a torch beam, the bulb illuminance should be multiplied by the solid angle. 
+// a typical torch with a beam width of 15 degrees would use outer angle of 0.15 (7.5 degrees in radians),
+// and an illuminance approximately equal to the bulb's lumens, e.g. 1200.
+message PBSpotlight {
+  // the cone radius in radians. distance away from forward in which the light is visible. 
+  // for a torch a value around 0.15 is appropriate.    
+  float angle = 1;
+  // optional angle at which the light is brightest. should be <= outer angle. 
+  // if specified, the light will fall off smoothly between `inner_angle` and `angle`.
+  optional float inner_angle = 2;
+}

package/proto/decentraland/sdk/components/texture_camera.proto

@@ -0,0 +1,41 @@
+syntax = "proto3";
+
+package decentraland.sdk.components;
+
+import "decentraland/sdk/components/common/id.proto";
+import "decentraland/common/colors.proto";
+
+option (common.ecs_component_id) = 1207;
+
+message PBTextureCamera {
+    // rendered texture width
+    optional uint32 width = 1;
+    // rendered texture height
+    optional uint32 height = 2;
+    // which layer of entities to render. entity layers can be specified by adding PBCameraLayers to target entities.
+    // defaults to 0
+    optional uint32 layer = 3;
+
+    // default black
+    optional decentraland.common.Color4 clear_color = 6;
+    // default infinity
+    optional float far_plane = 7;
+
+    oneof mode {
+        Perspective perspective = 8;
+        Orthographic orthographic = 9;
+        /* Portal portal = 10; */ 
+    };
+}
+
+message Perspective {
+    // vertical field of view in radians
+    // defaults to pi/4 = 45 degrees
+    optional float field_of_view = 1;
+}
+
+message Orthographic {
+    // vertical extent of the visible range in meters
+    // defaults to 4m
+    optional float vertical_range = 1;
+}

package/proto/decentraland/sdk/components/ui_canvas.proto

@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+import "decentraland/sdk/components/common/id.proto";
+package decentraland.sdk.components;
+
+option (common.ecs_component_id) = 1203;
+
+import "decentraland/common/colors.proto";
+
+// The UiCanvas component can be attached to a ui root entity to specify properties of the ui texture.
+message PBUiCanvas {
+  uint32 width = 1;
+  uint32 height = 2;
+
+  optional decentraland.common.Color4 color = 3; // default = (0.0, 0.0, 0.0, 0.0) / transparent
+}

package/proto/decentraland/sdk/components/ui_scroll_result.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+package decentraland.sdk.components;
+
+import "decentraland/sdk/components/common/id.proto";
+import "decentraland/common/vectors.proto";
+
+option (common.ecs_component_id) = 1202;
+
+message PBUiScrollResult {
+  decentraland.common.Vector2 value = 1;
+}

package/proto/decentraland/sdk/components/ui_text.proto

@@ -23,4 +23,7 @@ message PBUiText {
   optional common.Font font = 4;                 // font for the text (default: sans-serif)
   optional int32 font_size = 5;                  // size of the text (default: 10)
   optional TextWrap text_wrap = 6;               // wrap text when the border is reached (default: TW_WRAP)
+  
+  optional float outline_width = 7;              // width of the outline (default: 0)
+  optional decentraland.common.Color4 outline_color = 8; // RGBA color of the outline (default: opaque black)
 }

package/proto/decentraland/sdk/components/ui_transform.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 package decentraland.sdk.components;
 
 import "decentraland/sdk/components/common/id.proto";
+import "decentraland/common/vectors.proto";
 
 option (common.ecs_component_id) = 1050;
 
@@ -79,6 +80,20 @@ enum PointerFilterMode {
   PFM_BLOCK = 1;
 }
 
+enum ShowScrollBar {
+  SSB_BOTH = 0;
+  SSB_ONLY_VERTICAL = 1;
+  SSB_ONLY_HORIZONTAL = 2;
+  SSB_HIDDEN = 3;
+}
+
+message ScrollPositionValue {
+  oneof value {
+    decentraland.common.Vector2 position = 1;
+    string reference = 2;
+  }
+}
+
 message PBUiTransform {
   int32 parent = 1;
   int32 right_of = 2;
@@ -145,4 +160,12 @@ message PBUiTransform {
   float padding_bottom = 51;
   
   optional PointerFilterMode pointer_filter = 52; // default: PointerFilterMode.PFM_NONE
+  optional float opacity = 53; // default: 1
+
+  optional string element_id = 54; // default empty
+
+  optional ScrollPositionValue scroll_position = 55; // default position=(0,0)
+  optional ShowScrollBar scroll_visible = 56; // default ShowScrollBar.SSB_BOTH
+
+  optional int32 z_index = 57; // default 0
 }

package/public/sdk-components.proto

@@ -16,6 +16,8 @@ import public "decentraland/sdk/components/camera_mode.proto";
 import public "decentraland/sdk/components/engine_info.proto";
 import public "decentraland/sdk/components/gltf_container.proto";
 import public "decentraland/sdk/components/gltf_container_loading_state.proto";
+import public "decentraland/sdk/components/gltf_node.proto";
+import public "decentraland/sdk/components/gltf_node_state.proto";
 import public "decentraland/sdk/components/material.proto";
 import public "decentraland/sdk/components/mesh_collider.proto";
 import public "decentraland/sdk/components/mesh_renderer.proto";