aboutsummaryrefslogtreecommitdiff
path: root/scene/resources/world.h
diff options
context:
space:
mode:
authorRémi Verschelde2017-03-05 16:44:50 +0100
committerRémi Verschelde2017-03-05 16:44:50 +0100
commit5dbf1809c6e3e905b94b8764e99491e608122261 (patch)
tree5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /scene/resources/world.h
parent45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff)
downloadgodot-5dbf180.tar.gz
godot-5dbf180.tar.zst
godot-5dbf180.zip
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/resources/world.h')
-rw-r--r--scene/resources/world.h29
1 files changed, 13 insertions, 16 deletions
diff --git a/scene/resources/world.h b/scene/resources/world.h
index 1ad60f340..a597633ca 100644
--- a/scene/resources/world.h
+++ b/scene/resources/world.h
@@ -30,9 +30,9 @@
#define WORLD_H
#include "resource.h"
+#include "scene/resources/environment.h"
#include "servers/physics_server.h"
#include "servers/visual_server.h"
-#include "scene/resources/environment.h"
class SpatialIndexer;
class Camera;
@@ -41,42 +41,39 @@ class VisibilityNotifier;
class World : public Resource {
GDCLASS(World, Resource);
RES_BASE_EXTENSION("wrd");
+
private:
RID space;
RID scenario;
- SpatialIndexer* indexer;
+ SpatialIndexer *indexer;
Ref<Environment> environment;
protected:
-
static void _bind_methods();
-friend class Camera;
-friend class VisibilityNotifier;
+ friend class Camera;
+ friend class VisibilityNotifier;
- void _register_camera(Camera* p_camera);
- void _update_camera(Camera* p_camera);
- void _remove_camera(Camera* p_camera);
+ void _register_camera(Camera *p_camera);
+ void _update_camera(Camera *p_camera);
+ void _remove_camera(Camera *p_camera);
- void _register_notifier(VisibilityNotifier* p_notifier,const Rect3& p_rect);
- void _update_notifier(VisibilityNotifier *p_notifier,const Rect3& p_rect);
- void _remove_notifier(VisibilityNotifier* p_notifier);
-friend class Viewport;
+ void _register_notifier(VisibilityNotifier *p_notifier, const Rect3 &p_rect);
+ void _update_notifier(VisibilityNotifier *p_notifier, const Rect3 &p_rect);
+ void _remove_notifier(VisibilityNotifier *p_notifier);
+ friend class Viewport;
void _update(uint64_t p_frame);
-
public:
-
RID get_space() const;
RID get_scenario() const;
- void set_environment(const Ref<Environment>& p_environment);
+ void set_environment(const Ref<Environment> &p_environment);
Ref<Environment> get_environment() const;
PhysicsDirectSpaceState *get_direct_space_state();
World();
~World();
-
};
#endif // WORLD_H