Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 21, 2014, 3:28:28 PM (11 years ago)
Author:
smerkli
Message:

Some cleanups, added a "change look" command

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r10065 r10066  
    3939{  // tolua_export
    4040
     41    /** Structure to describe a single event */
    4142    struct event
    4243    {   
     44        /** Instruction for this event */
    4345        std::string fctName;
    44         float x1;
    45         float y1;
    46         float z1;
    4746
    48         float x2;
    49         float y2;
    50         float z2;
     47        Vector3 v1;
     48        Vector3 v2;
    5149
     50        /** Time span of the event */
    5251        float duration;
    5352
     53        /** Start point in time of the event */
    5454        float eventTime;
    55 
    5655    };
    5756
    … …  
    6160        public:
    6261            ScriptController(Context* context);
    63 
    6462            virtual ~ScriptController() { }
    6563
    66             //virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    67            
    6864            void takeControl(int ctrlid);
    6965            void setPlayer(PlayerInfo* player) { this->player_ = player; }
    … …  
    7369            // LUA interface
    7470            // tolua_begin
    75             void moveAndLook(float xm, float ym, float zm,
    76               float xl, float yl, float zl, float t);
    77 
    7871            void eventScheduler(std::string instruction,
    7972              float x1, float y1, float z1,
    … …  
    115108            bool processing;
    116109
    117             /* Data about the point to go to and what to look at */
    118             /* - Target position */
    119             Vector3 target;
    120 
    121             /* - Time it should take to get there */
    122             float timeToTarget;
     110            /* Data about the event currently being processed */
     111            /* - The event itself */
     112            event currentEvent;
    123113
    124114            /* - Time this event has been going on for */
    … …  
    127117
    128118            /* - Position to look at during that transition */
    129             Vector3 lookAtPosition;
     119            //Vector3 lookAtPosition;
    130120
    131121    };// tolua_export
Note: See TracChangeset for help on using the changeset viewer.