Revision 1de9280c

View differences:

server/src/EmotionConfig.cpp
168 168
    gaze_override.eyeblink_request_right = 3 * humotion::GazeState::EYEBLINK_TIME_DEFAULT;
169 169

  
170 170
    //mouth:
171
    mouth_override.position_left   = 0.0;
172
    mouth_override.opening_left    = 3.0;
171
    mouth_override.position_left   = -2.0;
172
    mouth_override.opening_left    = 2.0;
173 173
    mouth_override.position_center = 15.0;
174
    mouth_override.opening_center  = 20.0;
175
    mouth_override.position_right  = 0.0;
176
    mouth_override.opening_right   = 3.0;
174
    mouth_override.opening_center  = 15.0;
175
    mouth_override.position_right  = -2.0;
176
    mouth_override.opening_right   = 2.0;
177 177
}
178 178

  
179 179
void EmotionConfig::init_angry(){
......
197 197
    gaze_override.eyeblink_request_right = 0;
198 198

  
199 199
    //mouth:
200
    mouth_override.position_left   = 0.0;
201
    mouth_override.opening_left    = 3.0;
200
    mouth_override.position_left   = -2.0;
201
    mouth_override.opening_left    = 1.0;
202 202
    mouth_override.position_center = 15.0;
203
    mouth_override.opening_center  = 25.0;
204
    mouth_override.position_right  = 0.0;
205
    mouth_override.opening_right   = 3.0;
203
    mouth_override.opening_center  = 15.0;
204
    mouth_override.position_right  = -2.0;
205
    mouth_override.opening_right   = 1.0;
206 206
}
207 207

  
208 208
void EmotionConfig::init_surprised(){
......
227 227
    gaze_override.eyeblink_request_right = humotion::GazeState::EYEBLINK_TIME_DEFAULT;
228 228

  
229 229
    //mouth:
230
    mouth_override.position_left   = 0.0;
231
    mouth_override.opening_left    = 3.0;
230
    mouth_override.position_left   = -2.0;
231
    mouth_override.opening_left    = 0.0;
232 232
    mouth_override.position_center = 15.0;
233
    mouth_override.opening_center  = 30.0;
234
    mouth_override.position_right  = 0.0;
235
    mouth_override.opening_right   = 3.0;
233
    mouth_override.opening_center  = 15.0;
234
    mouth_override.position_right  = -2.0;
235
    mouth_override.opening_right   = 0.0;
236 236
}
237 237

  
238 238
void EmotionConfig::init_fear(){
......
258 258

  
259 259
    //mouth:
260 260
    mouth_override.position_left   = 0.0;
261
    mouth_override.opening_left    = 3.0;
262
    mouth_override.position_center = 20.0;
263
    mouth_override.opening_center  = 20.0;
261
    mouth_override.opening_left    = 0.0;
262
    mouth_override.position_center = 15.0;
263
    mouth_override.opening_center  = 15.0;
264 264
    mouth_override.position_right  = 0.0;
265
    mouth_override.opening_right   = 3.0;
265
    mouth_override.opening_right   = 0.0;
266 266
}

Also available in: Unified diff