Revision 3f2353f5 server/src/EmotionConfig.cpp

View differences:

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

  
101 100
}
102 101

  
103 102
void EmotionConfig::init_happy(){
......
129 128
    mouth_override.position_right  = 12.5;
130 129
    mouth_override.opening_right   = 0.0;
131 130

  
131
    // faster overblending
132
    overblend_time_ms = 300;
132 133
}
133 134

  
134 135
void EmotionConfig::init_sad(){
......
158 159
    mouth_override.opening_center  = 4.0;
159 160
    mouth_override.position_right  = 20.0;
160 161
    mouth_override.opening_right   = 0.0;
162

  
163
    // slower overblending
164
    overblend_time_ms = 900;
161 165
}
162 166

  
163 167
void EmotionConfig::init_angry(){
......
217 221
    mouth_override.opening_center  = 9.0;
218 222
    mouth_override.position_right  = 12.5;
219 223
    mouth_override.opening_right   = 0.0;
224

  
225
    // faster overblending
226
    overblend_time_ms = 300;
220 227
}
221 228

  
222 229
void EmotionConfig::init_fear(){
......
247 254
    mouth_override.opening_center  = 2.2;
248 255
    mouth_override.position_right  = 18.9;
249 256
    mouth_override.opening_right   = 0.0;
257

  
258
    // slower overblending
259
    overblend_time_ms = 800;
250 260
}

Also available in: Unified diff