From 5dbf1809c6e3e905b94b8764e99491e608122261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 5 Mar 2017 16:44:50 +0100 Subject: 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 --- drivers/gl_context/context_gl.cpp | 19 +++++++------------ drivers/gl_context/context_gl.h | 24 +++++++++--------------- 2 files changed, 16 insertions(+), 27 deletions(-) (limited to 'drivers/gl_context') diff --git a/drivers/gl_context/context_gl.cpp b/drivers/gl_context/context_gl.cpp index e99ec93e11..9fe7fbf2b8 100644 --- a/drivers/gl_context/context_gl.cpp +++ b/drivers/gl_context/context_gl.cpp @@ -28,31 +28,26 @@ /*************************************************************************/ #include "context_gl.h" +#if defined(OPENGL_ENABLED) || defined(GLES2_ENABLED) -#if defined(OPENGL_ENABLED) || defined(GLES2_ENABLED) - - - -ContextGL *ContextGL::singleton=NULL; +ContextGL *ContextGL::singleton = NULL; ContextGL *ContextGL::get_singleton() { return singleton; } - ContextGL::ContextGL() { - + ERR_FAIL_COND(singleton); - - singleton=this; -} + singleton = this; +} ContextGL::~ContextGL() { - if (singleton==this) - singleton=NULL; + if (singleton == this) + singleton = NULL; } #endif diff --git a/drivers/gl_context/context_gl.h b/drivers/gl_context/context_gl.h index 535b492297..280da1aea6 100644 --- a/drivers/gl_context/context_gl.h +++ b/drivers/gl_context/context_gl.h @@ -37,34 +37,28 @@ @author Juan Linietsky */ - class ContextGL { static ContextGL *singleton; -public: +public: static ContextGL *get_singleton(); - - virtual void release_current()=0; - virtual void make_current()=0; + virtual void release_current() = 0; - virtual void swap_buffers()=0; - - virtual Error initialize()=0; + virtual void make_current() = 0; - virtual void set_use_vsync(bool p_use)=0; - virtual bool is_using_vsync() const=0; + virtual void swap_buffers() = 0; + virtual Error initialize() = 0; - - - ContextGL(); - ~ContextGL(); + virtual void set_use_vsync(bool p_use) = 0; + virtual bool is_using_vsync() const = 0; + ContextGL(); + ~ContextGL(); }; - #endif #endif -- cgit v1.2.3