Changeset 10059

Timestamp:

May 15, 2014, 5:09:35 PM (11 years ago)

Author:

samuezu

Message:

works more or less, but big trouble accessing the scriptableController-controlled entity

Location:

code/branches/ScriptableController

Files:

• data/levels/levelTry.oxw (modified) (1 diff)
• src/orxonox/controllers/ControllerDirector.cc (modified) (1 diff)
• src/orxonox/controllers/ScriptController.cc (modified) (5 diffs)
• src/orxonox/controllers/ScriptController.h (modified) (1 diff)

code/branches/ScriptableController/data/levels/levelTry.oxw

@@ -72 +72 @@
 
 
-    <Billboard position="500,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=10 />
-    <DistanceTrigger position="0,0,0" distance="200" target="Pawn"
+    <Billboard position="3500,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=10 />
+    <DistanceTrigger position="3500,0,0" distance="200" target="Pawn"
       beaconMode="exclude" targetname="bcnDestroyer" name="takeControl"
     />

code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc

@@ -91 +91 @@
        tmp << "newctrlid = " << ctrlid;
        std::string todo = tmp.str();
-
+       
        /* Run the string using the luastate created earlier */
        ls->doString(todo);

code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc

@@ -125 +125 @@
     void ScriptController::tick(float dt)
     {
+
+        
+
         /* If this controller has no entity entry, do nothing */
         if( !(this->entity_) )
@@ -152 +155 @@
     void ScriptController::moveToPosition_beta(float x, float y, float z )
     {
+
+        orxout()<<"moveToPosition_beta executed"<<endl;
         //const Vector3 local = this->getPosition();
         const Vector3 target = Vector3(100*x,100*y,100*z);
@@ -158 +163 @@
        
         
-        this->entity_->lookAt(target);
-        this->entity_->moveFrontBack(-1000*target.length());      
-
-  
+        //this->entity_->lookAt(target);
+        //this->entity_->moveFrontBack(-1000*target.length());      
+
+        if(this->entity_!=NULL)
+            orxout()<<"not-NULL-entity"<<endl;
+
+        if(this->player_!=NULL)
+            orxout()<<"not-NULL-player"<<endl;
+
+        orxout() << this->player_->getClientID() << endl; // IMPOSSIBLE TO ACCESS this->player AND this->entity
+        
+        //this->entity_ = this->player_->getClientID();//getControllableEntity();
+
+            //if(this->entity_==this->player_->getControllableEntity())
+            //orxout()<<"same entity"<<endl;
+
         /* This works fine */
         orxout()<<x<<"  "<<y<<"  "<<z<<endl;
@@ -168 +185 @@
     void ScriptController::eventScheduler(std::string instruction, float x, float y, float z, float executionTime)
     {
+
 
         /*put data (from LUA) into time-sorted eventList*/ 
@@ -178 +196 @@
         tmp.eventTime=executionTime;
 
-        for(unsigned int i=0;i<eventList.size();i++)
+        orxout()<<tmp.fctName<<endl;
+
+        if(eventList.size()==0)
         {
-            if(tmp.eventTime<eventList[i].eventTime)
+            orxout()<<"eventList empty (01)"<<endl;
+            eventList.insert(eventList.begin(), tmp);
+            orxout()<<"first event added"<<endl;
+        }
+
+
+       for (std::vector<event>::iterator it=eventList.begin(); it<eventList.end(); it++)
             {
-                std::vector<event>::iterator it = eventList.begin();
-
-                eventList.insert(it+(i+1),tmp);
-                break;
+
+                if(tmp.eventTime<it->eventTime)
+                {
+                    eventList.insert(it,tmp);
+                    orxout()<<"new event added"<<endl;
+                }
+
             }
-            if(i==eventList.size()-1)
-            {
-                std::vector<event>::iterator it = eventList.end();
-
-                eventList.insert(it,tmp);
-
-            }
-
-        }
-        
+
+       
+       if(eventList.size()==0)
+            orxout()<<"eventList empty"<<endl;
+
+        else
+            orxout()<<"eventList is not empty"<<endl;
+
         
     }

code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h

@@ -64 +64 @@
             void setPlayer(PlayerInfo* player) { this->player_ = player; }
            
+           
+
             //void set_luasrc(std::string);
             //void set_controlled(ControllableEntity*);