Revision bb168e08

View differences:

client/python/test.py
37 37

  
38 38
    r.set_current_emotion(RobotEmotion(RobotEmotion.SAD))
39 39
    r.set_head_animation(RobotAnimation(RobotAnimation.HEAD_SHAKE))
40
    r.set_speak("test 123")
41 40

  
42 41
    g = RobotGaze()
43 42
    g.gaze_type = RobotGaze.GAZETARGET_ABSOLUTE
server/src/EmotionConfig.cpp
97 97
    mouth_override.opening_center  = 1.0;
98 98
    mouth_override.position_right  = 14.7;
99 99
    mouth_override.opening_right   = 0.0;*/
100
    mouth_override.position_left   = 11.54200000000000000000;
100
    /*mouth_override.position_left   = 11.54200000000000000000;
101 101
    mouth_override.opening_left    = 0; //2.412000;
102 102
    mouth_override.position_center = 12.50000000000000000;
103 103
    mouth_override.opening_center  = 0; //1.737000;
104 104
    mouth_override.position_right  = 11.5250000000000000000;
105 105
    mouth_override.opening_right   = 0;//2.412000;
106

  
106
    */
107
    
108
    mouth_override.position_left   = 20;
109
    mouth_override.opening_left    = 0.0;
110
    mouth_override.position_center = 20;
111
    mouth_override.opening_center  = 0.0;
112
    mouth_override.position_right  = 20;
113
    mouth_override.opening_right   = 0.0;
107 114

  
108 115
}
109 116

  
......
127 134
    //eyeblink request
128 135
    gaze_override.eyeblink_request_left  = humotion::GazeState::EYEBLINK_TIME_DEFAULT;
129 136
    gaze_override.eyeblink_request_right = humotion::GazeState::EYEBLINK_TIME_DEFAULT;
130

  
137
/*
131 138
    mouth_override.position_left   = -1+9.5;
132 139
    mouth_override.opening_left    = 0.0;
133 140
    mouth_override.position_center = 24.3;
134 141
    mouth_override.opening_center  = 7.0;
135 142
    mouth_override.position_right  = -1+10.5;
136
    mouth_override.opening_right   = 0.0;
143
    mouth_override.opening_right   = 0.0;*/
144
  
145
    mouth_override.position_left   = 18; //13.56850000000000000000;
146
    mouth_override.opening_left    = 0; //.791000;
147
    mouth_override.position_center = 26; //14.18400000000000000000;
148
    mouth_override.opening_center  = 5;
149
    mouth_override.position_right  = 18; //15.31800000000000000000;
150
    mouth_override.opening_right   = 0; //2.791000;
151

  
152
 
137 153

  
138 154
}
139 155

  
......
158 174
    gaze_override.eyeblink_request_right = 3 * humotion::GazeState::EYEBLINK_TIME_DEFAULT;
159 175

  
160 176
    //mouth:
161
    mouth_override.position_left   = 13.0;
177
    mouth_override.position_left   = 21.0;
162 178
    mouth_override.opening_left    = 0.0;
163
    mouth_override.position_center = 6.1;
179
    mouth_override.position_center = 16.0;
164 180
    mouth_override.opening_center  = 0.0;
165
    mouth_override.position_right  = 13.0;
181
    mouth_override.position_right  = 21.0;
166 182
    mouth_override.opening_right   = 0.0;
167 183
}
168 184

  
......
187 203
    gaze_override.eyeblink_request_right = 0;
188 204

  
189 205
    //mouth:
190
    mouth_override.position_left   = 20.5;
191
    mouth_override.opening_left    = 10.0;
192
    mouth_override.position_center = 12.3;
206
    mouth_override.position_left   = 21;
207
    mouth_override.opening_left    = 6.0;
208
    mouth_override.position_center = 22.3;
193 209
    mouth_override.opening_center  = 0.0;
194
    mouth_override.position_right  = 20.5;
195
    mouth_override.opening_right   = 10.0;
210
    mouth_override.position_right  = 21;
211
    mouth_override.opening_right   = 6.0;
196 212
}
197 213

  
198 214
void EmotionConfig::init_surprised(){
......
217 233
    gaze_override.eyeblink_request_right = humotion::GazeState::EYEBLINK_TIME_DEFAULT;
218 234

  
219 235
    //mouth:
220
    mouth_override.position_left   = 11; //13.56850000000000000000;
221
    mouth_override.opening_left    = 0; //.791000;
222
    mouth_override.position_center = 13; //14.18400000000000000000;
223
    mouth_override.opening_center  = 5;
224
    mouth_override.position_right  = 12; //15.31800000000000000000;
225
    mouth_override.opening_right   = 0; //2.791000;
236
    mouth_override.position_left   = 22;
237
    mouth_override.opening_left    = 0.0;
238
    mouth_override.position_center = 26.0;
239
    mouth_override.opening_center  = 10.0;
240
    mouth_override.position_right  = 22.0;
241
    mouth_override.opening_right   = 0.0;
226 242

  
243
    
227 244
}
228 245

  
229 246
void EmotionConfig::init_fear(){
......
248 265
    gaze_override.eyeblink_request_right = 0;
249 266

  
250 267
    //mouth:
251
    mouth_override.position_left   = 12.9;
268
    mouth_override.position_left   = 14;
252 269
    mouth_override.opening_left    = 0.0;
253
    mouth_override.position_center = 17.3;
254
    mouth_override.opening_center  = 7.2;
255
    mouth_override.position_right  = 12.9;
270
    mouth_override.position_center = 21;
271
    mouth_override.opening_center  = 5;
272
    mouth_override.position_right  = 35.9;
256 273
    mouth_override.opening_right   = 0.0;
257 274
}

Also available in: Unified diff