Rendering player and tiles now works.

This commit is contained in:
2016-11-27 13:53:18 +02:00
parent 914ae0de0d
commit 8173937797
35 changed files with 1160 additions and 230 deletions

18
src/model/GameConfig.h Normal file
View File

@@ -0,0 +1,18 @@
/*
* Settings.h
*
* Created on: Nov 13, 2016
* Author: tibi
*/
namespace farmlands {
namespace model {
struct GameConfig
{
float graphics_Scale;
float graphics_UiScale;
};
}
}

View File

@@ -12,7 +12,10 @@ namespace farmlands {
namespace model {
Level::Level(size_t layerCount, size_t rowCount, size_t columnCount)
: m_cells(new Cell[layerCount * rowCount * columnCount]),
: m_cellWidth(0),
m_cellHeight(0),
m_cells(new Cell[layerCount * rowCount * columnCount]),
m_textures(new int[layerCount]),
m_layers(layerCount),
m_rows(rowCount),
m_columns(columnCount)
@@ -22,6 +25,7 @@ Level::Level(size_t layerCount, size_t rowCount, size_t columnCount)
Level::~Level()
{
delete[] m_cells;
delete[] m_textures;
}
@@ -43,6 +47,16 @@ void Level::setCell(size_t layer, size_t row, size_t col, Cell value)
m_cells[layer * m_rows * m_columns + row * m_columns + col] = value;
}
int Level::texture(size_t layer) const
{
return m_textures[layer];
}
void Level::setTexture(size_t layer, int textureId) const
{
m_textures[layer] = textureId;
}
} /* namespace model */
} /* namespace farmlands */

View File

@@ -32,10 +32,14 @@ namespace model {
Cell cell(size_t layer, size_t row, size_t col) const;
void setCell(size_t layer, size_t row, size_t col, Cell value);
int texture(size_t layer) const;
void setTexture(size_t layer, int textureId) const;
size_t m_cellWidth, m_cellHeight;
private:
Cell* m_cells;
int* m_textures;
size_t m_layers;
size_t m_rows;
size_t m_columns;

View File

@@ -1,7 +1,7 @@
/*
* Player.h
*
* Created on: Nov 12, 2016
* Created on: Nov 26, 2016
* Author: tibi
*/
@@ -11,9 +11,12 @@
namespace farmlands {
namespace model {
#define PLAYER_INVENTORY_SIZE 3*12
struct Player
{
float posX, posY;
int inventory[PLAYER_INVENTORY_SIZE];
};
}