Changeset 9757 in orxonox.OLD for branches/new_class_id/src/lib

Timestamp:

Sep 18, 2006, 10:06:19 PM (18 years ago)

Author:

bensch

Message:

new_class_id: hups… this was bad naming… confusing too.

Location:

branches/new_class_id/src/lib

Files:

• coord/p_node.cc (modified) (1 diff)
• graphics/effects/cloud_effect.cc (modified) (1 diff)
• graphics/effects/fog_effect.cc (modified) (1 diff)
• graphics/effects/lightning_effect.cc (modified) (1 diff)
• graphics/effects/rain_effect.cc (modified) (1 diff)
• graphics/effects/snow_effect.cc (modified) (1 diff)
• gui/gl/glgui_box.cc (modified) (2 diffs)
• gui/gl/glgui_frame.cc (modified) (2 diffs)
• lang/class_id.h (modified) (2 diffs)
• lang/object_list.cc (modified) (2 diffs)
• lang/object_list.h (modified) (1 diff)
• network/network_game_manager.cc (modified) (5 diffs)
• network/network_stream.cc (modified) (4 diffs)
• network/synchronizeable.cc (modified) (1 diff)
• particles/particle_system.cc (modified) (1 diff)
• script_engine/script.cc (modified) (1 diff)
• script_engine/script_class.h (modified) (1 diff)
• shell/shell_completion.cc (modified) (1 diff)
• util/loading/factory.h (modified) (1 diff)
• util/loading/fast_factory.h (modified) (1 diff)

branches/new_class_id/src/lib/coord/p_node.cc

@@ -78 +78 @@
 PNode::~PNode ()
 {
-  PRINTF(0)("delete %s::%s\n", this->getClassCName(), this->getCName());
+  PRINTF(4)("delete %s::%s\n", this->getClassCName(), this->getCName());
   this->debugNode(0);
   // remove the Node, delete it's children (if required).

branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc

@@ -49 +49 @@
 
 
-CREATE_SCRIPTABLE_CLASS(CloudEffect, CloudEffect::classID(),
+CREATE_SCRIPTABLE_CLASS(CloudEffect,
                         addMethod("skyColor", Executor4<CloudEffect, lua_State*,float,float,float,float>(&CloudEffect::shellSkyColor))
                         ->addMethod("cloudColor", Executor4<CloudEffect, lua_State*,float,float,float,float>(&CloudEffect::shellCloudColor))

branches/new_class_id/src/lib/graphics/effects/fog_effect.cc

@@ -32 +32 @@
 #include "class_id_DEPRECATED.h"
 
-CREATE_SCRIPTABLE_CLASS(FogEffect, FogEffect::classID(),
+CREATE_SCRIPTABLE_CLASS(FogEffect,
                         addMethod("fadeIn", Executor0<FogEffect, lua_State*>(&FogEffect::fadeInFog))
                             ->addMethod("fadeOut", Executor0<FogEffect, lua_State*>(&FogEffect::fadeOutFog))

branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc

@@ -35 +35 @@
 SHELL_COMMAND(deactivate, LightningEffect, deactivateLightning);
 
-CREATE_SCRIPTABLE_CLASS(LightningEffect, LightningEffect::classID(),
+CREATE_SCRIPTABLE_CLASS(LightningEffect,
                         addMethod("activate", Executor0<LightningEffect, lua_State*>(&LightningEffect::activate))
                             ->addMethod("deactivate", Executor0<LightningEffect, lua_State*>(&LightningEffect::deactivate))

branches/new_class_id/src/lib/graphics/effects/rain_effect.cc

@@ -44 +44 @@
 
 
-CREATE_SCRIPTABLE_CLASS(RainEffect, RainEffect::classID(),
+CREATE_SCRIPTABLE_CLASS(RainEffect,
                         addMethod("startRaining", Executor0<RainEffect, lua_State*>(&RainEffect::startRaining))
                             ->addMethod("stopRaining", Executor0<RainEffect, lua_State*>(&RainEffect::stopRaining))

branches/new_class_id/src/lib/graphics/effects/snow_effect.cc

@@ -37 +37 @@
 
 
-CREATE_SCRIPTABLE_CLASS(SnowEffect, SnowEffect::classID(),
+CREATE_SCRIPTABLE_CLASS(SnowEffect,
                             addMethod("activate", Executor0<SnowEffect, lua_State*>(&SnowEffect::activate))
                             ->addMethod("deactivate", Executor0<SnowEffect, lua_State*>(&SnowEffect::deactivate))

branches/new_class_id/src/lib/gui/gl/glgui_box.cc

@@ -150 +150 @@
     while (itC != this->_children.end())
     {
-      if ((*itC)->isA(GLGuiContainer::classID()))
+      if ((*itC)->isA(GLGuiContainer::staticClassID()))
         static_cast<GLGuiContainer*>(*itC)->showAll();
       else
@@ -165 +165 @@
     while (itC != this->_children.end())
     {
-      if ((*itC)->isA(GLGuiContainer::classID()))
+      if ((*itC)->isA(GLGuiContainer::staticClassID()))
         static_cast<GLGuiContainer*>(*itC)->hideAll();
       else

branches/new_class_id/src/lib/gui/gl/glgui_frame.cc

@@ -71 +71 @@
     if (this->child != NULL)
     {
-      if (this->child->isA(GLGuiContainer::classID()))
+      if (this->child->isA(GLGuiContainer::staticClassID()))
         static_cast<GLGuiContainer*>(this->child)->showAll();
       else
@@ -83 +83 @@
     if (this->child != NULL)
     {
-      if (this->child->isA(GLGuiContainer::classID()))
+      if (this->child->isA(GLGuiContainer::staticClassID()))
         static_cast<GLGuiContainer*>(this->child)->hideAll();
       else

branches/new_class_id/src/lib/lang/class_id.h

@@ -61 +61 @@
 public:
   /** @returns the NullClass' ID. */
-  static const ClassID& classID() { return NullClass::_classID; }
+  static const ClassID& staticClassID() { return NullClass::_classID; }
   /** @param id the ID to acquire @param name the name to acquire @brief acquires the ID of this Class */
   static void acquireID(const int*& id, const std::string*& name) { id = &_nullID; name = &_nullName; };
@@ -69 +69 @@
 
 private:
-  static ClassID         _classID;      //!< The NullClass' ID
+  static ClassID            _classID;      //!< The NullClass' ID
   static const std::string  _nullName;     //!< The NullClass' Name ("NullClass")
   static int                _nullID;       //!< The NullClass' ID

branches/new_class_id/src/lib/lang/object_list.cc

@@ -125 +125 @@
     return base->_identity;
   else
-    return NullClass::classID();
+    return NullClass::staticClassID();
 }
 
@@ -141 +141 @@
     return base->_identity;
   else
-    return NullClass::classID();
+    return NullClass::staticClassID();
 }
 

branches/new_class_id/src/lib/lang/object_list.h

@@ -25 +25 @@
   public: \
    static inline const ObjectList<ClassName>& objectList() { return ClassName::_objectList; }; \
-   static inline const ClassID& classID() { return ClassName::_objectList.identity(); }; \
+   static inline const ClassID& staticClassID() { return ClassName::_objectList.identity(); }; \
   private: \
    static ObjectList<ClassName> _objectList

branches/new_class_id/src/lib/network/network_game_manager.cc

@@ -92 +92 @@
   assert( SharedNetworkData::getInstance()->isMasterServer());
   assert( State::getGameRules() );
-  assert( State::getGameRules()->isA( NetworkGameRules::classID()) );
+  assert( State::getGameRules()->isA( NetworkGameRules::staticClassID()) );
 
   NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));
@@ -105 +105 @@
 
   assert( bo != NULL );
-  assert( bo->isA( Playable::classID()) );
+  assert( bo->isA( Playable::staticClassID()) );
 
   Playable & playable = *(dynamic_cast<Playable*>(bo));
@@ -130 +130 @@
     stats->setNickName( Preferences::getInstance()->getString( "multiplayer", "nickname", "Server" ) );
 
-  if ( rules.isA( MultiplayerTeamDeathmatch::classID()) )
+  if ( rules.isA( MultiplayerTeamDeathmatch::staticClassID()) )
     dynamic_cast<MultiplayerTeamDeathmatch*>(&rules)->respawnPlayable( &playable, team, 0.0f );
 
@@ -192 +192 @@
     if ( (*it)->getUniqueID() == uniqueId )
     {
-      if ( (*it)->isA(Playable::classID()) )
+      if ( (*it)->isA(Playable::staticClassID()) )
       {
         getInstance()->playablesToDelete.push_back( dynamic_cast<Playable*>(*it) );
@@ -321 +321 @@
 
   assert( State::getGameRules() );
-  assert( State::getGameRules()->isA( NetworkGameRules::classID()) );
+  assert( State::getGameRules()->isA( NetworkGameRules::staticClassID()) );
 
   NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));

branches/new_class_id/src/lib/network/network_stream.cc

@@ -967 +967 @@
 
       // if handshake not finished only sync handshake
-      if ( peer->second.handshake && Handshake::classID() != sync.getLeafClassID())
+      if ( peer->second.handshake && Handshake::staticClassID() != sync.getLeafClassID())
         continue;
 
@@ -973 +973 @@
       if ( ( SharedNetworkData::getInstance()->isMasterServer() ||
              SharedNetworkData::getInstance()->isProxyServerActive() &&  peer->second.isClient())
-             && Handshake::classID() == sync.getLeafClassID() && sync.getUniqueID() != peer->second.userId )
+             && Handshake::staticClassID() == sync.getLeafClassID() && sync.getUniqueID() != peer->second.userId )
         continue;
 
       /* list of synchronizeables that will never be synchronized over the network: */
       // do not sync null parent
-      if ( NullParent::classID() == sync.getLeafClassID())
+      if ( NullParent::staticClassID() == sync.getLeafClassID())
         continue;
 
@@ -1187 +1187 @@
           /* These are some small exeptions in creation: Not all objects can/should be created via Factory */
           /* Exception 1: NullParent */
-          if( NullParent::classID() == leafClassId || Synchronizeable::classID() == leafClassId || NetworkGameManager::classID() == leafClassId)
+          if( NullParent::staticClassID() == leafClassId || Synchronizeable::staticClassID() == leafClassId || NetworkGameManager::staticClassID() == leafClassId)
           {
             PRINTF(1)("Don't create Object with ID %x, ignored!\n", (int)leafClassId);
@@ -1203 +1203 @@
           }
 
-          if ( b->isA(Synchronizeable::classID()) )
+          if ( b->isA(Synchronizeable::staticClassID()) )
           {
             sync = dynamic_cast<Synchronizeable*>(b);

branches/new_class_id/src/lib/network/synchronizeable.cc

@@ -75 +75 @@
     // remove the message manager only by the server
     if ( (SharedNetworkData::getInstance()->isMasterServer() )
-          && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( MessageManager::classID() ) )
+          && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( MessageManager::staticClassID() ) )
       NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );
   }

branches/new_class_id/src/lib/particles/particle_system.cc

@@ -134 +134 @@
     if (emitter != NULL)
     {
-      if (emitter->isA(ParticleEmitter::classID()))
+      if (emitter->isA(ParticleEmitter::staticClassID()))
         this->addEmitter(dynamic_cast<ParticleEmitter*>(emitter));
       else

branches/new_class_id/src/lib/script_engine/script.cc

@@ -25 +25 @@
 ObjectListDefinition(Script);
 
-CREATE_SCRIPTABLE_CLASS(Script, Script::classID(),
+CREATE_SCRIPTABLE_CLASS(Script,
                     addMethod("addObject", Executor2<Script, lua_State*,const std::string&, const std::string& >(&Script::addObject))
                     ->addMethod("registerClass", Executor1<Script, lua_State*,const std::string&>(&Script::registerClass))

branches/new_class_id/src/lib/script_engine/script_class.h

@@ -18 +18 @@
  * this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
  */
-#define CREATE_SCRIPTABLE_CLASS(CLASS_NAME, CLASS_ID, SCRIPT_METHODS) \
-    tScriptClass<CLASS_NAME> global_##CLASS_NAME##_ScriptableClass(#CLASS_NAME, CLASS_ID, (new ScriptMethod)->SCRIPT_METHODS)
+#define CREATE_SCRIPTABLE_CLASS(CLASS_NAME, SCRIPT_METHODS) \
+    tScriptClass<CLASS_NAME> global_##CLASS_NAME##_ScriptableClass(#CLASS_NAME, CLASS_NAME::staticClassID(), (new ScriptMethod)->SCRIPT_METHODS)
 
 

branches/new_class_id/src/lib/shell/shell_completion.cc

@@ -87 +87 @@
       if (objectList != NULL)
         classID = objectList->identity();
-      if (classID != NullClass::classID())
+      if (classID != NullClass::staticClassID())
         completeType |= ObjectCompletion;
       completeType |= FunctionCompletion;

branches/new_class_id/src/lib/util/loading/factory.h

@@ -34 +34 @@
  */
 #define CREATE_FACTORY(CLASS_NAME) \
-    tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(CLASS_NAME::classID())
+    tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(CLASS_NAME::staticClassID())
 
 //! The Factory is a loadable object handler

branches/new_class_id/src/lib/util/loading/fast_factory.h

@@ -39 +39 @@
  */
 #define CREATE_FAST_FACTORY_STATIC(CLASS_NAME) \
-  FastFactory* CLASS_NAME::fastFactory = tFastFactory<CLASS_NAME>::getFastFactory(CLASS_NAME::classID(), #CLASS_NAME)
+  FastFactory* CLASS_NAME::fastFactory = tFastFactory<CLASS_NAME>::getFastFactory(CLASS_NAME::staticClassID(), #CLASS_NAME)
 
 //! A struct, that holds Lists of Objects of a certain type.