Page MenuHomePhabricator (Chris)
Files F102512

No OneTemporary
Actions

Size
36 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/boardelem.cpp b/boardelem.cpp
index bb44141..ff3b5f4 100644
--- a/boardelem.cpp
+++ b/boardelem.cpp
@@ -1,50 +1,50 @@
#include "boardelem.h"
namespace efc {
sf::RectangleShape createNeighbour(int pos) {
sf::RectangleShape rectangle(sf::Vector2f(efc::TILE_SIZE, efc::TILE_SIZE));
sf::Vector2i cords(efc::transPosition(pos));
- rectangle.setFillColor(sf::Color(240, 240, 240,168));
- rectangle.setOutlineColor(sf::Color(24,24,24));
+ rectangle.setFillColor(sf::Color(240, 240, 240,98));
+ rectangle.setOutlineColor(sf::Color(24,24,24, 90));
rectangle.setPosition(cords.x*efc::TILE_SIZE, cords.y*efc::TILE_SIZE);
- rectangle.setOutlineThickness(1);
+// rectangle.setOutlineThickness(0.5);
return rectangle;
}
}
efc::BoardElem::BoardElem(TextureHolder *textures,int pos, int type)
{
textureTiles = &textures->textureTiles;
this->pos = pos;
this->type = type;
sf::Vector2i cords = efc::transPosition(pos);
int y_type = (int) type / efc::TILE_BOARD_SIZE;
int x_type = type % efc::TILE_BOARD_SIZE;
setPosition(cords.x*efc::TILE_SIZE,cords.y*efc::TILE_SIZE);
setTexture(textures->textureTiles);
setTextureRect(sf::IntRect(x_type*efc::TILE_SIZE, y_type*efc::TILE_SIZE, efc::TILE_SIZE, efc::TILE_SIZE));
}
diff --git a/boardelems.cpp b/boardelems.cpp
index b6fefc3..18c8472 100644
--- a/boardelems.cpp
+++ b/boardelems.cpp
@@ -1,36 +1,46 @@
#include "boardelems.h"
BoardElems::BoardElems()
{
active = false;
}
void BoardElems::draw(sf::RenderTarget& target, sf::RenderStates states) const
{
- states.transform *= getTransform();
-
-
+ std::set<int> neighboursAll;
+ states.transform *= getTransform();
for (const efc::BoardElem &i: items)
{
target.draw(i, states);
- std::vector<int> neighbours(efc::getNeighbours(i.pos));
+ std::set<int> neighbours(efc::getNeighbours(i.pos));
if (active==true)
{
for (int j: neighbours)
{
if (items_map.count(j)==0)
{
- sf::RectangleShape sprite(efc::createNeighbour(j));
- target.draw(sprite, states);
+ neighboursAll.insert(j);
+// sf::RectangleShape sprite(efc::createNeighbour(j));
+// target.draw(sprite, states);
}
}
}
// std::cout << "POS: "<< i.getPosition().x << " " << i.getPosition().y << std::endl;
}
-
+ if (active==true)
+ {
+ for (int j: neighboursAll)
+ {
+ if (items_map.count(j)==0)
+ {
+ sf::RectangleShape sprite(efc::createNeighbour(j));
+ target.draw(sprite, states);
+ }
+ }
+ }
}
diff --git a/boardelems.h b/boardelems.h
index a66a7e6..7e88165 100644
--- a/boardelems.h
+++ b/boardelems.h
@@ -1,17 +1,18 @@
#ifndef BOARDELEMS_H
#define BOARDELEMS_H
#include "boardelem.h"
+#include "elemsdescription.h"
class BoardElems: public sf::Drawable, public sf::Transformable
{
public:
BoardElems();
std::vector<efc::BoardElem> items;
std::map<int, efc::BoardElem> items_map;
bool active;
private:
virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const;
};
#endif // BOARDELEMS_H
diff --git a/elemsdescription.h b/elemsdescription.h
new file mode 100644
index 0000000..0f29714
--- /dev/null
+++ b/elemsdescription.h
@@ -0,0 +1,263 @@
+#ifndef ELEMSDESCRIPTION_H
+#define ELEMSDESCRIPTION_H
+
+static int fields[256][6] = {
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+ {10,2,10,0,2,2},
+};
+
+#endif // ELEMSDESCRIPTION_H
diff --git a/enfucraft.pro b/enfucraft.pro
index e5cddab..236e17a 100644
--- a/enfucraft.pro
+++ b/enfucraft.pro
@@ -1,41 +1,42 @@
TEMPLATE = app
CONFIG += console
CONFIG -= app_bundle
CONFIG -= qt
CONFIG += c++11
SOURCES += main.cpp \
game.cpp \
tilemap.cpp \
selector.cpp \
playerhud.cpp \
boardelem.cpp \
boardelems.cpp \
textureholder.cpp \
hover.cpp \
guiwindow.cpp \
purchaseguielem.cpp \
guichoosebuilding.cpp
LIBS += -lsfml-window -lsfml-system -lsfml-graphics
DESTDIR = ../build_release_enfucraft
assets.path = $${DESTDIR}/assets
assets.files = assets/*
INSTALLS += assets
HEADERS += \
game.h \
tilemap.h \
selector.h \
playerhud.h \
boardelem.h \
boardelems.h \
textureholder.h \
hover.h \
guiwindow.h \
purchaseguielem.h \
- guichoosebuilding.h
+ guichoosebuilding.h \
+ elemsdescription.h
RESOURCES += \
images.qrc
diff --git a/game.cpp b/game.cpp
index 40d79a6..5e9ec42 100644
--- a/game.cpp
+++ b/game.cpp
@@ -1,275 +1,284 @@
#include <stdlib.h>
#include <iostream>
#include "game.h"
#include "guiwindow.h"
#include <time.h> /* time */
namespace efc {
void Game::initBoard()
{
// Grass tile starts at 342 and has 11 tiles
// int level[256];
// int level[256];
// Structure of the board
/*
{
342, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
80, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0,
1, 1, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3 }
*/
// Fill the array
for (int i=0;i<256;i++)
{
int grass = (rand() % 10) + 1;
level[i] = 342 + grass;
level[i] = level[i];
}
// level[0] = 441;
// level[240] = 0;
// level[255] = 0;
// level[15] = 0;
level[8] = 813;
level[24] = 803;
level[40] = 803;
level[56] = 803;
level[72] = 803;
level[88] = 801;
level[167] = 809;
level[183] = 803;
level[199] = 803;
level[215] = 803;
level[231] = 803;
level[247] = 812;
level[112] = 811;
for (int i=113;i<117;i++)
level[i] = 816;
level[117] = 815;
level[138] = 800;
for (int i=139;i<143;i++)
level[i] = 816;
level[143] = 814;
map.load(&textures, sf::Vector2u(efc::TILE_SIZE, efc::TILE_SIZE), level, efc::BOARD_SIZE, efc::BOARD_SIZE);
PlayerHud playerHud1(&textures, std::rand() % 80, &gameFont, 32,0);
PlayerHud playerHud2(&textures, std::rand() % 30, &gameFont, 32,1);
PlayerHud playerHud3(&textures, std::rand() % 60, &gameFont, 32,2);
PlayerHud playerHud4(&textures, std::rand() % 50, &gameFont, 32,3);
players[0] = playerHud1;
players[1] = playerHud2;
players[2] = playerHud3;
players[3] = playerHud4;
players[0].setActive(true);
setCurrentNeighbours();
}
void Game::setCurrentNeighbours ()
{
currentNeighbours = players[turn].getNeighbours();
}
void Game::loadAssets()
{
if (!textureFaces.loadFromFile("assets/img/faces.jpg"))
std::exit(1);
if (!textureTiles.loadFromFile("assets/img/zw-tilesets/_MAP.png"))
std::exit(1);
if (!gameFont.loadFromFile("assets/fnt/8bitOperatorPlus-Regular.ttf"))
{
std::exit(1);
}
}
Game::Game():
window(sf::VideoMode(512, 400), "EnFuCraft"),
viewTiles(sf::FloatRect(00, 00, 400, 400)),
+ viewFull(sf::FloatRect(00, 00, 400, 400)),
viewGui(sf::FloatRect(00, 00, 112, 400)),
selector(efc::TILE_SIZE),
guiSelectBuilding(&textures),
turn(0)
-
{
window.setVerticalSyncEnabled(true);
Hover hover;
GuiWindow guiWindow(&textures);
currentState = state_init;
std::srand (time(NULL));
loadAssets();
viewGui.setViewport(sf::FloatRect(0.8f,0, 1.0f, 1.0f));
viewTiles.setViewport(sf::FloatRect(0,0, 0.8f, 1.0f));
selector.changeColor(turn); //This is only for the test TODO: remove
initBoard();
currentState = state_game;
// run the main loop
while (window.isOpen())
{
// handle events
sf::Event event;
- sf::Vector2i localPositionTmp = sf::Mouse::getPosition(window);
- sf::Vector2f localPosition = window.mapPixelToCoords(localPositionTmp,viewTiles);
-
- float hover_x =localPosition.x;
- float hover_y = localPosition.y;
-
- if (localPosition.y > 290)
- hover_y = hover_y - 100;
- if (localPosition.x > 240)
- hover_x = hover_x - 150;
-
- if (hover_x>250)
- hover_x = 249.0f;
- if (hover_x<0)
- hover_x = 1.0f;
- if (hover_y>300)
- hover_y = 299.0f;
- if (hover_y<0)
- hover_y = 1.0f;
-
-
while (window.pollEvent(event))
{
-
+ sf::Vector2i localPositionTmp = sf::Mouse::getPosition(window);
+ sf::Vector2f localPosition = window.mapPixelToCoords(localPositionTmp,viewTiles);
int mousePosX = (int)localPosition.x / efc::TILE_SIZE;
int mousePosY = (int)localPosition.y / efc::TILE_SIZE;
int mousePos = efc::transCords(sf::Vector2i(mousePosX, mousePosY));
if(event.type == sf::Event::Closed)
window.close();
- if (currentNeighbours.find(mousePos) != currentNeighbours.end())
- {
-
-
- }
-
if (event.type == sf::Event::MouseButtonReleased)
{
-
- sf::Vector2i mTP = sf::Mouse::getPosition(window);
-
if (event.mouseButton.button == sf::Mouse::Left)
{
+ if (currentState==state_menu)
+ {
+
+ }
+
if (currentState==state_game)
{
if (currentNeighbours.find(mousePos) != currentNeighbours.end())
{
std::cout << "SUPER" << std::endl;
if (!guiSelectBuilding.active)
{
+ float hover_x =localPosition.x;
+ float hover_y = localPosition.y;
+ if (localPosition.y > 290)
+ hover_y = hover_y - 100;
+ if (localPosition.x > 240)
+ hover_x = hover_x - 150;
+ if (hover_x>250)
+ hover_x = 249.0f;
+ if (hover_x<0)
+ hover_x = 1.0f;
+ if (hover_y>300)
+ hover_y = 299.0f;
+ if (hover_y<0)
+ hover_y = 1.0f;
selectedPos = mousePos;
guiSelectBuilding.setPosition(hover_x, hover_y);
guiSelectBuilding.active = true;
currentState = state_gui_elem;
}
break;
}
- turn++;
- if (turn==4)
- turn = 0;
- selector.changeColor(turn);
- for (int i=0;i<4;i++)
- {
- if (i==turn)
- {
- players[i].setActive(true);
- if (currentNeighbours.find(mousePos) != currentNeighbours.end())
- {
-// std::cout << "SUPER" << std::endl;
- }
- currentNeighbours = players[i].getNeighbours();
- }
- else
- players[i].setActive(false);
- }
+ nextPlayer();
}
+
if (currentState==state_gui_elem)
{
std::string result = guiSelectBuilding.getElem(localPosition);
command(result);
}
-
}
}
+ if ((localPosition.x>=0) && (localPosition.y>=0) && (localPosition.x<=efc::BOARD_SIZE*efc::TILE_SIZE) && (localPosition.y<=efc::BOARD_SIZE*efc::TILE_SIZE))
+ {
+ selector.setPosition((int) (localPosition.x / efc::TILE_SIZE)*efc::TILE_SIZE, ((int) localPosition.y / efc::TILE_SIZE)*efc::TILE_SIZE);
+ }
}
- if ((localPosition.x>=0) && (localPosition.y>=0) && (localPosition.x<=efc::BOARD_SIZE*efc::TILE_SIZE) && (localPosition.y<=efc::BOARD_SIZE*efc::TILE_SIZE))
- {
- selector.setPosition((int) (localPosition.x / efc::TILE_SIZE)*efc::TILE_SIZE, ((int) localPosition.y / efc::TILE_SIZE)*efc::TILE_SIZE);
- }
+
render();
}
}
+void Game::nextPlayer(){
+ players[turn].updatePlayer();
+ turn++;
+
+ if (turn==4)
+ turn = 0;
+ selector.changeColor(turn);
+ for (int i=0;i<4;i++)
+ {
+ if (i==turn)
+ {
+ players[i].setActive(true);
+ currentNeighbours = players[i].getNeighbours();
+ }
+ else
+ players[i].setActive(false);
+ }
+}
+
void Game::drawPlayersGui(){
for (int i=0;i<4;i++)
{
window.draw(players[i]);
}
}
+void Game::drawSquares() {
+ window.draw(selector);
+
+}
+
+
void Game::update()
{
}
void Game::render()
{
window.clear();
- if ((currentState==state_game) || (currentState==state_gui_elem))
+ if (currentState==state_game)
{
window.setView(viewTiles);
window.draw(map);
for (int i=0;i<4;i++)
{
window.draw(players[i].elems);
}
- window.draw(selector);
+ drawSquares();
window.setView(viewGui);
drawPlayersGui();
+ } else if (currentState==state_gui_elem) {
+ window.setView(viewTiles);
+ window.draw(map);
+ for (int i=0;i<4;i++)
+ {
+ window.draw(players[i].elems);
+ }
+// window.draw(selector);
+ window.setView(viewGui);
+ drawPlayersGui();
}
window.setView(viewTiles);
window.draw(guiSelectBuilding);
window.display();
}
void Game::command(std::string command){
-// std::cout << "RUNNING:" + command << std::endl;
if (command=="close")
currentState=state_game;
+ if (command=="end_turn")
+ nextPlayer();
if (command.find("build_")==0)
{
int buildingType = std::stoi(command.substr(6));
players[turn].addElem(selectedPos, buildingType);
currentState = state_game;
setCurrentNeighbours();
}
-
}
sf::Vector2f Game::getMousePos(){
sf::Vector2i mousePosTmp(sf::Mouse::getPosition(window));
sf::Vector2f mousePosition(window.mapPixelToCoords(mousePosTmp,viewTiles));
return mousePosition;
}
}
diff --git a/game.h b/game.h
index c4ad3a8..861193a 100644
--- a/game.h
+++ b/game.h
@@ -1,65 +1,68 @@
#ifndef GAME_H
#define GAME_H
#include <SFML/Window.hpp>
#include <SFML/Graphics.hpp>
#include "tilemap.h"
#include "selector.h"
#include "playerhud.h"
#include "textureholder.h"
#include "hover.h"
#include "guichoosebuilding.h"
namespace efc {
class Game
{
public:
Game();
sf::RenderWindow window;
sf::View viewTiles;
private:
void initBoard();
void loadAssets();
void drawPlayersGui();
sf::Vector2f getMousePos();
enum states {
state_init,
state_menu,
state_game,
state_gui_elem,
state_select_building,
state_quit
};
states currentState;
sf::Texture textureTiles;
sf::Texture textureFaces;
sf::Font gameFont;
TileMap map;
PlayerHud players[4];
int mapSize;
int level[256];
int levelElems[256];
TextureHolder textures;
std::set<int> currentNeighbours;
void command(std::string command);
int selectedPos;
int turn;
void update();
void render();
sf::View viewGui;
Selector selector;
+ sf::View viewFull;
+
GuiChooseBuilding guiSelectBuilding;
void setCurrentNeighbours ();
+ void nextPlayer();
-
+ void drawSquares();
};
}
#endif // GAME_H
diff --git a/playerhud.cpp b/playerhud.cpp
index 27f18d5..0c9510b 100644
--- a/playerhud.cpp
+++ b/playerhud.cpp
@@ -1,142 +1,157 @@
#include "playerhud.h"
#include "textureholder.h"
#include "boardelem.h"
-
void PlayerHud::addElem(int pos, int type) {
efc::BoardElem startElem(textures, pos,type);
elems.items.push_back(startElem);
elems.items_map.insert({pos, startElem});
}
std::set<int> PlayerHud::getNeighbours(){
-
std::set<int> neighbours;
-
for (std::pair<int, efc::BoardElem> i: elems.items_map)
{
- std::cout << "adding " << i.first << std::endl;
+ std::cout << "adding " << i.first << std::endl;
- std::vector<int> neighboursVector(efc::getNeighbours(i.second.pos));
- for (int j: neighboursVector)
- {
+ std::set<int> neighboursVector(efc::getNeighbours(i.second.pos));
+ for (int j: neighboursVector)
+ {
+ std::cout << "neigh " << j << " " << elems.items_map.count(j) << std::endl;
- if (elems.items_map.count(j) == 0)
- {
+ if (elems.items_map.count(j) == 0)
+ {
neighbours.insert(j);
- }
-
-
-
-
-
- }
-
+ }
+ }
}
return neighbours;
+}
+void PlayerHud::updatePlayer(){
+ for (const efc::BoardElem &i: elems.items)
+ {
+ int cashUpd = textures->tilesDescription[i.type][1];
+ int foodUpd = textures->tilesDescription[i.type][3];
+ int enrgUpd = textures->tilesDescription[i.type][3];
+ cash += cashUpd;
+ energy += enrgUpd;
+ food += foodUpd;
+ txtCash.setString("Cash: " + std::to_string(cash));
+ std::cout << "CASH " << i.type << " " << i.pos << " " << cashUpd << " " << cash<< std::endl;
+ }
}
PlayerHud::PlayerHud()
{
active = false;
+ food = 0;
+ cash = 0;
+ energy = 0;
}
void PlayerHud::setActive(bool newState){
active = newState;
elems.active = newState;
-
}
PlayerHud::PlayerHud(TextureHolder *textures, int faceNumber, sf::Font *gameFont, int faceSize, int pos)
{
active = false;
- int startPositions[4] = {0,15,240, 255};
this->textures = textures;
- efc::BoardElem startElem(textures, startPositions[pos],441);
+ efc::BoardElem startElem(textures, startPlayers[pos],441);
elems.items.push_back(startElem);
- elems.items_map.insert({pos, startElem});
+ elems.items_map.insert({startPlayers[pos], startElem});
this->faceSize = faceSize;
spriteFace.setTexture(textures->textureFaces);
this->pos = pos;
food = 0;
cash = 0;
energy = 0;
int x = faceNumber % 10;
int y = (int) faceNumber /10;
txtCash.setFont(*gameFont);
txtFood.setFont(*gameFont);
txtEnergy.setFont(*gameFont);
+ txtNextRound.setFont(*gameFont);
+
+
+ txtNextRound.setString("End Turn");
+ txtNextRound.setScale(sf::Vector2f(0.25f, 1.f));
+ txtNextRound.setCharacterSize(10);
+ txtNextRound.setPosition(9,(pos*100)+10);
txtCash.setPosition(1,(pos*100)+40);
txtCash.setString("Cash: " + std::to_string(cash));
txtCash.setCharacterSize(10);
txtCash.setScale(sf::Vector2f(0.25f, 1.f));
txtFood.setPosition(1,(pos*100)+55);
txtFood.setString("Food: " + std::to_string(food));
txtFood.setCharacterSize(10);
txtFood.setScale(sf::Vector2f(0.25f, 1.f));
txtEnergy.setPosition(1,(pos*100)+70);
txtEnergy.setString("Enrg: " + std::to_string(energy));
- txtEnergy.setString("Enrg: " + std::to_string(energy));
txtEnergy.setCharacterSize(10);
txtEnergy.setScale(sf::Vector2f(0.25f, 1.f));
+
std::cout << "playerHud" << faceNumber << " " << x << " " << y << std::endl;
spriteFace.setTextureRect(sf::IntRect(x*faceSize, y*faceSize, faceSize, faceSize));
spriteFace.setScale(sf::Vector2f(0.25f, 1.f));
spriteFace.setPosition(0,pos*100);
}
void PlayerHud::draw(sf::RenderTarget& target, sf::RenderStates states) const
{
// // apply the transform
states.transform *= getTransform();
// Color rectangles making the gui on the right side
sf::RectangleShape rectangle(sf::Vector2f(faceSize, faceSize));
sf::RectangleShape rectangle2(sf::Vector2f(faceSize, (faceSize*2)+3));
if (pos==0)
{
rectangle.setFillColor(sf::Color(50, 50, 150,168));
rectangle2.setFillColor(sf::Color(100, 100, 150,168));
rectangle.setOutlineColor(sf::Color(0,0,128));
}
else if (pos==1)
{
rectangle.setFillColor(sf::Color(50, 150, 50,168));
rectangle2.setFillColor(sf::Color(100, 150,100,168));
rectangle.setOutlineColor(sf::Color(0,128,0));
}
else if (pos==2)
{
rectangle.setFillColor(sf::Color(150, 50, 50,168));
rectangle2.setFillColor(sf::Color(150, 100,100,168));
rectangle.setOutlineColor(sf::Color(128,0,0));
}
else if (pos==3)
{
rectangle.setFillColor(sf::Color(150, 150, 150,168));
rectangle2.setFillColor(sf::Color(200, 200,200,168));
rectangle.setOutlineColor(sf::Color(128,128,128));
}
rectangle.setOutlineThickness(1);
rectangle.setPosition(0, pos*100);
rectangle2.setPosition(0, (pos*100)+faceSize+1);
target.draw(rectangle, states);
target.draw(rectangle2, states);
target.draw(txtCash, states);
target.draw(txtFood, states);
target.draw(txtEnergy, states);
+ if (active)
+ target.draw(txtNextRound, states);
target.draw(spriteFace, states);
}
diff --git a/playerhud.h b/playerhud.h
index ea6a810..d2ab1cb 100644
--- a/playerhud.h
+++ b/playerhud.h
@@ -1,44 +1,52 @@
#ifndef PLAYERHUD_H
#define PLAYERHUD_H
#include <iostream>
#include <set>
#include <SFML/Window.hpp>
#include <SFML/Graphics.hpp>
#include <SFML/System.hpp>
#include "boardelems.h"
#include "textureholder.h"
+#include "elemsdescription.h"
+
+static int startPlayers[4] = {0,15,240,255};
+
class PlayerHud : public sf::Drawable, public sf::Transformable
{
public:
PlayerHud();
PlayerHud(TextureHolder *textures, int faceNumber, sf::Font *gameFont, int tileSize, int pos);
virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const;
std::set<int> getNeighbours();
int pos;
int cash;
int energy;
int food;
bool active;
BoardElems elems;
void setActive(bool newState);
std::vector<int> properties;
void addElem(int pos, int type);
+ void updatePlayer();
+
+
private:
sf::Sprite spriteFace;
sf::Text txtCash;
sf::Text txtEnergy;
sf::Text txtFood;
+ sf::Text txtNextRound;
int faceSize;
int tileSize;
TextureHolder *textures;
};
#endif // PLAYERHUD_H
diff --git a/selector.cpp b/selector.cpp
index 1d4c9d5..6e0594b 100644
--- a/selector.cpp
+++ b/selector.cpp
@@ -1,44 +1,44 @@
#include "selector.h"
Selector::Selector(int squareSize)
- :rectangle(sf::Vector2f(squareSize, squareSize))
+ :rectangle(sf::Vector2f(squareSize-1, squareSize-1))
{
this->squareSize = squareSize;
rectangle.setFillColor(sf::Color(150, 250, 150,168));
rectangle.setOutlineThickness(1);
rectangle.setOutlineColor(sf::Color(0,255,0));
changeColor(3);
}
void Selector::changeColor(int colorNumber)
{
if (colorNumber==0)
{
rectangle.setFillColor(sf::Color(150, 150, 250,168));
rectangle.setOutlineColor(sf::Color(0,0,255));
}
else if (colorNumber==1)
{
rectangle.setFillColor(sf::Color(150, 250, 150,168));
rectangle.setOutlineColor(sf::Color(0,255,0));
}
else if (colorNumber==2)
{
rectangle.setFillColor(sf::Color(250, 150, 150,168));
rectangle.setOutlineColor(sf::Color(255,0,0));
}
else if (colorNumber==3)
{
rectangle.setFillColor(sf::Color(200, 200, 200,168));
rectangle.setOutlineColor(sf::Color(200,200,200));
}
}
void Selector::draw(sf::RenderTarget& target, sf::RenderStates states) const
{
// // apply the transform
states.transform *= getTransform();
target.draw(rectangle, states);
}
diff --git a/textureholder.cpp b/textureholder.cpp
index 43f32d7..4490ac3 100644
--- a/textureholder.cpp
+++ b/textureholder.cpp
@@ -1,12 +1,39 @@
#include "textureholder.h"
TextureHolder::TextureHolder()
{
if (!textureTiles.loadFromFile("assets/img/zw-tilesets/_MAP.png"))
std::exit(1);
if (!textureFaces.loadFromFile("assets/img/faces.jpg"))
std::exit(1);
if (!textureGui.loadFromFile("assets/img/gui.png"))
std::exit(1);
+
+
+
+ int defaultArray[6] = {10,2,10,0,2,2};
+ int defaultFields[4] = {441, 8, 88, 328};
+
+ for (int i: defaultFields)
+ {
+ std::map<int, int> params;
+ params.insert({0, 10});
+ params.insert({1, 2});
+ params.insert({2, 10});
+ params.insert({3, 0});
+ params.insert({4, 10});
+ params.insert({5, 0});
+
+ tilesDescription.insert({i, params});
+
+ }
+
+
+// tilesDescription.insert({441, &defaultArray});
+// tilesDescription.insert({8, &defaultArray});
+// tilesDescription.insert({88, &defaultArray});
+// tilesDescription.insert({328, &defaultArray});
+
+
}
diff --git a/textureholder.h b/textureholder.h
index 01b3f81..fa30199 100644
--- a/textureholder.h
+++ b/textureholder.h
@@ -1,16 +1,18 @@
#ifndef TEXTUREHOLDER_H
#define TEXTUREHOLDER_H
#include <SFML/Window.hpp>
#include <SFML/Graphics.hpp>
class TextureHolder
{
public:
TextureHolder();
sf::Texture textureTiles;
sf::Texture textureFaces;
sf::Texture textureGui;
+ std::map<int, std::map<int, int>> tilesDescription;
+
};
#endif // TEXTUREHOLDER_H
diff --git a/tilemap.cpp b/tilemap.cpp
index c8eba46..29604ab 100644
--- a/tilemap.cpp
+++ b/tilemap.cpp
@@ -1,103 +1,119 @@
#include "tilemap.h"
-
namespace efc {
sf::Vector2i transPosition(int pos) {
int x = (int) pos % efc::BOARD_SIZE;
int y = (int) pos / efc::BOARD_SIZE;
sf::Vector2i cords(x,y);
return cords;
}
sf::Vector2i transTilePosition(int pos) {
int x = (int) pos % efc::TILE_BOARD_SIZE;
int y = (int) pos / efc::TILE_BOARD_SIZE;
sf::Vector2i cords(x,y);
return cords;
}
int transCords(sf::Vector2i cords) {
// std::cout << cords.x << " " << cords.y << " " << std::endl;
int pos = (cords.y * efc::BOARD_SIZE)+cords.x;
return pos;
}
sf::IntRect transPosIntoRect(int pos)
{
sf::Vector2i cords = efc::transTilePosition(pos);
sf::IntRect posRect((int)cords.x*efc::TILE_SIZE, (int)cords.y*efc::TILE_SIZE, efc::TILE_SIZE, efc::TILE_SIZE);
std::cout << "debug transPosIntoRect " << pos << " "<< cords.x << " " << cords.y << " " << posRect.left << " " << posRect.top << std::endl;
return posRect;
}
-std::vector<int> getNeighbours(int pos) {
+std::set<int> getNeighbours(int pos) {
sf::Vector2i cords = efc::transPosition(pos);
+
+
+
std::vector<int> neighbours;
+ std::set<int> neighboursSet;
+
if (cords.x>0)
+ {
neighbours.push_back(pos-1);
+ neighboursSet.insert(pos-1);
+ }
if (cords.x<efc::BOARD_SIZE-1)
+ {
neighbours.push_back(pos+1);
+ neighboursSet.insert(pos+1);
+ }
+
if (cords.y>0)
+ {
neighbours.push_back(pos-efc::BOARD_SIZE);
+ neighboursSet.insert(pos-efc::BOARD_SIZE);
+ }
if (cords.y<efc::BOARD_SIZE)
+ {
neighbours.push_back(pos+efc::BOARD_SIZE);
- return neighbours;
+ neighboursSet.insert(pos+efc::BOARD_SIZE);
+ }
+ return neighboursSet;
}
-
}
TileMap::TileMap()
{
}
bool TileMap::load(TextureHolder *textures, sf::Vector2u tileSize, const int* tiles, unsigned int width, unsigned int height)
{
this->m_tileset = &textures->textureTiles;
// resize the vertex array to fit the level size
m_vertices.setPrimitiveType(sf::Quads);
m_vertices.resize(width * height * 4);
// populate the vertex array, with one quad per tile
for (unsigned int i = 0; i < width; ++i)
for (unsigned int j = 0; j < height; ++j)
{
// get the current tile number
int tileNumber = tiles[i + j * width];
// find its position in the tileset texture
int tu = tileNumber % (m_tileset->getSize().x / tileSize.x);
int tv = tileNumber / (m_tileset->getSize().x / tileSize.x);
// get a pointer to the current tile's quad
sf::Vertex* quad = &m_vertices[(i + j * width) * 4];
// define its 4 corners
quad[0].position = sf::Vector2f(i * tileSize.x, j * tileSize.y);
quad[1].position = sf::Vector2f((i + 1) * tileSize.x, j * tileSize.y);
quad[2].position = sf::Vector2f((i + 1) * tileSize.x, (j + 1) * tileSize.y);
quad[3].position = sf::Vector2f(i * tileSize.x, (j + 1) * tileSize.y);
// define its 4 texture coordinates
quad[0].texCoords = sf::Vector2f(tu * tileSize.x, tv * tileSize.y);
quad[1].texCoords = sf::Vector2f((tu + 1) * tileSize.x, tv * tileSize.y);
quad[2].texCoords = sf::Vector2f((tu + 1) * tileSize.x, (tv + 1) * tileSize.y);
quad[3].texCoords = sf::Vector2f(tu * tileSize.x, (tv + 1) * tileSize.y);
}
return true;
}
void TileMap::draw(sf::RenderTarget& target, sf::RenderStates states) const
{
// apply the transform
states.transform *= getTransform();
// apply the tileset texture
states.texture = m_tileset;
// draw the vertex array
target.draw(m_vertices, states);
}
sf::VertexArray m_vertices;
sf::Texture m_tileset;
diff --git a/tilemap.h b/tilemap.h
index 9285f22..14b106f 100644
--- a/tilemap.h
+++ b/tilemap.h
@@ -1,38 +1,39 @@
#ifndef TILEMAP_H
#define TILEMAP_H
#include <iostream>
#include <SFML/Window.hpp>
#include <SFML/Graphics.hpp>
#include <SFML/System.hpp>
#include "textureholder.h"
+#include <set>
+
namespace efc {
enum {
TILE_SIZE = 25,
BOARD_SIZE = 16,
TILE_BOARD_SIZE = 40
};
sf::Vector2i transPosition(int pos);
int transCords(sf::Vector2i cords);
-std::vector<int> getNeighbours(int pos);
+std::set<int> getNeighbours(int pos);
sf::IntRect transPosIntoRect(int pos);
sf::Vector2i transTilePosition(int pos);
-
}
class TileMap : public sf::Drawable, public sf::Transformable
{
public:
bool load(TextureHolder *textures, sf::Vector2u tileSize, const int* tiles, unsigned int width, unsigned int height);
TileMap();
private:
virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const;
sf::VertexArray m_vertices;
sf::Texture *m_tileset;
TextureHolder *textures;
};
#endif // TILEMAP_H

File Metadata

Mime Type
text/x-diff
Expires
Mon, Feb 2, 9:10 PM (1 d, 19 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
55583
Default Alt Text
(36 KB)

Event Timeline