my own uncrustify run

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

diff --git a/plugins/entity/modelskinkey.h b/plugins/entity/modelskinkey.h
index 58c7da247665b1a801bf2ff91737159f63a30a50..34d9111201a79cc2c1f5aa554d50cf0985cf87d2 100644 (file)
--- a/plugins/entity/modelskinkey.h
+++ b/plugins/entity/modelskinkey.h
@@ -1,25 +1,25 @@
 /*
-Copyright (C) 2001-2006, William Joseph.
-All Rights Reserved.
+   Copyright (C) 2001-2006, William Joseph.
+   All Rights Reserved.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   GtkRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GtkRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
-#if !defined(INCLUDED_MODELSKINKEY_H)
+#if !defined( INCLUDED_MODELSKINKEY_H )
 #define INCLUDED_MODELSKINKEY_H
 
 #include "modelskin.h"
@@ -30,82 +30,70 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "entitylib.h"
 #include "traverselib.h"
 
-inline void parseTextureName(CopiedString& name, const char* token)
-{
-  StringOutputStream cleaned(256);
-  cleaned << PathCleaned(token);
-  name = StringRange(cleaned.c_str(), path_get_filename_base_end(cleaned.c_str())); // remove extension
+inline void parseTextureName( CopiedString& name, const char* token ){
+       StringOutputStream cleaned( 256 );
+       cleaned << PathCleaned( token );
+       name = StringRange( cleaned.c_str(), path_get_filename_base_end( cleaned.c_str() ) ); // remove extension
 }
 
 class ModelSkinKey : public ModuleObserver
 {
-  CopiedString m_name;
-  ModelSkin* m_skin;
-  Callback m_skinChangedCallback;
-
-  ModelSkinKey(const ModelSkinKey&);
-  ModelSkinKey operator=(const ModelSkinKey&);
-
-  void construct()
-  {
-    m_skin = &GlobalModelSkinCache().capture(m_name.c_str());
-    m_skin->attach(*this);
-  }
-  void destroy()
-  {
-    m_skin->detach(*this);
-    GlobalModelSkinCache().release(m_name.c_str());
-  }
+CopiedString m_name;
+ModelSkin* m_skin;
+Callback m_skinChangedCallback;
+
+ModelSkinKey( const ModelSkinKey& );
+ModelSkinKey operator=( const ModelSkinKey& );
+
+void construct(){
+       m_skin = &GlobalModelSkinCache().capture( m_name.c_str() );
+       m_skin->attach( *this );
+}
+void destroy(){
+       m_skin->detach( *this );
+       GlobalModelSkinCache().release( m_name.c_str() );
+}
 
 public:
-  ModelSkinKey(const Callback& skinChangedCallback) : m_skinChangedCallback(skinChangedCallback)
-  {
-    construct();
-  }
-  ~ModelSkinKey()
-  {
-    destroy();
-  }
-  ModelSkin& get() const
-  {
-    return *m_skin;
-  }
-  void skinChanged(const char* value)
-  {
-    destroy();
-    parseTextureName(m_name, value);
-    construct();
-  }
-  typedef MemberCaller1<ModelSkinKey, const char*, &ModelSkinKey::skinChanged> SkinChangedCaller;
-
-  void realise()
-  {
-    m_skinChangedCallback();
-  }
-  void unrealise()
-  {
-  }
+ModelSkinKey( const Callback& skinChangedCallback ) : m_skinChangedCallback( skinChangedCallback ){
+       construct();
+}
+~ModelSkinKey(){
+       destroy();
+}
+ModelSkin& get() const {
+       return *m_skin;
+}
+void skinChanged( const char* value ){
+       destroy();
+       parseTextureName( m_name, value );
+       construct();
+}
+typedef MemberCaller1<ModelSkinKey, const char*, &ModelSkinKey::skinChanged> SkinChangedCaller;
+
+void realise(){
+       m_skinChangedCallback();
+}
+void unrealise(){
+}
 };
 
 class InstanceSkinChanged : public scene::Instantiable::Visitor
 {
 public:
-  void visit(scene::Instance& instance) const
-  {
-    //\todo don't do this for instances that are not children of the entity setting the skin
-    SkinnedModel* skinned = InstanceTypeCast<SkinnedModel>::cast(instance);
-    if(skinned != 0)
-    {
-      skinned->skinChanged();
-    }
-  }
+void visit( scene::Instance& instance ) const {
+       //\todo don't do this for instances that are not children of the entity setting the skin
+       SkinnedModel* skinned = InstanceTypeCast<SkinnedModel>::cast( instance );
+       if ( skinned != 0 ) {
+               skinned->skinChanged();
+       }
+}
 };
 
-inline void Node_modelSkinChanged(scene::Node& node)
-{
-  scene::Instantiable* instantiable = Node_getInstantiable(node);
-  ASSERT_NOTNULL(instantiable);
-  instantiable->forEachInstance(InstanceSkinChanged());
+inline void Node_modelSkinChanged( scene::Node& node ){
+       scene::Instantiable* instantiable = Node_getInstantiable( node );
+       ASSERT_NOTNULL( instantiable );
+       instantiable->forEachInstance( InstanceSkinChanged() );
 }
 
 #endif