Changeset 9777 in orxonox.OLD for branches/new_class_id/src/lib/shell

Timestamp:

Sep 20, 2006, 9:49:13 AM (18 years ago)

Author:

bensch

Message:

calling static functions again out of the Shell

Location:

branches/new_class_id/src/lib/shell

Files:

• shell_command.cc (modified) (2 diffs)
• shell_command.h (modified) (1 diff)
• some_shell_commands.cc (modified) (2 diffs)

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

@@ -300 +300 @@
     if (sc != NULL)
     {
-      for(std::vector<BaseObject*>::const_iterator bo = boList.begin(); bo != boList.end(); ++bo)
-      {
-        PRINT(0)("Command '%s' on '%s::%s'\n", sc->getCName(), (*bo)->getClassCName(), (*bo)->getCName());
-        (*sc->executor)((*bo), inputSplits.subSet(paramBegin));
-      }
+
+      if(sc->executor->getType() == Executor<const SubString>::FunctionStatic )
+      {
+        PRINT(0)("Static Command '%s' of Class '%s' with parameters\n", sc->getCName(), sc->shellClass->getCName());
+        (*sc->executor)(NULL, inputSplits.subSet(paramBegin));
+      }
+      else
+        for(std::vector<BaseObject*>::const_iterator bo = boList.begin(); bo != boList.end(); ++bo)
+        {
+          PRINT(0)("Command '%s' on '%s::%s'\n", sc->getCName(), (*bo)->getClassCName(), (*bo)->getCName());
+          (*sc->executor)((*bo), inputSplits.subSet(paramBegin));
+        }
       return true;
     }
@@ -377 +384 @@
     else
     {
-//       if(this->completors[parameter] == NULL)
-//       delete this->completors[parameter];
-//       this->completors[parameter] = completorPlugin.clone();
+      //       if(this->completors[parameter] == NULL)
+      //       delete this->completors[parameter];
+      //       this->completors[parameter] = completorPlugin.clone();
     }
     return this;

branches/new_class_id/src/lib/shell/shell_command.h

@@ -56 +56 @@
    */
 #define SHELL_COMMAND_STATIC(command, class, function) \
-           OrxShell::ShellCommand* shell_command_##class##_##command = OrxShell::ShellCommand::registerCommand(#command, #class, createExecutor<class, BaseObject>(function))
+           OrxShell::ShellCommand* shell_command_##class##_##command = OrxShell::ShellCommand::registerCommand(#command, #class, createExecutor<class, BaseObject>(&class::function))
 
 

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

@@ -29 +29 @@
 
 #include "network_game_rules.h"
-  SHELL_COMMAND(say, NetworkGameRules, shellSay)->setAlias("say");
+SHELL_COMMAND(say, NetworkGameRules, shellSay)->setAlias("say");
 
 #include "player_stats.h"
-  SHELL_COMMAND(nick, PlayerStats, shellNick)->setAlias("nick");
+SHELL_COMMAND(nick, PlayerStats, shellNick)->setAlias("nick");
 
 // #include "class_list.h"
@@ -40 +40 @@
 
 #include "p_node.h"
-  SHELL_COMMAND(debugNode, PNode, debugNode);
-  SHELL_COMMAND(setPosition, PNode, setAbsCoor);
+SHELL_COMMAND(debugNode, PNode, debugNode);
+SHELL_COMMAND(setPosition, PNode, setAbsCoor);
 
 #include "render_2d.h"
-  SHELL_COMMAND(toggleNodeVisibility, Render2D, toggleNodesVisibility);
+SHELL_COMMAND(toggleNodeVisibility, Render2D, toggleNodesVisibility);
 
 
 #include "material.h"
-  SHELL_COMMAND(setDiffuseTexture, Material, setDiffuseMap)
-      ->defaultValues(MT_NULL, (int)GL_TEXTURE_2D)
-      ->completionPlugin(0, CompletorFileSystem());
+SHELL_COMMAND(setDiffuseTexture, Material, setDiffuseMap)
+->defaultValues(MT_NULL, (int)GL_TEXTURE_2D)
+->completionPlugin(0, CompletorFileSystem());
 
 #include "loading/resource_manager.h"
 SHELL_COMMAND(debug, ResourceManager, debug);
+#include "loading/load_param_class_description.h"
+OrxShell::ShellCommand* shell_command_LPCD_printAll =
+  OrxShell::ShellCommand::registerCommand("printAll", "LoadParamClassDescription",
+                                          new Executor2_static<LoadParamClassDescription, const SubString, const std::string&, bool>(&LoadParamClassDescription::printAll))
+//SHELL_COMMAND_STATIC(print, LoadParamClassDescription, printAll)
+->defaultValues(MT_NULL, true);