blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 745 Projects 19 Wiki Activity

collada: call from operator to Collada exporter/importer now uses structures instead of passing many parameters

This commit is contained in:
Gaia Clary 2018-02-28 15:59:49 +01:00
parent 01f732d97b
commit 91c3cfbb6f
4 changed files with 61 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/collada/DocumentExporter.h
View File

@ -31,6 +31,7 @@
extern "C" {
#include "DNA_customdata_types.h"
#include "BKE_depsgraph.h"
}
struct Scene;

97
source/blender/collada/collada.cpp
View File

@ -42,96 +42,27 @@ extern "C"
#include "BLI_fileops.h"
#include "BLI_linklist.h"
int collada_import(bContext *C,
const char *filepath,
int import_units,
int find_chains,
int auto_connect,
int fix_orientation,
int min_chain_length,
int keep_bind_info)
int collada_import(bContext *C, ImportSettings *import_settings)
{
ImportSettings import_settings;
import_settings.filepath = (char *)filepath;
import_settings.import_units = import_units != 0;
import_settings.auto_connect = auto_connect != 0;
import_settings.find_chains = find_chains != 0;
import_settings.fix_orientation = fix_orientation != 0;
import_settings.min_chain_length = min_chain_length;
import_settings.keep_bind_info = keep_bind_info !=0;
DocumentImporter imp(C, &import_settings);
if (imp.import()) return 1;
return 0;
DocumentImporter imp(C, import_settings);
return (imp.import())? 1:0;
}
int collada_export(EvaluationContext *eval_ctx,
Scene *sce,
const char *filepath,
int apply_modifiers,
BC_export_mesh_type export_mesh_type,
int selected,
int include_children,
int include_armatures,
int include_shapekeys,
int deform_bones_only,
int include_animations,
int sampling_rate,
int active_uv_only,
BC_export_texture_type export_texture_type,
int use_texture_copies,
int triangulate,
int use_object_instantiation,
int use_blender_profile,
int sort_by_name,
BC_export_transformation_type export_transformation_type,
int open_sim,
int limit_precision,
int keep_bind_info)
ExportSettings *export_settings)
{
ExportSettings export_settings;
export_settings.filepath = (char *)filepath;
export_settings.apply_modifiers = apply_modifiers != 0;
export_settings.export_mesh_type = export_mesh_type;
export_settings.selected = selected != 0;
export_settings.include_children = include_children != 0;
export_settings.include_armatures = include_armatures != 0;
export_settings.include_shapekeys = include_shapekeys != 0;
export_settings.deform_bones_only = deform_bones_only != 0;
export_settings.include_animations = include_animations;
export_settings.sampling_rate = sampling_rate;
export_settings.active_uv_only = active_uv_only != 0;
export_settings.export_texture_type = export_texture_type;
export_settings.use_texture_copies = use_texture_copies != 0;
export_settings.triangulate = triangulate != 0;
export_settings.use_object_instantiation = use_object_instantiation != 0;
export_settings.use_blender_profile = use_blender_profile != 0;
export_settings.sort_by_name = sort_by_name != 0;
export_settings.export_transformation_type = export_transformation_type;
export_settings.open_sim = open_sim != 0;
export_settings.limit_precision = limit_precision != 0;
export_settings.keep_bind_info = keep_bind_info !=0;
int includeFilter = OB_REL_NONE;
if (export_settings.include_armatures) includeFilter |= OB_REL_MOD_ARMATURE;
if (export_settings.include_children) includeFilter |= OB_REL_CHILDREN_RECURSIVE;
if (export_settings->include_armatures) includeFilter |= OB_REL_MOD_ARMATURE;
if (export_settings->include_children) includeFilter |= OB_REL_CHILDREN_RECURSIVE;
eObjectSet objectSet = (export_settings.selected) ? OB_SET_SELECTED : OB_SET_ALL;
export_settings.export_set = BKE_object_relational_superset(sce, objectSet, (eObRelationTypes)includeFilter);
int export_count = BLI_linklist_count(export_settings.export_set);
eObjectSet objectSet = (export_settings->selected) ? OB_SET_SELECTED : OB_SET_ALL;
export_settings->export_set = BKE_object_relational_superset(sce, objectSet, (eObRelationTypes)includeFilter);
int export_count = BLI_linklist_count(export_settings->export_set);
if (export_count == 0) {
if (export_settings.selected) {
if (export_settings->selected) {
fprintf(stderr, "Collada: Found no objects to export.\nPlease ensure that all objects which shall be exported are also visible in the 3D Viewport.\n");
}
else {
@ -139,14 +70,14 @@ int collada_export(EvaluationContext *eval_ctx,
}
}
else {
if (export_settings.sort_by_name)
bc_bubble_sort_by_Object_name(export_settings.export_set);
if (export_settings->sort_by_name)
bc_bubble_sort_by_Object_name(export_settings->export_set);
}
DocumentExporter exporter(&export_settings);
DocumentExporter exporter(export_settings);
int status = exporter.exportCurrentScene(eval_ctx, sce);
BLI_linklist_free(export_settings.export_set, NULL);
BLI_linklist_free(export_settings->export_set, NULL);
return (status) ? -1:export_count;
}

35
source/blender/collada/collada.h
View File

@ -50,42 +50,11 @@ struct Scene;
* both return 1 on success, 0 on error
*/
int collada_import(struct bContext *C,
const char *filepath,
int import_units,
int find_chains,
int auto_connect,
int fix_orientation,
int min_chain_length,
int keep_bind_info);
ImportSettings *import_settings);
int collada_export(struct EvaluationContext *eval_ctx,
struct Scene *sce,
const char *filepath,
int apply_modifiers,
BC_export_mesh_type export_mesh_type,
int selected,
int include_children,
int include_armatures,
int include_shapekeys,
int deform_bones_only,
int include_animations,
int sampling_rate,
int active_uv_only,
BC_export_texture_type export_texture_type,
int use_texture_copies,
int triangulate,
int use_object_instantiation,
int use_blender_profile,
int sort_by_name,
BC_export_transformation_type export_transformation_type,
int open_sim,
int limit_precision,
int keep_bind_info);
ExportSettings *export_settings);
#ifdef __cplusplus
}

76
source/blender/editors/io/io_collada.c
View File

@ -40,6 +40,7 @@
#include "BKE_global.h"
#include "BKE_main.h"
#include "BKE_report.h"
#include "BKE_object.h"
#include "ED_screen.h"
#include "ED_object.h"
@ -167,33 +168,41 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
EvaluationContext *eval_ctx = G.main->eval_ctx;
Scene *scene = CTX_data_scene(C);
ExportSettings export_settings;
export_settings.filepath = filepath;
export_settings.apply_modifiers = apply_modifiers != 0;
export_settings.export_mesh_type = export_mesh_type;
export_settings.selected = selected != 0;
export_settings.include_children = include_children != 0;
export_settings.include_armatures = include_armatures != 0;
export_settings.include_shapekeys = include_shapekeys != 0;
export_settings.deform_bones_only = deform_bones_only != 0;
export_settings.include_animations = include_animations;
export_settings.sampling_rate = sampling_rate;
export_settings.active_uv_only = active_uv_only != 0;
export_settings.export_texture_type = export_texture_type;
export_settings.use_texture_copies = use_texture_copies != 0;
export_settings.triangulate = triangulate != 0;
export_settings.use_object_instantiation = use_object_instantiation != 0;
export_settings.use_blender_profile = use_blender_profile != 0;
export_settings.sort_by_name = sort_by_name != 0;
export_settings.export_transformation_type = export_transformation_type;
export_settings.open_sim = open_sim != 0;
export_settings.limit_precision = limit_precision != 0;
export_settings.keep_bind_info = keep_bind_info != 0;
int includeFilter = OB_REL_NONE;
if (export_settings.include_armatures) includeFilter |= OB_REL_MOD_ARMATURE;
if (export_settings.include_children) includeFilter |= OB_REL_CHILDREN_RECURSIVE;
export_count = collada_export(eval_ctx,
scene,
filepath,
apply_modifiers,
export_mesh_type,
selected,
include_children,
include_armatures,
include_shapekeys,
deform_bones_only,
include_animations,
sampling_rate,
active_uv_only,
export_texture_type,
use_texture_copies,
triangulate,
use_object_instantiation,
use_blender_profile,
sort_by_name,
export_transformation_type,
open_sim,
limit_precision,
keep_bind_info
&export_settings
);
if (export_count == 0) {
@ -460,6 +469,7 @@ static int wm_collada_import_exec(bContext *C, wmOperator *op)
int min_chain_length;
int keep_bind_info;
ImportSettings import_settings;
if (!RNA_struct_property_is_set(op->ptr, "filepath")) {
BKE_report(op->reports, RPT_ERROR, "No filename given");
@ -477,14 +487,16 @@ static int wm_collada_import_exec(bContext *C, wmOperator *op)
min_chain_length = RNA_int_get(op->ptr, "min_chain_length");
RNA_string_get(op->ptr, "filepath", filename);
if (collada_import(
C, filename,
import_units,
find_chains,
auto_connect,
fix_orientation,
min_chain_length,
keep_bind_info) )
import_settings.filepath = filename;
import_settings.import_units = import_units != 0;
import_settings.auto_connect = auto_connect != 0;
import_settings.find_chains = find_chains != 0;
import_settings.fix_orientation = fix_orientation != 0;
import_settings.min_chain_length = min_chain_length;
import_settings.keep_bind_info = keep_bind_info != 0;
if (collada_import(C, &import_settings) )
{
return OPERATOR_FINISHED;
}