2011-04-27 11:58:34 +00:00
|
|
|
/*
|
|
|
|
|
* Copyright 2011, Blender Foundation.
|
|
|
|
|
*
|
|
|
|
|
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "background.h"
|
|
|
|
|
#include "buffers.h"
|
|
|
|
|
#include "camera.h"
|
|
|
|
|
#include "device.h"
|
|
|
|
|
#include "integrator.h"
|
2011-08-28 13:55:59 +00:00
|
|
|
#include "film.h"
|
2011-04-27 11:58:34 +00:00
|
|
|
#include "light.h"
|
|
|
|
|
#include "scene.h"
|
|
|
|
|
#include "session.h"
|
|
|
|
|
#include "shader.h"
|
|
|
|
|
|
|
|
|
|
#include "util_color.h"
|
|
|
|
|
#include "util_foreach.h"
|
|
|
|
|
#include "util_function.h"
|
|
|
|
|
#include "util_progress.h"
|
|
|
|
|
#include "util_time.h"
|
|
|
|
|
|
|
|
|
|
#include "blender_sync.h"
|
|
|
|
|
#include "blender_session.h"
|
|
|
|
|
#include "blender_util.h"
|
|
|
|
|
|
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
|
|
2012-01-09 16:58:01 +00:00
|
|
|
BlenderSession::BlenderSession(BL::RenderEngine b_engine_, BL::UserPreferences b_userpref_,
|
|
|
|
|
BL::BlendData b_data_, BL::Scene b_scene_)
|
|
|
|
|
: b_engine(b_engine_), b_userpref(b_userpref_), b_data(b_data_), b_scene(b_scene_),
|
2012-09-04 13:29:07 +00:00
|
|
|
b_v3d(PointerRNA_NULL), b_rv3d(PointerRNA_NULL)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
|
|
|
|
/* offline render */
|
|
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
width = b_engine.resolution_x();
|
|
|
|
|
height = b_engine.resolution_y();
|
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
background = true;
|
|
|
|
|
last_redraw_time = 0.0f;
|
|
|
|
|
|
|
|
|
|
create_session();
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-09 16:58:01 +00:00
|
|
|
BlenderSession::BlenderSession(BL::RenderEngine b_engine_, BL::UserPreferences b_userpref_,
|
|
|
|
|
BL::BlendData b_data_, BL::Scene b_scene_,
|
2011-04-27 11:58:34 +00:00
|
|
|
BL::SpaceView3D b_v3d_, BL::RegionView3D b_rv3d_, int width_, int height_)
|
2012-01-09 16:58:01 +00:00
|
|
|
: b_engine(b_engine_), b_userpref(b_userpref_), b_data(b_data_), b_scene(b_scene_),
|
2012-09-04 13:29:07 +00:00
|
|
|
b_v3d(b_v3d_), b_rv3d(b_rv3d_)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
|
|
|
|
/* 3d view render */
|
|
|
|
|
width = width_;
|
|
|
|
|
height = height_;
|
|
|
|
|
background = false;
|
|
|
|
|
last_redraw_time = 0.0f;
|
|
|
|
|
|
|
|
|
|
create_session();
|
2011-12-21 20:51:55 +00:00
|
|
|
session->start();
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BlenderSession::~BlenderSession()
|
|
|
|
|
{
|
|
|
|
|
free_session();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BlenderSession::create_session()
|
|
|
|
|
{
|
2011-11-04 15:46:15 +00:00
|
|
|
SceneParams scene_params = BlenderSync::get_scene_params(b_scene, background);
|
2012-09-04 13:29:07 +00:00
|
|
|
SessionParams session_params = BlenderSync::get_session_params(b_engine, b_userpref, b_scene, background);
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2011-10-30 10:12:34 +00:00
|
|
|
/* reset status/progress */
|
2012-06-09 18:56:12 +00:00
|
|
|
last_status = "";
|
|
|
|
|
last_progress = -1.0f;
|
2011-10-30 10:12:34 +00:00
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
/* create scene */
|
2012-09-04 13:29:07 +00:00
|
|
|
scene = new Scene(scene_params, session_params.device);
|
|
|
|
|
|
|
|
|
|
/* create session */
|
|
|
|
|
session = new Session(session_params);
|
|
|
|
|
session->scene = scene;
|
|
|
|
|
session->progress.set_update_callback(function_bind(&BlenderSession::tag_redraw, this));
|
|
|
|
|
session->progress.set_cancel_callback(function_bind(&BlenderSession::test_cancel, this));
|
|
|
|
|
session->set_pause(BlenderSync::get_session_pause(b_scene, background));
|
2011-04-27 11:58:34 +00:00
|
|
|
|
|
|
|
|
/* create sync */
|
2012-12-28 14:21:30 +00:00
|
|
|
sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background, session->progress, session_params.device.type == DEVICE_CPU);
|
2012-04-30 12:49:26 +00:00
|
|
|
sync->sync_data(b_v3d, b_engine.camera_override());
|
2011-04-27 11:58:34 +00:00
|
|
|
|
|
|
|
|
if(b_rv3d)
|
|
|
|
|
sync->sync_view(b_v3d, b_rv3d, width, height);
|
|
|
|
|
else
|
2012-04-13 17:42:03 +00:00
|
|
|
sync->sync_camera(b_engine.camera_override(), width, height);
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2011-12-21 20:51:55 +00:00
|
|
|
/* set buffer parameters */
|
2012-10-16 11:57:46 +00:00
|
|
|
BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, b_v3d, b_rv3d, scene->camera, width, height);
|
2011-12-20 12:25:37 +00:00
|
|
|
session->reset(buffer_params, session_params.samples);
|
2013-01-01 16:15:13 +00:00
|
|
|
|
|
|
|
|
b_engine.use_highlight_tiles(session_params.progressive_refine == false);
|
Packed and generated images support for Cycles
This commit adds support of packed and generated images
for Cycles when using SVM backend. Movies are still not
supported. This changes also doesn't touch OSL which is
much less trivial to adopt for any images which are not
saved to disk.
Implementation details:
- When adding images to Image Manager is now possible
to mark image as builtin. Builtin images will bypass
OIIO loader and will use special loading callbacks.
- Callbacks are set by Blender Session and they're
using C++ RNA interface to obtain needed data (pixels,
dimensions, is_float flag).
- Image Manager assumes file path is used as reference
to a builtin images, but in fact currently image
datablock name is used for reference. This makes it
easy to find an image in BlendData database.
- Added some extra properties to Image RNA:
* channels, which denotes actual number of channels
in ImBuf. This is needed to treat image's pixels
correct (before it wasn't possible because API
used internal number of channels for pixels which
is in fact doesn't correlate with image depth)
* is_float, which is truth if image is stored in
float buffer of ImBuf.
- Implemented string lookup for C++ RNA collections
for cases there's no manual lookup function.
OSL is not supported because it used own image loading
and filtering routines and there's seems to be no API
to feed pre-loaded pixels directly to the library.
Think we'll either need to add some API to support
such kind of feeding or consider OSL does not have
support of packed images at all.
Movies are not supported at this moment because of lack
of RNA API to load specified frame. It's not difficult
to solve, just need to consider what to best here:
* Either write some general python interface for ImBuf
and use it via C++ API, or
* Write a PY API function which will return pixels for
given frame, or
* Use bad-level BKE_* call
Anyway, small steps, further improvements later.
Reviewed by Brecht, thanks!
2013-01-12 10:59:13 +00:00
|
|
|
|
|
|
|
|
/* setup callbacks for builtin image support */
|
2013-01-30 13:42:12 +00:00
|
|
|
scene->image_manager->builtin_image_info_cb = function_bind(&BlenderSession::builtin_image_info, this, _1, _2, _3, _4, _5, _6);
|
|
|
|
|
scene->image_manager->builtin_image_pixels_cb = function_bind(&BlenderSession::builtin_image_pixels, this, _1, _2, _3);
|
|
|
|
|
scene->image_manager->builtin_image_float_pixels_cb = function_bind(&BlenderSession::builtin_image_float_pixels, this, _1, _2, _3);
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
|
2012-11-09 08:46:53 +00:00
|
|
|
void BlenderSession::reset_session(BL::BlendData b_data_, BL::Scene b_scene_)
|
|
|
|
|
{
|
|
|
|
|
b_data = b_data_;
|
|
|
|
|
b_scene = b_scene_;
|
|
|
|
|
|
|
|
|
|
SceneParams scene_params = BlenderSync::get_scene_params(b_scene, background);
|
|
|
|
|
SessionParams session_params = BlenderSync::get_session_params(b_engine, b_userpref, b_scene, background);
|
|
|
|
|
|
2012-11-10 08:13:13 +00:00
|
|
|
width = b_engine.resolution_x();
|
|
|
|
|
height = b_engine.resolution_y();
|
|
|
|
|
|
2012-11-09 08:46:53 +00:00
|
|
|
if(scene->params.modified(scene_params) ||
|
2013-02-14 16:48:43 +00:00
|
|
|
session->params.modified(session_params) ||
|
|
|
|
|
!scene_params.persistent_data)
|
2012-11-09 08:46:53 +00:00
|
|
|
{
|
|
|
|
|
/* if scene or session parameters changed, it's easier to simply re-create
|
|
|
|
|
* them rather than trying to distinguish which settings need to be updated
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
delete session;
|
|
|
|
|
|
|
|
|
|
create_session();
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
session->progress.reset();
|
|
|
|
|
scene->reset();
|
|
|
|
|
|
2013-01-08 16:56:04 +00:00
|
|
|
session->tile_manager.set_tile_order(session_params.tile_order);
|
|
|
|
|
|
2012-11-09 08:46:53 +00:00
|
|
|
/* peak memory usage should show current render peak, not peak for all renders
|
|
|
|
|
* made by this render session
|
|
|
|
|
*/
|
|
|
|
|
session->stats.mem_peak = session->stats.mem_used;
|
|
|
|
|
|
|
|
|
|
/* sync object should be re-created */
|
2012-12-28 14:21:30 +00:00
|
|
|
sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background, session->progress, session_params.device.type == DEVICE_CPU);
|
2012-11-09 08:46:53 +00:00
|
|
|
sync->sync_data(b_v3d, b_engine.camera_override());
|
|
|
|
|
sync->sync_camera(b_engine.camera_override(), width, height);
|
|
|
|
|
|
|
|
|
|
BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, PointerRNA_NULL, PointerRNA_NULL, scene->camera, width, height);
|
|
|
|
|
session->reset(buffer_params, session_params.samples);
|
2013-01-01 16:15:13 +00:00
|
|
|
|
|
|
|
|
b_engine.use_highlight_tiles(session_params.progressive_refine == false);
|
2012-11-09 08:46:53 +00:00
|
|
|
}
|
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
void BlenderSession::free_session()
|
|
|
|
|
{
|
2012-11-09 08:46:53 +00:00
|
|
|
if(sync)
|
|
|
|
|
delete sync;
|
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
delete session;
|
|
|
|
|
}
|
|
|
|
|
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
static PassType get_pass_type(BL::RenderPass b_pass)
|
|
|
|
|
{
|
|
|
|
|
switch(b_pass.type()) {
|
|
|
|
|
case BL::RenderPass::type_COMBINED:
|
|
|
|
|
return PASS_COMBINED;
|
|
|
|
|
|
|
|
|
|
case BL::RenderPass::type_Z:
|
|
|
|
|
return PASS_DEPTH;
|
|
|
|
|
case BL::RenderPass::type_NORMAL:
|
|
|
|
|
return PASS_NORMAL;
|
|
|
|
|
case BL::RenderPass::type_OBJECT_INDEX:
|
|
|
|
|
return PASS_OBJECT_ID;
|
|
|
|
|
case BL::RenderPass::type_UV:
|
|
|
|
|
return PASS_UV;
|
2012-04-30 12:49:26 +00:00
|
|
|
case BL::RenderPass::type_VECTOR:
|
|
|
|
|
return PASS_MOTION;
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
case BL::RenderPass::type_MATERIAL_INDEX:
|
|
|
|
|
return PASS_MATERIAL_ID;
|
|
|
|
|
|
|
|
|
|
case BL::RenderPass::type_DIFFUSE_DIRECT:
|
|
|
|
|
return PASS_DIFFUSE_DIRECT;
|
|
|
|
|
case BL::RenderPass::type_GLOSSY_DIRECT:
|
|
|
|
|
return PASS_GLOSSY_DIRECT;
|
|
|
|
|
case BL::RenderPass::type_TRANSMISSION_DIRECT:
|
|
|
|
|
return PASS_TRANSMISSION_DIRECT;
|
|
|
|
|
|
|
|
|
|
case BL::RenderPass::type_DIFFUSE_INDIRECT:
|
|
|
|
|
return PASS_DIFFUSE_INDIRECT;
|
|
|
|
|
case BL::RenderPass::type_GLOSSY_INDIRECT:
|
|
|
|
|
return PASS_GLOSSY_INDIRECT;
|
|
|
|
|
case BL::RenderPass::type_TRANSMISSION_INDIRECT:
|
|
|
|
|
return PASS_TRANSMISSION_INDIRECT;
|
|
|
|
|
|
|
|
|
|
case BL::RenderPass::type_DIFFUSE_COLOR:
|
|
|
|
|
return PASS_DIFFUSE_COLOR;
|
|
|
|
|
case BL::RenderPass::type_GLOSSY_COLOR:
|
|
|
|
|
return PASS_GLOSSY_COLOR;
|
|
|
|
|
case BL::RenderPass::type_TRANSMISSION_COLOR:
|
|
|
|
|
return PASS_TRANSMISSION_COLOR;
|
|
|
|
|
|
|
|
|
|
case BL::RenderPass::type_EMIT:
|
|
|
|
|
return PASS_EMISSION;
|
|
|
|
|
case BL::RenderPass::type_ENVIRONMENT:
|
|
|
|
|
return PASS_BACKGROUND;
|
2012-02-28 16:45:08 +00:00
|
|
|
case BL::RenderPass::type_AO:
|
|
|
|
|
return PASS_AO;
|
2012-03-28 10:39:21 +00:00
|
|
|
case BL::RenderPass::type_SHADOW:
|
|
|
|
|
return PASS_SHADOW;
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
|
|
|
|
|
case BL::RenderPass::type_DIFFUSE:
|
|
|
|
|
case BL::RenderPass::type_COLOR:
|
|
|
|
|
case BL::RenderPass::type_REFRACTION:
|
|
|
|
|
case BL::RenderPass::type_SPECULAR:
|
|
|
|
|
case BL::RenderPass::type_REFLECTION:
|
|
|
|
|
case BL::RenderPass::type_MIST:
|
|
|
|
|
return PASS_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return PASS_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
static BL::RenderResult begin_render_result(BL::RenderEngine b_engine, int x, int y, int w, int h, const char *layername)
|
|
|
|
|
{
|
2012-10-22 17:34:16 +00:00
|
|
|
return b_engine.begin_result(x, y, w, h, layername);
|
2012-09-04 13:29:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void end_render_result(BL::RenderEngine b_engine, BL::RenderResult b_rr, bool cancel = false)
|
|
|
|
|
{
|
2012-10-22 17:34:16 +00:00
|
|
|
b_engine.end_result(b_rr, (int)cancel);
|
2012-09-04 13:29:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BlenderSession::do_write_update_render_tile(RenderTile& rtile, bool do_update_only)
|
|
|
|
|
{
|
|
|
|
|
BufferParams& params = rtile.buffers->params;
|
|
|
|
|
int x = params.full_x - session->tile_manager.params.full_x;
|
|
|
|
|
int y = params.full_y - session->tile_manager.params.full_y;
|
|
|
|
|
int w = params.width;
|
|
|
|
|
int h = params.height;
|
|
|
|
|
|
|
|
|
|
/* get render result */
|
|
|
|
|
BL::RenderResult b_rr = begin_render_result(b_engine, x, y, w, h, b_rlay_name.c_str());
|
|
|
|
|
|
|
|
|
|
/* can happen if the intersected rectangle gives 0 width or height */
|
|
|
|
|
if (b_rr.ptr.data == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BL::RenderResult::layers_iterator b_single_rlay;
|
|
|
|
|
b_rr.layers.begin(b_single_rlay);
|
|
|
|
|
BL::RenderLayer b_rlay = *b_single_rlay;
|
|
|
|
|
|
|
|
|
|
if (do_update_only) {
|
|
|
|
|
/* update only needed */
|
2013-01-01 16:15:13 +00:00
|
|
|
|
|
|
|
|
if (rtile.sample != 0) {
|
|
|
|
|
/* sample would be zero at initial tile update, which is only needed
|
|
|
|
|
* to tag tile form blender side as IN PROGRESS for proper highlight
|
|
|
|
|
* no buffers should be sent to blender yet
|
|
|
|
|
*/
|
|
|
|
|
update_render_result(b_rr, b_rlay, rtile);
|
|
|
|
|
}
|
|
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
end_render_result(b_engine, b_rr, true);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
/* write result */
|
|
|
|
|
write_render_result(b_rr, b_rlay, rtile);
|
|
|
|
|
end_render_result(b_engine, b_rr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BlenderSession::write_render_tile(RenderTile& rtile)
|
|
|
|
|
{
|
|
|
|
|
do_write_update_render_tile(rtile, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BlenderSession::update_render_tile(RenderTile& rtile)
|
|
|
|
|
{
|
2013-01-28 17:37:51 +00:00
|
|
|
/* use final write for preview renders, otherwise render result wouldn't be
|
|
|
|
|
* be updated in blender side
|
|
|
|
|
* would need to be investigated a bit further, but for now shall be fine
|
|
|
|
|
*/
|
|
|
|
|
if (!b_engine.is_preview())
|
|
|
|
|
do_write_update_render_tile(rtile, true);
|
|
|
|
|
else
|
|
|
|
|
do_write_update_render_tile(rtile, false);
|
2012-09-04 13:29:07 +00:00
|
|
|
}
|
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
void BlenderSession::render()
|
|
|
|
|
{
|
2012-09-04 13:29:07 +00:00
|
|
|
/* set callback to write out render results */
|
|
|
|
|
session->write_render_tile_cb = function_bind(&BlenderSession::write_render_tile, this, _1);
|
|
|
|
|
session->update_render_tile_cb = function_bind(&BlenderSession::update_render_tile, this, _1);
|
|
|
|
|
|
2011-12-21 20:51:55 +00:00
|
|
|
/* get buffer parameters */
|
2012-09-04 13:29:07 +00:00
|
|
|
SessionParams session_params = BlenderSync::get_session_params(b_engine, b_userpref, b_scene, background);
|
2012-10-16 11:57:46 +00:00
|
|
|
BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, b_v3d, b_rv3d, scene->camera, width, height);
|
2011-12-21 20:51:55 +00:00
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
/* render each layer */
|
2011-12-21 20:51:55 +00:00
|
|
|
BL::RenderSettings r = b_scene.render();
|
2012-09-04 13:29:07 +00:00
|
|
|
BL::RenderSettings::layers_iterator b_iter;
|
2011-12-21 20:51:55 +00:00
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
for(r.layers.begin(b_iter); b_iter != r.layers.end(); ++b_iter) {
|
|
|
|
|
b_rlay_name = b_iter->name();
|
|
|
|
|
|
|
|
|
|
/* temporary render result to find needed passes */
|
|
|
|
|
BL::RenderResult b_rr = begin_render_result(b_engine, 0, 0, 1, 1, b_rlay_name.c_str());
|
|
|
|
|
BL::RenderResult::layers_iterator b_single_rlay;
|
|
|
|
|
b_rr.layers.begin(b_single_rlay);
|
|
|
|
|
|
|
|
|
|
/* layer will be missing if it was disabled in the UI */
|
|
|
|
|
if(b_single_rlay == b_rr.layers.end()) {
|
|
|
|
|
end_render_result(b_engine, b_rr, true);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BL::RenderLayer b_rlay = *b_single_rlay;
|
2011-04-27 11:58:34 +00:00
|
|
|
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
/* add passes */
|
2012-01-26 14:55:25 +00:00
|
|
|
vector<Pass> passes;
|
|
|
|
|
Pass::add(PASS_COMBINED, passes);
|
|
|
|
|
|
2012-01-26 19:07:01 +00:00
|
|
|
if(session_params.device.advanced_shading) {
|
2012-09-04 13:29:07 +00:00
|
|
|
|
|
|
|
|
/* loop over passes */
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
BL::RenderLayer::passes_iterator b_pass_iter;
|
2012-09-04 13:29:07 +00:00
|
|
|
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
for(b_rlay.passes.begin(b_pass_iter); b_pass_iter != b_rlay.passes.end(); ++b_pass_iter) {
|
|
|
|
|
BL::RenderPass b_pass(*b_pass_iter);
|
|
|
|
|
PassType pass_type = get_pass_type(b_pass);
|
|
|
|
|
|
2012-04-30 12:49:26 +00:00
|
|
|
if(pass_type == PASS_MOTION && scene->integrator->motion_blur)
|
|
|
|
|
continue;
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
if(pass_type != PASS_NONE)
|
2012-01-26 14:55:25 +00:00
|
|
|
Pass::add(pass_type, passes);
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
/* free result without merging */
|
|
|
|
|
end_render_result(b_engine, b_rr, true);
|
|
|
|
|
|
2012-01-26 14:55:25 +00:00
|
|
|
buffer_params.passes = passes;
|
2012-06-20 14:24:52 +00:00
|
|
|
scene->film->tag_passes_update(scene, passes);
|
2012-01-26 14:55:25 +00:00
|
|
|
scene->film->tag_update(scene);
|
2012-05-18 14:06:53 +00:00
|
|
|
scene->integrator->tag_update(scene);
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
|
2011-12-21 20:51:55 +00:00
|
|
|
/* update scene */
|
2012-09-04 13:29:07 +00:00
|
|
|
sync->sync_data(b_v3d, b_engine.camera_override(), b_rlay_name.c_str());
|
2011-12-21 20:51:55 +00:00
|
|
|
|
Cycles: merging features from tomato branch.
=== BVH build time optimizations ===
* BVH building was multithreaded. Not all building is multithreaded, packing
and the initial bounding/splitting is still single threaded, but recursive
splitting is, which was the main bottleneck.
* Object splitting now uses binning rather than sorting of all elements, using
code from the Embree raytracer from Intel.
http://software.intel.com/en-us/articles/embree-photo-realistic-ray-tracing-kernels/
* Other small changes to avoid allocations, pack memory more tightly, avoid
some unnecessary operations, ...
These optimizations do not work yet when Spatial Splits are enabled, for that
more work is needed. There's also other optimizations still needed, in
particular for the case of many low poly objects, the packing step and node
memory allocation.
BVH raytracing time should remain about the same, but BVH build time should be
significantly reduced, test here show speedup of about 5x to 10x on a dual core
and 5x to 25x on an 8-core machine, depending on the scene.
=== Threads ===
Centralized task scheduler for multithreading, which is basically the
CPU device threading code wrapped into something reusable.
Basic idea is that there is a single TaskScheduler that keeps a pool of threads,
one for each core. Other places in the code can then create a TaskPool that they
can drop Tasks in to be executed by the scheduler, and wait for them to complete
or cancel them early.
=== Normal ====
Added a Normal output to the texture coordinate node. This currently
gives the object space normal, which is the same under object animation.
In the future this might become a "generated" normal so it's also stable for
deforming objects, but for now it's already useful for non-deforming objects.
=== Render Layers ===
Per render layer Samples control, leaving it to 0 will use the common scene
setting.
Environment pass will now render environment even if film is set to transparent.
Exclude Layers" added. Scene layers (all object that influence the render,
directly or indirectly) are shared between all render layers. However sometimes
it's useful to leave out some object influence for a particular render layer.
That's what this option allows you to do.
=== Filter Glossy ===
When using a value higher than 0.0, this will blur glossy reflections after
blurry bounces, to reduce noise at the cost of accuracy. 1.0 is a good
starting value to tweak.
Some light paths have a low probability of being found while contributing much
light to the pixel. As a result these light paths will be found in some pixels
and not in others, causing fireflies. An example of such a difficult path might
be a small light that is causing a small specular highlight on a sharp glossy
material, which we are seeing through a rough glossy material. With path tracing
it is difficult to find the specular highlight, but if we increase the roughness
on the material the highlight gets bigger and softer, and so easier to find.
Often this blurring will be hardly noticeable, because we are seeing it through
a blurry material anyway, but there are also cases where this will lead to a
loss of detail in lighting.
2012-04-28 08:53:59 +00:00
|
|
|
/* update session */
|
|
|
|
|
int samples = sync->get_layer_samples();
|
|
|
|
|
session->reset(buffer_params, (samples == 0)? session_params.samples: samples);
|
|
|
|
|
|
2011-12-21 20:51:55 +00:00
|
|
|
/* render */
|
|
|
|
|
session->start();
|
|
|
|
|
session->wait();
|
|
|
|
|
|
|
|
|
|
if(session->progress.get_cancel())
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
/* clear callback */
|
|
|
|
|
session->write_render_tile_cb = NULL;
|
|
|
|
|
session->update_render_tile_cb = NULL;
|
2012-11-09 08:46:53 +00:00
|
|
|
|
|
|
|
|
/* free all memory used (host and device), so we wouldn't leave render
|
|
|
|
|
* engine with extra memory allocated
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
session->device_free();
|
|
|
|
|
|
|
|
|
|
delete sync;
|
|
|
|
|
sync = NULL;
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
void BlenderSession::do_write_update_render_result(BL::RenderResult b_rr, BL::RenderLayer b_rlay, RenderTile& rtile, bool do_update_only)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
2012-09-04 13:29:07 +00:00
|
|
|
RenderBuffers *buffers = rtile.buffers;
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
|
|
|
|
|
/* copy data from device */
|
|
|
|
|
if(!buffers->copy_from_device())
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
BufferParams& params = buffers->params;
|
2011-08-28 13:55:59 +00:00
|
|
|
float exposure = scene->film->exposure;
|
2011-05-09 09:03:08 +00:00
|
|
|
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
vector<float> pixels(params.width*params.height*4);
|
2011-05-09 09:03:08 +00:00
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
if (!do_update_only) {
|
|
|
|
|
/* copy each pass */
|
|
|
|
|
BL::RenderLayer::passes_iterator b_iter;
|
|
|
|
|
|
|
|
|
|
for(b_rlay.passes.begin(b_iter); b_iter != b_rlay.passes.end(); ++b_iter) {
|
|
|
|
|
BL::RenderPass b_pass(*b_iter);
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
/* find matching pass type */
|
|
|
|
|
PassType pass_type = get_pass_type(b_pass);
|
|
|
|
|
int components = b_pass.channels();
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
/* copy pixels */
|
2013-02-10 18:02:59 +00:00
|
|
|
if(!buffers->get_pass_rect(pass_type, exposure, rtile.sample, components, &pixels[0]))
|
|
|
|
|
memset(&pixels[0], 0, pixels.size()*sizeof(float));
|
|
|
|
|
|
|
|
|
|
b_pass.rect(&pixels[0]);
|
2012-09-04 13:29:07 +00:00
|
|
|
}
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
}
|
2011-08-28 13:55:59 +00:00
|
|
|
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
/* copy combined pass */
|
2012-09-04 13:29:07 +00:00
|
|
|
if(buffers->get_pass_rect(PASS_COMBINED, exposure, rtile.sample, 4, &pixels[0]))
|
2012-10-22 17:34:16 +00:00
|
|
|
b_rlay.rect(&pixels[0]);
|
Cycles: Render Passes
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
|
|
|
|
|
|
|
|
/* tag result as updated */
|
2012-10-22 17:34:16 +00:00
|
|
|
b_engine.update_result(b_rr);
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
void BlenderSession::write_render_result(BL::RenderResult b_rr, BL::RenderLayer b_rlay, RenderTile& rtile)
|
|
|
|
|
{
|
|
|
|
|
do_write_update_render_result(b_rr, b_rlay, rtile, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BlenderSession::update_render_result(BL::RenderResult b_rr, BL::RenderLayer b_rlay, RenderTile& rtile)
|
|
|
|
|
{
|
|
|
|
|
do_write_update_render_result(b_rr, b_rlay, rtile, true);
|
|
|
|
|
}
|
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
void BlenderSession::synchronize()
|
|
|
|
|
{
|
|
|
|
|
/* on session/scene parameter changes, we recreate session entirely */
|
2011-11-04 15:46:15 +00:00
|
|
|
SceneParams scene_params = BlenderSync::get_scene_params(b_scene, background);
|
2012-09-04 13:29:07 +00:00
|
|
|
SessionParams session_params = BlenderSync::get_session_params(b_engine, b_userpref, b_scene, background);
|
2011-04-27 11:58:34 +00:00
|
|
|
|
|
|
|
|
if(session->params.modified(session_params) ||
|
2012-06-09 18:56:12 +00:00
|
|
|
scene->params.modified(scene_params))
|
|
|
|
|
{
|
2011-04-27 11:58:34 +00:00
|
|
|
free_session();
|
|
|
|
|
create_session();
|
2011-12-21 20:51:55 +00:00
|
|
|
session->start();
|
2011-04-27 11:58:34 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-16 13:14:02 +00:00
|
|
|
/* increase samples, but never decrease */
|
|
|
|
|
session->set_samples(session_params.samples);
|
2011-08-29 16:54:13 +00:00
|
|
|
session->set_pause(BlenderSync::get_session_pause(b_scene, background));
|
2011-08-28 13:55:59 +00:00
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
/* copy recalc flags, outside of mutex so we can decide to do the real
|
2012-06-09 17:22:52 +00:00
|
|
|
* synchronization at a later time to not block on running updates */
|
2011-04-27 11:58:34 +00:00
|
|
|
sync->sync_recalc();
|
|
|
|
|
|
|
|
|
|
/* try to acquire mutex. if we don't want to or can't, come back later */
|
|
|
|
|
if(!session->ready_to_reset() || !session->scene->mutex.try_lock()) {
|
|
|
|
|
tag_update();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* data and camera synchronize */
|
2012-04-30 12:49:26 +00:00
|
|
|
sync->sync_data(b_v3d, b_engine.camera_override());
|
2011-04-27 11:58:34 +00:00
|
|
|
|
|
|
|
|
if(b_rv3d)
|
|
|
|
|
sync->sync_view(b_v3d, b_rv3d, width, height);
|
|
|
|
|
else
|
2012-04-13 17:42:03 +00:00
|
|
|
sync->sync_camera(b_engine.camera_override(), width, height);
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2011-08-29 16:54:13 +00:00
|
|
|
/* unlock */
|
|
|
|
|
session->scene->mutex.unlock();
|
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
/* reset if needed */
|
2011-12-20 12:25:37 +00:00
|
|
|
if(scene->need_reset()) {
|
2012-10-16 11:57:46 +00:00
|
|
|
BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, b_v3d, b_rv3d, scene->camera, width, height);
|
2011-12-20 12:25:37 +00:00
|
|
|
session->reset(buffer_params, session_params.samples);
|
|
|
|
|
}
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool BlenderSession::draw(int w, int h)
|
|
|
|
|
{
|
|
|
|
|
/* before drawing, we verify camera and viewport size changes, because
|
2012-06-09 17:22:52 +00:00
|
|
|
* we do not get update callbacks for those, we must detect them here */
|
2011-04-27 11:58:34 +00:00
|
|
|
if(session->ready_to_reset()) {
|
|
|
|
|
bool reset = false;
|
|
|
|
|
|
|
|
|
|
/* try to acquire mutex. if we can't, come back later */
|
|
|
|
|
if(!session->scene->mutex.try_lock()) {
|
|
|
|
|
tag_update();
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
/* update camera from 3d view */
|
|
|
|
|
|
|
|
|
|
sync->sync_view(b_v3d, b_rv3d, w, h);
|
|
|
|
|
|
2013-02-05 14:16:19 +00:00
|
|
|
if(scene->camera->need_update)
|
2011-04-27 11:58:34 +00:00
|
|
|
reset = true;
|
|
|
|
|
|
|
|
|
|
session->scene->mutex.unlock();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* if dimensions changed, reset */
|
|
|
|
|
if(width != w || height != h) {
|
|
|
|
|
width = w;
|
|
|
|
|
height = h;
|
|
|
|
|
reset = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* reset if requested */
|
2011-08-28 13:55:59 +00:00
|
|
|
if(reset) {
|
2012-09-04 13:29:07 +00:00
|
|
|
SessionParams session_params = BlenderSync::get_session_params(b_engine, b_userpref, b_scene, background);
|
2012-10-16 11:57:46 +00:00
|
|
|
BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, b_v3d, b_rv3d, scene->camera, w, h);
|
2011-12-20 12:25:37 +00:00
|
|
|
|
|
|
|
|
session->reset(buffer_params, session_params.samples);
|
2011-08-28 13:55:59 +00:00
|
|
|
}
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
2013-02-15 09:15:14 +00:00
|
|
|
else {
|
|
|
|
|
tag_update();
|
|
|
|
|
}
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2011-08-23 12:20:11 +00:00
|
|
|
/* update status and progress for 3d view draw */
|
|
|
|
|
update_status_progress();
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2011-08-23 12:20:11 +00:00
|
|
|
/* draw */
|
2012-10-16 11:57:46 +00:00
|
|
|
BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, b_v3d, b_rv3d, scene->camera, width, height);
|
2011-12-20 12:25:37 +00:00
|
|
|
|
|
|
|
|
return !session->draw(buffer_params);
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BlenderSession::get_status(string& status, string& substatus)
|
|
|
|
|
{
|
|
|
|
|
session->progress.get_status(status, substatus);
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-22 13:17:43 +00:00
|
|
|
void BlenderSession::get_progress(float& progress, double& total_time)
|
|
|
|
|
{
|
2012-09-04 13:29:07 +00:00
|
|
|
double tile_time;
|
|
|
|
|
int tile, sample, samples_per_tile;
|
|
|
|
|
int tile_total = session->tile_manager.state.num_tiles;
|
|
|
|
|
|
|
|
|
|
session->progress.get_tile(tile, total_time, tile_time);
|
2011-08-22 13:17:43 +00:00
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
sample = session->progress.get_sample();
|
2012-10-13 12:38:32 +00:00
|
|
|
samples_per_tile = session->params.samples;
|
2012-09-04 13:29:07 +00:00
|
|
|
|
2012-11-13 01:53:07 +00:00
|
|
|
if(samples_per_tile && tile_total)
|
|
|
|
|
progress = ((float)sample / (float)(tile_total * samples_per_tile));
|
2012-10-13 12:38:32 +00:00
|
|
|
else
|
|
|
|
|
progress = 0.0;
|
2011-08-22 13:17:43 +00:00
|
|
|
}
|
|
|
|
|
|
2011-08-23 12:20:11 +00:00
|
|
|
void BlenderSession::update_status_progress()
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
2012-02-07 17:22:47 +00:00
|
|
|
string timestatus, status, substatus;
|
2011-08-22 13:17:43 +00:00
|
|
|
float progress;
|
|
|
|
|
double total_time;
|
|
|
|
|
char time_str[128];
|
2012-11-05 08:04:57 +00:00
|
|
|
float mem_used = (float)session->stats.mem_used / 1024.0f / 1024.0f;
|
|
|
|
|
float mem_peak = (float)session->stats.mem_peak / 1024.0f / 1024.0f;
|
2011-08-22 13:17:43 +00:00
|
|
|
|
|
|
|
|
get_status(status, substatus);
|
|
|
|
|
get_progress(progress, total_time);
|
|
|
|
|
|
2012-11-05 08:04:57 +00:00
|
|
|
timestatus = string_printf("Mem: %.2fM, Peak: %.2fM | ", mem_used, mem_peak);
|
|
|
|
|
|
|
|
|
|
timestatus += b_scene.name();
|
2012-09-04 13:29:07 +00:00
|
|
|
if(b_rlay_name != "")
|
|
|
|
|
timestatus += ", " + b_rlay_name;
|
|
|
|
|
timestatus += " | ";
|
|
|
|
|
|
2012-01-09 16:57:46 +00:00
|
|
|
BLI_timestr(total_time, time_str);
|
2012-09-04 13:29:07 +00:00
|
|
|
timestatus += "Elapsed: " + string(time_str) + " | ";
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2011-08-22 13:17:43 +00:00
|
|
|
if(substatus.size() > 0)
|
|
|
|
|
status += " | " + substatus;
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2011-10-30 10:12:34 +00:00
|
|
|
if(status != last_status) {
|
2012-10-22 17:34:16 +00:00
|
|
|
b_engine.update_stats("", (timestatus + status).c_str());
|
2012-11-05 08:04:57 +00:00
|
|
|
b_engine.update_memory_stats(mem_used, mem_peak);
|
2011-10-30 10:12:34 +00:00
|
|
|
last_status = status;
|
|
|
|
|
}
|
|
|
|
|
if(progress != last_progress) {
|
2012-10-22 17:34:16 +00:00
|
|
|
b_engine.update_progress(progress);
|
2011-10-30 10:12:34 +00:00
|
|
|
last_progress = progress;
|
|
|
|
|
}
|
2011-08-23 12:20:11 +00:00
|
|
|
}
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2011-08-23 12:20:11 +00:00
|
|
|
void BlenderSession::tag_update()
|
|
|
|
|
{
|
|
|
|
|
/* tell blender that we want to get another update callback */
|
2012-10-22 17:34:16 +00:00
|
|
|
b_engine.tag_update();
|
2011-08-23 12:20:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BlenderSession::tag_redraw()
|
|
|
|
|
{
|
2011-08-22 13:17:43 +00:00
|
|
|
if(background) {
|
2011-08-23 12:20:11 +00:00
|
|
|
/* update stats and progress, only for background here because
|
2012-06-09 17:22:52 +00:00
|
|
|
* in 3d view we do it in draw for thread safety reasons */
|
2011-08-23 12:20:11 +00:00
|
|
|
update_status_progress();
|
|
|
|
|
|
2011-08-22 13:17:43 +00:00
|
|
|
/* offline render, redraw if timeout passed */
|
2012-06-09 17:45:22 +00:00
|
|
|
if(time_dt() - last_redraw_time > 1.0) {
|
2012-10-22 17:34:16 +00:00
|
|
|
b_engine.tag_redraw();
|
2011-04-27 11:58:34 +00:00
|
|
|
last_redraw_time = time_dt();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
/* tell blender that we want to redraw */
|
2012-10-22 17:34:16 +00:00
|
|
|
b_engine.tag_redraw();
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BlenderSession::test_cancel()
|
|
|
|
|
{
|
|
|
|
|
/* test if we need to cancel rendering */
|
|
|
|
|
if(background)
|
2012-10-22 17:34:16 +00:00
|
|
|
if(b_engine.test_break())
|
2011-04-27 11:58:34 +00:00
|
|
|
session->progress.set_cancel("Cancelled");
|
|
|
|
|
}
|
|
|
|
|
|
Movies support for Cycles
This adds support of movie textures for Cycles rendering.
Uses the same builtin images routines as packed/generated images,
but with some extra non-rna hookups from blender_session side.
Basically, it's not so clear how to give access to video frames
via C++ RNA -- it'll require exposing ImBuf to API, doing some
threading locks and so. Ended up adding two more functions which
are actually bad level call, but don't consider it's so much bad
-- we have few bad calls already, which are actually related.
Changed a bit how builtin images names are passing to image
manager. Now it's not just an ID datablock name, but also a frame
number concatenated via '@' character, which makes itpossible to
easily know frame number to be used for movie images, without
adding extra descriptors to image manager.
Decoding of builtin name is a bit slower now, but it should be
still nothing in comparison with rendering complexity.
Also exposed image user's frame_current to python API, which
is needed to get absolute frame number of movie from node's
image user.
P.S. Generated/packed images are also using bad level call but
only does it to make things more clear here. Either all images
are using C++ RNA here or no images does. That's the most clear
for now.
2013-01-16 17:07:25 +00:00
|
|
|
/* builtin image file name is actually an image datablock name with
|
|
|
|
|
* absolute sequence frame number concatenated via '@' character
|
|
|
|
|
*
|
2013-01-30 13:42:12 +00:00
|
|
|
* this function splits frame from builtin name
|
Movies support for Cycles
This adds support of movie textures for Cycles rendering.
Uses the same builtin images routines as packed/generated images,
but with some extra non-rna hookups from blender_session side.
Basically, it's not so clear how to give access to video frames
via C++ RNA -- it'll require exposing ImBuf to API, doing some
threading locks and so. Ended up adding two more functions which
are actually bad level call, but don't consider it's so much bad
-- we have few bad calls already, which are actually related.
Changed a bit how builtin images names are passing to image
manager. Now it's not just an ID datablock name, but also a frame
number concatenated via '@' character, which makes itpossible to
easily know frame number to be used for movie images, without
adding extra descriptors to image manager.
Decoding of builtin name is a bit slower now, but it should be
still nothing in comparison with rendering complexity.
Also exposed image user's frame_current to python API, which
is needed to get absolute frame number of movie from node's
image user.
P.S. Generated/packed images are also using bad level call but
only does it to make things more clear here. Either all images
are using C++ RNA here or no images does. That's the most clear
for now.
2013-01-16 17:07:25 +00:00
|
|
|
*/
|
2013-01-30 13:42:12 +00:00
|
|
|
int BlenderSession::builtin_image_frame(const string &builtin_name)
|
Movies support for Cycles
This adds support of movie textures for Cycles rendering.
Uses the same builtin images routines as packed/generated images,
but with some extra non-rna hookups from blender_session side.
Basically, it's not so clear how to give access to video frames
via C++ RNA -- it'll require exposing ImBuf to API, doing some
threading locks and so. Ended up adding two more functions which
are actually bad level call, but don't consider it's so much bad
-- we have few bad calls already, which are actually related.
Changed a bit how builtin images names are passing to image
manager. Now it's not just an ID datablock name, but also a frame
number concatenated via '@' character, which makes itpossible to
easily know frame number to be used for movie images, without
adding extra descriptors to image manager.
Decoding of builtin name is a bit slower now, but it should be
still nothing in comparison with rendering complexity.
Also exposed image user's frame_current to python API, which
is needed to get absolute frame number of movie from node's
image user.
P.S. Generated/packed images are also using bad level call but
only does it to make things more clear here. Either all images
are using C++ RNA here or no images does. That's the most clear
for now.
2013-01-16 17:07:25 +00:00
|
|
|
{
|
|
|
|
|
int last = builtin_name.find_last_of('@');
|
2013-01-30 13:42:12 +00:00
|
|
|
return atoi(builtin_name.substr(last + 1, builtin_name.size() - last - 1).c_str());
|
Movies support for Cycles
This adds support of movie textures for Cycles rendering.
Uses the same builtin images routines as packed/generated images,
but with some extra non-rna hookups from blender_session side.
Basically, it's not so clear how to give access to video frames
via C++ RNA -- it'll require exposing ImBuf to API, doing some
threading locks and so. Ended up adding two more functions which
are actually bad level call, but don't consider it's so much bad
-- we have few bad calls already, which are actually related.
Changed a bit how builtin images names are passing to image
manager. Now it's not just an ID datablock name, but also a frame
number concatenated via '@' character, which makes itpossible to
easily know frame number to be used for movie images, without
adding extra descriptors to image manager.
Decoding of builtin name is a bit slower now, but it should be
still nothing in comparison with rendering complexity.
Also exposed image user's frame_current to python API, which
is needed to get absolute frame number of movie from node's
image user.
P.S. Generated/packed images are also using bad level call but
only does it to make things more clear here. Either all images
are using C++ RNA here or no images does. That's the most clear
for now.
2013-01-16 17:07:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-01-30 13:42:12 +00:00
|
|
|
void BlenderSession::builtin_image_info(const string &builtin_name, void *builtin_data, bool &is_float, int &width, int &height, int &channels)
|
Packed and generated images support for Cycles
This commit adds support of packed and generated images
for Cycles when using SVM backend. Movies are still not
supported. This changes also doesn't touch OSL which is
much less trivial to adopt for any images which are not
saved to disk.
Implementation details:
- When adding images to Image Manager is now possible
to mark image as builtin. Builtin images will bypass
OIIO loader and will use special loading callbacks.
- Callbacks are set by Blender Session and they're
using C++ RNA interface to obtain needed data (pixels,
dimensions, is_float flag).
- Image Manager assumes file path is used as reference
to a builtin images, but in fact currently image
datablock name is used for reference. This makes it
easy to find an image in BlendData database.
- Added some extra properties to Image RNA:
* channels, which denotes actual number of channels
in ImBuf. This is needed to treat image's pixels
correct (before it wasn't possible because API
used internal number of channels for pixels which
is in fact doesn't correlate with image depth)
* is_float, which is truth if image is stored in
float buffer of ImBuf.
- Implemented string lookup for C++ RNA collections
for cases there's no manual lookup function.
OSL is not supported because it used own image loading
and filtering routines and there's seems to be no API
to feed pre-loaded pixels directly to the library.
Think we'll either need to add some API to support
such kind of feeding or consider OSL does not have
support of packed images at all.
Movies are not supported at this moment because of lack
of RNA API to load specified frame. It's not difficult
to solve, just need to consider what to best here:
* Either write some general python interface for ImBuf
and use it via C++ API, or
* Write a PY API function which will return pixels for
given frame, or
* Use bad-level BKE_* call
Anyway, small steps, further improvements later.
Reviewed by Brecht, thanks!
2013-01-12 10:59:13 +00:00
|
|
|
{
|
2013-01-30 13:42:12 +00:00
|
|
|
PointerRNA ptr;
|
|
|
|
|
RNA_id_pointer_create((ID*)builtin_data, &ptr);
|
|
|
|
|
BL::Image b_image(ptr);
|
Packed and generated images support for Cycles
This commit adds support of packed and generated images
for Cycles when using SVM backend. Movies are still not
supported. This changes also doesn't touch OSL which is
much less trivial to adopt for any images which are not
saved to disk.
Implementation details:
- When adding images to Image Manager is now possible
to mark image as builtin. Builtin images will bypass
OIIO loader and will use special loading callbacks.
- Callbacks are set by Blender Session and they're
using C++ RNA interface to obtain needed data (pixels,
dimensions, is_float flag).
- Image Manager assumes file path is used as reference
to a builtin images, but in fact currently image
datablock name is used for reference. This makes it
easy to find an image in BlendData database.
- Added some extra properties to Image RNA:
* channels, which denotes actual number of channels
in ImBuf. This is needed to treat image's pixels
correct (before it wasn't possible because API
used internal number of channels for pixels which
is in fact doesn't correlate with image depth)
* is_float, which is truth if image is stored in
float buffer of ImBuf.
- Implemented string lookup for C++ RNA collections
for cases there's no manual lookup function.
OSL is not supported because it used own image loading
and filtering routines and there's seems to be no API
to feed pre-loaded pixels directly to the library.
Think we'll either need to add some API to support
such kind of feeding or consider OSL does not have
support of packed images at all.
Movies are not supported at this moment because of lack
of RNA API to load specified frame. It's not difficult
to solve, just need to consider what to best here:
* Either write some general python interface for ImBuf
and use it via C++ API, or
* Write a PY API function which will return pixels for
given frame, or
* Use bad-level BKE_* call
Anyway, small steps, further improvements later.
Reviewed by Brecht, thanks!
2013-01-12 10:59:13 +00:00
|
|
|
|
|
|
|
|
if(b_image) {
|
|
|
|
|
is_float = b_image.is_float();
|
|
|
|
|
width = b_image.size()[0];
|
|
|
|
|
height = b_image.size()[1];
|
|
|
|
|
channels = b_image.channels();
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
is_float = false;
|
|
|
|
|
width = 0;
|
|
|
|
|
height = 0;
|
|
|
|
|
channels = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-30 13:42:12 +00:00
|
|
|
bool BlenderSession::builtin_image_pixels(const string &builtin_name, void *builtin_data, unsigned char *pixels)
|
Packed and generated images support for Cycles
This commit adds support of packed and generated images
for Cycles when using SVM backend. Movies are still not
supported. This changes also doesn't touch OSL which is
much less trivial to adopt for any images which are not
saved to disk.
Implementation details:
- When adding images to Image Manager is now possible
to mark image as builtin. Builtin images will bypass
OIIO loader and will use special loading callbacks.
- Callbacks are set by Blender Session and they're
using C++ RNA interface to obtain needed data (pixels,
dimensions, is_float flag).
- Image Manager assumes file path is used as reference
to a builtin images, but in fact currently image
datablock name is used for reference. This makes it
easy to find an image in BlendData database.
- Added some extra properties to Image RNA:
* channels, which denotes actual number of channels
in ImBuf. This is needed to treat image's pixels
correct (before it wasn't possible because API
used internal number of channels for pixels which
is in fact doesn't correlate with image depth)
* is_float, which is truth if image is stored in
float buffer of ImBuf.
- Implemented string lookup for C++ RNA collections
for cases there's no manual lookup function.
OSL is not supported because it used own image loading
and filtering routines and there's seems to be no API
to feed pre-loaded pixels directly to the library.
Think we'll either need to add some API to support
such kind of feeding or consider OSL does not have
support of packed images at all.
Movies are not supported at this moment because of lack
of RNA API to load specified frame. It's not difficult
to solve, just need to consider what to best here:
* Either write some general python interface for ImBuf
and use it via C++ API, or
* Write a PY API function which will return pixels for
given frame, or
* Use bad-level BKE_* call
Anyway, small steps, further improvements later.
Reviewed by Brecht, thanks!
2013-01-12 10:59:13 +00:00
|
|
|
{
|
2013-01-30 13:42:12 +00:00
|
|
|
int frame = builtin_image_frame(builtin_name);
|
Movies support for Cycles
This adds support of movie textures for Cycles rendering.
Uses the same builtin images routines as packed/generated images,
but with some extra non-rna hookups from blender_session side.
Basically, it's not so clear how to give access to video frames
via C++ RNA -- it'll require exposing ImBuf to API, doing some
threading locks and so. Ended up adding two more functions which
are actually bad level call, but don't consider it's so much bad
-- we have few bad calls already, which are actually related.
Changed a bit how builtin images names are passing to image
manager. Now it's not just an ID datablock name, but also a frame
number concatenated via '@' character, which makes itpossible to
easily know frame number to be used for movie images, without
adding extra descriptors to image manager.
Decoding of builtin name is a bit slower now, but it should be
still nothing in comparison with rendering complexity.
Also exposed image user's frame_current to python API, which
is needed to get absolute frame number of movie from node's
image user.
P.S. Generated/packed images are also using bad level call but
only does it to make things more clear here. Either all images
are using C++ RNA here or no images does. That's the most clear
for now.
2013-01-16 17:07:25 +00:00
|
|
|
|
2013-01-30 13:42:12 +00:00
|
|
|
PointerRNA ptr;
|
|
|
|
|
RNA_id_pointer_create((ID*)builtin_data, &ptr);
|
|
|
|
|
BL::Image b_image(ptr);
|
Packed and generated images support for Cycles
This commit adds support of packed and generated images
for Cycles when using SVM backend. Movies are still not
supported. This changes also doesn't touch OSL which is
much less trivial to adopt for any images which are not
saved to disk.
Implementation details:
- When adding images to Image Manager is now possible
to mark image as builtin. Builtin images will bypass
OIIO loader and will use special loading callbacks.
- Callbacks are set by Blender Session and they're
using C++ RNA interface to obtain needed data (pixels,
dimensions, is_float flag).
- Image Manager assumes file path is used as reference
to a builtin images, but in fact currently image
datablock name is used for reference. This makes it
easy to find an image in BlendData database.
- Added some extra properties to Image RNA:
* channels, which denotes actual number of channels
in ImBuf. This is needed to treat image's pixels
correct (before it wasn't possible because API
used internal number of channels for pixels which
is in fact doesn't correlate with image depth)
* is_float, which is truth if image is stored in
float buffer of ImBuf.
- Implemented string lookup for C++ RNA collections
for cases there's no manual lookup function.
OSL is not supported because it used own image loading
and filtering routines and there's seems to be no API
to feed pre-loaded pixels directly to the library.
Think we'll either need to add some API to support
such kind of feeding or consider OSL does not have
support of packed images at all.
Movies are not supported at this moment because of lack
of RNA API to load specified frame. It's not difficult
to solve, just need to consider what to best here:
* Either write some general python interface for ImBuf
and use it via C++ API, or
* Write a PY API function which will return pixels for
given frame, or
* Use bad-level BKE_* call
Anyway, small steps, further improvements later.
Reviewed by Brecht, thanks!
2013-01-12 10:59:13 +00:00
|
|
|
|
|
|
|
|
if(b_image) {
|
|
|
|
|
int width = b_image.size()[0];
|
|
|
|
|
int height = b_image.size()[1];
|
|
|
|
|
int channels = b_image.channels();
|
|
|
|
|
|
Movies support for Cycles
This adds support of movie textures for Cycles rendering.
Uses the same builtin images routines as packed/generated images,
but with some extra non-rna hookups from blender_session side.
Basically, it's not so clear how to give access to video frames
via C++ RNA -- it'll require exposing ImBuf to API, doing some
threading locks and so. Ended up adding two more functions which
are actually bad level call, but don't consider it's so much bad
-- we have few bad calls already, which are actually related.
Changed a bit how builtin images names are passing to image
manager. Now it's not just an ID datablock name, but also a frame
number concatenated via '@' character, which makes itpossible to
easily know frame number to be used for movie images, without
adding extra descriptors to image manager.
Decoding of builtin name is a bit slower now, but it should be
still nothing in comparison with rendering complexity.
Also exposed image user's frame_current to python API, which
is needed to get absolute frame number of movie from node's
image user.
P.S. Generated/packed images are also using bad level call but
only does it to make things more clear here. Either all images
are using C++ RNA here or no images does. That's the most clear
for now.
2013-01-16 17:07:25 +00:00
|
|
|
unsigned char *image_pixels;
|
|
|
|
|
image_pixels = image_get_pixels_for_frame(b_image, frame);
|
Packed and generated images support for Cycles
This commit adds support of packed and generated images
for Cycles when using SVM backend. Movies are still not
supported. This changes also doesn't touch OSL which is
much less trivial to adopt for any images which are not
saved to disk.
Implementation details:
- When adding images to Image Manager is now possible
to mark image as builtin. Builtin images will bypass
OIIO loader and will use special loading callbacks.
- Callbacks are set by Blender Session and they're
using C++ RNA interface to obtain needed data (pixels,
dimensions, is_float flag).
- Image Manager assumes file path is used as reference
to a builtin images, but in fact currently image
datablock name is used for reference. This makes it
easy to find an image in BlendData database.
- Added some extra properties to Image RNA:
* channels, which denotes actual number of channels
in ImBuf. This is needed to treat image's pixels
correct (before it wasn't possible because API
used internal number of channels for pixels which
is in fact doesn't correlate with image depth)
* is_float, which is truth if image is stored in
float buffer of ImBuf.
- Implemented string lookup for C++ RNA collections
for cases there's no manual lookup function.
OSL is not supported because it used own image loading
and filtering routines and there's seems to be no API
to feed pre-loaded pixels directly to the library.
Think we'll either need to add some API to support
such kind of feeding or consider OSL does not have
support of packed images at all.
Movies are not supported at this moment because of lack
of RNA API to load specified frame. It's not difficult
to solve, just need to consider what to best here:
* Either write some general python interface for ImBuf
and use it via C++ API, or
* Write a PY API function which will return pixels for
given frame, or
* Use bad-level BKE_* call
Anyway, small steps, further improvements later.
Reviewed by Brecht, thanks!
2013-01-12 10:59:13 +00:00
|
|
|
|
Movies support for Cycles
This adds support of movie textures for Cycles rendering.
Uses the same builtin images routines as packed/generated images,
but with some extra non-rna hookups from blender_session side.
Basically, it's not so clear how to give access to video frames
via C++ RNA -- it'll require exposing ImBuf to API, doing some
threading locks and so. Ended up adding two more functions which
are actually bad level call, but don't consider it's so much bad
-- we have few bad calls already, which are actually related.
Changed a bit how builtin images names are passing to image
manager. Now it's not just an ID datablock name, but also a frame
number concatenated via '@' character, which makes itpossible to
easily know frame number to be used for movie images, without
adding extra descriptors to image manager.
Decoding of builtin name is a bit slower now, but it should be
still nothing in comparison with rendering complexity.
Also exposed image user's frame_current to python API, which
is needed to get absolute frame number of movie from node's
image user.
P.S. Generated/packed images are also using bad level call but
only does it to make things more clear here. Either all images
are using C++ RNA here or no images does. That's the most clear
for now.
2013-01-16 17:07:25 +00:00
|
|
|
if(image_pixels) {
|
|
|
|
|
memcpy(pixels, image_pixels, width * height * channels * sizeof(unsigned char));
|
|
|
|
|
MEM_freeN(image_pixels);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if(channels == 1) {
|
|
|
|
|
memset(pixels, 0, width * height * sizeof(unsigned char));
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
unsigned char *cp = pixels;
|
|
|
|
|
for(int i = 0; i < width * height; i++, cp += channels) {
|
|
|
|
|
cp[0] = 255;
|
|
|
|
|
cp[1] = 0;
|
|
|
|
|
cp[2] = 255;
|
|
|
|
|
if(channels == 4)
|
|
|
|
|
cp[3] = 255;
|
|
|
|
|
}
|
|
|
|
|
}
|
Packed and generated images support for Cycles
This commit adds support of packed and generated images
for Cycles when using SVM backend. Movies are still not
supported. This changes also doesn't touch OSL which is
much less trivial to adopt for any images which are not
saved to disk.
Implementation details:
- When adding images to Image Manager is now possible
to mark image as builtin. Builtin images will bypass
OIIO loader and will use special loading callbacks.
- Callbacks are set by Blender Session and they're
using C++ RNA interface to obtain needed data (pixels,
dimensions, is_float flag).
- Image Manager assumes file path is used as reference
to a builtin images, but in fact currently image
datablock name is used for reference. This makes it
easy to find an image in BlendData database.
- Added some extra properties to Image RNA:
* channels, which denotes actual number of channels
in ImBuf. This is needed to treat image's pixels
correct (before it wasn't possible because API
used internal number of channels for pixels which
is in fact doesn't correlate with image depth)
* is_float, which is truth if image is stored in
float buffer of ImBuf.
- Implemented string lookup for C++ RNA collections
for cases there's no manual lookup function.
OSL is not supported because it used own image loading
and filtering routines and there's seems to be no API
to feed pre-loaded pixels directly to the library.
Think we'll either need to add some API to support
such kind of feeding or consider OSL does not have
support of packed images at all.
Movies are not supported at this moment because of lack
of RNA API to load specified frame. It's not difficult
to solve, just need to consider what to best here:
* Either write some general python interface for ImBuf
and use it via C++ API, or
* Write a PY API function which will return pixels for
given frame, or
* Use bad-level BKE_* call
Anyway, small steps, further improvements later.
Reviewed by Brecht, thanks!
2013-01-12 10:59:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-30 13:42:12 +00:00
|
|
|
bool BlenderSession::builtin_image_float_pixels(const string &builtin_name, void *builtin_data, float *pixels)
|
Packed and generated images support for Cycles
This commit adds support of packed and generated images
for Cycles when using SVM backend. Movies are still not
supported. This changes also doesn't touch OSL which is
much less trivial to adopt for any images which are not
saved to disk.
Implementation details:
- When adding images to Image Manager is now possible
to mark image as builtin. Builtin images will bypass
OIIO loader and will use special loading callbacks.
- Callbacks are set by Blender Session and they're
using C++ RNA interface to obtain needed data (pixels,
dimensions, is_float flag).
- Image Manager assumes file path is used as reference
to a builtin images, but in fact currently image
datablock name is used for reference. This makes it
easy to find an image in BlendData database.
- Added some extra properties to Image RNA:
* channels, which denotes actual number of channels
in ImBuf. This is needed to treat image's pixels
correct (before it wasn't possible because API
used internal number of channels for pixels which
is in fact doesn't correlate with image depth)
* is_float, which is truth if image is stored in
float buffer of ImBuf.
- Implemented string lookup for C++ RNA collections
for cases there's no manual lookup function.
OSL is not supported because it used own image loading
and filtering routines and there's seems to be no API
to feed pre-loaded pixels directly to the library.
Think we'll either need to add some API to support
such kind of feeding or consider OSL does not have
support of packed images at all.
Movies are not supported at this moment because of lack
of RNA API to load specified frame. It's not difficult
to solve, just need to consider what to best here:
* Either write some general python interface for ImBuf
and use it via C++ API, or
* Write a PY API function which will return pixels for
given frame, or
* Use bad-level BKE_* call
Anyway, small steps, further improvements later.
Reviewed by Brecht, thanks!
2013-01-12 10:59:13 +00:00
|
|
|
{
|
2013-01-30 13:42:12 +00:00
|
|
|
int frame = builtin_image_frame(builtin_name);
|
Movies support for Cycles
This adds support of movie textures for Cycles rendering.
Uses the same builtin images routines as packed/generated images,
but with some extra non-rna hookups from blender_session side.
Basically, it's not so clear how to give access to video frames
via C++ RNA -- it'll require exposing ImBuf to API, doing some
threading locks and so. Ended up adding two more functions which
are actually bad level call, but don't consider it's so much bad
-- we have few bad calls already, which are actually related.
Changed a bit how builtin images names are passing to image
manager. Now it's not just an ID datablock name, but also a frame
number concatenated via '@' character, which makes itpossible to
easily know frame number to be used for movie images, without
adding extra descriptors to image manager.
Decoding of builtin name is a bit slower now, but it should be
still nothing in comparison with rendering complexity.
Also exposed image user's frame_current to python API, which
is needed to get absolute frame number of movie from node's
image user.
P.S. Generated/packed images are also using bad level call but
only does it to make things more clear here. Either all images
are using C++ RNA here or no images does. That's the most clear
for now.
2013-01-16 17:07:25 +00:00
|
|
|
|
2013-01-30 13:42:12 +00:00
|
|
|
PointerRNA ptr;
|
|
|
|
|
RNA_id_pointer_create((ID*)builtin_data, &ptr);
|
|
|
|
|
BL::Image b_image(ptr);
|
Packed and generated images support for Cycles
This commit adds support of packed and generated images
for Cycles when using SVM backend. Movies are still not
supported. This changes also doesn't touch OSL which is
much less trivial to adopt for any images which are not
saved to disk.
Implementation details:
- When adding images to Image Manager is now possible
to mark image as builtin. Builtin images will bypass
OIIO loader and will use special loading callbacks.
- Callbacks are set by Blender Session and they're
using C++ RNA interface to obtain needed data (pixels,
dimensions, is_float flag).
- Image Manager assumes file path is used as reference
to a builtin images, but in fact currently image
datablock name is used for reference. This makes it
easy to find an image in BlendData database.
- Added some extra properties to Image RNA:
* channels, which denotes actual number of channels
in ImBuf. This is needed to treat image's pixels
correct (before it wasn't possible because API
used internal number of channels for pixels which
is in fact doesn't correlate with image depth)
* is_float, which is truth if image is stored in
float buffer of ImBuf.
- Implemented string lookup for C++ RNA collections
for cases there's no manual lookup function.
OSL is not supported because it used own image loading
and filtering routines and there's seems to be no API
to feed pre-loaded pixels directly to the library.
Think we'll either need to add some API to support
such kind of feeding or consider OSL does not have
support of packed images at all.
Movies are not supported at this moment because of lack
of RNA API to load specified frame. It's not difficult
to solve, just need to consider what to best here:
* Either write some general python interface for ImBuf
and use it via C++ API, or
* Write a PY API function which will return pixels for
given frame, or
* Use bad-level BKE_* call
Anyway, small steps, further improvements later.
Reviewed by Brecht, thanks!
2013-01-12 10:59:13 +00:00
|
|
|
|
|
|
|
|
if(b_image) {
|
|
|
|
|
int width = b_image.size()[0];
|
|
|
|
|
int height = b_image.size()[1];
|
|
|
|
|
int channels = b_image.channels();
|
|
|
|
|
|
Movies support for Cycles
This adds support of movie textures for Cycles rendering.
Uses the same builtin images routines as packed/generated images,
but with some extra non-rna hookups from blender_session side.
Basically, it's not so clear how to give access to video frames
via C++ RNA -- it'll require exposing ImBuf to API, doing some
threading locks and so. Ended up adding two more functions which
are actually bad level call, but don't consider it's so much bad
-- we have few bad calls already, which are actually related.
Changed a bit how builtin images names are passing to image
manager. Now it's not just an ID datablock name, but also a frame
number concatenated via '@' character, which makes itpossible to
easily know frame number to be used for movie images, without
adding extra descriptors to image manager.
Decoding of builtin name is a bit slower now, but it should be
still nothing in comparison with rendering complexity.
Also exposed image user's frame_current to python API, which
is needed to get absolute frame number of movie from node's
image user.
P.S. Generated/packed images are also using bad level call but
only does it to make things more clear here. Either all images
are using C++ RNA here or no images does. That's the most clear
for now.
2013-01-16 17:07:25 +00:00
|
|
|
float *image_pixels;
|
|
|
|
|
image_pixels = image_get_float_pixels_for_frame(b_image, frame);
|
Packed and generated images support for Cycles
This commit adds support of packed and generated images
for Cycles when using SVM backend. Movies are still not
supported. This changes also doesn't touch OSL which is
much less trivial to adopt for any images which are not
saved to disk.
Implementation details:
- When adding images to Image Manager is now possible
to mark image as builtin. Builtin images will bypass
OIIO loader and will use special loading callbacks.
- Callbacks are set by Blender Session and they're
using C++ RNA interface to obtain needed data (pixels,
dimensions, is_float flag).
- Image Manager assumes file path is used as reference
to a builtin images, but in fact currently image
datablock name is used for reference. This makes it
easy to find an image in BlendData database.
- Added some extra properties to Image RNA:
* channels, which denotes actual number of channels
in ImBuf. This is needed to treat image's pixels
correct (before it wasn't possible because API
used internal number of channels for pixels which
is in fact doesn't correlate with image depth)
* is_float, which is truth if image is stored in
float buffer of ImBuf.
- Implemented string lookup for C++ RNA collections
for cases there's no manual lookup function.
OSL is not supported because it used own image loading
and filtering routines and there's seems to be no API
to feed pre-loaded pixels directly to the library.
Think we'll either need to add some API to support
such kind of feeding or consider OSL does not have
support of packed images at all.
Movies are not supported at this moment because of lack
of RNA API to load specified frame. It's not difficult
to solve, just need to consider what to best here:
* Either write some general python interface for ImBuf
and use it via C++ API, or
* Write a PY API function which will return pixels for
given frame, or
* Use bad-level BKE_* call
Anyway, small steps, further improvements later.
Reviewed by Brecht, thanks!
2013-01-12 10:59:13 +00:00
|
|
|
|
Movies support for Cycles
This adds support of movie textures for Cycles rendering.
Uses the same builtin images routines as packed/generated images,
but with some extra non-rna hookups from blender_session side.
Basically, it's not so clear how to give access to video frames
via C++ RNA -- it'll require exposing ImBuf to API, doing some
threading locks and so. Ended up adding two more functions which
are actually bad level call, but don't consider it's so much bad
-- we have few bad calls already, which are actually related.
Changed a bit how builtin images names are passing to image
manager. Now it's not just an ID datablock name, but also a frame
number concatenated via '@' character, which makes itpossible to
easily know frame number to be used for movie images, without
adding extra descriptors to image manager.
Decoding of builtin name is a bit slower now, but it should be
still nothing in comparison with rendering complexity.
Also exposed image user's frame_current to python API, which
is needed to get absolute frame number of movie from node's
image user.
P.S. Generated/packed images are also using bad level call but
only does it to make things more clear here. Either all images
are using C++ RNA here or no images does. That's the most clear
for now.
2013-01-16 17:07:25 +00:00
|
|
|
if(image_pixels) {
|
|
|
|
|
memcpy(pixels, image_pixels, width * height * channels * sizeof(float));
|
|
|
|
|
MEM_freeN(image_pixels);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if(channels == 1) {
|
|
|
|
|
memset(pixels, 0, width * height * sizeof(float));
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
float *fp = pixels;
|
|
|
|
|
for(int i = 0; i < width * height; i++, fp += channels) {
|
|
|
|
|
fp[0] = 1.0f;
|
|
|
|
|
fp[1] = 0.0f;
|
|
|
|
|
fp[2] = 1.0f;
|
|
|
|
|
if(channels == 4)
|
|
|
|
|
fp[3] = 1.0f;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
Packed and generated images support for Cycles
This commit adds support of packed and generated images
for Cycles when using SVM backend. Movies are still not
supported. This changes also doesn't touch OSL which is
much less trivial to adopt for any images which are not
saved to disk.
Implementation details:
- When adding images to Image Manager is now possible
to mark image as builtin. Builtin images will bypass
OIIO loader and will use special loading callbacks.
- Callbacks are set by Blender Session and they're
using C++ RNA interface to obtain needed data (pixels,
dimensions, is_float flag).
- Image Manager assumes file path is used as reference
to a builtin images, but in fact currently image
datablock name is used for reference. This makes it
easy to find an image in BlendData database.
- Added some extra properties to Image RNA:
* channels, which denotes actual number of channels
in ImBuf. This is needed to treat image's pixels
correct (before it wasn't possible because API
used internal number of channels for pixels which
is in fact doesn't correlate with image depth)
* is_float, which is truth if image is stored in
float buffer of ImBuf.
- Implemented string lookup for C++ RNA collections
for cases there's no manual lookup function.
OSL is not supported because it used own image loading
and filtering routines and there's seems to be no API
to feed pre-loaded pixels directly to the library.
Think we'll either need to add some API to support
such kind of feeding or consider OSL does not have
support of packed images at all.
Movies are not supported at this moment because of lack
of RNA API to load specified frame. It's not difficult
to solve, just need to consider what to best here:
* Either write some general python interface for ImBuf
and use it via C++ API, or
* Write a PY API function which will return pixels for
given frame, or
* Use bad-level BKE_* call
Anyway, small steps, further improvements later.
Reviewed by Brecht, thanks!
2013-01-12 10:59:13 +00:00
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
CCL_NAMESPACE_END
|
|
|
|
|
|
