diff options
author | Ton Roosendaal <ton@blender.org> | 2006-01-24 01:05:47 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-01-24 01:05:47 +0300 |
commit | 042d612df219c8f6a29afa235537380f227b5684 (patch) | |
tree | 310a2c859b99c559115bbcda0aa70f2543bf962c /source/blender/imbuf | |
parent | 5668480c99001a617fd59a2383deb858195ffb26 (diff) |
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/radiance_hdr.c | 21 | ||||
-rw-r--r-- | source/blender/imbuf/intern/scaling.c | 45 | ||||
-rw-r--r-- | source/blender/imbuf/intern/writeimage.c | 14 |
3 files changed, 57 insertions, 23 deletions
diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c index a90d7d651f8..bd2d41881db 100644 --- a/source/blender/imbuf/intern/radiance_hdr.c +++ b/source/blender/imbuf/intern/radiance_hdr.c @@ -197,8 +197,8 @@ struct ImBuf *imb_loadhdr(unsigned char *mem, int size, int flags) ptr = (unsigned char *)strchr((char*)&mem[x+1], '\n'); ptr++; - if (flags & IB_test) ibuf = IMB_allocImBuf(width, height, 24, 0, 0); - else ibuf = IMB_allocImBuf(width, height, 24, IB_rect|IB_rectfloat, 0); + if (flags & IB_test) ibuf = IMB_allocImBuf(width, height, 32, 0, 0); + else ibuf = IMB_allocImBuf(width, height, 32, IB_rect|IB_rectfloat, 0); if (ibuf==NULL) return NULL; ibuf->ftype = RADHDR; @@ -224,7 +224,7 @@ struct ImBuf *imb_loadhdr(unsigned char *mem, int size, int flags) *rect_float++ = fcol[RED]; *rect_float++ = fcol[GRN]; *rect_float++ = fcol[BLU]; - *rect_float++ = 255; + *rect_float++ = 1.0f; /* Also old oldstyle for the rest of blender which is not using floats yet */ /* very weird mapping! (ton) */ @@ -339,19 +339,28 @@ static void writeHeader(FILE *file, int width, int height) short imb_savehdr(struct ImBuf *ibuf, char *name, int flags) { - int y, width=ibuf->x, height=ibuf->y; FILE* file = fopen(name, "wb"); - + float *fp= NULL; + int y, width=ibuf->x, height=ibuf->y; + char *cp= NULL; + if (file==NULL) return 0; writeHeader(file, width, height); + if(ibuf->rect) + cp= (char *)(ibuf->rect + (height-1)*width); + if(ibuf->rect_float) + fp= ibuf->rect_float + 4*(height-1)*width; + for (y=height-1;y>=0;y--) { - if (fwritecolrs(file, width,(unsigned char *)&ibuf->rect[y*width*4], &ibuf->rect_float[y*width*4]) < 0) { + if (fwritecolrs(file, width, cp, fp) < 0) { fclose(file); printf("HDR write error\n"); return 0; } + if(cp) cp-= 4*width; + if(fp) fp-= 4*width; } fclose(file); diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index 539ea0377b3..c962f1fbde5 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -915,26 +915,33 @@ struct ImBuf *IMB_scaleImBuf(struct ImBuf * ibuf, short newx, short newy) return(ibuf); } +struct imbufRGBA { + float r, g, b, a; +}; struct ImBuf *IMB_scalefastImBuf(struct ImBuf *ibuf, short newx, short newy) { unsigned int *rect,*_newrect,*newrect; - float *rectf,*_newrectf,*newrectf; - int x,y, do_float=0; + struct imbufRGBA *rectf, *_newrectf, *newrectf; + int x,y, do_float=0, do_rect=0; int ofsx,ofsy,stepx,stepy; + rect = NULL; _newrect = NULL; newrect = NULL; rectf = NULL; _newrectf = NULL; newrectf = NULL; if (ibuf==NULL) return(0); - if (ibuf->rect==NULL) return(ibuf); + if (ibuf->rect) do_rect = 1; if (ibuf->rect_float) do_float = 1; - + if (do_rect==0 && do_float==0) return(ibuf); + if (newx == ibuf->x && newy == ibuf->y) return(ibuf); - - _newrect = MEM_mallocN(newx * newy * sizeof(int), "scalefastimbuf"); - if (_newrect==NULL) return(ibuf); - newrect = _newrect; - + + if(do_rect) { + _newrect = MEM_mallocN(newx * newy * sizeof(int), "scalefastimbuf"); + if (_newrect==NULL) return(ibuf); + newrect = _newrect; + } + if (do_float) { _newrectf = MEM_mallocN(newx * newy * sizeof(float) * 4, "scalefastimbuf f"); if (_newrectf==NULL) return(ibuf); @@ -946,30 +953,34 @@ struct ImBuf *IMB_scalefastImBuf(struct ImBuf *ibuf, short newx, short newy) ofsy = 32768; for (y = newy; y > 0 ; y--){ - rect = ibuf->rect; - rect += (ofsy >> 16) * ibuf->x; + if(do_rect) { + rect = ibuf->rect; + rect += (ofsy >> 16) * ibuf->x; + } if (do_float) { - rectf = ibuf->rect_float; + rectf = (struct imbufRGBA *)ibuf->rect_float; rectf += (ofsy >> 16) * ibuf->x; } ofsy += stepy; ofsx = 32768; for (x = newx ; x>0 ; x--){ - *newrect++ = rect[ofsx >> 16]; + if (do_rect) *newrect++ = rect[ofsx >> 16]; if (do_float) *newrectf++ = rectf[ofsx >> 16]; ofsx += stepx; } } - imb_freerectImBuf(ibuf); - ibuf->mall |= IB_rect; - ibuf->rect = _newrect; + if (do_rect) { + imb_freerectImBuf(ibuf); + ibuf->mall |= IB_rect; + ibuf->rect = _newrect; + } if (do_float) { imb_freerectfloatImBuf(ibuf); ibuf->mall |= IB_rectfloat; - ibuf->rect_float = _newrectf; + ibuf->rect_float = (float *)_newrectf; } scalefast_Z_ImBuf(ibuf, newx, newy); diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c index 522ce78ebc0..ae75de8f54f 100644 --- a/source/blender/imbuf/intern/writeimage.c +++ b/source/blender/imbuf/intern/writeimage.c @@ -65,6 +65,8 @@ #include "IMB_bitplanes.h" #include "IMB_divers.h" +/* added facility to copy with saving non-float rects */ + short IMB_saveiff(struct ImBuf *ibuf, char *name, int flags) { short ok=TRUE,delpl=FALSE; @@ -75,24 +77,36 @@ short IMB_saveiff(struct ImBuf *ibuf, char *name, int flags) /* Put formats that take a filename here */ if (IS_jpg(ibuf)) { + if(ibuf->rect==NULL && ibuf->rect_float) + IMB_rect_from_float(ibuf); return imb_savejpeg(ibuf, name, flags); } if (IS_radhdr(ibuf)) { return imb_savehdr(ibuf, name, flags); } if (IS_png(ibuf)) { + if(ibuf->rect==NULL && ibuf->rect_float) + IMB_rect_from_float(ibuf); return imb_savepng(ibuf, name, flags); } if (IS_bmp(ibuf)) { + if(ibuf->rect==NULL && ibuf->rect_float) + IMB_rect_from_float(ibuf); return imb_savebmp(ibuf, name, flags); } if (IS_tga(ibuf)) { + if(ibuf->rect==NULL && ibuf->rect_float) + IMB_rect_from_float(ibuf); return imb_savetarga(ibuf, name, flags); } if (IS_iris(ibuf)) { + if(ibuf->rect==NULL && ibuf->rect_float) + IMB_rect_from_float(ibuf); return imb_saveiris(ibuf, name, flags); } if (G.have_libtiff && IS_tiff(ibuf)) { + if(ibuf->rect==NULL && ibuf->rect_float) + IMB_rect_from_float(ibuf); return imb_savetiff(ibuf, name, flags); } #ifdef WITH_OPENEXR |