diff --git a/proto/decentraland/common/texture.proto b/proto/decentraland/common/texture.proto index ca037b1b..98df84e6 100644 --- a/proto/decentraland/common/texture.proto +++ b/proto/decentraland/common/texture.proto @@ -20,10 +20,8 @@ message Texture { optional TextureFilterMode filter_mode = 3; // default = FilterMode.Bilinear // Final uv = offset + (input_uv * tiling) - // Offset for texture positioning. - optional Vector2 offset = 4; // default = Vector2.Zero - // Tiling multiplier for texture repetition. - optional Vector2 tiling = 5; // default = Vector2.One + optional Vector2 offset = 4; // default = Vector2.Zero; Offset for texture positioning, only works for the texture property in PbrMaterial or UnlitMaterial. + optional Vector2 tiling = 5; // default = Vector2.One; Tiling multiplier for texture repetition, only works for the texture property in PbrMaterial or UnlitMaterial. } message AvatarTexture { diff --git a/proto/decentraland/sdk/components/material.proto b/proto/decentraland/sdk/components/material.proto index 3936b27e..bb3545f8 100644 --- a/proto/decentraland/sdk/components/material.proto +++ b/proto/decentraland/sdk/components/material.proto @@ -22,7 +22,7 @@ message PBMaterial { optional float alpha_test = 2; // default = 0.5. range value: from 0 to 1 optional bool cast_shadows = 3; // default = true optional decentraland.common.Color4 diffuse_color = 4; // default = white; - optional decentraland.common.TextureUnion alpha_texture = 5; // default = null + optional decentraland.common.TextureUnion alpha_texture = 5; // default = null. Note that tilling and offset properties are ignored for this texture. } message PbrMaterial { @@ -30,10 +30,10 @@ message PBMaterial { optional float alpha_test = 2; // default = 0.5. range value: from 0 to 1 optional bool cast_shadows = 3; // default = true - // @deprecated Alpha textures are no longer supported on PBRMaterial and UnlitMaterial.alphaTexture should be used instead. - optional decentraland.common.TextureUnion alpha_texture = 4; // default = null - optional decentraland.common.TextureUnion emissive_texture = 5; // default = null - optional decentraland.common.TextureUnion bump_texture = 6; // default = null + + optional decentraland.common.TextureUnion alpha_texture = 4; // @deprecated Alpha textures are no longer supported on PBRMaterial and UnlitMaterial.alphaTexture should be used instead. + optional decentraland.common.TextureUnion emissive_texture = 5; // default = null. Note that tilling and offset properties are ignored for this texture. + optional decentraland.common.TextureUnion bump_texture = 6; // default = null. Note that tilling and offset properties are ignored for this texture. optional decentraland.common.Color4 albedo_color = 7; // default = white; optional decentraland.common.Color3 emissive_color = 8; // default = black; @@ -54,5 +54,4 @@ message PBMaterial { UnlitMaterial unlit = 1; PbrMaterial pbr = 2; } - -} +} \ No newline at end of file diff --git a/proto/decentraland/sdk/components/tween.proto b/proto/decentraland/sdk/components/tween.proto index 90f820b7..2ed6d784 100644 --- a/proto/decentraland/sdk/components/tween.proto +++ b/proto/decentraland/sdk/components/tween.proto @@ -15,6 +15,7 @@ message PBTween { Move move = 3; Rotate rotate = 4; Scale scale = 5; + TextureMove texture_move = 8; } optional bool playing = 6; // default true (pause or running) @@ -37,6 +38,19 @@ message Scale { decentraland.common.Vector3 end = 2; } +// This tween mode allows to move the texture of a PbrMaterial or UnlitMaterial. +// You can also specify the movement type (offset or tiling) +message TextureMove { + decentraland.common.Vector2 start = 1; + decentraland.common.Vector2 end = 2; + optional TextureMovementType movement_type = 3; // default = TextureMovementType.TMT_OFFSET +} + +enum TextureMovementType { + TMT_OFFSET = 0; // default = TextureMovementType.TMT_OFFSET + TMT_TILING = 1; +} + // Implementation guidelines for these easing functions can be found // at https://github.com/ai/easings.net/blob/6fcd5f852a470bf1a7890e8178afa0f471d5f2ec/src/easings/easingsFunctions.ts enum EasingFunction {