summaryrefslogtreecommitdiff
path: root/scene/2d/tile_map.h
diff options
context:
space:
mode:
authorCarl Olsson <carl.olsson@gmail.com>2015-02-14 06:43:50 +1000
committerCarl Olsson <carl.olsson@gmail.com>2015-02-14 06:43:50 +1000
commit8bb1e19d7355ac92ec5cfe39fbb6db73d6c0fffe (patch)
treeb98892d157c013ecdbb9d54482ad464377229914 /scene/2d/tile_map.h
parent9d182e93a3d75396405733109f9f086969c4b19b (diff)
Replace body_mode property with use_kinematic flag.
Revert 2D Platformer demo's moving platforms to sprite plus body.
Diffstat (limited to 'scene/2d/tile_map.h')
-rw-r--r--scene/2d/tile_map.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/scene/2d/tile_map.h b/scene/2d/tile_map.h
index 52e8eae306..c8708e1bed 100644
--- a/scene/2d/tile_map.h
+++ b/scene/2d/tile_map.h
@@ -33,7 +33,6 @@
#include "scene/resources/tile_set.h"
#include "self_list.h"
#include "vset.h"
-#include "servers/physics_2d_server.h"
class TileMap : public Node2D {
@@ -61,7 +60,7 @@ private:
Mode mode;
Matrix32 custom_transform;
HalfOffset half_offset;
- Physics2DServer::BodyMode body_mode;
+ bool use_kinematic;
union PosKey {
@@ -179,8 +178,8 @@ public:
void set_collision_layer_mask(uint32_t p_layer);
uint32_t get_collision_layer_mask() const;
- void set_collision_body_mode(Physics2DServer::BodyMode p_body_mode);
- Physics2DServer::BodyMode get_collision_body_mode() const;
+ void set_collision_use_kinematic(bool p_use_kinematic);
+ bool get_collision_use_kinematic() const;
void set_collision_friction(float p_friction);
float get_collision_friction() const;