Revision 9cb381ec server/src/EmotionConfig.cpp
| server/src/EmotionConfig.cpp | ||
|---|---|---|
| 27 | 27 |
*/ |
| 28 | 28 |
|
| 29 | 29 |
#include "EmotionConfig.h" |
| 30 |
using namespace boost; |
|
| 31 | 30 |
|
| 32 | 31 |
EmotionConfig::EmotionConfig(){
|
| 33 | 32 |
select_config(NEUTRAL); |
| ... | ... | |
| 42 | 41 |
|
| 43 | 42 |
|
| 44 | 43 |
bool EmotionConfig::is_active(){
|
| 45 |
if (get_system_time() >= end_time){
|
|
| 44 |
if (std::chrono::steady_clock::now() >= end_time){
|
|
| 46 | 45 |
return false; |
| 47 | 46 |
} |
| 48 | 47 |
|
| ... | ... | |
| 51 | 50 |
|
| 52 | 51 |
void EmotionConfig::set_duration(unsigned long ms){
|
| 53 | 52 |
//set a timeout: |
| 54 |
end_time = get_system_time() + posix_time::milliseconds(ms);
|
|
| 53 |
end_time = std::chrono::steady_clock::now() + std::chrono::milliseconds(ms);
|
|
| 55 | 54 |
} |
| 56 | 55 |
|
| 57 | 56 |
void EmotionConfig::select_config(EmotionType e){
|
| ... | ... | |
| 104 | 103 |
mouth_override.position_right = 11.5250000000000000000; |
| 105 | 104 |
mouth_override.opening_right = 0;//2.412000; |
| 106 | 105 |
*/ |
| 107 |
|
|
| 106 |
|
|
| 108 | 107 |
mouth_override.position_left = 20; |
| 109 | 108 |
mouth_override.opening_left = 0.0; |
| 110 | 109 |
mouth_override.position_center = 22; |
| ... | ... | |
| 141 | 140 |
mouth_override.opening_center = 7.0; |
| 142 | 141 |
mouth_override.position_right = -1+10.5; |
| 143 | 142 |
mouth_override.opening_right = 0.0;*/ |
| 144 |
|
|
| 143 |
|
|
| 145 | 144 |
mouth_override.position_left = 18; //13.56850000000000000000; |
| 146 | 145 |
mouth_override.opening_left = 0; //.791000; |
| 147 | 146 |
mouth_override.position_center = 26; //14.18400000000000000000; |
| ... | ... | |
| 149 | 148 |
mouth_override.position_right = 18; //15.31800000000000000000; |
| 150 | 149 |
mouth_override.opening_right = 0; //2.791000; |
| 151 | 150 |
|
| 152 |
|
|
| 151 |
|
|
| 153 | 152 |
|
| 154 | 153 |
} |
| 155 | 154 |
|
| ... | ... | |
| 240 | 239 |
mouth_override.position_right = 22.0; |
| 241 | 240 |
mouth_override.opening_right = 0.0; |
| 242 | 241 |
|
| 243 |
|
|
| 242 |
|
|
| 244 | 243 |
} |
| 245 | 244 |
|
| 246 | 245 |
void EmotionConfig::init_fear(){
|
Also available in: Unified diff