22bf5ba4d1
We now import and apply custom normals using a similar strategy
to the STL importer. We store custom normal data for each loop
as we read each MPoly and then apply it to the mesh after
`BKE_mesh_calc_edges()` is called.
The new behavior is optional and may be disabled in the Collada import
UI. When disabled, we use the old behavior of only using normals
to determine whether or not to smooth shade an MPoly.
----
Patch as requested in {T49814}.
The Collada import UI now has an additional checkbox, similar to the glTF and FBX import UIs:
{F13428264}
Here is a test Collada file with a simple test cube with flipped custom normals:
{F13428260}
{F13428282}
And a sphere where the two halves are disconnected geometry, but has custom normals that make the halves appear to be connected:
{F13436363}
{F13436368}
I've tested it on a number of my own meshes, and the custom normals appear to be imported
correctly. I'm not too sure about how I've plumbed the option down, though, or whether this
is the most proper way to apply custom normals.
Reviewed By: gaiaclary
Differential Revision: https://developer.blender.org/D15804
106 lines
3.3 KiB
C++
106 lines
3.3 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup collada
|
|
*/
|
|
|
|
/* COLLADABU_ASSERT, may be able to remove later */
|
|
#include "COLLADABUPlatform.h"
|
|
|
|
#include "DocumentExporter.h"
|
|
#include "DocumentImporter.h"
|
|
#include "ExportSettings.h"
|
|
#include "ImportSettings.h"
|
|
#include "collada.h"
|
|
|
|
#include "BKE_context.h"
|
|
#include "BKE_scene.h"
|
|
#include "DEG_depsgraph.h"
|
|
#include "DEG_depsgraph_query.h"
|
|
|
|
/* make dummy file */
|
|
#include "BLI_fileops.h"
|
|
#include "BLI_linklist.h"
|
|
|
|
extern "C" {
|
|
|
|
static void print_import_header(ImportSettings &import_settings)
|
|
{
|
|
fprintf(stderr, "+-- Collada Import parameters------\n");
|
|
fprintf(stderr, "| input file : %s\n", import_settings.filepath);
|
|
fprintf(stderr, "| use units : %s\n", (import_settings.import_units) ? "yes" : "no");
|
|
fprintf(stderr, "| custom normals : %s\n", (import_settings.custom_normals) ? "yes" : "no");
|
|
fprintf(stderr, "| autoconnect : %s\n", (import_settings.auto_connect) ? "yes" : "no");
|
|
fprintf(stderr, "+-- Armature Import parameters ----\n");
|
|
fprintf(stderr, "| find bone chains: %s\n", (import_settings.find_chains) ? "yes" : "no");
|
|
fprintf(stderr, "| min chain len : %d\n", import_settings.min_chain_length);
|
|
fprintf(stderr, "| fix orientation : %s\n", (import_settings.fix_orientation) ? "yes" : "no");
|
|
fprintf(stderr, "| keep bind info : %s\n", (import_settings.keep_bind_info) ? "yes" : "no");
|
|
}
|
|
|
|
static void print_import_footer(int status)
|
|
{
|
|
fprintf(stderr, "+----------------------------------\n");
|
|
fprintf(stderr, "| Collada Import : %s\n", (status) ? "OK" : "FAIL");
|
|
fprintf(stderr, "+----------------------------------\n");
|
|
}
|
|
|
|
int collada_import(bContext *C, ImportSettings *import_settings)
|
|
{
|
|
print_import_header(*import_settings);
|
|
DocumentImporter imp(C, import_settings);
|
|
int status = imp.import() ? 1 : 0;
|
|
print_import_footer(status);
|
|
|
|
return status;
|
|
}
|
|
|
|
int collada_export(bContext *C, ExportSettings *export_settings)
|
|
{
|
|
BlenderContext blender_context(C);
|
|
ViewLayer *view_layer = blender_context.get_view_layer();
|
|
|
|
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;
|
|
}
|
|
|
|
/* Fetch the complete set of exported objects
|
|
* ATTENTION: Invisible objects will not be exported
|
|
*/
|
|
eObjectSet objectSet = (export_settings->selected) ? OB_SET_SELECTED : OB_SET_ALL;
|
|
export_settings->export_set = BKE_object_relational_superset(
|
|
view_layer, objectSet, (eObRelationTypes)includeFilter);
|
|
|
|
int export_count = BLI_linklist_count(export_settings->export_set);
|
|
|
|
if (export_count == 0) {
|
|
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 {
|
|
fprintf(stderr, "Collada: Your scene seems to be empty. No Objects will be exported.\n");
|
|
}
|
|
}
|
|
else {
|
|
if (export_settings->sort_by_name) {
|
|
bc_bubble_sort_by_Object_name(export_settings->export_set);
|
|
}
|
|
}
|
|
|
|
DocumentExporter exporter(blender_context, export_settings);
|
|
int status = exporter.exportCurrentScene();
|
|
|
|
BLI_linklist_free(export_settings->export_set, nullptr);
|
|
|
|
return (status) ? -1 : export_count;
|
|
}
|
|
|
|
/* end extern C */
|
|
}
|