Revision 92d9b645

View differences:

server/src/EmotionConfig.cpp
91 91
    gaze_override.eyeblink_request_right = 0;
92 92

  
93 93
    //mouth:
94
    mouth_override.position_left   = 20.0;
95
    mouth_override.opening_left    = 0.0;
96
    mouth_override.position_center = 20.0;
97
    mouth_override.opening_center  = 0.0;
98
    mouth_override.position_right  = 20.0;
99
    mouth_override.opening_right   = 0.0;
94
    mouth_override.position_left   = 5.0;
95
    mouth_override.opening_left    = 5.0;
96
    mouth_override.position_center = 10.0;
97
    mouth_override.opening_center  = 5.0;
98
    mouth_override.position_right  = 5.0;
99
    mouth_override.opening_right   = 5.0;
100 100

  
101 101
}
102 102

  
......
138 138
    //right opening: 12.6
139 139

  
140 140
    
141
    mouth_override.position_left   = 0.0;
142
    mouth_override.opening_left    = 0.0;
141
    mouth_override.position_left   = 5.0;
142
    mouth_override.opening_left    = 5.0;
143 143
    mouth_override.position_center = 40.0;
144
    mouth_override.opening_center  = 0.0;
145
    mouth_override.position_right  = 0.0;
146
    mouth_override.opening_right   = 0.0;
144
    mouth_override.opening_center  = 15.0;
145
    mouth_override.position_right  = 5.0;
146
    mouth_override.opening_right   = 5.0;
147 147

  
148 148
}
149 149

  
......
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    = 0.0;
173
    mouth_override.position_center = 40.0;
171
    mouth_override.position_left   = 5.0;
172
    mouth_override.opening_left    = 5.0;
173
    mouth_override.position_center = 60.0;
174 174
    mouth_override.opening_center  = 15.0;
175
    mouth_override.position_right  = 0.0;
176
    mouth_override.opening_right   = 0.0;
175
    mouth_override.position_right  = 5.0;
176
    mouth_override.opening_right   = 5.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   = 10.0;
200
    mouth_override.position_left   = 0.0;
201 201
    mouth_override.opening_left    = 5.0;
202 202
    mouth_override.position_center = 10.0;
203 203
    mouth_override.opening_center  = 5.0;
204
    mouth_override.position_right  = 10.0;
204
    mouth_override.position_right  = 0.0;
205 205
    mouth_override.opening_right   = 5.0;
206 206
}
207 207

  
......
228 228

  
229 229
    //mouth:
230 230
    mouth_override.position_left   = 0.0;
231
    mouth_override.opening_left    = 0.0;
232
    mouth_override.position_center = 0.0;
233
    mouth_override.opening_center  = 20.0;
231
    mouth_override.opening_left    = 5.0;
232
    mouth_override.position_center = 40.0;
233
    mouth_override.opening_center  = 15.0;
234 234
    mouth_override.position_right  = 0.0;
235
    mouth_override.opening_right   = 0.0;
235
    mouth_override.opening_right   = 5.0;
236 236
}
237 237

  
238 238
void EmotionConfig::init_fear(){
......
257 257
    gaze_override.eyeblink_request_right = 0;
258 258

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

Also available in: Unified diff