Changeset 9916 in orxonox.OLD

Timestamp:

Nov 3, 2006, 9:29:16 PM (17 years ago)

Author:

bensch

Message:

orxonox/trunk: Windows runs again without any segfaults
it seems, that windows links object files differently… and extremely strange

Location:

trunk/src/lib

Files:

• script_engine/Makefile.am (modified) (1 diff)
• script_engine/script.cc (modified) (1 diff)
• script_engine/script_class.cc (modified) (2 diffs)
• shell/shell.cc (modified) (2 diffs)
• shell/shell.h (modified) (1 diff)
• shell/shell_command.cc (modified) (3 diffs)
• shell/shell_input.cc (modified) (1 diff)

trunk/src/lib/script_engine/Makefile.am

@@ -13 +13 @@
 
 libORXscript_a_SOURCES = \
+                script_class.cc \
+                script_method.cc \
                 script.cc \
                 script_manager.cc \
-                script_class.cc \
-                script_method.cc \
                 executor_lua_state.cc
 

trunk/src/lib/script_engine/script.cc

@@ -24 +24 @@
 
 ObjectListDefinition(Script);
-
-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))
-                    ->addMethod("selectFunction", Executor2ret<Script, lua_State*, bool, const std::string&, int >(&Script::selectFunction))
-                    ->addMethod("executeFunction", Executor0ret<Script, lua_State*,bool >(&Script::executeFunction))
-                     );
 
 

trunk/src/lib/script_engine/script_class.cc

@@ -17 +17 @@
 
 #include "script_class.h"
+#include "script.h"
+#include "debug.h"
 #include <cassert>
 
 ObjectListDefinition(ScriptClass);
+
+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))
+                    ->addMethod("selectFunction", Executor2ret<Script, lua_State*, bool, const std::string&, int >(&Script::selectFunction))
+                    ->addMethod("executeFunction", Executor0ret<Script, lua_State*,bool >(&Script::executeFunction))
+                     );
 /**
  * @brief standard constructor
@@ -27 +36 @@
     : BaseObject(name), _classID(classID)
 {
+  PRINTF(4)("Name %s\n", name.c_str());
   assert(scriptMethods != NULL);
   this->registerObject(this, ScriptClass::_objectList);

trunk/src/lib/shell/shell.cc

@@ -30 +30 @@
 namespace OrxShell
 {
-
-  SHELL_COMMAND(clear, Shell, clear)
-  ->describe("Clears the shell from unwanted lines (empties all buffers)")
-  ->setAlias("clear");
-  SHELL_COMMAND(deactivate, Shell, deactivate)
-  ->describe("Deactivates the Shell. (moves it into background)")
-  ->setAlias("hide");
-  SHELL_COMMAND(textsize, Shell, setTextSize)
-  ->describe("Sets the size of the Text size, linespacing")
-  ->defaultValues(15, 0);
-  SHELL_COMMAND(textcolor, Shell, setTextColor)
-  ->describe("Sets the Color of the Shells Text (red, green, blue, alpha)")
-  ->defaultValues(SHELL_DEFAULT_TEXT_COLOR);
-  SHELL_COMMAND(backgroundcolor, Shell, setBackgroundColor)
-  ->describe("Sets the Color of the Shells Background (red, green, blue, alpha)")
-  ->defaultValues(SHELL_DEFAULT_BACKGROUND_COLOR);
-  SHELL_COMMAND(backgroundimage, Shell, setBackgroundImage)
-  ->describe("sets the background image to load for the Shell")
-  ->completionPlugin(0, OrxShell::CompletorFileSystem());
-  SHELL_COMMAND(font, Shell, setFont)
-  ->describe("Sets the font of the Shell")
-  ->defaultValues(SHELL_DEFAULT_FONT)
-  ->completionPlugin(0, OrxShell::CompletorFileSystem(".ttf", "fonts/"));
-
   ObjectListDefinition(Shell);
 
@@ -557 +533 @@
     this->shellBuffer->debug();
   }
-
-  /**
-   * @brief a Handy Function, to Test the behaviour of the Shell.
-   */
-  void Shell::testShell() const
-  {
-    for (unsigned int i = 0; i < 100; i++)
-      PRINT(0)("%d\n", i);
-  }
-  SHELL_COMMAND(test, Shell, testShell);
-
 }

trunk/src/lib/shell/shell.h

@@ -82 +82 @@
     void debug() const;
 
-    void testShell() const;
   private:
     void updateResolution(unsigned int width);

trunk/src/lib/shell/shell_command.cc

@@ -19 +19 @@
 #include "shell_command_class.h"
 
+#include "shell_input.h"
+#include "shell.h"
+
 #include "compiler.h"
 #include "helper_functions.h"
@@ -28 +31 @@
 {
   ObjectListDefinition(ShellCommand);
+
   SHELL_COMMAND(debug, ShellCommandClass, help);
 
+  SHELL_COMMAND(help, ShellInput, help)
+  ->describe("retrieve some help about the input mode")
+  ->setAlias("help");
+
+  SHELL_COMMAND(clear, Shell, clear)
+  ->describe("Clears the shell from unwanted lines (empties all buffers)")
+  ->setAlias("clear");
+  SHELL_COMMAND(deactivate, Shell, deactivate)
+  ->describe("Deactivates the Shell. (moves it into background)")
+  ->setAlias("hide");
+  SHELL_COMMAND(textsize, Shell, setTextSize)
+  ->describe("Sets the size of the Text size, linespacing")
+  ->defaultValues(15, 0);
+  SHELL_COMMAND(textcolor, Shell, setTextColor)
+  ->describe("Sets the Color of the Shells Text (red, green, blue, alpha)")
+  ->defaultValues(SHELL_DEFAULT_TEXT_COLOR);
+  SHELL_COMMAND(backgroundcolor, Shell, setBackgroundColor)
+  ->describe("Sets the Color of the Shells Background (red, green, blue, alpha)")
+  ->defaultValues(SHELL_DEFAULT_BACKGROUND_COLOR);
+  SHELL_COMMAND(backgroundimage, Shell, setBackgroundImage)
+  ->describe("sets the background image to load for the Shell")
+  ->completionPlugin(0, OrxShell::CompletorFileSystem());
+  SHELL_COMMAND(font, Shell, setFont)
+  ->describe("Sets the font of the Shell")
+  ->defaultValues(SHELL_DEFAULT_FONT)
+  ->completionPlugin(0, OrxShell::CompletorFileSystem(".ttf", "fonts/"));
 
   /**
@@ -39 +69 @@
   ShellCommand::ShellCommand(const std::string& commandName, const std::string& className, Executor<const SubString>* executor)
   {
+    PRINTF(4)("create shellcommand '%s' for class '%s'\n", commandName.c_str(), className.c_str());
     this->registerObject(this, ShellCommand::_objectList);
-    PRINTF(4)("create shellcommand '%s' for class '%s'\n", commandName.c_str(), className.c_str());
     this->setName(commandName);
 

trunk/src/lib/shell/shell_input.cc

@@ -28 +28 @@
 namespace OrxShell
 {
-  SHELL_COMMAND(help, ShellInput, help)
-  ->describe("retrieve some help about the input mode")
-  ->setAlias("help");
-
   ObjectListDefinition(ShellInput);