bMorgan/AsteroidsSFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

needed to push some big changes before I lose them

Browse source
This commit is contained in:
bMorgan01 2020-10-14 00:47:11 -06:00
parent d84b2810d2
commit d767806e1c
35 changed files with 637 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

37
MySprite.h
View file

@ -27,18 +27,13 @@ protected:
IntRect textureRect;
};
struct Rider {
MySprite* sprite;
bool followsDirection = false, followsPosition = true;
};
Physics spritePhysics{};
Animation spriteAnimation{};
Rider spriteRider{};
bool toErase = false, circularHitbox = false;
string type = "Sprite";
public:
enum EdgeBehavior {
IGNORE, LOOP, BOUNCE
@ -164,9 +159,9 @@ public:
setOrigin(spriteAnimation.width/2.0, spriteAnimation.height/2.0);
}
void update(RenderWindow* window = nullptr) {
spritePhysics.xPos += cos(spritePhysics.direction * (PI/180)) * spritePhysics.velocity;
spritePhysics.yPos += -(sin(spritePhysics.direction * (PI/180)) * spritePhysics.velocity);
virtual void update(RenderWindow* window = nullptr) {
spritePhysics.xPos += cos(spritePhysics.direction * (PI/180.0)) * spritePhysics.velocity;
spritePhysics.yPos += -(sin(spritePhysics.direction * (PI/180.0)) * spritePhysics.velocity);
if (edgeBehavior == LOOP) {
if (spritePhysics.xPos <= -getGlobalBounds().width)
@ -215,12 +210,6 @@ public:
}
}
if (spriteRider.sprite != nullptr) {
if (spriteRider.followsPosition) spriteRider.sprite->setPosition(spritePhysics.xPos, spritePhysics.yPos);
if (spriteRider.followsDirection) spriteRider.sprite->setDirection(spritePhysics.direction);
}
setPosition(spritePhysics.xPos, spritePhysics.yPos);
setRotation(-spritePhysics.direction);
}
@ -311,17 +300,17 @@ public:
return toErase;
}
void setRider(MySprite* sprite) {
spriteRider.sprite = sprite;
}
Rider getRider() {
return spriteRider;
}
Animation getAnimation() {
return spriteAnimation;
}
string getType() {
return type;
}
void setType(string type) {
this->type = std::move(type);
}
};