summary refs log tree commit diff stats
path: root/src/components
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2018-05-04 00:08:35 -0400
committerKelly Rauchenberger <fefferburbia@gmail.com>2018-05-09 17:59:13 -0400
commit69c04dfb6c49e7b2d34a6699c071f037880fbde5 (patch)
tree2cab984cb5723dfdda00bd2f4062ebaac0222be1 /src/components
parent83f51a6892629921b4cc482b986656a0a5cc5f6a (diff)
downloadtherapy-69c04dfb6c49e7b2d34a6699c071f037880fbde5.tar.gz
therapy-69c04dfb6c49e7b2d34a6699c071f037880fbde5.tar.bz2
therapy-69c04dfb6c49e7b2d34a6699c071f037880fbde5.zip
Added ferrying (buggy)
A freefalling body is considered to be "ferried" if it is grounded by another body (not a map). Its location is then dependent on the ferry's location; in this way, the ferry carries the passenger around.

This implementation is kind of buggy currently: first of all, ferrying does not work vertically upward, because the ferry will consider the passenger to be a wall and will not continue moving upward.

Second, ferries are not processed before passengers, so passengers can move in a physics tick using the knowledge of a ferry's location before it moves in that tick.

Third, if the transform coordinates are set by any system other than the PonderingSystem, the relative coordinates to the ferry will not be updated and the body will not be unferried if necessary.

This is still a cool commit because, three years later, we have finally overcome the issue that stopped development on the original branch in 2015.
Diffstat (limited to 'src/components')
-rw-r--r--src/components/ponderable.h33
1 files changed, 33 insertions, 0 deletions
diff --git a/src/components/ponderable.h b/src/components/ponderable.h index 5354f87..45150a0 100644 --- a/src/components/ponderable.h +++ b/src/components/ponderable.h
@@ -1,11 +1,15 @@
1#ifndef TANGIBLE_H_746DB3EE 1#ifndef TANGIBLE_H_746DB3EE
2#define TANGIBLE_H_746DB3EE 2#define TANGIBLE_H_746DB3EE
3 3
4#include <set>
4#include "component.h" 5#include "component.h"
6#include "entity_manager.h"
5 7
6class PonderableComponent : public Component { 8class PonderableComponent : public Component {
7public: 9public:
8 10
11 using id_type = EntityManager::id_type;
12
9 /** 13 /**
10 * List of different types of physical bodies. 14 * List of different types of physical bodies.
11 * 15 *
@@ -67,6 +71,35 @@ public:
67 bool grounded = false; 71 bool grounded = false;
68 72
69 /** 73 /**
74 * Whether or not a freefalling body is being ferried by another body.
75 *
76 * @managed_by PonderingSystem
77 */
78 bool ferried = false;
79
80 /**
81 * The entity that is ferrying this body, if there is one.
82 *
83 * @managed_by PonderingSystem
84 */
85 id_type ferry;
86
87 /**
88 * The location of the body relative to the location of its ferry.
89 *
90 * @managed_by PonderingSystem
91 */
92 double relX;
93 double relY;
94
95 /**
96 * The bodies that are being ferried by this body.
97 *
98 * @managed_by PonderingSystem
99 */
100 std::set<id_type> passengers;
101
102 /**
70 * If enabled, this will prevent the body from moving. 103 * If enabled, this will prevent the body from moving.
71 */ 104 */
72 bool frozen = false; 105 bool frozen = false;