Revision ea068cf1 include/humotion/server/controller.h

View differences:

include/humotion/server/controller.h
53 53
    void set_activated(void);
54 54

  
55 55
 private:
56
    bool activated;
57 56
    void add_motion_generator(MotionGenerator *m);
58 57
    GazeState relative_gaze_to_absolute_gaze(GazeState relative);
59 58

  
60 59
    typedef std::vector<MotionGenerator *> motion_generator_vector_t;
61
    motion_generator_vector_t motion_generator_vector;
62
    JointInterface *joint_interface;
60
    motion_generator_vector_t motion_generator_vector_;
63 61

  
64
    Timestamp last_known_absolute_timestamp;
65
    double last_known_absolute_target_pan;
66
    double last_known_absolute_target_tilt;
67
    double last_known_absolute_target_roll;
62
    JointInterface *joint_interface_;
63

  
64
    bool activated_;
65

  
66
    Timestamp last_known_absolute_timestamp_;
67
    double last_known_absolute_target_pan_;
68
    double last_known_absolute_target_tilt_;
69
    double last_known_absolute_target_roll_;
68 70
};
69 71

  
70 72
}  // namespace server

Also available in: Unified diff