eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-09-01 11:39:18 +02:00
Code Issues 134 Wiki Activity

merge, with tmj renderer

Browse Source
This commit is contained in:
milek7
2017-08-18 00:56:05 +02:00
parent 08acc60a8b 4ee618a3c1
commit ec60853614
85 changed files with 6815 additions and 3770 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