mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-02 08:49:20 -05:00
Solve bug by removing unnecessary assert in IODescription cut.
This commit is contained in:
@@ -277,12 +277,12 @@ vec4 calculateGrayScaleOverlay(
|
||||
}
|
||||
#endfor
|
||||
|
||||
|
||||
/*
|
||||
// HSV blending
|
||||
vec3 hsvCurrent = rgb2hsv(currentColor.rgb);
|
||||
vec3 hsvNew = vec3(hsvCurrent.x, hsvCurrent.y, colorGrayScale.r);
|
||||
vec3 rgbNew = hsv2rgb(hsvNew);
|
||||
/*
|
||||
|
||||
|
||||
// HSL blending
|
||||
vec3 hslCurrent = rgb2hsl(currentColor.rgb);
|
||||
@@ -291,7 +291,7 @@ vec4 calculateGrayScaleOverlay(
|
||||
vec3 rgbNew = hsl2rgb(hslNew);
|
||||
*/
|
||||
// No color blending, use grayscale
|
||||
//vec3 rgbNew = colorGrayScale.rgb;
|
||||
vec3 rgbNew = colorGrayScale.rgb;
|
||||
vec4 color = blendOver(currentColor, vec4(rgbNew, colorGrayScale.a));
|
||||
|
||||
return color;
|
||||
|
||||
@@ -84,8 +84,7 @@ namespace openspace {
|
||||
ratio.y = write.region.numPixels.y / (double) read.region.numPixels.y;
|
||||
|
||||
double ratioRatio = ratio.x / ratio.y;
|
||||
ghoul_assert(glm::abs(ratioRatio - 1.0) < 0.001, "Different read/write aspect ratio!");
|
||||
|
||||
//ghoul_assert(glm::abs(ratioRatio - 1.0) < 0.01, "Different read/write aspect ratio!");
|
||||
|
||||
IODescription whatCameOff = *this;
|
||||
whatCameOff.read.region = read.region.globalCut(side, pos);
|
||||
|
||||
Reference in New Issue
Block a user