Revision 6d13138a src/server/controller.cpp
| src/server/controller.cpp | ||
|---|---|---|
| 38 | 38 |
// using namespace humotion::server; |
| 39 | 39 |
|
| 40 | 40 |
using humotion::server::Controller; |
| 41 |
using humotion::server::Config; |
|
| 41 | 42 |
|
| 42 | 43 |
//! constructor |
| 43 | 44 |
Controller::Controller(JointInterface *j) {
|
| 44 | 45 |
activated_ = false; |
| 45 | 46 |
joint_interface_ = j; |
| 47 |
|
|
| 48 |
config_ = new Config(); |
|
| 46 | 49 |
} |
| 47 | 50 |
|
| 48 | 51 |
//! destructor |
| ... | ... | |
| 55 | 58 |
// (i.e. the neck generator must be added after the eye generator!) |
| 56 | 59 |
|
| 57 | 60 |
// eye motion generation: |
| 58 |
add_motion_generator(new EyeMotionGenerator(joint_interface_)); |
|
| 61 |
add_motion_generator(new EyeMotionGenerator(joint_interface_, config_));
|
|
| 59 | 62 |
|
| 60 | 63 |
// eyelid motion generator |
| 61 |
add_motion_generator(new EyelidMotionGenerator(joint_interface_)); |
|
| 64 |
add_motion_generator(new EyelidMotionGenerator(joint_interface_, config_));
|
|
| 62 | 65 |
|
| 63 | 66 |
// neck motion generator |
| 64 |
add_motion_generator(new NeckMotionGenerator(joint_interface_)); |
|
| 67 |
add_motion_generator(new NeckMotionGenerator(joint_interface_, config_));
|
|
| 65 | 68 |
|
| 66 | 69 |
// mouth motion generator |
| 67 |
add_motion_generator(new MouthMotionGenerator(joint_interface_)); |
|
| 70 |
add_motion_generator(new MouthMotionGenerator(joint_interface_, config_));
|
|
| 68 | 71 |
|
| 69 | 72 |
// eyebrow motion generator |
| 70 |
add_motion_generator(new EyebrowMotionGenerator(joint_interface_)); |
|
| 73 |
add_motion_generator(new EyebrowMotionGenerator(joint_interface_, config_));
|
|
| 71 | 74 |
} |
| 72 | 75 |
|
| 73 | 76 |
//! add a single motion genrator |
Also available in: Unified diff