Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/collada/ImageExporter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/collada/ImageExporter.cpp')
-rw-r--r--source/blender/collada/ImageExporter.cpp166
1 files changed, 72 insertions, 94 deletions
diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/collada/ImageExporter.cpp
index c2666f591b5..d7ab16f81e7 100644
--- a/source/blender/collada/ImageExporter.cpp
+++ b/source/blender/collada/ImageExporter.cpp
@@ -51,7 +51,10 @@ extern "C" {
#include "MaterialExporter.h"
-ImagesExporter::ImagesExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryImages(sw), export_settings(export_settings)
+ImagesExporter::ImagesExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings, KeyImageMap &key_image_map) :
+ COLLADASW::LibraryImages(sw),
+ export_settings(export_settings),
+ key_image_map(key_image_map)
{
}
@@ -59,135 +62,110 @@ void ImagesExporter::export_UV_Image(Image *image, bool use_copies)
{
std::string name(id_name(image));
std::string translated_name(translate_id(name));
- bool not_yet_exported = find(mImages.begin(), mImages.end(), translated_name) == mImages.end();
- if (not_yet_exported) {
-
- ImBuf *imbuf = BKE_image_acquire_ibuf(image, NULL, NULL);
- if (!imbuf) {
- fprintf(stderr, "Collada export: image does not exist:\n%s\n", image->name);
- return;
- }
+ ImBuf *imbuf = BKE_image_acquire_ibuf(image, NULL, NULL);
+ if (!imbuf) {
+ fprintf(stderr, "Collada export: image does not exist:\n%s\n", image->name);
+ return;
+ }
- bool is_dirty = (imbuf->userflags & IB_BITMAPDIRTY) != 0;
+ bool is_dirty = (imbuf->userflags & IB_BITMAPDIRTY) != 0;
- ImageFormatData imageFormat;
- BKE_imbuf_to_image_format(&imageFormat, imbuf);
+ ImageFormatData imageFormat;
+ BKE_imbuf_to_image_format(&imageFormat, imbuf);
- short image_source = image->source;
- bool is_generated = image_source == IMA_SRC_GENERATED;
- bool is_packed = BKE_image_has_packedfile(image);
+ short image_source = image->source;
+ bool is_generated = image_source == IMA_SRC_GENERATED;
+ bool is_packed = BKE_image_has_packedfile(image);
- char export_path[FILE_MAX];
- char source_path[FILE_MAX];
- char export_dir[FILE_MAX];
- char export_file[FILE_MAX];
+ char export_path[FILE_MAX];
+ char source_path[FILE_MAX];
+ char export_dir[FILE_MAX];
+ char export_file[FILE_MAX];
- // Destination folder for exported assets
- BLI_split_dir_part(this->export_settings->filepath, export_dir, sizeof(export_dir));
+ // Destination folder for exported assets
+ BLI_split_dir_part(this->export_settings->filepath, export_dir, sizeof(export_dir));
- if (is_generated || is_dirty || use_copies || is_packed) {
+ if (is_generated || is_dirty || use_copies || is_packed) {
- // make absolute destination path
+ // make absolute destination path
- BLI_strncpy(export_file, name.c_str(), sizeof(export_file));
- BKE_image_path_ensure_ext_from_imformat(export_file, &imageFormat);
+ BLI_strncpy(export_file, name.c_str(), sizeof(export_file));
+ BKE_image_path_ensure_ext_from_imformat(export_file, &imageFormat);
- BLI_join_dirfile(export_path, sizeof(export_path), export_dir, export_file);
+ BLI_join_dirfile(export_path, sizeof(export_path), export_dir, export_file);
- // make dest directory if it doesn't exist
- BLI_make_existing_file(export_path);
- }
+ // make dest directory if it doesn't exist
+ BLI_make_existing_file(export_path);
+ }
- if (is_generated || is_dirty || is_packed) {
+ if (is_generated || is_dirty || is_packed) {
- // This image in its current state only exists in Blender memory.
- // So we have to export it. The export will keep the image state intact,
- // so the exported file will not be associated with the image.
+ // This image in its current state only exists in Blender memory.
+ // So we have to export it. The export will keep the image state intact,
+ // so the exported file will not be associated with the image.
- if (BKE_imbuf_write_as(imbuf, export_path, &imageFormat, true) == 0) {
- fprintf(stderr, "Collada export: Cannot export image to:\n%s\n", export_path);
- return;
- }
- BLI_strncpy(export_path, export_file, sizeof(export_path));
+ if (BKE_imbuf_write_as(imbuf, export_path, &imageFormat, true) == 0) {
+ fprintf(stderr, "Collada export: Cannot export image to:\n%s\n", export_path);
+ return;
}
- else {
+ BLI_strncpy(export_path, export_file, sizeof(export_path));
+ }
+ else {
- // make absolute source path
- BLI_strncpy(source_path, image->name, sizeof(source_path));
- BLI_path_abs(source_path, BKE_main_blendfile_path_from_global());
- BLI_cleanup_path(NULL, source_path);
+ // make absolute source path
+ BLI_strncpy(source_path, image->name, sizeof(source_path));
+ BLI_path_abs(source_path, BKE_main_blendfile_path_from_global());
+ BLI_cleanup_path(NULL, source_path);
- if (use_copies) {
+ if (use_copies) {
- // This image is already located on the file system.
- // But we want to create copies here.
- // To move images into the same export directory.
- // Note: If an image is already located in the export folder,
- // then skip the copy (as it would result in a file copy error).
+ // This image is already located on the file system.
+ // But we want to create copies here.
+ // To move images into the same export directory.
+ // Note: If an image is already located in the export folder,
+ // then skip the copy (as it would result in a file copy error).
- if (BLI_path_cmp(source_path, export_path) != 0) {
- if (BLI_copy(source_path, export_path) != 0) {
- fprintf(stderr, "Collada export: Cannot copy image:\n source:%s\ndest :%s\n", source_path, export_path);
- return;
- }
+ if (BLI_path_cmp(source_path, export_path) != 0) {
+ if (BLI_copy(source_path, export_path) != 0) {
+ fprintf(stderr, "Collada export: Cannot copy image:\n source:%s\ndest :%s\n", source_path, export_path);
+ return;
}
-
- BLI_strncpy(export_path, export_file, sizeof(export_path));
-
}
- else {
- // Do not make any copies, but use the source path directly as reference
- // to the original image
+ BLI_strncpy(export_path, export_file, sizeof(export_path));
- BLI_strncpy(export_path, source_path, sizeof(export_path));
- }
}
+ else {
- COLLADASW::Image img(COLLADABU::URI(COLLADABU::URI::nativePathToUri(export_path)), translated_name, translated_name); /* set name also to mNameNC. This helps other viewers import files exported from Blender better */
- img.add(mSW);
- fprintf(stdout, "Collada export: Added image: %s\n", export_file);
- mImages.push_back(translated_name);
+ // Do not make any copies, but use the source path directly as reference
+ // to the original image
- BKE_image_release_ibuf(image, imbuf, NULL);
+ BLI_strncpy(export_path, source_path, sizeof(export_path));
+ }
}
-}
-
-bool ImagesExporter::hasImages(Scene *sce)
-{
- LinkNode *node;
-
- for (node = this->export_settings->export_set; node; node = node->next) {
- Object *ob = (Object *)node->link;
- for (int a = 0; a < ob->totcol; a++) {
- Material *ma = give_current_material(ob, a + 1);
+ COLLADASW::Image img(COLLADABU::URI(COLLADABU::URI::nativePathToUri(export_path)), translated_name, translated_name); /* set name also to mNameNC. This helps other viewers import files exported from Blender better */
+ img.add(mSW);
+ fprintf(stdout, "Collada export: Added image: %s\n", export_file);
- // no material, but check all of the slots
- if (!ma) continue;
- // TODO: find image textures in shader nodes
- }
- }
- return false;
+ BKE_image_release_ibuf(image, imbuf, NULL);
}
void ImagesExporter::exportImages(Scene *sce)
{
+ bool use_texture_copies = this->export_settings->use_texture_copies;
openLibrary();
- MaterialFunctor mf;
- if (this->export_settings->include_material_textures) {
- mf.forEachMaterialInExportSet<ImagesExporter>(sce, *this, this->export_settings->export_set);
- }
-
- closeLibrary();
-}
+ KeyImageMap::iterator iter;
+ for (iter = key_image_map.begin(); iter != key_image_map.end(); iter++) {
+ Image *image = iter->second;
+ std::string uid(id_name(image));
+ std::string key = translate_id(uid);
+ export_UV_Image(image, use_texture_copies);
+ }
-void ImagesExporter::operator()(Material *ma, Object *ob)
-{
- // bool use_texture_copies = this->export_settings->use_texture_copies;
- // TODO call export_UV_Image for every image in shader nodes
+ closeLibrary();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 10:43:34 +0300