Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-26 08:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rewrite the grid display code

Browse source 
- Grid tile number of columns and rows is now controlled by the grid size, mMargin and mTileMaxSize
- Add a variable mSelectedTileMaxSize to control the size of the selected tile
- Update the render function to display the selected tile on top of the other
This commit is contained in:
Koerty 2018-03-22 08:03:12 +01:00
parent 5bd40476f6
commit 8d9c4a20ec
2 changed files with 54 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
es-app/src/views/gamelist/GridGameListView.cpp
View file

@ -6,8 +6,8 @@
GridGameListView::GridGameListView(Window* window, FileData* root) : ISimpleGameListView(window, root),
mGrid(window)
{
mGrid.setPosition(0, mSize.y() * 0.2f);
mGrid.setSize(mSize.x(), mSize.y() * 0.8f);
mGrid.setPosition(mSize.x() * 0.1f, mSize.y() * 0.1f);
// mGrid.setSize(mSize.x(), mSize.y() * 0.8f);
addChild(&mGrid);
populateList(root->getChildrenListToDisplay());

105
es-core/src/components/ImageGridComponent.h
View file

@ -40,49 +40,15 @@ public:
void render(const Transform4x4f& parentTrans) override;
private:
Vector2f getSquareSize(std::shared_ptr<TextureResource> tex = nullptr) const
{
Vector2f aspect(1, 1);
if(tex)
{
const Vector2i& texSize = tex->getSize();
if(texSize.x() > texSize.y())
aspect[0] = (float)texSize.x() / texSize.y();
else
aspect[1] = (float)texSize.y() / texSize.x();
}
return Vector2f(156 * aspect.x(), 156 * aspect.y());
};
Vector2f getMaxSquareSize() const
{
Vector2f squareSize(32, 32);
// calc biggest square size
for(auto it = mEntries.cbegin(); it != mEntries.cend(); it++)
{
Vector2f chkSize = getSquareSize(it->data.texture);
if(chkSize.x() > squareSize.x())
squareSize[0] = chkSize[0];
if(chkSize.y() > squareSize.y())
squareSize[1] = chkSize[1];
}
return squareSize;
};
// Calculate how much tiles of size mTileMaxSize we can fit in a grid of size mSize using a margin of size mMargin
Vector2i getGridDimension() const
{
Vector2f squareSize = getMaxSquareSize();
Vector2i gridDimension((int)(mSize.x() / (squareSize.x() + getPadding().x())), (int)(mSize.y() / (squareSize.y() + getPadding().y())));
return gridDimension;
// GRID_SIZE = COLUMNS * TILE_SIZE + (COLUMNS - 1) * MARGIN
// <=> COLUMNS = (GRID_SIZE + MARGIN) / (TILE_SIZE + MARGIN)
return Vector2i((int) ((mSize.x() + mMargin.x()) / (mTileMaxSize.x() + mMargin.x())),
(int) ((mSize.y() + mMargin.y()) / (mTileMaxSize.y() + mMargin.y())));
};
Vector2f getPadding() const { return Vector2f(24, 24); }
void buildImages();
void updateImages();
@ -90,13 +56,24 @@ private:
bool mEntriesDirty;
Vector2f mMargin;
Vector2f mTileMaxSize;
Vector2f mSelectedTileMaxSize;
std::vector<ImageComponent> mImages;
};
template<typename T>
ImageGridComponent<T>::ImageGridComponent(Window* window) : IList<ImageGridData, T>(window)
{
Vector2f screen = Vector2f((float)Renderer::getScreenWidth(), (float)Renderer::getScreenHeight());
mEntriesDirty = true;
mSize = screen * 0.8f;
mMargin = screen * 0.01f;
mTileMaxSize = screen * 0.19f;
mSelectedTileMaxSize = mTileMaxSize + mMargin * 3.0f;
}
template<typename T>
@ -158,11 +135,37 @@ void ImageGridComponent<T>::render(const Transform4x4f& parentTrans)
mEntriesDirty = false;
}
// Dirty solution (took from updateImages function) to keep the selected image and render it later (on top of the others)
// Will be changed for a cleaner way with the introduction of GridTileComponent
Vector2i gridDimension = getGridDimension();
int cursorRow = mCursor / gridDimension.x();
int start = (cursorRow - (gridDimension.y() / 2)) * gridDimension.x();
//if we're at the end put the row as close as we can and no higher
if(start + (gridDimension.x() * gridDimension.y()) >= (int)mEntries.size())
start = gridDimension.x() * ((int)mEntries.size()/gridDimension.x() - gridDimension.y() + 1);
if(start < 0)
start = 0;
unsigned int i = (unsigned int)start;
ImageComponent* selectedImage = NULL;
for(auto it = mImages.begin(); it != mImages.end(); it++)
{
it->render(trans);
// If it's the selected image, keep it for later, otherwise render it now
if(i == (unsigned int)mCursor)
selectedImage = it.base();
else
it->render(trans);
i++;
}
// Render the selected image on top of the others
if (selectedImage != NULL)
selectedImage->render(trans);
GuiComponent::renderChildren(trans);
}
@ -179,31 +182,28 @@ void ImageGridComponent<T>::onSizeChanged()
updateImages();
}
// create and position imagecomponents (mImages)
// Create and position imagecomponents (mImages)
template<typename T>
void ImageGridComponent<T>::buildImages()
{
mImages.clear();
Vector2i gridDimension = getGridDimension();
Vector2f squareSize = getMaxSquareSize();
Vector2f padding = getPadding();
// attempt to center within our size
Vector2f totalSize(gridDimension.x() * (squareSize.x() + padding.x()), gridDimension.y() * (squareSize.y() + padding.y()));
Vector2f offset(mSize.x() - totalSize.x(), mSize.y() - totalSize.y());
offset /= 2;
Vector2f startPosition = mTileMaxSize / 2;
Vector2f tileDistance = mTileMaxSize + mMargin;
// Layout tile size and position
for(int y = 0; y < gridDimension.y(); y++)
{
for(int x = 0; x < gridDimension.x(); x++)
{
// Create tiles
mImages.push_back(ImageComponent(mWindow));
ImageComponent& image = mImages.at(y * gridDimension.x() + x);
image.setPosition((squareSize.x() + padding.x()) * (x + 0.5f) + offset.x(), (squareSize.y() + padding.y()) * (y + 0.5f) + offset.y());
image.setPosition(x * tileDistance.x() + startPosition.x(), y * tileDistance.y() + startPosition.y());
image.setOrigin(0.5f, 0.5f);
image.setResize(squareSize.x(), squareSize.y());
image.setMaxSize(mTileMaxSize);
image.setImage("");
}
}
@ -238,14 +238,13 @@ void ImageGridComponent<T>::updateImages()
continue;
}
Vector2f squareSize = getSquareSize(mEntries.at(i).data.texture);
if(i == (unsigned int)mCursor)
{
image.setColorShift(0xFFFFFFFF);
image.setResize(squareSize.x() + getPadding().x() * 0.95f, squareSize.y() + getPadding().y() * 0.95f);
image.setMaxSize(mSelectedTileMaxSize);
}else{
image.setColorShift(0xAAAAAABB);
image.setResize(squareSize.x(), squareSize.y());
image.setMaxSize(mTileMaxSize);
}
image.setImage(mEntries.at(i).data.texture);