mirror of
https://github.com/ApfelTeeSaft/PlanetFleet.git
synced 2026-08-26 19:33:38 +00:00
changed namespace
This commit is contained in:
+20
-24
@@ -3,33 +3,29 @@
|
||||
|
||||
#include "missile.h"
|
||||
|
||||
using namespace game::core;
|
||||
using namespace game::util;
|
||||
using namespace vb01;
|
||||
|
||||
namespace game{
|
||||
namespace content{
|
||||
Missile::Missile(Unit *unit, Node *node, Vector3 *target, Vector3 pos, Vector3 dir, Vector3 left, Vector3 up, int id, int weaponTypeId, int weaponId) :
|
||||
Projectile(unit, node, pos, dir, left, up, id, weaponTypeId, weaponId) {
|
||||
this->target = target;
|
||||
this->type = (MissileType)weaponId;
|
||||
this->initTime = getTime();
|
||||
}
|
||||
|
||||
void Missile::update() {
|
||||
Projectile::update();
|
||||
pos = pos + dirVec * speed;
|
||||
node->setPosition(pos);
|
||||
float angle = dirVec.getAngleBetween(*target - pos);
|
||||
Vector3 axis = dirVec.cross(*target - pos).norm();
|
||||
namespace battleship{
|
||||
Missile::Missile(Unit *unit, Node *node, Vector3 *target, Vector3 pos, Vector3 dir, Vector3 left, Vector3 up, int id, int weaponTypeId, int weaponId) :
|
||||
Projectile(unit, node, pos, dir, left, up, id, weaponTypeId, weaponId) {
|
||||
this->target = target;
|
||||
this->type = (MissileType)weaponId;
|
||||
this->initTime = getTime();
|
||||
}
|
||||
|
||||
void Missile::update() {
|
||||
Projectile::update();
|
||||
pos = pos + dirVec * speed;
|
||||
node->setPosition(pos);
|
||||
float angle = dirVec.getAngleBetween(*target - pos);
|
||||
Vector3 axis = dirVec.cross(*target - pos).norm();
|
||||
|
||||
if(rotationSpeed / 180 * PI < angle){
|
||||
Quaternion rotQuat = Quaternion(rotationSpeed / 180 * PI, axis);
|
||||
orientProjectile(rotQuat * dirVec);
|
||||
}
|
||||
|
||||
if(!exploded && getTime() - initTime > selfDistructTime)
|
||||
Projectile::explode(nullptr);
|
||||
if(rotationSpeed / 180 * PI < angle){
|
||||
Quaternion rotQuat = Quaternion(rotationSpeed / 180 * PI, axis);
|
||||
orientProjectile(rotQuat * dirVec);
|
||||
}
|
||||
|
||||
if(!exploded && getTime() - initTime > selfDistructTime)
|
||||
Projectile::explode(nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user