Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add repeat fit mode to image decorator #493

Merged
merged 5 commits into from
Aug 7, 2023
Merged

Add repeat fit mode to image decorator #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e6d984
Add repeat fit mode to image decorator
viseztrance Aug 6, 2023
55ba52e
Use a meaningful name for repeatable image
viseztrance Aug 6, 2023
9400a4c
Don't repeat images within spritesheets
viseztrance Aug 6, 2023
101fb19
Revert "Don't repeat images within spritesheets"
viseztrance Aug 7, 2023
ce0546d
Don't instantiate repeating elements using a spritesheet
viseztrance Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Backends/RmlUi_Renderer_GL2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ bool RenderInterface_GL2::GenerateTexture(Rml::TextureHandle& texture_handle, co
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);

texture_handle = (Rml::TextureHandle)texture_id;

Expand Down
4 changes: 2 additions & 2 deletions Backends/RmlUi_Renderer_GL3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,8 +731,8 @@ bool RenderInterface_GL3::GenerateTexture(Rml::TextureHandle& texture_handle, co
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);

texture_handle = (Rml::TextureHandle)texture_id;

Expand Down
Binary file added Samples/assets/alien_small.tga
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions Samples/basic/demo/data/demo.rml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ p.title
border: 1dp #777;
font-effect: shadow( 1dp 1dp #333 );
}
.image-mode.repeat > div {
height: 120dp;
}
#decorators .image-mode > div > p
{
margin: -2em 0 0 0;
Expand All @@ -223,6 +226,9 @@ p.title
.fit-cover { decorator: image( icon-invader cover ); }
.fit-scale-none { decorator: image( icon-invader scale-none ); }
.fit-scale-down { decorator: image( icon-invader scale-down ); }
.fit-repeat { decorator: image( /assets/alien_small.tga repeat ); }
.fit-repeat-x { decorator: image( /assets/alien_small.tga repeat-x ); }
.fit-repeat-y { decorator: image( /assets/alien_small.tga repeat-y ); }
.orientation-vertical { decorator: image( icon-invader flip-vertical scale-none ); }
.orientation-horizontal { decorator: image( icon-invader flip-horizontal scale-none ); }
.orientation-rotate { decorator: image( icon-invader rotate-180 scale-none ); }
Expand Down Expand Up @@ -709,6 +715,11 @@ progress {
<div class="fit-scale-none"></div>
<div class="fit-scale-down"></div>
</div>
<div class="image-mode repeat">
<div class="fit-repeat"><p>repeat</p></div>
<div class="fit-repeat-x"><p>repeat-x</p></div>
<div class="fit-repeat-y"><p>repeat-y</p></div>
</div>
<h1>Image decorator alignment modes</h1>
<div class="image-mode">
<div class="align-default"><p style="font-style: italic;">default</p></div>
Expand Down
18 changes: 18 additions & 0 deletions Source/Core/DecoratorTiled.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ void DecoratorTiled::Tile::GenerateGeometry(Vector<Vertex>& vertices, Vector<int

Vector2f final_tile_dimensions;
bool offset_and_clip_tile = false;
Vector2f repeat_factor = Vector2f(1);

switch (fit_mode)
{
Expand Down Expand Up @@ -165,6 +166,20 @@ void DecoratorTiled::Tile::GenerateGeometry(Vector<Vertex>& vertices, Vector<int
offset_and_clip_tile = true;
}
break;
case REPEAT:
final_tile_dimensions = surface_dimensions;
repeat_factor = surface_dimensions / tile_dimensions;
break;
case REPEAT_X:
final_tile_dimensions = Vector2f(surface_dimensions.x, tile_dimensions.y);
repeat_factor.x = surface_dimensions.x / tile_dimensions.x;
offset_and_clip_tile = true;
break;
case REPEAT_Y:
final_tile_dimensions = Vector2f(tile_dimensions.x, surface_dimensions.y);
repeat_factor.y = surface_dimensions.y / tile_dimensions.y;
offset_and_clip_tile = true;
break;
}

Vector2f tile_offset(0, 0);
Expand Down Expand Up @@ -206,6 +221,9 @@ void DecoratorTiled::Tile::GenerateGeometry(Vector<Vertex>& vertices, Vector<int
}
}

scaled_texcoords[0] *= repeat_factor;
scaled_texcoords[1] *= repeat_factor;

// Resize the vertex and index arrays to fit the new geometry.
int index_offset = (int)vertices.size();
vertices.resize(vertices.size() + 4);
Expand Down
3 changes: 3 additions & 0 deletions Source/Core/DecoratorTiled.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ class DecoratorTiled : public Decorator {
COVER, // Tile is stretched to cover the boundaries, keeping aspect ratio fixed.
SCALE_NONE, // Tile is never scaled.
SCALE_DOWN, // Tile acts like 'scale-none' if smaller than boundaries, or like 'contain' otherwise.
REPEAT, // Tile is repeated on both x and y axis
REPEAT_X, // Tile is repeated on the x axis
REPEAT_Y, // Tile is repeated on the y axis
};

/**
Expand Down
13 changes: 11 additions & 2 deletions Source/Core/DecoratorTiledInstancer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void DecoratorTiledInstancer::RegisterTileProperty(const String& name, bool regi
if (register_fit_modes)
{
String fit_name = CreateString(32, "%s-fit", name.c_str());
ids.fit = RegisterProperty(fit_name, "fill").AddParser("keyword", "fill, contain, cover, scale-none, scale-down").GetId();
ids.fit = RegisterProperty(fit_name, "fill").AddParser("keyword", "fill, contain, cover, scale-none, scale-down, repeat, repeat-x, repeat-y").GetId();

String align_x_name = CreateString(32, "%s-align-x", name.c_str());
ids.align_x = RegisterProperty(align_x_name, "center").AddParser("keyword", "left, center, right").AddParser("length_percent").GetId();
Expand Down Expand Up @@ -99,8 +99,9 @@ bool DecoratorTiledInstancer::GetTileProperties(DecoratorTiled::Tile* tiles, Tex
DecoratorTiled::Tile& tile = tiles[i];
Texture& texture = textures[i];

const Sprite* sprite = instancer_interface.GetSprite(texture_name);
// A tile is always either a sprite or an image.
if (const Sprite* sprite = instancer_interface.GetSprite(texture_name))
if (sprite)
{
tile.position = sprite->rectangle.Position();
tile.size = sprite->rectangle.Size();
Expand Down Expand Up @@ -134,6 +135,14 @@ bool DecoratorTiledInstancer::GetTileProperties(DecoratorTiled::Tile* tiles, Tex
const Property& fit_property = *properties.GetProperty(ids.fit);
tile.fit_mode = (DecoratorTiled::TileFitMode)fit_property.value.Get<int>();

if (sprite && (tile.fit_mode == DecoratorTiled::TileFitMode::REPEAT ||
tile.fit_mode == DecoratorTiled::TileFitMode::REPEAT_X ||
tile.fit_mode == DecoratorTiled::TileFitMode::REPEAT_Y)) {
Log::Message(Log::LT_WARNING, "Decorator fit value is '%s', which is incompatible with a spritesheet",
fit_property.ToString().c_str());
return false;
}

const Property* align_properties[2] = {properties.GetProperty(ids.align_x), properties.GetProperty(ids.align_y)};

for (int dimension = 0; dimension < 2; dimension++)
Expand Down