Changeset 10585 in orxonox.OLD

Timestamp:

Feb 8, 2007, 6:14:35 PM (17 years ago)

Author:

snellen

Message:

Removed classes Account and Object (both needed only to test the scriptingframework)and removed example.cc, cleaned commented code in script_trigger.cc and gameworld.cc. … more to come

Location:

branches/cleanup/src

Files:

• lib/script_engine/account.cc (deleted)
• lib/script_engine/example.cc (deleted)
• lib/script_engine/object.cc (deleted)
• story_entities/game_world.cc (modified) (1 diff)
• world_entities/script_trigger.cc (modified) (1 diff)
• world_entities/script_trigger.h (modified) (1 diff)

branches/cleanup/src/story_entities/game_world.cc

@@ -193 +193 @@
   this->dataXML = (TiXmlElement*)root->Clone();
 
-  //remove this after finished testing !!!!
-  //Object* obj= new Object();
-  //obj->setName("Obj");
-  //Account* a = new Account();
-  //a->setName("a");
-  //Account *b = new Account(30);
-  //b->setName("b");
-
-
   LoadParamXML(root, "ScriptManager", &this->scriptManager, ScriptManager, loadParams);
 

branches/cleanup/src/world_entities/script_trigger.cc

@@ -244 +244 @@
   }
 }
-
-/*
- void ScriptTrigger::testScriptingFramework()
-{
-   std::string file("lunartest2.lua");
-   //get script
-   Script* script = State::getScriptManager()->getScriptByFile(file);
-   printf("-------------------------- top of the stack:%i\n",lua_gettop(script->getLuaState()));
-
-      //execute a function
-   printf("----------- main -----------\n");
-   std::string main("main");
-   if( script->selectFunction(main,3))
-     printf("function %s selected\n",main.c_str());
-
-   script->pushParam(3.14159,main);
-   printf("-------------------------- top of the stack:%i\n",lua_gettop(script->getLuaState()));
-   script->executeFunction();
-
-   int ret = script->getReturnedInt();
-   printf("main returned %i\n",ret);
-
-   if(script->getReturnedBool())
-     printf("main returned true\n");
-   else
-     printf("main returned false\n");
-
-   float retf = script->getReturnedFloat();
-   printf("main returned %f\n",retf);
-
-
-   printf("-------------------------- top of the stack:%i\n",lua_gettop(script->getLuaState()));
-      //execute a 2nd function
-   printf("----------- test -----------\n");
-   std::string test("test");
-   if( script->selectFunction(test,0))
-     printf("function %s selected\n",test.c_str());
-
-   script->executeFunction();
-
-
-      //if(argc>1) lua_dofile(script.getLuaState(), argv[1]);
-   printf("-------------------------- top of the stack:%i\n",lua_gettop(script->getLuaState()));
-
-}*/

branches/cleanup/src/world_entities/script_trigger.h

@@ -30 +30 @@
     virtual void tick(float timestep);
     virtual void executeAction(float timestep);
-    void testScriptingFramework();
 
     /// SET MEMBER