From f696350881eeeaf319c29e615cabaa351c55eb12 Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Sun, 23 May 2010 19:15:11 +0200 Subject: Changed BulletPattern::update to not take time and step arguments. Also updated patterns. --- engine/bulletpattern.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'engine/bulletpattern.cpp') diff --git a/engine/bulletpattern.cpp b/engine/bulletpattern.cpp index b4b5a31..b9a0bbd 100644 --- a/engine/bulletpattern.cpp +++ b/engine/bulletpattern.cpp @@ -7,7 +7,7 @@ #include "bulletpattern.h" BulletPattern::BulletPattern() { - num_bullets = stride = color_g = color_b = 0; + num_bullets = stride = steps = color_g = color_b = 0; color_r = 1; bullets = new float[2048]; @@ -16,18 +16,19 @@ BulletPattern::BulletPattern() { for(float i = 0; i < M_PI * 16; i += 0.1) { bullets[k++] = 0.5 + cosf(i) * 0.05; bullets[k++] = 0.5 + sinf(i) * 0.05; - bullets[k++] = cosf(i) / 10000.0; - bullets[k++] = sinf(i) / 10000.0; + bullets[k++] = cosf(i) / 1000.0; + bullets[k++] = sinf(i) / 1000.0; } } -void BulletPattern::update(unsigned int time, unsigned int step) { - while(num_bullets < 503 && num_bullets * 4 < time) { +void BulletPattern::update() { + steps++; + while(num_bullets < 503 && num_bullets / 2 < steps) { num_bullets++; } for(int i = 0; i < num_bullets; i++) { - bullets[i*4] += bullets[i*4 + 2] * step; - bullets[i*4 + 1] += bullets[i*4 + 3] * step; + bullets[i*4] += bullets[i*4 + 2]; + bullets[i*4 + 1] += bullets[i*4 + 3]; } } -- cgit v1.2.3