beams shoot from further forward on the ship, noised added
This commit is contained in:
parent
0c2a21e4da
commit
eaf5a55d18
4 changed files with 15 additions and 10 deletions
23
BeamWeapon.h
23
BeamWeapon.h
|
|
@ -5,6 +5,7 @@
|
|||
#ifndef SFML_TEMPLATE_BEAMWEAPON_H
|
||||
#define SFML_TEMPLATE_BEAMWEAPON_H
|
||||
|
||||
#include <thread>
|
||||
#include "Beam.h"
|
||||
|
||||
class BeamWeapon : public Weapon {
|
||||
|
|
@ -19,20 +20,24 @@ public:
|
|||
|
||||
Shootable* shoot(const Ship* shooter) override {
|
||||
framesShot++;
|
||||
|
||||
if (noise.getStatus() != sf::Sound::Playing) noise.play();
|
||||
|
||||
projectile.setShooter((GameSprite *) shooter);
|
||||
|
||||
sf::Vector2f adjusted(shooter->getXPos() + shooter->getLocalBounds().width/4 * shooter->getScale().x * cos(shooter->getDirection()*GameSprite::PI/180), shooter->getYPos() - shooter->getLocalBounds().width/4 * shooter->getScale().x * sin(shooter->getDirection()*GameSprite::PI/180));
|
||||
double newWidth = shooter->getTarget() == nullptr ? projectile.getRange() : GameSprite::distance(adjusted, shooter->getTarget()->getPosition());
|
||||
projectile.setTextureRect(sf::IntRect(projectile.getTextureRect().left, projectile.getTextureRect().top, newWidth > projectile.getRange() ? projectile.getRange() * (1/projectile.getScale().x) : newWidth * (1/projectile.getScale().x), projectile.getTextureRect().height));
|
||||
projectile.setOrigin(0, projectile.getLocalBounds().height/2);
|
||||
projectile.setPosition(adjusted);
|
||||
projectile.setDirection(shooter->getTarget() == nullptr ? shooter->getDirection() : -GameSprite::getAimAngle(shooter->getTarget()->getPosition(), projectile.getPosition()));
|
||||
|
||||
if (framesShot == duration) {
|
||||
framesShot = 0;
|
||||
currentFrame = 0;
|
||||
noise.stop();
|
||||
}
|
||||
|
||||
noise.play();
|
||||
|
||||
projectile.setShooter((GameSprite *) shooter);
|
||||
double newWidth = shooter->getTarget() == nullptr ? projectile.getRange() : GameSprite::distance(shooter->getPosition(), shooter->getTarget()->getPosition());
|
||||
projectile.setTextureRect(sf::IntRect(projectile.getTextureRect().left, projectile.getTextureRect().top, newWidth > projectile.getRange() ? projectile.getRange() * (1/projectile.getScale().x) : newWidth * (1/projectile.getScale().x), projectile.getTextureRect().height));
|
||||
projectile.setOrigin(0, projectile.getLocalBounds().height/2);
|
||||
projectile.setDirection(shooter->getTarget() == nullptr ? shooter->getDirection() : -GameSprite::getAimAngle(shooter->getTarget()->getPosition(), shooter->getPosition()));
|
||||
projectile.setPosition(shooter->getPosition());
|
||||
|
||||
return new Shootable(projectile);
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue