summaryrefslogtreecommitdiff
path: root/scene/3d/room_instance.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-03-05 16:44:50 +0100
committerRémi Verschelde <rverschelde@gmail.com>2017-03-05 16:44:50 +0100
commit5dbf1809c6e3e905b94b8764e99491e608122261 (patch)
tree5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /scene/3d/room_instance.h
parent45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff)
A Whole New World (clang-format edition)
I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
Diffstat (limited to 'scene/3d/room_instance.h')
-rw-r--r--scene/3d/room_instance.h25
1 files changed, 5 insertions, 20 deletions
diff --git a/scene/3d/room_instance.h b/scene/3d/room_instance.h
index cbc1b12b7e..68be5eecf2 100644
--- a/scene/3d/room_instance.h
+++ b/scene/3d/room_instance.h
@@ -36,7 +36,6 @@
@author Juan Linietsky <reduzio@gmail.com>
*/
-
/* RoomInstance Logic:
a) Instances that belong to the room are drawn only if the room is visible (seen through portal, or player inside)
b) Instances that don't belong to any room are considered to belong to the root room (RID empty)
@@ -44,52 +43,38 @@
*/
-
-
-
class Room : public VisualInstance {
- GDCLASS( Room, VisualInstance );
-public:
-
-
-
+ GDCLASS(Room, VisualInstance);
+public:
private:
Ref<RoomBounds> room;
-
int level;
- void _parse_node_faces(PoolVector<Face3> &all_faces,const Node *p_node) const;
-
+ void _parse_node_faces(PoolVector<Face3> &all_faces, const Node *p_node) const;
void _bounds_changed();
-
protected:
-
void _notification(int p_what);
static void _bind_methods();
public:
-
enum {
// used to notify portals that the room in which they are has changed.
- NOTIFICATION_AREA_CHANGED=60
+ NOTIFICATION_AREA_CHANGED = 60
};
virtual Rect3 get_aabb() const;
virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const;
- void set_room( const Ref<RoomBounds>& p_room );
+ void set_room(const Ref<RoomBounds> &p_room);
Ref<RoomBounds> get_room() const;
-
Room();
~Room();
-
};
-
#endif // ROOM_INSTANCE_H