Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

[xonotic/netradiant.git] / plugins / entity / colour.h

diff --git a/plugins/entity/colour.h b/plugins/entity/colour.h
index ae209d239e29425a70110c77215a8b7ab5b3da4c..86e0deb60037900f6e2c863a239dc3c1946135d9 100644 (file)
--- a/plugins/entity/colour.h
+++ b/plugins/entity/colour.h
@@ -30,76 +30,62 @@
 #include "generic/callback.h"
 #include "stringio.h"
 
-inline void default_colour(Vector3 &colour)
-{
-    colour = Vector3(1, 1, 1);
+inline void default_colour( Vector3& colour ){
+       colour = Vector3( 1, 1, 1 );
+}
+inline void read_colour( Vector3& colour, const char* value ){
+       if ( !string_parse_vector3( value, colour ) ) {
+               default_colour( colour );
+       }
 }
+inline void write_colour( const Vector3& colour, Entity* entity ){
+       char value[64];
 
-inline void read_colour(Vector3 &colour, const char *value)
-{
-    if (!string_parse_vector3(value, colour)) {
-        default_colour(colour);
-    }
+       sprintf( value, "%f %f %f", colour[0], colour[1], colour[2] );
+       entity->setKeyValue( "_color", value );
 }
 
-inline void write_colour(const Vector3 &colour, Entity *entity)
+class Colour
 {
-    char value[64];
+Callback<void()> m_colourChanged;
+Shader* m_state;
 
-    sprintf(value, "%f %f %f", colour[0], colour[1], colour[2]);
-    entity->setKeyValue("_color", value);
+void capture_state(){
+       m_state = colour_capture_state_fill( m_colour );
+}
+void release_state(){
+       colour_release_state_fill( m_colour );
 }
-
-class Colour {
-    Callback<void()> m_colourChanged;
-    Shader *m_state;
-
-    void capture_state()
-    {
-        m_state = colour_capture_state_fill(m_colour);
-    }
-
-    void release_state()
-    {
-        colour_release_state_fill(m_colour);
-    }
 
 public:
-    Vector3 m_colour;
+Vector3 m_colour;
 
-    Colour(const Callback<void()> &colourChanged)
-            : m_colourChanged(colourChanged)
-    {
-        default_colour(m_colour);
-        capture_state();
-    }
-
-    ~Colour()
-    {
-        release_state();
-    }
-
-    void colourChanged(const char *value)
-    {
-        release_state();
-        read_colour(m_colour, value);
-        capture_state();
+Colour( const Callback<void()>& colourChanged )
+       : m_colourChanged( colourChanged ){
+       default_colour( m_colour );
+       capture_state();
+}
+~Colour(){
+       release_state();
+}
 
-        m_colourChanged();
-    }
+void colourChanged( const char* value ){
+       release_state();
+       read_colour( m_colour, value );
+       capture_state();
 
-    typedef MemberCaller<Colour, void(const char *), &Colour::colourChanged> ColourChangedCaller;
+       m_colourChanged();
+}
+typedef MemberCaller<Colour, void(const char*), &Colour::colourChanged> ColourChangedCaller;
 
 
-    void write(Entity *entity) const
-    {
-        write_colour(m_colour, entity);
-    }
+void write( Entity* entity ) const {
+       write_colour( m_colour, entity );
+}
 
-    Shader *state() const
-    {
-        return m_state;
-    }
+Shader* state() const {
+       return m_state;
+}
 };
 
 #endif