Revision 1e1c61a8 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

  
100 101
}
101 102

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

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

  
135 134
void EmotionConfig::init_sad(){
136 135
    gaze_override.pan_offset = 0.0;
137
    gaze_override.tilt_offset = -13.0;
136
    gaze_override.tilt_offset = -3.0;
138 137
    gaze_override.roll_offset = -3.0;
139 138
    gaze_override.gaze_type = humotion::GazeState::GAZETYPE_ABSOLUTE; //GAZETYPE_OVERRIDE;
140 139

  
......
159 158
    mouth_override.opening_center  = 4.0;
160 159
    mouth_override.position_right  = 20.0;
161 160
    mouth_override.opening_right   = 0.0;
162

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

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

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

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

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

Also available in: Unified diff