diff options
Diffstat (limited to 'game/player/PlayerBulletScript.cpp')
| -rw-r--r-- | game/player/PlayerBulletScript.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/game/player/PlayerBulletScript.cpp b/game/player/PlayerBulletScript.cpp index 50b6617..2bd067d 100644 --- a/game/player/PlayerBulletScript.cpp +++ b/game/player/PlayerBulletScript.cpp @@ -17,7 +17,9 @@ void PlayerBulletScript::fixed_update(crepe::duration_t dt){ Transform& transform = this->get_component<Transform>(); Camera& camera = this->get_components_by_name<Camera>("camera").front(); Transform& cam_transform = this->get_components_by_name<Transform>("camera").front(); - + Rigidbody& bullet_body = this->get_component<Rigidbody>(); + transform.rotation += bullet_body.data.angular_velocity; + transform.position += bullet_body.data.linear_velocity * dt.count(); vec2 half_screen = camera.viewport_size / 2; float despawn_location = cam_transform.position.x + half_screen.x + 50; if(transform.position.x > despawn_location){ @@ -29,11 +31,13 @@ void PlayerBulletScript::despawn_bullet(){ Transform& transform = this->get_component<Transform>(); Rigidbody& bullet_body = this->get_component<Rigidbody>(); bullet_body.active = false; + BehaviorScript& bullet_script = this->get_component<BehaviorScript>(); + bullet_script.active = false; transform.position = {0,-850}; } bool PlayerBulletScript::on_collide(const CollisionEvent& e){ - cout << "collision happened with " << e.info.other.metadata.tag << endl; - //this->despawn_bullet(); + cout << "player bullet collision happened with " << e.info.other.metadata.tag << endl; + this->despawn_bullet(); return false; } |