Revision 0ca8388c

View differences:

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

  
93 93
    //mouth:
94
    mouth_override.position_left   = 14.7;
94
    /*mouth_override.position_left   = 14.7;
95 95
    mouth_override.opening_left    = 0.0;
96 96
    mouth_override.position_center = 16.0;
97 97
    mouth_override.opening_center  = 1.0;
98 98
    mouth_override.position_right  = 14.7;
99
    mouth_override.opening_right   = 0.0;
99
    mouth_override.opening_right   = 0.0;*/
100
    mouth_override.position_left   = 11.54200000000000000000;
101
    mouth_override.opening_left    = 0; //2.412000;
102
    mouth_override.position_center = 12.50000000000000000;
103
    mouth_override.opening_center  = 0; //1.737000;
104
    mouth_override.position_right  = 11.5250000000000000000;
105
    mouth_override.opening_right   = 0;//2.412000;
106

  
100 107

  
101 108
}
102 109

  
......
121 128
    gaze_override.eyeblink_request_left  = humotion::GazeState::EYEBLINK_TIME_DEFAULT;
122 129
    gaze_override.eyeblink_request_right = humotion::GazeState::EYEBLINK_TIME_DEFAULT;
123 130

  
124
    //mouth:
125
    mouth_override.position_left   = 12.5;
131
    mouth_override.position_left   = -1+9.5;
126 132
    mouth_override.opening_left    = 0.0;
127
    mouth_override.position_center = 14.88;
128
    mouth_override.opening_center  = 7.4;
129
    mouth_override.position_right  = 12.5;
133
    mouth_override.position_center = 24.3;
134
    mouth_override.opening_center  = 7.0;
135
    mouth_override.position_right  = -1+10.5;
130 136
    mouth_override.opening_right   = 0.0;
131 137

  
132 138
}
......
152 158
    gaze_override.eyeblink_request_right = 3 * humotion::GazeState::EYEBLINK_TIME_DEFAULT;
153 159

  
154 160
    //mouth:
155
    mouth_override.position_left   = 20.0;
161
    mouth_override.position_left   = 13.0;
156 162
    mouth_override.opening_left    = 0.0;
157
    mouth_override.position_center = 16.1;
158
    mouth_override.opening_center  = 4.0;
159
    mouth_override.position_right  = 20.0;
163
    mouth_override.position_center = 6.1;
164
    mouth_override.opening_center  = 0.0;
165
    mouth_override.position_right  = 13.0;
160 166
    mouth_override.opening_right   = 0.0;
161 167
}
162 168

  
......
181 187
    gaze_override.eyeblink_request_right = 0;
182 188

  
183 189
    //mouth:
184
    mouth_override.position_left   = 12.5;
185
    mouth_override.opening_left    = 0.0;
186
    mouth_override.position_center = 16.3;
187
    mouth_override.opening_center  = 2.0;
188
    mouth_override.position_right  = 17.5;
189
    mouth_override.opening_right   = 0.0;
190
    mouth_override.position_left   = 20.5;
191
    mouth_override.opening_left    = 10.0;
192
    mouth_override.position_center = 12.3;
193
    mouth_override.opening_center  = 0.0;
194
    mouth_override.position_right  = 20.5;
195
    mouth_override.opening_right   = 10.0;
190 196
}
191 197

  
192 198
void EmotionConfig::init_surprised(){
......
211 217
    gaze_override.eyeblink_request_right = humotion::GazeState::EYEBLINK_TIME_DEFAULT;
212 218

  
213 219
    //mouth:
214
    mouth_override.position_left   = 12.5;
215
    mouth_override.opening_left    = 0.0;
216
    mouth_override.position_center = 16.3;
217
    mouth_override.opening_center  = 9.0;
218
    mouth_override.position_right  = 12.5;
219
    mouth_override.opening_right   = 0.0;
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;
226

  
220 227
}
221 228

  
222 229
void EmotionConfig::init_fear(){
......
241 248
    gaze_override.eyeblink_request_right = 0;
242 249

  
243 250
    //mouth:
244
    mouth_override.position_left   = 18.9;
251
    mouth_override.position_left   = 12.9;
245 252
    mouth_override.opening_left    = 0.0;
246
    mouth_override.position_center = 16.3;
247
    mouth_override.opening_center  = 2.2;
248
    mouth_override.position_right  = 18.9;
253
    mouth_override.position_center = 17.3;
254
    mouth_override.opening_center  = 7.2;
255
    mouth_override.position_right  = 12.9;
249 256
    mouth_override.opening_right   = 0.0;
250 257
}

Also available in: Unified diff