background

This commit is contained in:
serk 2017-01-21 04:40:20 +01:00
parent 8a38afc7e7
commit f8595bce4c
4 changed files with 18 additions and 4 deletions

View file

@ -3,7 +3,7 @@
Combat::Combat() {
ia = playerOneTurn = true;
enemy = new IaEnemy();
initShader();
}
Combat::Combat(bool ia) {
@ -11,17 +11,26 @@ Combat::Combat(bool ia) {
playerOneTurn = true;
if (ia) enemy = new IaEnemy();
else enemy = new Player();
initShader();
}
void Combat::initShader() {
_text.create(W_WIDTH, W_HEIGHT);
_background.setTexture(_text);
_shader.loadFromFile("./resources/shader.frag", sf::Shader::Fragment);
_shader.setParameter("resolution", sf::Vector2f(W_WIDTH, W_HEIGHT));
}
void Combat::update(float deltaTime, sf::RenderWindow *window) {
if (playerOneTurn) player.update(deltaTime, window);
else if (ia) playerOneTurn = enemy->update(deltaTime, window);
_shader.setParameter("time", deltaTime);
}
void Combat::draw(sf::RenderWindow *window) {
player.draw(window);
enemy->draw(window);
window->draw(_background, &_shader);
}
void Combat::updateEvents(sf::Event e) {

View file

@ -23,8 +23,11 @@ private:
bool playerOneTurn, ia;
Player player;
Actor *enemy;
sf::Texture _text;
sf::Sprite _background;
static sf::Shader _shader;
sf::Shader _shader;
void initShader();
};

View file

@ -12,6 +12,8 @@ const int SCENE_NUM = 4;
#define MARGEERR 0.30f
#define BLACKVALUE 0.00025f
#define W_WIDTH 800
#define W_HEIGHT 600
#define ASSERT(expression) do \
{ \

View file

@ -20,7 +20,7 @@ Game* Game::i() {
// Main game loop
void Game::run() {
sf::Clock c;
sf::RenderWindow window(sf::VideoMode(800, 600), "SFML window");
sf::RenderWindow window(sf::VideoMode(W_WIDTH, W_HEIGHT), "SFML window");
float oldTime = c.getElapsedTime().asSeconds();
while (isRunning) {
float time = c.getElapsedTime().asSeconds();