forked from bartvdbraak/blender
7a90af7b5a
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!
105 lines
3.1 KiB
C++
105 lines
3.1 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef __IMAGE_H__
|
|
#define __IMAGE_H__
|
|
|
|
#include "device_memory.h"
|
|
|
|
#include "util_string.h"
|
|
#include "util_thread.h"
|
|
#include "util_vector.h"
|
|
|
|
#include "kernel_types.h" /* for TEX_NUM_FLOAT_IMAGES */
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
#define TEX_NUM_IMAGES 95
|
|
#define TEX_IMAGE_BYTE_START TEX_NUM_FLOAT_IMAGES
|
|
|
|
#define TEX_EXTENDED_NUM_FLOAT_IMAGES 5
|
|
#define TEX_EXTENDED_NUM_IMAGES 512
|
|
#define TEX_EXTENDED_IMAGE_BYTE_START TEX_EXTENDED_NUM_FLOAT_IMAGES
|
|
|
|
/* color to use when textures are not found */
|
|
#define TEX_IMAGE_MISSING_R 1
|
|
#define TEX_IMAGE_MISSING_G 0
|
|
#define TEX_IMAGE_MISSING_B 1
|
|
#define TEX_IMAGE_MISSING_A 1
|
|
|
|
class Device;
|
|
class DeviceScene;
|
|
class Progress;
|
|
|
|
class ImageManager {
|
|
public:
|
|
ImageManager();
|
|
~ImageManager();
|
|
|
|
int add_image(const string& filename, bool is_builtin, bool animated, bool& is_float);
|
|
void remove_image(const string& filename, bool is_builtin);
|
|
bool is_float_image(const string& filename, bool is_builtin);
|
|
|
|
void device_update(Device *device, DeviceScene *dscene, Progress& progress);
|
|
void device_free(Device *device, DeviceScene *dscene);
|
|
|
|
void set_osl_texture_system(void *texture_system);
|
|
void set_pack_images(bool pack_images_);
|
|
void set_extended_image_limits(void);
|
|
bool set_animation_frame_update(int frame);
|
|
|
|
bool need_update;
|
|
|
|
boost::function<void(const string &filename, bool &is_float, int &width, int &height, int &channels)> builtin_image_info_cb;
|
|
boost::function<bool(const string &filename, unsigned char *pixels)> builtin_image_pixels_cb;
|
|
boost::function<bool(const string &filename, float *pixels)> builtin_image_float_pixels_cb;
|
|
private:
|
|
int tex_num_images;
|
|
int tex_num_float_images;
|
|
int tex_image_byte_start;
|
|
thread_mutex device_mutex;
|
|
int animation_frame;
|
|
|
|
struct Image {
|
|
string filename;
|
|
bool is_builtin;
|
|
|
|
bool need_load;
|
|
bool animated;
|
|
int users;
|
|
};
|
|
|
|
vector<Image*> images;
|
|
vector<Image*> float_images;
|
|
void *osl_texture_system;
|
|
bool pack_images;
|
|
|
|
bool file_load_image(Image *img, device_vector<uchar4>& tex_img);
|
|
bool file_load_float_image(Image *img, device_vector<float4>& tex_img);
|
|
|
|
void device_load_image(Device *device, DeviceScene *dscene, int slot, Progress *progess);
|
|
void device_free_image(Device *device, DeviceScene *dscene, int slot);
|
|
|
|
void device_pack_images(Device *device, DeviceScene *dscene, Progress& progess);
|
|
};
|
|
|
|
CCL_NAMESPACE_END
|
|
|
|
#endif /* __IMAGE_H__ */
|
|
|