Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Color info in node editor backdrop now supports color management.

Browse Source
This commit is contained in:
Lukas Toenne
2011-04-23 08:30:28 +00:00
parent 176e45f88e
commit f69825e8e8
6 changed files with 68 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/blender/editors/space_image/image_draw.c
View File

@@ -45,7 +45,7 @@
#include "PIL_time.h"
#include "BLI_math_color.h"
#include "BLI_math.h"
#include "BLI_threads.h"
#include "BLI_string.h"
#include "BLI_utildefines.h"
@@ -133,7 +133,7 @@ static void draw_render_info(Scene *scene, Image *ima, ARegion *ar)
BKE_image_release_renderresult(scene, ima);
}
void draw_image_info(ARegion *ar, int channels, int x, int y, char *cp, float *fp, int *zp, float *zpf)
void draw_image_info(ARegion *ar, int color_manage, int channels, int x, int y, char *cp, float *fp, int *zp, float *zpf)
{
char str[256];
float dx= 6;
@@ -149,6 +149,7 @@ void draw_image_info(ARegion *ar, int channels, int x, int y, char *cp, float *f
unsigned char blue[3] = {255, 255, 255};
#endif
float hue=0, sat=0, val=0, lum=0, u=0, v=0;
float col[4], finalcol[4];
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND);
@@ -230,31 +231,47 @@ void draw_image_info(ARegion *ar, int channels, int x, int y, char *cp, float *f
}
}
glDisable(GL_BLEND);
/* color rectangle */
if (channels==1) {
if (fp)
glColor3f(fp[0], fp[0], fp[0]);
col[0] = col[1] = col[2] = fp[0];
else if (cp)
glColor3ub(cp[0], cp[0], cp[0]);
col[0] = col[1] = col[2] = (float)cp[0]/255.0f;
else
glColor3ub(0, 0, 0);
col[0] = col[1] = col[2] = 0.0f;
}
else if (channels==3) {
if (fp)
glColor3fv(fp);
else if (cp)
glColor3ub(cp[0], cp[1], cp[2]);
copy_v3_v3(col, fp);
else if (cp) {
col[0] = (float)cp[0]/255.0f;
col[1] = (float)cp[1]/255.0f;
col[2] = (float)cp[2]/255.0f;
}
else
glColor3ub(0, 0, 0);
zero_v3(col);
}
else if (channels==4) {
if (fp)
glColor4fv(fp);
else if (cp)
glColor4ub(cp[0], cp[1], cp[2], cp[3]);
copy_v4_v4(col, fp);
else if (cp) {
col[0] = (float)cp[0]/255.0f;
col[1] = (float)cp[1]/255.0f;
col[2] = (float)cp[2]/255.0f;
col[3] = (float)cp[3]/255.0f;
}
else
glColor3ub(0, 0, 0);
zero_v4(col);
}
if (color_manage) {
linearrgb_to_srgb_v3_v3(finalcol, col);
finalcol[3] = col[3];
}
else {
copy_v4_v4(finalcol, col);
}
glDisable(GL_BLEND);
glColor3fv(finalcol);
dx += 5;
glBegin(GL_QUADS);
glVertex2f(dx, 3);

2
source/blender/editors/space_image/image_intern.h
View File

@@ -60,7 +60,7 @@ void IMAGE_OT_toolbox(struct wmOperatorType *ot);
/* image_draw.c */
void draw_image_main(struct SpaceImage *sima, struct ARegion *ar, struct Scene *scene);
void draw_image_info(struct ARegion *ar, int channels, int x, int y, char *cp, float *fp, int *zp, float *zpf);
void draw_image_info(struct ARegion *ar, int color_manage, int channels, int x, int y, char *cp, float *fp, int *zp, float *zpf);
void draw_image_grease_pencil(struct bContext *C, short onlyv2d);
/* image_ops.c */

3
source/blender/editors/space_image/image_ops.c
View File

@@ -1632,7 +1632,8 @@ static void sample_draw(const bContext *UNUSED(C), ARegion *ar, void *arg_info)
{
ImageSampleInfo *info= arg_info;
if(info->draw) {
draw_image_info(ar, info->channels, info->x, info->y, info->colp, info->colfp, info->zp, info->zfp);
/* no color management needed for images (color_manage=0) */
draw_image_info(ar, 0, info->channels, info->x, info->y, info->colp, info->colfp, info->zp, info->zfp);
}
}

43
source/blender/editors/space_node/drawnode.c
View File

@@ -1442,7 +1442,7 @@ void draw_nodespace_back_pix(ARegion *ar, SpaceNode *snode, int color_manage)
}
}
void draw_nodespace_color_info(ARegion *ar, int channels, int x, int y, char *cp, float *fp)
void draw_nodespace_color_info(ARegion *ar, int color_manage, int channels, int x, int y, char *cp, float *fp)
{
char str[256];
float dx= 6;
@@ -1458,6 +1458,7 @@ void draw_nodespace_color_info(ARegion *ar, int channels, int x, int y, char *cp
unsigned char blue[3] = {255, 255, 255};
#endif
float hue=0, sat=0, val=0, lum=0, u=0, v=0;
float col[4], finalcol[4];
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND);
@@ -1541,31 +1542,47 @@ void draw_nodespace_color_info(ARegion *ar, int channels, int x, int y, char *cp
}
}
glDisable(GL_BLEND);
/* color rectangle */
if (channels==1) {
if (fp)
glColor3f(fp[0], fp[0], fp[0]);
col[0] = col[1] = col[2] = fp[0];
else if (cp)
glColor3ub(cp[0], cp[0], cp[0]);
col[0] = col[1] = col[2] = (float)cp[0]/255.0f;
else
glColor3ub(0, 0, 0);
col[0] = col[1] = col[2] = 0.0f;
}
else if (channels==3) {
if (fp)
glColor3fv(fp);
else if (cp)
glColor3ub(cp[0], cp[1], cp[2]);
copy_v3_v3(col, fp);
else if (cp) {
col[0] = (float)cp[0]/255.0f;
col[1] = (float)cp[1]/255.0f;
col[2] = (float)cp[2]/255.0f;
}
else
glColor3ub(0, 0, 0);
zero_v3(col);
}
else if (channels==4) {
if (fp)
glColor4fv(fp);
else if (cp)
glColor4ub(cp[0], cp[1], cp[2], cp[3]);
copy_v4_v4(col, fp);
else if (cp) {
col[0] = (float)cp[0]/255.0f;
col[1] = (float)cp[1]/255.0f;
col[2] = (float)cp[2]/255.0f;
col[3] = (float)cp[3]/255.0f;
}
else
glColor3ub(0, 0, 0);
zero_v4(col);
}
if (color_manage) {
linearrgb_to_srgb_v3_v3(finalcol, col);
finalcol[3] = col[3];
}
else {
copy_v4_v4(finalcol, col);
}
glDisable(GL_BLEND);
glColor3fv(finalcol);
dx += 5;
glBegin(GL_QUADS);
glVertex2f(dx, 3);

5
source/blender/editors/space_node/node_edit.c
View File

@@ -1142,11 +1142,12 @@ typedef struct ImageSampleInfo {
int draw;
} ImageSampleInfo;
static void sample_draw(const bContext *UNUSED(C), ARegion *ar, void *arg_info)
static void sample_draw(const bContext *C, ARegion *ar, void *arg_info)
{
ImageSampleInfo *info= arg_info;
draw_nodespace_color_info(ar, info->channels, info->x, info->y, info->col, info->colf);
draw_nodespace_color_info(ar, (CTX_data_scene(C)->r.color_mgt_flag & R_COLOR_MANAGEMENT), info->channels,
info->x, info->y, info->col, info->colf);
}
static void sample_apply(bContext *C, wmOperator *op, wmEvent *event)

2
source/blender/editors/space_node/node_intern.h
View File

@@ -90,7 +90,7 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link);
void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3 );
int node_link_bezier_points(View2D *v2d, SpaceNode *snode, bNodeLink *link, float coord_array[][2], int resol);
void draw_nodespace_back_pix(ARegion *ar, SpaceNode *snode, int color_manage);
void draw_nodespace_color_info(ARegion *ar, int channels, int x, int y, char *cp, float *fp);
void draw_nodespace_color_info(struct ARegion *ar, int color_manage, int channels, int x, int y, char *cp, float *fp);
/* node_edit.c */
void node_tree_from_ID(ID *id, bNodeTree **ntree, bNodeTree **edittree, int *treetype);