Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix MDL implementation of mx_hsvtorgb #1584

Merged
merged 1 commit into from
Oct 28, 2023
Merged

Fix MDL implementation of mx_hsvtorgb #1584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions source/MaterialXGenMdl/mdl/materialx/hsv.mdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ import ::limits::*;
export float3 mx_hsvtorgb(float3 hsv) {
// from "Color Imaging, Fundamentals and Applications", Reinhard et al., p. 442

// A hue of 1.0 is questionably valid, and needs to be interpreted as 0.0f
float h_prime = (hsv.x < 1.0f) ? hsv.x * 6.0f : 0.0f; // H * 360.0/60.0
float h_floor = math::floor(h_prime);
float f = h_prime - h_floor;
float h = 6.0 * (hsv.x - math::floor(hsv.x));
int hi = int(h); // truncate
float f = h - float(hi);

float zy = hsv.z*hsv.y;
float a = hsv.z - zy;
float b = hsv.z - zy*f;
float c = a + zy*f;

switch(int(h_floor)) {
switch(hi) {
default:
// hue out of [0,1] range...
// fall through...
Expand Down