stephenseo/Triangles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Compare commits

base: stephenseo:3036a8c97de89aebd1e829ecf28ad7387e041130
Branches Tags
stephenseo:master
stephenseo:develop
..
compare: stephenseo:9fb86c4cf8bf068edc9c12294efa7902cfafcdfc
Branches Tags
stephenseo:develop
stephenseo:master

2 commits
3036a8c97d ... 9fb86c4cf8

Author SHA1 Message Date
Stephen Seo
9fb86c4cf8 Update LICENSE year 2024-01-23 13:48:46 +09:00
Stephen Seo
f0ea268ab2 Fix color picking 2024-01-23 13:48:31 +09:00
2 changed files with 9 additions and 7 deletions
Show stats Expand all files Collapse all files

2
LICENSE
View file

@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) 2020-2021,2023 Stephen Seo Copyright (c) 2020-2021,2023-2024 Stephen Seo
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

14
src/state.cpp
View file

@ -223,15 +223,17 @@ void Tri::State::handle_events() {
int mx = GetMouseX(); int mx = GetMouseX();
int my = GetMouseY(); int my = GetMouseY();
if(mx < 0) { mx = 0; } if(mx < 0) { mx = 0; }
else if(mx >= (int)width) { mx = width - 1; } else if(mx >= drawImage.width) { mx = drawImage.width - 1; }
if(my < 0) { my = 0; } if(my < 0) { my = 0; }
else if(my >= (int)height) { my = height - 1; } else if(my >= drawImage.height) { my = drawImage.height - 1; }
colorPickerColor[0] = colors[mx + my * width].r; my = drawImage.height - my;
colorPickerColor[1] = colors[mx + my * width].g;
colorPickerColor[2] = colors[mx + my * width].b; colorPickerColor[0] = (float)(colors[mx + my * drawImage.width].r) / 255.0F;
colorPickerColor[1] = (float)(colors[mx + my * drawImage.width].g) / 255.0F;
colorPickerColor[2] = (float)(colors[mx + my * drawImage.width].b) / 255.0F;
colorPickerColor[3] = 1.0f; colorPickerColor[3] = 1.0f;
pointCircle.fillColor = colors[mx + my * width]; pointCircle.fillColor = colors[mx + my * drawImage.width];
flags.reset(F_COPY_COLOR_MODE); flags.reset(F_COPY_COLOR_MODE);
set_notification_text("Color set"); set_notification_text("Color set");