#include "entityCreator.h"
-#include <queue>
+#include <bear/Queue.h>
#include "entityManager.h"
#include "input/inputManager.h"
#include "Entities/Ball.h"
+#include "Entities/Polygon.h"
#include "graphics/colors.h"
/// ***** Private Variables *****
-typedef std::queue<Ball*> queBall;
+//static bear::Queue<int> s_test;
-queBall startBalls;
-queBall mouseBalls;
+typedef bear::Queue<Ball*> queBall;
+typedef bear::Queue<Polygon*> quePoly;
+
+static queBall s_startBalls;
+static queBall s_mouseBalls;
+
+static quePoly s_startPolys;
/// ***** Private Method Headers *****
-Ball* addBall(const Vector2& pos,
- float radius,
- const float* color,
- queBall& que);
+static Ball* addBall(const Vector2& vecPos,
+ float fRadius,
+ const float* color,
+ queBall& que);
+
+static Polygon* addPoly(const vector<Vector2>& vecPoints,
+ const float* color,
+ quePoly& que);
-void removeBall(queBall& que);
-void removeAllBalls(queBall& que);
+static void removeBall(queBall& que);
+static void removeAllBalls(queBall& que);
+
+static void removePoly(quePoly& que);
+static void removeAllPolys(quePoly& que);
/// ***** Initializers/Cleaners *****
void creator::init()
{
- Ball* ball;
- float startMass = 5;
+ Ball* pBall;
+ float fStartMass = 5;
+
+ s_startBalls.init();
+ s_mouseBalls.init();
+
+ s_startPolys.init();
- ball = addBall(Vector2(50, 50), 20, cWhite, startBalls);
- ball->mass = startMass;
+ pBall = addBall(Vector2(50, 50), 20, cWhite, s_startBalls);
+ pBall->mass = fStartMass;
- ball = addBall(Vector2(150, 50), 20, cGrey, startBalls);
- ball->mass = startMass;
+ pBall = addBall(Vector2(150, 50), 20, cGrey, s_startBalls);
+ pBall->mass = fStartMass;
- ball = addBall(Vector2(50, 100), 20, cRed, startBalls);
- ball->mass = startMass;
+ pBall = addBall(Vector2(50, 100), 20, cRed, s_startBalls);
+ pBall->mass = fStartMass;
- ball = addBall(Vector2(100, 100), 20, cGreen, startBalls);
- ball->mass = startMass;
+ pBall = addBall(Vector2(100, 100), 20, cGreen, s_startBalls);
+ pBall->mass = fStartMass;
- ball = addBall(Vector2(150, 100), 20, cBlue, startBalls);
- ball->mass = startMass;
+ pBall = addBall(Vector2(150, 100), 20, cBlue, s_startBalls);
+ pBall->mass = fStartMass;
- ball = addBall(Vector2(50, 150), 20, cYellow, startBalls);
- ball->mass = startMass;
+ pBall = addBall(Vector2(50, 150), 20, cYellow, s_startBalls);
+ pBall->mass = fStartMass;
- ball = addBall(Vector2(100, 150), 20, cMagenta, startBalls);
- ball->mass = startMass;
+ pBall = addBall(Vector2(100, 150), 20, cMagenta, s_startBalls);
+ pBall->mass = fStartMass;
- ball = addBall(Vector2(150, 150), 20, cCyan, startBalls);
- ball->mass = startMass;
+ pBall = addBall(Vector2(150, 150), 20, cCyan, s_startBalls);
+ pBall->mass = fStartMass;
- for( int i = 0; i<100; i++)
+
+ for( int i = 0; i < 50; i++)
{
- addBall(Vector2(200+i*2, 200+i*2), 10, cCyan);
+ addBall(Vector2(200 + i * 2, 200 + i * 2), 10, cCyan);
}
+
+
+ vector<Vector2> points;
+ points.push_back(Vector2(500,500));
+ points.push_back(Vector2(300,500));
+ points.push_back(Vector2(500,300));
+
+ addPoly(points, cRed, s_startPolys);
}
void creator::clean()
{
- removeAllBalls(startBalls);
- removeAllBalls(mouseBalls);
+ removeAllPolys(s_startPolys);
+ s_startPolys.fini();
+
+ removeAllBalls(s_mouseBalls);
+ s_mouseBalls.fini();
+
+ removeAllBalls(s_startBalls);
+ s_startBalls.fini();
}
/// ***** Public Methods *****
void creator::addBall(const Vector2& pos, float radius, const float* color)
{
- addBall(pos, radius, color, mouseBalls);
+ addBall(pos, radius, color, s_mouseBalls);
}
void creator::removeBall()
{
- removeBall(mouseBalls);
+ removeBall(s_mouseBalls);
}
void creator::removeAllBalls()
{
- removeAllBalls(mouseBalls);
+ removeAllBalls(s_mouseBalls);
}
void creator::handleInput()
if(input::mouseLeft())
addBall(input::mousePosition(), 10, cCyan);
- if(input::mouseRight() && ! mouseBalls.empty())
+ if(input::mouseRight() && ! s_mouseBalls.isEmpty())
removeBall();
}
/// ***** Private Methods *****
-Ball* addBall(const Vector2& pos,
- float radius,
- const float* color,
- queBall& que)
+Ball* addBall(const Vector2& vecPos,
+ float fRadius,
+ const float* color,
+ queBall& que)
{
- Ball* ball = new Ball(pos, radius, color);
+ Ball* pBall = new Ball(vecPos, fRadius, color);
- que.push(ball);
- manager::add(ball);
+ que.pushBack(pBall);
+ manager::add(pBall);
- return ball;
+ return pBall;
+}
+Polygon* addPoly(const vector<Vector2>& vecPoints,
+ const float* color,
+ quePoly& que)
+{
+ Polygon* pPoly = new Polygon(vecPoints, color);
+
+ que.pushBack(pPoly);
+ manager::add(pPoly);
+
+ return pPoly;
}
void removeBall(queBall& que)
{
- Ball* ball = que.front();
+ Ball* pBall = que.getFront();
- manager::remove(ball);
- que.pop();
+ manager::remove(pBall);
+ que.popFront();
- delete ball;
+ delete pBall;
}
void removeAllBalls(queBall& que)
{
- while(! que.empty() )
+ while(! que.isEmpty() )
{
- Ball* ball = que.front();
- que.pop();
- manager::remove(ball);
+ removeBall(que);
+ }
+}
- delete ball;
+static void removePoly(quePoly& que)
+{
+ Polygon* pPoly = que.getFront();
+
+ manager::remove(pPoly);
+ que.popFront();
+
+ delete pPoly;
+}
+static void removeAllPolys(quePoly& que)
+{
+ while(! que.isEmpty() )
+ {
+ removePoly(que);
}
}