diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/controllable.h | 6 | ||||
-rw-r--r-- | src/components/droppable.h | 2 | ||||
-rw-r--r-- | src/components/ponderable.h | 2 | ||||
-rw-r--r-- | src/components/transformable.cpp | 2 | ||||
-rw-r--r-- | src/components/transformable.h | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/components/controllable.h b/src/components/controllable.h index 317d68d..baccf13 100644 --- a/src/components/controllable.h +++ b/src/components/controllable.h | |||
@@ -14,20 +14,20 @@ class ControllableComponent : public Component { | |||
14 | void setJumpKey(int k); | 14 | void setJumpKey(int k); |
15 | int getDropKey() const; | 15 | int getDropKey() const; |
16 | void setDropKey(int k); | 16 | void setDropKey(int k); |
17 | 17 | ||
18 | bool isFrozen() const; | 18 | bool isFrozen() const; |
19 | void setFrozen(bool f); | 19 | void setFrozen(bool f); |
20 | bool isHoldingLeft() const; | 20 | bool isHoldingLeft() const; |
21 | void setHoldingLeft(bool f); | 21 | void setHoldingLeft(bool f); |
22 | bool isHoldingRight() const; | 22 | bool isHoldingRight() const; |
23 | void setHoldingRight(bool f); | 23 | void setHoldingRight(bool f); |
24 | 24 | ||
25 | private: | 25 | private: |
26 | int leftKey = GLFW_KEY_LEFT; | 26 | int leftKey = GLFW_KEY_LEFT; |
27 | int rightKey = GLFW_KEY_RIGHT; | 27 | int rightKey = GLFW_KEY_RIGHT; |
28 | int jumpKey = GLFW_KEY_UP; | 28 | int jumpKey = GLFW_KEY_UP; |
29 | int dropKey = GLFW_KEY_DOWN; | 29 | int dropKey = GLFW_KEY_DOWN; |
30 | 30 | ||
31 | bool frozen = false; | 31 | bool frozen = false; |
32 | bool holdingLeft = false; | 32 | bool holdingLeft = false; |
33 | bool holdingRight = false; | 33 | bool holdingRight = false; |
diff --git a/src/components/droppable.h b/src/components/droppable.h index 1f5608b..83fcb9d 100644 --- a/src/components/droppable.h +++ b/src/components/droppable.h | |||
@@ -7,7 +7,7 @@ class DroppableComponent : public Component { | |||
7 | public: | 7 | public: |
8 | void setDroppable(bool can); | 8 | void setDroppable(bool can); |
9 | bool isDroppable() const; | 9 | bool isDroppable() const; |
10 | 10 | ||
11 | private: | 11 | private: |
12 | bool droppable = false; | 12 | bool droppable = false; |
13 | }; | 13 | }; |
diff --git a/src/components/ponderable.h b/src/components/ponderable.h index 5aab4b3..c836d2a 100644 --- a/src/components/ponderable.h +++ b/src/components/ponderable.h | |||
@@ -13,7 +13,7 @@ class PonderableComponent : public Component { | |||
13 | void setAccelX(double v); | 13 | void setAccelX(double v); |
14 | double getAccelY() const; | 14 | double getAccelY() const; |
15 | void setAccelY(double v); | 15 | void setAccelY(double v); |
16 | 16 | ||
17 | private: | 17 | private: |
18 | double velocityX = 0.0; | 18 | double velocityX = 0.0; |
19 | double velocityY = 0.0; | 19 | double velocityY = 0.0; |
diff --git a/src/components/transformable.cpp b/src/components/transformable.cpp index 0d6b67e..89b1e5d 100644 --- a/src/components/transformable.cpp +++ b/src/components/transformable.cpp | |||
@@ -3,7 +3,7 @@ | |||
3 | TransformableComponent::TransformableComponent(double x, double y, int w, int h) | 3 | TransformableComponent::TransformableComponent(double x, double y, int w, int h) |
4 | : x(x), y(y), w(w), h(h) | 4 | : x(x), y(y), w(w), h(h) |
5 | { | 5 | { |
6 | 6 | ||
7 | } | 7 | } |
8 | 8 | ||
9 | double TransformableComponent::getX() const | 9 | double TransformableComponent::getX() const |
diff --git a/src/components/transformable.h b/src/components/transformable.h index 87ba84d..69f4f0e 100644 --- a/src/components/transformable.h +++ b/src/components/transformable.h | |||
@@ -6,17 +6,17 @@ | |||
6 | class TransformableComponent : public Component { | 6 | class TransformableComponent : public Component { |
7 | public: | 7 | public: |
8 | TransformableComponent(double x, double y, int w, int h); | 8 | TransformableComponent(double x, double y, int w, int h); |
9 | 9 | ||
10 | double getX() const; | 10 | double getX() const; |
11 | double getY() const; | 11 | double getY() const; |
12 | int getW() const; | 12 | int getW() const; |
13 | int getH() const; | 13 | int getH() const; |
14 | 14 | ||
15 | void setX(double v); | 15 | void setX(double v); |
16 | void setY(double v); | 16 | void setY(double v); |
17 | void setW(int v); | 17 | void setW(int v); |
18 | void setH(int v); | 18 | void setH(int v); |
19 | 19 | ||
20 | private: | 20 | private: |
21 | double x; | 21 | double x; |
22 | double y; | 22 | double y; |