projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finished changes to deps directory building
[physics.git]
/
src
/
Entities
/
Ball.cpp
diff --git
a/src/Entities/Ball.cpp
b/src/Entities/Ball.cpp
index
b3ca115
..
e235739
100644
(file)
--- a/
src/Entities/Ball.cpp
+++ b/
src/Entities/Ball.cpp
@@
-16,16
+16,18
@@
*/
#include "Ball.h"
*/
#include "Ball.h"
-#include "../debug.h"
-#include "../Vector2.h"
-#include "../graphics/graphics.h"
+#include <bear/debug.h>
+#include <bear/Vector2.h>
+using namespace bear;
+
+#include "graphics/graphics.h"
/// ***** Constructors/Destructors *****
Ball::Ball(const Vector2& pos, float radius, const float* color)
/// ***** Constructors/Destructors *****
Ball::Ball(const Vector2& pos, float radius, const float* color)
- : PhysicsEntity(pos),
radius(radius),
color(color)
+ : PhysicsEntity(pos),
m_radius(radius), m_
color(color)
{
}
{
}
@@
-38,10
+40,10
@@
Ball::~Ball()
void Ball::draw() const
{
void Ball::draw() const
{
- graphics::drawCircle(
radius, position,
color);
+ graphics::drawCircle(
m_radius, m_position, m_
color);
}
float Ball::getRadius() const
{
}
float Ball::getRadius() const
{
- return radius;
+ return
m_
radius;
}
}