1c0f374ec3
The `object_to_world` and `world_to_object` matrices are set during depsgraph evaluation, calculated from the object's animated location, rotation, scale, parenting, and constraints. It's confusing and unnecessary to store them with the original data in DNA. This commit moves them to `ObjectRuntime` and moves the matrices to use the C++ `float4x4` type, giving the potential for simplified code using the C++ abstractions. The matrices are accessible with functions on `Object` directly since they are used so commonly. Though for write access, directly using the runtime struct is necessary. The inverse `world_to_object` matrix is often calculated before it's used, even though it's calculated as part of depsgraph evaluation. Long term we might not want to store this in `ObjectRuntime` at all, and just calculate it on demand. Or at least we should remove the redundant calculations. That should be done separately though. Pull Request: https://projects.blender.org/blender/blender/pulls/118210
63 lines
1.5 KiB
C
63 lines
1.5 KiB
C
/* SPDX-FileCopyrightText: 2023 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup DNA
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "DNA_vec_defaults.h"
|
|
|
|
/* Struct members on own line. */
|
|
/* clang-format off */
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
/** \name Object Struct
|
|
* \{ */
|
|
|
|
#define _DNA_DEFAULT_Object \
|
|
{ \
|
|
/* Type is not very meaningful as a default, normally changed. */ \
|
|
.type = OB_EMPTY, \
|
|
.color = {1, 1, 1, 1}, \
|
|
\
|
|
.constinv = _DNA_DEFAULT_UNIT_M4, \
|
|
.parentinv = _DNA_DEFAULT_UNIT_M4, \
|
|
\
|
|
.scale = {1, 1, 1}, \
|
|
.dscale = {1, 1, 1}, \
|
|
/* Objects should default to having Euler XYZ rotations, \
|
|
* but rotations default to quaternions. */ \
|
|
.rotmode = ROT_MODE_EUL, \
|
|
/** See #unit_axis_angle. */ \
|
|
.rotAxis = {0, 1, 0}, \
|
|
.rotAngle = 0, \
|
|
.drotAxis = {0, 1, 0}, \
|
|
.drotAngle = 0, \
|
|
.quat = _DNA_DEFAULT_UNIT_QT, \
|
|
.dquat = _DNA_DEFAULT_UNIT_QT, \
|
|
.flag = OB_FLAG_USE_SIMULATION_CACHE, \
|
|
.protectflag = OB_LOCK_ROT4D, \
|
|
\
|
|
.dt = OB_TEXTURE, \
|
|
\
|
|
.empty_drawtype = OB_PLAINAXES, \
|
|
.empty_drawsize = 1.0, \
|
|
.empty_image_depth = OB_EMPTY_IMAGE_DEPTH_DEFAULT, \
|
|
.ima_ofs = {-0.5, -0.5}, \
|
|
\
|
|
.instance_faces_scale = 1, \
|
|
.col_group = 0x01, \
|
|
.col_mask = 0xffff, \
|
|
.preview = NULL, \
|
|
.duplicator_visibility_flag = OB_DUPLI_FLAG_VIEWPORT | OB_DUPLI_FLAG_RENDER, \
|
|
.pc_ids = {NULL, NULL}, \
|
|
.lineart = { .crease_threshold = DEG2RAD(140.0f) }, \
|
|
}
|
|
|
|
/** \} */
|
|
|
|
/* clang-format on */
|