Changeset 8711 in orxonox.OLD for trunk/src/lib

Timestamp:

Jun 22, 2006, 1:09:20 PM (19 years ago)

Author:

bensch

Message:

merged the script_engine back here

Location:

trunk/src/lib

Files:

• coord/p_node.h (modified) (1 diff)
• gui/gl/glgui_handler.cc (modified) (1 diff)
• script_engine/Makefile.am (modified) (1 diff)
• script_engine/lunartest.lua (deleted)
• script_engine/lunartest2.lua (modified) (1 diff)
• script_engine/script.cc (modified) (6 diffs)
• script_engine/script.h (modified) (2 diffs)
• script_engine/script_class.cc (modified) (1 diff)
• script_engine/script_manager.cc (modified) (1 diff)
• script_engine/script_manager.h (modified) (1 diff)
• script_engine/script_method.cc (modified) (1 diff)
• script_engine/script_method.h (modified) (1 diff)
• util/executor/executor_lua.h (modified) (2 diffs)

trunk/src/lib/coord/p_node.h

@@ -103 +103 @@
   /** @returns the absolute position */
   inline const Vector& getAbsCoor () const { return this->absCoordinate; };
+  /** @returns the absolute X coordinate. */
+  inline float getAbsCoorX() { return this->absCoordinate.x; };
+  /** @returns the absolute Y Coordinate */
+  inline float getAbsCoorY() { return this->absCoordinate.y; };
+  /** @returns the absolute Z Coordinate */
+  inline float getAbsCoorZ() { return this->absCoordinate.z; };
+
   /** @returns the absolute position */
   inline const Vector& getLastAbsCoor () const { return this->lastAbsCoordinate; };
+  
   void shiftCoor (const Vector& shift);
   void shiftCoor (float x, float y, float z) { this->shiftCoor(Vector(x, y, z)); };

trunk/src/lib/gui/gl/glgui_handler.cc

@@ -23 +23 @@
 
 #include "class_list.h"
+#include <cassert>
 
 #include <cassert>

trunk/src/lib/script_engine/Makefile.am

@@ -16 +16 @@
                 script_manager.cc \
                 script_class.cc \
-                script_method.cc \
-                \
-                account.cc \
-                object.cc
-
-
+                script_method.cc
+                
 AM_CPPFLAGS= @LUA_INCLUDES@
 

trunk/src/lib/script_engine/lunartest2.lua

@@ -22 +22 @@
 
 function main(arg)
-  io.write("hello i am main!")
+  io.write("hello i am main!\n")
   -- use parameter
   io.write("main received ", arg)
   io.write(" as parameter\n")
 
- o = Object()
-  o:printName()
+ 
   --call member of an inserted object
   Obj:printName()
 
   --create object of a registered type
-  --o = Object()
-  --o:printName()
+  o = Object()
+  o:printName()
 
   --take returnvalue from c

trunk/src/lib/script_engine/script.cc

@@ +1 @@
+/*
+   orxonox - the future of 3D-vertical-scrollers
+
+   Copyright (C) 2004 orx
+
+   This program 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, or (at your option)
+   any later version.
+
+### File Specific:
+   main-programmer: Silvan Nellen
+   co-programmer: Benjamin Grauer
+*/
+
 #include "script.h"
 #include "script_class.h"
 #include "luaincl.h"
 
+#include "util/loading/resource_manager.h"
 
 #include "loading/load_param.h"
@@ -58 +74 @@
  {
 
+   std::string filedest(ResourceManager::getInstance()->getDataDir());
+   filedest += "scripts/" + filename;
+   
    if(currentFile.length() != 0)
    {
@@ -64 +83 @@
     }
 
-   int error = luaL_loadfile (luaState, filename.c_str());
+   int error = luaL_loadfile (luaState, filedest.c_str());
 
    if(error == 0)
    {
+     
      error = lua_pcall(luaState, 0, 0, 0);
 
@@ -192 +212 @@
  bool Script::pushParam(int param, std::string& toFunction)
  {
-   if(currentFunction.compare(toFunction) == 0)
+   if(currentFunction == toFunction)
    {
      lua_pushnumber(luaState, (lua_Number) param);
      argumentCount++;
-    return true;
+     return true;
    }
    else
@@ -267 +287 @@
        returnCount--;
      }
+     else
+       printf("ERROR: Form %s : trying to retreive non bolean value",this->currentFile.c_str());
    }
    return returnValue;
@@ -313 +335 @@
  }
 
+ bool Script::registerStandartClasses()
+ {
+   bool success = false;
+   
+   //success = this->registerClass(std::string("Vector"));
+   
+   return success;
+ }
+ 
+ 
+ bool Script::registerClass( const std::string& className)
+ {
+   BaseObject* scriptClass = ClassList::getObject(className, CL_SCRIPT_CLASS);
+   //printf("The script class for %s is at %p \n",className.c_str(),scriptClass);
+   WorldObject tmpObj;
+   if (scriptClass != NULL)
+   {
+     tmpObj.type = className;
+     if( !classIsRegistered(className) )
+     {
+       static_cast<ScriptClass*>(scriptClass)->registerClass(this);
+       tmpObj.name = "";
+       registeredObjects.push_back(tmpObj);
+       return true;
+     }
+   }
+   return false;
+ 
+ }
 
  bool Script::classIsRegistered(const std::string& type)

trunk/src/lib/script_engine/script.h

@@ +1 @@
+/*!
+ * @file scrip.h
+ *  wrapper for a lua_State
+ */
+
 #ifndef _SCRIPT_H
 #define _SCRIPT_H
@@ -58 +63 @@
 
     int  reportError(int error);                      //!< Get errormessage from the lua stack and print it.
+    bool registerStandartClasses();                   //!< Register all the classes that the script might need
+    bool registerClass(const std::string& className); //!< Register a class but dont add any instances 
     bool classIsRegistered(const std::string& type);  //!< Checks wheter the class "type" has already been registered with the script
     bool objectIsAdded(const std::string& name);      //!< Checks wheter the object "name" has already been added to the script

trunk/src/lib/script_engine/script_class.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */

trunk/src/lib/script_engine/script_manager.cc

@@ +1 @@
+/*
+   orxonox - the future of 3D-vertical-scrollers
+
+   Copyright (C) 2004 orx
+
+   This program 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, or (at your option)
+   any later version.
+
+### File Specific:
+   main-programmer: Silvan Nellen
+   co-programmer: Benjamin Grauer
+*/
+
+
 #include <string>
 #include <list>

trunk/src/lib/script_engine/script_manager.h

@@ +1 @@
+/*!
+ * @file scrip_manager.h
+ *  manages the scripts
+ */
+
 #ifndef _SCRIPT_MANAGER_H
 #define _SCRIPT_MANAGER_H

trunk/src/lib/script_engine/script_method.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */

trunk/src/lib/script_engine/script_method.h

@@ -1 +1 @@
 /*!
- * @file script_class.h
+ * @file script_method.h
  * @brief Definition of ...
 */

trunk/src/lib/util/executor/executor_lua.h

@@ -182 +182 @@
 
 
+///////////
+//// 3 ////
+///////////
+//! Executes a Function with a lua_State* parameter.
+template<class T, typename type0, typename type1, typename type2> class ExecutorLua3 : public Executor
+{
+  public:
+    /**
+   * @brief Constructor of a ExecutorXML
+   * @param function a Function to call
+     */
+    ExecutorLua3(void(T::*function)(type0, type1, type2))
+  : Executor(ExecutorParamType<type0>(), ExecutorParamType<type1>(), ExecutorParamType<type2>())
+    {
+      this->functionPointer = function;
+      this->functorType = Executor_Objective | Executor_NoLoadString;
+    }
+
+    /**
+     * @brief executes the Command on BaseObject
+     * @param object the BaseObject to execute this Executor on
+     * @param loadString ignored in this case
+     */
+    virtual void operator()(BaseObject* object, const SubString& = SubString()) const
+    {
+      PRINTF(1)("no usefull executor\n");
+    }
+
+    virtual void operator()(BaseObject* object, int& count, void* values) const
+    {
+      lua_State* state = (lua_State*)values;
+      count = 0;
+
+      (dynamic_cast<T*>(object)->*(functionPointer))(
+          fromLua<type0>(state, 1),
+          fromLua<type1>(state, 2),
+          fromLua<type2>(state, 3) );
+    }
+
+    /**
+     * @returns a _new_ Copy of this Executor
+     */
+    virtual Executor* clone () const
+    {
+      return new ExecutorLua3<T, type0, type1, type2>(this->functionPointer);
+    }
+  private:
+    void          (T::*functionPointer)(type0, type1, type2);
+};
+
 
 
@@ -209 +259 @@
       this->functorType = Executor_Objective | Executor_NoLoadString;
     }
-
+    
     /**
      * @brief executes the Command on BaseObject