- 1st stage: Linear Workflow This implements automatic linear workflow in Blender's renderer. With the new Colour Management option on in the Render buttons, all inputs to the renderer and compositor are converted to linear colour space before rendering, and gamma corrected afterwards. In essence, this makes all manual gamma correction with nodes, etc unnecessary, since it's done automatically through the pipeline. It's all explained much better in the notes/doc here, so please have a look: http://wiki.blender.org/index.php/Dev:Source/Blender/Architecture/Colour_Management And an example of the sort of difference it makes: http://mke3.net/blender/devel/rendering/b25_colormanagement_test01.jpg This also enables Colour Management in the default B.blend, and changes the default lamp falloff to inverse square, which is more correct, and much easier to use now it's all gamma corrected properly. Next step is to look into profiles/soft proofing for the compositor. Thanks to brecht for reviewing and fixing some oversights!
178 lines
4.8 KiB
C
178 lines
4.8 KiB
C
/**
|
|
* $Id$
|
|
*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
* All rights reserved.
|
|
*
|
|
* Contributor(s): Blender Foundation, 2002-2009
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
|
|
#include "DNA_image_types.h"
|
|
#include "DNA_screen_types.h"
|
|
#include "DNA_space_types.h"
|
|
|
|
#include "BKE_context.h"
|
|
#include "BKE_global.h"
|
|
#include "BKE_image.h"
|
|
#include "BKE_screen.h"
|
|
|
|
#include "BIF_gl.h"
|
|
#include "BIF_glutil.h"
|
|
|
|
#include "ED_screen.h"
|
|
|
|
#include "RE_pipeline.h"
|
|
|
|
#include "WM_api.h"
|
|
|
|
#define HEADER_HEIGHT 18
|
|
|
|
/* *********************** render callbacks ***************** */
|
|
|
|
/* set on initialize render, only one render output to imagewindow can exist, so the global isnt dangerous yet :) */
|
|
static ScrArea *image_area= NULL;
|
|
|
|
/* can get as well the full picture, as the parts while rendering */
|
|
/* XXX will be obsolete, here for reference now */
|
|
void imagewindow_progress(SpaceImage *sima, RenderResult *rr, volatile rcti *renrect)
|
|
{
|
|
float x1, y1, *rectf= NULL;
|
|
unsigned int *rect32= NULL;
|
|
int ymin, ymax, xmin, xmax;
|
|
|
|
/* if renrect argument, we only display scanlines */
|
|
if(renrect) {
|
|
/* if ymax==recty, rendering of layer is ready, we should not draw, other things happen... */
|
|
if(rr->renlay==NULL || renrect->ymax>=rr->recty)
|
|
return;
|
|
|
|
/* xmin here is first subrect x coord, xmax defines subrect width */
|
|
xmin = renrect->xmin;
|
|
xmax = renrect->xmax - xmin;
|
|
if (xmax<2) return;
|
|
|
|
ymin= renrect->ymin;
|
|
ymax= renrect->ymax - ymin;
|
|
if(ymax<2)
|
|
return;
|
|
renrect->ymin= renrect->ymax;
|
|
}
|
|
else {
|
|
xmin = ymin = 0;
|
|
xmax = rr->rectx - 2*rr->crop;
|
|
ymax = rr->recty - 2*rr->crop;
|
|
}
|
|
|
|
/* image window cruft */
|
|
|
|
/* find current float rect for display, first case is after composit... still weak */
|
|
if(rr->rectf)
|
|
rectf= rr->rectf;
|
|
else {
|
|
if(rr->rect32)
|
|
rect32= (unsigned int *)rr->rect32;
|
|
else {
|
|
if(rr->renlay==NULL || rr->renlay->rectf==NULL) return;
|
|
rectf= rr->renlay->rectf;
|
|
}
|
|
}
|
|
if(rectf) {
|
|
/* if scanline updates... */
|
|
rectf+= 4*(rr->rectx*ymin + xmin);
|
|
|
|
/* when rendering more pixels than needed, we crop away cruft */
|
|
if(rr->crop)
|
|
rectf+= 4*(rr->crop*rr->rectx + rr->crop);
|
|
}
|
|
|
|
/* tilerect defines drawing offset from (0,0) */
|
|
/* however, tilerect (xmin, ymin) is first pixel */
|
|
x1 = sima->centx + (rr->tilerect.xmin + rr->crop + xmin)*sima->zoom;
|
|
y1 = sima->centy + (rr->tilerect.ymin + rr->crop + ymin)*sima->zoom;
|
|
|
|
/* needed for gla draw */
|
|
// XXX { rcti rct= ar->winrct; rct.ymax-= HEADER_HEIGHT; glaDefine2DArea(&rct);}
|
|
|
|
glPixelZoom(sima->zoom, sima->zoom);
|
|
|
|
if(rect32)
|
|
glaDrawPixelsSafe(x1, y1, xmax, ymax, rr->rectx, GL_RGBA, GL_UNSIGNED_BYTE, rect32);
|
|
else
|
|
glaDrawPixelsSafe_to32(x1, y1, xmax, ymax, rr->rectx, rectf, 0);
|
|
|
|
glPixelZoom(1.0, 1.0);
|
|
|
|
}
|
|
|
|
|
|
/* coming from BIF_toggle_render_display() */
|
|
void imagewindow_toggle_render(bContext *C)
|
|
{
|
|
bScreen *sc= CTX_wm_screen(C);
|
|
ScrArea *sa;
|
|
|
|
/* check if any imagewindow is showing temporal render output */
|
|
for(sa=sc->areabase.first; sa; sa= sa->next) {
|
|
if(sa->spacetype==SPACE_IMAGE) {
|
|
SpaceImage *sima= sa->spacedata.first;
|
|
|
|
if(sima->image && sima->image->type==IMA_TYPE_R_RESULT)
|
|
if(sima->flag & (SI_PREVSPACE|SI_FULLWINDOW))
|
|
break;
|
|
}
|
|
}
|
|
|
|
if(sa) {
|
|
// XXX addqueue(sa->win, ESCKEY, 1); /* also returns from fullscreen */
|
|
}
|
|
else {
|
|
// sa= imagewindow_set_render_display(C);
|
|
// XXX scrarea_queue_headredraw(sa);
|
|
// XXX scrarea_queue_winredraw(sa);
|
|
}
|
|
}
|
|
|
|
/* NOTE: called while render, so no malloc allowed! */
|
|
static void imagewindow_renderinfo_cb(void *handle, RenderStats *rs)
|
|
{
|
|
if(image_area) {
|
|
// XXX BIF_make_render_text(rs);
|
|
|
|
// XXX sima_draw_render_info(sima, ar);
|
|
|
|
/* no screen_swapbuffers, prevent any other window to draw */
|
|
// XXX myswapbuffers();
|
|
}
|
|
}
|
|
|
|
void ED_space_image_render_callbacks(bContext *C, Render *re)
|
|
{
|
|
|
|
// RE_display_init_cb(re, C, imagewindow_init_display_cb);
|
|
// RE_display_draw_cb(re, C, imagewindow_progress_display_cb);
|
|
// RE_display_clear_cb(re, C, imagewindow_clear_display_cb);
|
|
RE_stats_draw_cb(re, C, imagewindow_renderinfo_cb);
|
|
}
|
|
|