Ton Roosendaal
042d612df2
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!
169 lines
4.0 KiB
C
169 lines
4.0 KiB
C
/**
|
|
*
|
|
* ***** BEGIN GPL/BL DUAL 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. The Blender
|
|
* Foundation also sells licenses for use in proprietary software under
|
|
* the Blender License. See http://www.blender.org/BL/ for information
|
|
* about this.
|
|
*
|
|
* 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.
|
|
*
|
|
* The Original Code is: all of this file.
|
|
*
|
|
* Contributor(s): none yet.
|
|
*
|
|
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
|
* writeimage.c
|
|
*
|
|
* $Id$
|
|
*/
|
|
|
|
#ifdef WIN32
|
|
#include <io.h>
|
|
#endif
|
|
|
|
#include "BKE_global.h"
|
|
#include "BLI_blenlib.h"
|
|
|
|
#include "imbuf.h"
|
|
#include "imbuf_patch.h"
|
|
|
|
#include "IMB_imbuf_types.h"
|
|
#include "IMB_imbuf.h"
|
|
|
|
#include "IMB_allocimbuf.h"
|
|
|
|
#include "IMB_targa.h"
|
|
#include "IMB_jpeg.h"
|
|
#include "IMB_iris.h"
|
|
#include "IMB_ham.h"
|
|
#include "IMB_hamx.h"
|
|
#include "IMB_amiga.h"
|
|
#include "IMB_png.h"
|
|
#include "IMB_bmp.h"
|
|
#include "IMB_tiff.h"
|
|
#include "IMB_radiance_hdr.h"
|
|
#ifdef WITH_OPENEXR
|
|
#include "openexr/openexr_api.h"
|
|
#endif
|
|
|
|
#include "IMB_iff.h"
|
|
#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;
|
|
int file = -1;
|
|
|
|
if (ibuf==0) return (FALSE);
|
|
ibuf->flags = 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
|
|
if (IS_openexr(ibuf)) {
|
|
return imb_save_openexr(ibuf, name, flags);
|
|
}
|
|
#endif
|
|
|
|
file = open(name, O_BINARY | O_RDWR | O_CREAT | O_TRUNC, 0666);
|
|
if (file < 0) return (FALSE);
|
|
|
|
if (flags & IB_rect){
|
|
if (ibuf->cmap){
|
|
imb_checkncols(ibuf);
|
|
}
|
|
}
|
|
|
|
/* Put formats that take a filehandle here */
|
|
ok = imb_start_iff(ibuf,file);
|
|
if (IS_amiga(ibuf)){
|
|
IMB_flipy(ibuf);
|
|
if (flags & IB_rect){
|
|
if ((flags & IB_cmap) == 0) {
|
|
if (IS_ham(ibuf)){
|
|
if (ok) ok = imb_converttoham(ibuf);
|
|
}else if (ibuf->cmap){
|
|
if (ok) ok = IMB_converttocmap(ibuf);
|
|
}
|
|
}
|
|
if (ok){
|
|
if (ibuf->planes==0){
|
|
delpl=TRUE;
|
|
ok=imb_addplanesImBuf(ibuf);
|
|
}
|
|
imb_longtobp(ibuf);
|
|
}
|
|
}
|
|
|
|
if (flags & IB_vert){
|
|
if (ok) ok = imb_encodebodyv(ibuf,file);
|
|
}
|
|
else{
|
|
if (ok) ok = imb_encodebodyh(ibuf,file);
|
|
}
|
|
if (ok) ok = imb_update_iff(file,BODY);
|
|
}else if (IS_anim(ibuf)) {
|
|
if (ok) ok = imb_enc_anim(ibuf, file);
|
|
if (ok) ok = imb_update_iff(file, BODY);
|
|
}
|
|
close(file);
|
|
|
|
if (ok==FALSE) {
|
|
fprintf(stderr,"Couldn't save picture.\n");
|
|
}
|
|
if (delpl) imb_freeplanesImBuf(ibuf);
|
|
|
|
return (ok);
|
|
}
|
|
|