diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
| commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
| tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /scene/3d/portal.h | |
| parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (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/portal.h')
| -rw-r--r-- | scene/3d/portal.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/scene/3d/portal.h b/scene/3d/portal.h index 077924c7e8..018708308f 100644 --- a/scene/3d/portal.h +++ b/scene/3d/portal.h @@ -34,14 +34,11 @@ @author Juan Linietsky <reduzio@gmail.com> */ - /* Portal Logic: If a portal is placed next (very close to) a similar, opposing portal, they automatically connect, otherwise, a portal connects to the parent room */ - - class Portal : public VisualInstance { GDCLASS(Portal, VisualInstance); @@ -56,17 +53,14 @@ class Portal : public VisualInstance { Rect3 aabb; - protected: - - bool _set(const StringName& p_name, const Variant& p_value); - bool _get(const StringName& p_name,Variant &r_ret) const; - void _get_property_list( List<PropertyInfo> *p_list) const; + bool _set(const StringName &p_name, const Variant &p_value); + bool _get(const StringName &p_name, Variant &r_ret) const; + void _get_property_list(List<PropertyInfo> *p_list) const; static void _bind_methods(); public: - virtual Rect3 get_aabb() const; virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const; @@ -76,10 +70,10 @@ public: void set_disable_distance(float p_distance); float get_disable_distance() const; - void set_disabled_color(const Color& p_disabled_color); + void set_disabled_color(const Color &p_disabled_color); Color get_disabled_color() const; - void set_shape(const Vector<Point2>& p_shape); + void set_shape(const Vector<Point2> &p_shape); Vector<Point2> get_shape() const; void set_connect_range(float p_range); @@ -87,7 +81,6 @@ public: Portal(); ~Portal(); - }; #endif |