godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4409 from Hinsbart/encode_axis_value 

Encode axis_value in Variant for InputEvent::JOYSTICK_MOTION.
This commit is contained in:
Rémi Verschelde 2016-04-24 14:32:43 +02:00
parent ef8b160da8 9201b5a27c
commit a1ebf555b7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/io/marshalls.cpp
View File

@ -438,8 +438,9 @@ Error decode_variant(Variant& r_variant,const uint8_t *p_buffer, int p_len,int *
case InputEvent::JOYSTICK_MOTION: {
ie.joy_motion.axis=decode_uint32(&buf[12]);
ie.joy_motion.axis_value=decode_float(&buf[16]);
if (r_len)
(*r_len)+=4;
(*r_len)+=8;
} break;
}
@ -1154,8 +1155,9 @@ Error encode_variant(const Variant& p_variant, uint8_t *r_buffer, int &r_len) {
int axis = ie.joy_motion.axis;
encode_uint32(axis,&buf[llen]);
encode_float(ie.joy_motion.axis_value, &buf[llen+4]);
}
llen+=4;
llen+=8;
} break;
}