revert a previous commit
This commit is contained in:
parent
7edf1bf0fd
commit
cdda33f786
|
|
@ -9,7 +9,6 @@
|
||||||
#include <imgui-SFML.h>
|
#include <imgui-SFML.h>
|
||||||
#include <imgui.h>
|
#include <imgui.h>
|
||||||
|
|
||||||
|
|
||||||
struct Ball
|
struct Ball
|
||||||
{
|
{
|
||||||
Ball(sf::Vector2f position_in, sf::Vector2f vel_in);
|
Ball(sf::Vector2f position_in, sf::Vector2f vel_in);
|
||||||
|
|
@ -17,8 +16,8 @@ struct Ball
|
||||||
sf::Vector2f pos;
|
sf::Vector2f pos;
|
||||||
sf::Vector2f velocity;
|
sf::Vector2f velocity;
|
||||||
sf::Vector2f previousPos{};
|
sf::Vector2f previousPos{};
|
||||||
bool alive{};
|
bool alive{true};
|
||||||
bool collided{};
|
bool collided{false};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Brick
|
struct Brick
|
||||||
|
|
@ -26,7 +25,7 @@ struct Brick
|
||||||
Brick(sf::Vector2f position_in);
|
Brick(sf::Vector2f position_in);
|
||||||
|
|
||||||
sf::Vector2f pos;
|
sf::Vector2f pos;
|
||||||
bool alive{};
|
bool alive{true};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Player
|
struct Player
|
||||||
|
|
@ -37,10 +36,10 @@ struct Player
|
||||||
sf::Vector2f pos{};
|
sf::Vector2f pos{};
|
||||||
sf::Vector2f previousPos{};
|
sf::Vector2f previousPos{};
|
||||||
int score{};
|
int score{};
|
||||||
int lives{};
|
int lives{3};
|
||||||
int mult{};
|
int mult{1};
|
||||||
bool left{};
|
bool left{false};
|
||||||
bool right{};
|
bool right{false};
|
||||||
};
|
};
|
||||||
|
|
||||||
class Game
|
class Game
|
||||||
|
|
|
||||||
|
|
@ -14,21 +14,14 @@
|
||||||
Ball::Ball(sf::Vector2f position_in, sf::Vector2f vel_in)
|
Ball::Ball(sf::Vector2f position_in, sf::Vector2f vel_in)
|
||||||
: pos(position_in)
|
: pos(position_in)
|
||||||
, velocity(vel_in)
|
, velocity(vel_in)
|
||||||
, alive(true)
|
|
||||||
, collided(false)
|
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
Brick::Brick(sf::Vector2f position_in)
|
Brick::Brick(sf::Vector2f position_in)
|
||||||
: pos(position_in)
|
: pos(position_in)
|
||||||
, alive(true)
|
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
Player::Player(sf::Vector2f position_in)
|
Player::Player(sf::Vector2f position_in)
|
||||||
: pos(position_in)
|
: pos(position_in)
|
||||||
, lives(3)
|
|
||||||
, mult(1)
|
|
||||||
, left(false)
|
|
||||||
, right{false}
|
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue