Revision efbcb710 server/include/EmotionConfig.h

View differences:

server/include/EmotionConfig.h
34 34

  
35 35

  
36 36
class EmotionConfig{
37
public: 
37
public:
38 38

  
39 39
    typedef enum{
40 40
        NEUTRAL  = 0,
......
48 48

  
49 49
    EmotionConfig();
50 50
    EmotionConfig(EmotionType e);
51
	~EmotionConfig();
51
    ~EmotionConfig();
52 52

  
53 53
    void set_duration(unsigned long ms);
54 54

  
......
64 64
    bool is_active();
65 65

  
66 66

  
67
	//override/influence the gaze state
68
	// -> override neck angles (will be added to neck ptr)
69
	// -> set eyelid opening (rel to moving eyeball)
70
	// -> force eyebrows
71
	humotion::GazeState gaze_override;
67
    //override/influence the gaze state
68
    // -> override neck angles (will be added to neck ptr)
69
    // -> set eyelid opening (rel to moving eyeball)
70
    // -> force eyebrows
71
    humotion::GazeState gaze_override;
72 72

  
73
	//override mouth
74
	humotion::MouthState mouth_override;
73
    //override mouth
74
    humotion::MouthState mouth_override;
75

  
76
    //overblend time
77
    unsigned int overblend_time_ms;
75 78
private:
76
     boost::system_time end_time;
79
    boost::system_time end_time;
77 80
};
78 81

  

Also available in: Unified diff