UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[python/modturtle.cpp] Added support for float parameter in colormode()

Browse Source 
The function can now accept the value 1.0 in addition to 1

Change-Id: I9a7021076844784ca997fc618253524089cbe855
(cherry picked from commit c69e1542ecc9a7e474a3f1e92cc97f644bf4b701)
This commit is contained in:
Arthur Camouseigt
2020-05-28 13:43:15 +02:00
committed by Émilie Feral
parent 1b2750c247
commit 4b20c69174
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/port/mod/turtle/modturtle.cpp
View File

@@ -168,8 +168,16 @@ mp_obj_t modturtle_pencolor(size_t n_args, const mp_obj_t *args) {
mp_obj_t modturtle_colormode(size_t n_args, const mp_obj_t *args) {
if(n_args == 0){
return mp_obj_new_int_from_uint(static_cast<int>(sTurtle.colorMode()));
} else{
int colorMode = mp_obj_get_int(args[0]);
} else {
// To accept both colormode(1) and colormode(1.0) we try to get args[0] as both int and float
mp_float_t decimalOne = mp_obj_get_float(args[0]);
int colorMode;
// But only 1 is accepted as float, 255 must be int
if (decimalOne == 1.0) {
colorMode = static_cast<int>(MicroPython::Color::Mode::MaxIntensity1);
} else {
colorMode = mp_obj_get_int(args[0]);
}
if (colorMode != static_cast<int>(MicroPython::Color::Mode::MaxIntensity1) &&
colorMode != static_cast<int>(MicroPython::Color::Mode::MaxIntensity255)) {
mp_raise_ValueError("Colormode can be 1 or 255");