eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 17:29:18 +02:00
Code Issues 123 Wiki Activity

changed NULL use to c++11 compliant

Browse Source
This commit is contained in:
tmj-fstate
2017-08-15 00:55:38 +02:00
parent 7068a4ceff
commit 7e51d5d2e0
27 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
color.h
View File

@@ -47,9 +47,9 @@ RGBtoHSV( glm::vec3 const &RGB ) {
hsv.x = ( RGB.g - RGB.b ) / delta; // between yellow & magenta
else
if( RGB.g >= max )
hsv.x = 2.0 + ( RGB.g - RGB.r ) / delta; // between cyan & yellow
hsv.x = 2.f + ( RGB.g - RGB.r ) / delta; // between cyan & yellow
else
hsv.x = 4.0 + ( RGB.r - RGB.g ) / delta; // between magenta & cyan
hsv.x = 4.f + ( RGB.r - RGB.g ) / delta; // between magenta & cyan
hsv.x *= 60.0; // degrees