Revision 16a22a2b

View differences:

server/src/Arbiter.cpp
247 247
    gaze_state.tilt  = requested_gaze_state.tilt;
248 248
    gaze_state.roll  = requested_gaze_state.roll;
249 249

  
250
    gaze_state.gaze_type = requested_gaze_state.gaze_type;
250 251
    gaze_state.timestamp = requested_gaze_state.timestamp;
251 252
    gaze_state.vergence  = requested_gaze_state.vergence;
252 253

  
server/src/EmotionConfig.cpp
71 71
    gaze_override.pan_offset = 0.0;
72 72
    gaze_override.tilt_offset = 0.0;
73 73
    gaze_override.roll_offset = 0.0;
74
    gaze_override.gaze_type = humotion::GazeState::GAZETYPE_OVERRIDE;
74
    gaze_override.gaze_type = humotion::GazeState::GAZETYPE_ABSOLUTE; //GAZETYPE_OVERRIDE;
75 75

  
76 76
    //not setable right now
77 77
    gaze_override.vergence = 0.0;
......
102 102
    gaze_override.pan_offset = 0.0;
103 103
    gaze_override.tilt_offset = 0.0;
104 104
    gaze_override.roll_offset = 0.0;
105
    gaze_override.gaze_type = humotion::GazeState::GAZETYPE_OVERRIDE;
105
    gaze_override.gaze_type = humotion::GazeState::GAZETYPE_ABSOLUTE; //GAZETYPE_OVERRIDE;
106 106

  
107 107
    //not setable right now
108 108
    gaze_override.vergence = 0.0;
......
132 132
    gaze_override.pan_offset = 0.0;
133 133
    gaze_override.tilt_offset = -3.0;
134 134
    gaze_override.roll_offset = -3.0;
135
    gaze_override.gaze_type = humotion::GazeState::GAZETYPE_OVERRIDE;
135
    gaze_override.gaze_type = humotion::GazeState::GAZETYPE_ABSOLUTE; //GAZETYPE_OVERRIDE;
136 136

  
137 137
    //not setable right now
138 138
    gaze_override.vergence = 0.0;
......
161 161
    gaze_override.pan_offset = 0.0;
162 162
    gaze_override.tilt_offset = -5.0;
163 163
    gaze_override.roll_offset = 0.0;
164
    gaze_override.gaze_type = humotion::GazeState::GAZETYPE_OVERRIDE;
164
    gaze_override.gaze_type = humotion::GazeState::GAZETYPE_ABSOLUTE; //GAZETYPE_OVERRIDE;
165 165

  
166 166
    //not setable right now
167 167
    gaze_override.vergence = 0.0;
......
190 190
    gaze_override.pan_offset  = 0.0;
191 191
    gaze_override.tilt_offset = 8.0;
192 192
    gaze_override.roll_offset = 0.0;
193
    gaze_override.gaze_type = humotion::GazeState::GAZETYPE_OVERRIDE;
193
    gaze_override.gaze_type = humotion::GazeState::GAZETYPE_ABSOLUTE; //GAZETYPE_OVERRIDE;
194 194

  
195 195
    //not setable right now
196 196
    gaze_override.vergence = 0.0;

Also available in: Unified diff