2002-10-12 11:37:38 +00:00
|
|
|
#
|
|
|
|
|
# $Id$
|
|
|
|
|
#
|
2008-04-16 22:40:48 +00:00
|
|
|
# ***** BEGIN GPL LICENSE BLOCK *****
|
2002-10-12 11:37:38 +00:00
|
|
|
#
|
|
|
|
|
# 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
|
2008-04-16 22:40:48 +00:00
|
|
|
# of the License, or (at your option) any later version.
|
2002-10-12 11:37:38 +00:00
|
|
|
#
|
|
|
|
|
# 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.
|
|
|
|
|
#
|
2008-04-16 22:40:48 +00:00
|
|
|
# ***** END GPL LICENSE BLOCK *****
|
2002-10-12 11:37:38 +00:00
|
|
|
#
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
LIBNAME = blenkernel
|
|
|
|
|
DIR = $(OCGDIR)/blender/$(LIBNAME)
|
|
|
|
|
|
|
|
|
|
include nan_compile.mk
|
|
|
|
|
|
|
|
|
|
CFLAGS += $(LEVEL_1_C_WARNINGS)
|
|
|
|
|
|
|
|
|
|
# OpenGL and Python
|
|
|
|
|
CPPFLAGS += -I$(OPENGL_HEADERS)
|
2003-03-25 23:36:40 +00:00
|
|
|
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
|
|
|
|
# Reference to the types in makesdna and imbuf
|
|
|
|
|
CPPFLAGS += -I../../makesdna
|
|
|
|
|
CPPFLAGS += -I../../imbuf
|
|
|
|
|
# This mod uses the BLI and BLO module
|
|
|
|
|
CPPFLAGS += -I../../blenlib
|
|
|
|
|
CPPFLAGS += -I../../blenloader
|
2003-11-23 14:28:46 +00:00
|
|
|
CPPFLAGS += -I../../python
|
2002-10-12 11:37:38 +00:00
|
|
|
# also avi is used
|
|
|
|
|
CPPFLAGS += -I../../avi
|
|
|
|
|
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
|
|
|
|
|
|
|
|
|
# we still refer to /include a bit...
|
|
|
|
|
CPPFLAGS += -I../../include
|
|
|
|
|
|
|
|
|
|
# to include the render stuff:
|
|
|
|
|
CPPFLAGS += -I../../render/extern/include
|
|
|
|
|
|
2007-10-21 15:48:09 +00:00
|
|
|
# for image stamping
|
2007-10-22 13:26:47 +00:00
|
|
|
CPPFLAGS += -I$(NAN_BMFONT)/include
|
2002-10-12 11:37:38 +00:00
|
|
|
# for sound
|
|
|
|
|
#CPPFLAGS += -I../../../kernel/gen_system
|
2006-02-05 19:12:25 +00:00
|
|
|
CPPFLAGS += $(NAN_SDLCFLAGS)
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
|
CPPFLAGS += -I$(NAN_IKSOLVER)/include
|
2005-07-26 06:46:21 +00:00
|
|
|
CPPFLAGS += -I$(NAN_DECIMATION)/include
|
2005-09-18 13:27:12 +00:00
|
|
|
CPPFLAGS += -I$(NAN_ELBEEM)/include
|
2008-01-09 22:32:36 +00:00
|
|
|
CPPFLAGS += -I$(NAN_OPENNL)/include
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2005-07-28 00:13:18 +00:00
|
|
|
# path to zlib
|
|
|
|
|
CPPFLAGS += -I$(NAN_ZLIB)/include
|
|
|
|
|
|
2007-03-24 21:06:23 +00:00
|
|
|
#path to nodes
|
|
|
|
|
CPPFLAGS += -I../../nodes
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
# path to our own external headerfiles
|
|
|
|
|
CPPFLAGS += -I..
|
|
|
|
|
|
2008-01-29 21:01:12 +00:00
|
|
|
# path to bullet2, for cloth
|
|
|
|
|
CPPFLAGS += -I../../../../extern/bullet2/src
|
|
|
|
|
|
2005-02-18 16:52:03 +00:00
|
|
|
ifeq ($(WITH_FREETYPE2), true)
|
2003-05-10 16:35:28 +00:00
|
|
|
CPPFLAGS += -DWITH_FREETYPE2
|
|
|
|
|
CPPFLAGS += -I$(NAN_FREETYPE)/include
|
|
|
|
|
CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
|
|
|
|
|
endif
|
2005-03-11 20:16:14 +00:00
|
|
|
|
2006-08-20 15:22:56 +00:00
|
|
|
ifeq ($(WITH_VERSE), true)
|
|
|
|
|
CPPFLAGS += -DWITH_VERSE
|
|
|
|
|
CPPFLAGS += -I$(NAN_VERSE)/include
|
|
|
|
|
endif
|
|
|
|
|
|
2006-02-05 19:12:25 +00:00
|
|
|
ifeq ($(WITH_FFMPEG),true)
|
|
|
|
|
CPPFLAGS += -DWITH_FFMPEG
|
2006-02-06 06:22:39 +00:00
|
|
|
CPPFLAGS += $(NAN_FFMPEGCFLAGS)
|
2006-02-05 19:12:25 +00:00
|
|
|
endif
|
|
|
|
|
|
Orange branch: OpenEXR finally in Blender!
Credits go to Gernot Ziegler, who originally coded EXR support, and to
Austin Benesh for bringing it further. Kent Mein provided a lot of code
for integrating float buffers in Blender imbuf and ImBuf API cleanup,
and provided Make and Scons and static linking.
At this moment; the EXR libraries are a *dependency*, so you cannot get
the Orange branch compiled without having OpenEXR installed. Get the
(precompiled or sources) stuff from www.openexr.com. Current default is
that the headers and lib resides in /user/local/
Several changes/additions/fixes were added:
- EXR code only supported 'half' format (16 bits per channel). I've added
float writing, but for reading it I need tomorrow. :)
- Quite some clumsy copying of data happened in EXR code.
- cleaned up the api calls already a bit, preparing for more advanced
support
- Zbuffers were saved 16 bits, now 32 bits
- automatic adding of .exr extensions went wrong
Imbuf:
- added proper imbuf->flags and imbuf->mall support for float buffers, it
was created for *each* imbuf. :)
- found bugs for float buffers in scaling and flipping. Code there will
need more checks still
- imbuf also needs to be verified to behave properly when no 32 bits
rect exists (for saving for example)
TODO:
- support internal float images for textures, backbuf, AO probes, and
display in Image window
Hope this commit won't screwup syncing with bf-blender... :/
2006-01-09 00:40:35 +00:00
|
|
|
ifeq ($(WITH_OPENEXR), true)
|
|
|
|
|
CPPFLAGS += -DWITH_OPENEXR
|
|
|
|
|
endif
|
|
|
|
|
|
2007-06-25 19:50:25 +00:00
|
|
|
ifeq ($(WITH_DDS), true)
|
|
|
|
|
CPPFLAGS += -DWITH_DDS
|
|
|
|
|
endif
|
|
|
|
|
|
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!
2006-01-23 22:05:47 +00:00
|
|
|
ifeq ($(WITH_QUICKTIME), true)
|
|
|
|
|
CPPFLAGS += -I../../quicktime
|
|
|
|
|
CPPFLAGS += -DWITH_QUICKTIME
|
|
|
|
|
endif
|