This patch implements the vector types (i.e:`float2`) by making heavy usage of templating. All vector functions are now outside of the vector classes (inside the `blender::math` namespace) and are not vector size dependent for the most part. In the ongoing effort to make shaders less GL centric, we are aiming to share more code between GLSL and C++ to avoid code duplication. ####Motivations: - We are aiming to share UBO and SSBO structures between GLSL and C++. This means we will use many of the existing vector types and others we currently don't have (uintX, intX). All these variations were asking for many more code duplication. - Deduplicate existing code which is duplicated for each vector size. - We also want to share small functions. Which means that vector functions should be static and not in the class namespace. - Reduce friction to use these types in new projects due to their incompleteness. - The current state of the `BLI_(float|double|mpq)(2|3|4).hh` is a bit of a let down. Most clases are incomplete, out of sync with each others with different codestyles, and some functions that should be static are not (i.e: `float3::reflect()`). ####Upsides: - Still support `.x, .y, .z, .w` for readability. - Compact, readable and easilly extendable. - All of the vector functions are available for all the vectors types and can be restricted to certain types. Also template specialization let us define exception for special class (like mpq). - With optimization ON, the compiler unroll the loops and performance is the same. ####Downsides: - Might impact debugability. Though I would arge that the bugs are rarelly caused by the vector class itself (since the operations are quite trivial) but by the type conversions. - Might impact compile time. I did not saw a significant impact since the usage is not really widespread. - Functions needs to be rewritten to support arbitrary vector length. For instance, one can't call `len_squared_v3v3` in `math::length_squared()` and call it a day. - Type cast does not work with the template version of the `math::` vector functions. Meaning you need to manually cast `float *` and `(float *)[3]` to `float3` for the function calls. i.e: `math::distance_squared(float3(nearest.co), positions[i]);` - Some parts might loose in readability: `float3::dot(v1.normalized(), v2.normalized())` becoming `math::dot(math::normalize(v1), math::normalize(v2))` But I propose, when appropriate, to use `using namespace blender::math;` on function local or file scope to increase readability. `dot(normalize(v1), normalize(v2))` ####Consideration: - Include back `.length()` method. It is quite handy and is more C++ oriented. - I considered the GLM library as a candidate for replacement. It felt like too much for what we need and would be difficult to extend / modify to our needs. - I used Macros to reduce code in operators declaration and potential copy paste bugs. This could reduce debugability and could be reverted. - This touches `delaunay_2d.cc` and the intersection code. I would like to know @howardt opinion on the matter. - The `noexcept` on the copy constructor of `mpq(2|3)` is being removed. But according to @JacquesLucke it is not a real problem for now. I would like to give a huge thanks to @JacquesLucke who helped during this and pushed me to reduce the duplication further. Reviewed By: brecht, sergey, JacquesLucke Differential Revision: https://developer.blender.org/D13791
436 lines
13 KiB
C++
436 lines
13 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
/** \file
|
|
* \ingroup bke
|
|
*/
|
|
|
|
#include <cmath>
|
|
#include <cstring>
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "DNA_defaults.h"
|
|
#include "DNA_hair_types.h"
|
|
#include "DNA_material_types.h"
|
|
#include "DNA_object_types.h"
|
|
|
|
#include "BLI_listbase.h"
|
|
#include "BLI_math_base.h"
|
|
#include "BLI_math_vec_types.hh"
|
|
#include "BLI_rand.h"
|
|
#include "BLI_string.h"
|
|
#include "BLI_utildefines.h"
|
|
|
|
#include "BKE_anim_data.h"
|
|
#include "BKE_customdata.h"
|
|
#include "BKE_global.h"
|
|
#include "BKE_hair.h"
|
|
#include "BKE_idtype.h"
|
|
#include "BKE_lib_id.h"
|
|
#include "BKE_lib_query.h"
|
|
#include "BKE_lib_remap.h"
|
|
#include "BKE_main.h"
|
|
#include "BKE_modifier.h"
|
|
#include "BKE_object.h"
|
|
|
|
#include "BLT_translation.h"
|
|
|
|
#include "DEG_depsgraph_query.h"
|
|
|
|
#include "BLO_read_write.h"
|
|
|
|
using blender::float3;
|
|
|
|
static const char *HAIR_ATTR_POSITION = "position";
|
|
static const char *HAIR_ATTR_RADIUS = "radius";
|
|
|
|
/* Hair datablock */
|
|
|
|
static void hair_random(Hair *hair);
|
|
|
|
static void hair_init_data(ID *id)
|
|
{
|
|
Hair *hair = (Hair *)id;
|
|
BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(hair, id));
|
|
|
|
MEMCPY_STRUCT_AFTER(hair, DNA_struct_default_get(Hair), id);
|
|
|
|
CustomData_reset(&hair->pdata);
|
|
CustomData_reset(&hair->cdata);
|
|
|
|
CustomData_add_layer_named(
|
|
&hair->pdata, CD_PROP_FLOAT3, CD_CALLOC, nullptr, hair->totpoint, HAIR_ATTR_POSITION);
|
|
CustomData_add_layer_named(
|
|
&hair->pdata, CD_PROP_FLOAT, CD_CALLOC, nullptr, hair->totpoint, HAIR_ATTR_RADIUS);
|
|
CustomData_add_layer(&hair->cdata, CD_HAIRCURVE, CD_CALLOC, nullptr, hair->totcurve);
|
|
BKE_hair_update_customdata_pointers(hair);
|
|
|
|
hair_random(hair);
|
|
}
|
|
|
|
static void hair_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src, const int flag)
|
|
{
|
|
Hair *hair_dst = (Hair *)id_dst;
|
|
const Hair *hair_src = (const Hair *)id_src;
|
|
hair_dst->mat = static_cast<Material **>(MEM_dupallocN(hair_src->mat));
|
|
|
|
const eCDAllocType alloc_type = (flag & LIB_ID_COPY_CD_REFERENCE) ? CD_REFERENCE : CD_DUPLICATE;
|
|
CustomData_copy(&hair_src->pdata, &hair_dst->pdata, CD_MASK_ALL, alloc_type, hair_dst->totpoint);
|
|
CustomData_copy(&hair_src->cdata, &hair_dst->cdata, CD_MASK_ALL, alloc_type, hair_dst->totcurve);
|
|
BKE_hair_update_customdata_pointers(hair_dst);
|
|
|
|
hair_dst->batch_cache = nullptr;
|
|
}
|
|
|
|
static void hair_free_data(ID *id)
|
|
{
|
|
Hair *hair = (Hair *)id;
|
|
BKE_animdata_free(&hair->id, false);
|
|
|
|
BKE_hair_batch_cache_free(hair);
|
|
|
|
CustomData_free(&hair->pdata, hair->totpoint);
|
|
CustomData_free(&hair->cdata, hair->totcurve);
|
|
|
|
MEM_SAFE_FREE(hair->mat);
|
|
}
|
|
|
|
static void hair_foreach_id(ID *id, LibraryForeachIDData *data)
|
|
{
|
|
Hair *hair = (Hair *)id;
|
|
for (int i = 0; i < hair->totcol; i++) {
|
|
BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, hair->mat[i], IDWALK_CB_USER);
|
|
}
|
|
}
|
|
|
|
static void hair_blend_write(BlendWriter *writer, ID *id, const void *id_address)
|
|
{
|
|
Hair *hair = (Hair *)id;
|
|
|
|
CustomDataLayer *players = nullptr, players_buff[CD_TEMP_CHUNK_SIZE];
|
|
CustomDataLayer *clayers = nullptr, clayers_buff[CD_TEMP_CHUNK_SIZE];
|
|
CustomData_blend_write_prepare(&hair->pdata, &players, players_buff, ARRAY_SIZE(players_buff));
|
|
CustomData_blend_write_prepare(&hair->cdata, &clayers, clayers_buff, ARRAY_SIZE(clayers_buff));
|
|
|
|
/* Write LibData */
|
|
BLO_write_id_struct(writer, Hair, id_address, &hair->id);
|
|
BKE_id_blend_write(writer, &hair->id);
|
|
|
|
/* Direct data */
|
|
CustomData_blend_write(writer, &hair->pdata, players, hair->totpoint, CD_MASK_ALL, &hair->id);
|
|
CustomData_blend_write(writer, &hair->cdata, clayers, hair->totcurve, CD_MASK_ALL, &hair->id);
|
|
|
|
BLO_write_pointer_array(writer, hair->totcol, hair->mat);
|
|
if (hair->adt) {
|
|
BKE_animdata_blend_write(writer, hair->adt);
|
|
}
|
|
|
|
/* Remove temporary data. */
|
|
if (players && players != players_buff) {
|
|
MEM_freeN(players);
|
|
}
|
|
if (clayers && clayers != clayers_buff) {
|
|
MEM_freeN(clayers);
|
|
}
|
|
}
|
|
|
|
static void hair_blend_read_data(BlendDataReader *reader, ID *id)
|
|
{
|
|
Hair *hair = (Hair *)id;
|
|
BLO_read_data_address(reader, &hair->adt);
|
|
BKE_animdata_blend_read_data(reader, hair->adt);
|
|
|
|
/* Geometry */
|
|
CustomData_blend_read(reader, &hair->pdata, hair->totpoint);
|
|
CustomData_blend_read(reader, &hair->cdata, hair->totcurve);
|
|
BKE_hair_update_customdata_pointers(hair);
|
|
|
|
/* Materials */
|
|
BLO_read_pointer_array(reader, (void **)&hair->mat);
|
|
}
|
|
|
|
static void hair_blend_read_lib(BlendLibReader *reader, ID *id)
|
|
{
|
|
Hair *hair = (Hair *)id;
|
|
for (int a = 0; a < hair->totcol; a++) {
|
|
BLO_read_id_address(reader, hair->id.lib, &hair->mat[a]);
|
|
}
|
|
}
|
|
|
|
static void hair_blend_read_expand(BlendExpander *expander, ID *id)
|
|
{
|
|
Hair *hair = (Hair *)id;
|
|
for (int a = 0; a < hair->totcol; a++) {
|
|
BLO_expand(expander, hair->mat[a]);
|
|
}
|
|
}
|
|
|
|
IDTypeInfo IDType_ID_HA = {
|
|
/*id_code */ ID_HA,
|
|
/*id_filter */ FILTER_ID_HA,
|
|
/*main_listbase_index */ INDEX_ID_HA,
|
|
/*struct_size */ sizeof(Hair),
|
|
/*name */ "Hair",
|
|
/*name_plural */ "hairs",
|
|
/*translation_context */ BLT_I18NCONTEXT_ID_HAIR,
|
|
/*flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE,
|
|
/*asset_type_info */ nullptr,
|
|
|
|
/*init_data */ hair_init_data,
|
|
/*copy_data */ hair_copy_data,
|
|
/*free_data */ hair_free_data,
|
|
/*make_local */ nullptr,
|
|
/*foreach_id */ hair_foreach_id,
|
|
/*foreach_cache */ nullptr,
|
|
/*foreach_path */ nullptr,
|
|
/*owner_get */ nullptr,
|
|
|
|
/*blend_write */ hair_blend_write,
|
|
/*blend_read_data */ hair_blend_read_data,
|
|
/*blend_read_lib */ hair_blend_read_lib,
|
|
/*blend_read_expand */ hair_blend_read_expand,
|
|
|
|
/*blend_read_undo_preserve */ nullptr,
|
|
|
|
/*lib_override_apply_post */ nullptr,
|
|
};
|
|
|
|
static void hair_random(Hair *hair)
|
|
{
|
|
const int numpoints = 8;
|
|
|
|
hair->totcurve = 500;
|
|
hair->totpoint = hair->totcurve * numpoints;
|
|
|
|
CustomData_realloc(&hair->pdata, hair->totpoint);
|
|
CustomData_realloc(&hair->cdata, hair->totcurve);
|
|
BKE_hair_update_customdata_pointers(hair);
|
|
|
|
RNG *rng = BLI_rng_new(0);
|
|
|
|
for (int i = 0; i < hair->totcurve; i++) {
|
|
HairCurve *curve = &hair->curves[i];
|
|
curve->firstpoint = i * numpoints;
|
|
curve->numpoints = numpoints;
|
|
|
|
float theta = 2.0f * M_PI * BLI_rng_get_float(rng);
|
|
float phi = saacosf(2.0f * BLI_rng_get_float(rng) - 1.0f);
|
|
|
|
float no[3] = {sinf(theta) * sinf(phi), cosf(theta) * sinf(phi), cosf(phi)};
|
|
normalize_v3(no);
|
|
|
|
float co[3];
|
|
copy_v3_v3(co, no);
|
|
|
|
float(*curve_co)[3] = hair->co + curve->firstpoint;
|
|
float *curve_radius = hair->radius + curve->firstpoint;
|
|
for (int key = 0; key < numpoints; key++) {
|
|
float t = key / (float)(numpoints - 1);
|
|
copy_v3_v3(curve_co[key], co);
|
|
curve_radius[key] = 0.02f * (1.0f - t);
|
|
|
|
float offset[3] = {2.0f * BLI_rng_get_float(rng) - 1.0f,
|
|
2.0f * BLI_rng_get_float(rng) - 1.0f,
|
|
2.0f * BLI_rng_get_float(rng) - 1.0f};
|
|
add_v3_v3(offset, no);
|
|
madd_v3_v3fl(co, offset, 1.0f / numpoints);
|
|
}
|
|
}
|
|
|
|
BLI_rng_free(rng);
|
|
}
|
|
|
|
void *BKE_hair_add(Main *bmain, const char *name)
|
|
{
|
|
Hair *hair = static_cast<Hair *>(BKE_id_new(bmain, ID_HA, name));
|
|
|
|
return hair;
|
|
}
|
|
|
|
BoundBox *BKE_hair_boundbox_get(Object *ob)
|
|
{
|
|
BLI_assert(ob->type == OB_HAIR);
|
|
Hair *hair = static_cast<Hair *>(ob->data);
|
|
|
|
if (ob->runtime.bb != nullptr && (ob->runtime.bb->flag & BOUNDBOX_DIRTY) == 0) {
|
|
return ob->runtime.bb;
|
|
}
|
|
|
|
if (ob->runtime.bb == nullptr) {
|
|
ob->runtime.bb = MEM_cnew<BoundBox>(__func__);
|
|
|
|
float min[3], max[3];
|
|
INIT_MINMAX(min, max);
|
|
|
|
float(*hair_co)[3] = hair->co;
|
|
float *hair_radius = hair->radius;
|
|
for (int a = 0; a < hair->totpoint; a++) {
|
|
float *co = hair_co[a];
|
|
float radius = (hair_radius) ? hair_radius[a] : 0.0f;
|
|
const float co_min[3] = {co[0] - radius, co[1] - radius, co[2] - radius};
|
|
const float co_max[3] = {co[0] + radius, co[1] + radius, co[2] + radius};
|
|
DO_MIN(co_min, min);
|
|
DO_MAX(co_max, max);
|
|
}
|
|
|
|
BKE_boundbox_init_from_minmax(ob->runtime.bb, min, max);
|
|
}
|
|
|
|
return ob->runtime.bb;
|
|
}
|
|
|
|
void BKE_hair_update_customdata_pointers(Hair *hair)
|
|
{
|
|
hair->co = (float(*)[3])CustomData_get_layer_named(
|
|
&hair->pdata, CD_PROP_FLOAT3, HAIR_ATTR_POSITION);
|
|
hair->radius = (float *)CustomData_get_layer_named(
|
|
&hair->pdata, CD_PROP_FLOAT, HAIR_ATTR_RADIUS);
|
|
hair->curves = (HairCurve *)CustomData_get_layer(&hair->cdata, CD_HAIRCURVE);
|
|
hair->mapping = (HairMaping *)CustomData_get_layer(&hair->cdata, CD_HAIRMAPPING);
|
|
}
|
|
|
|
bool BKE_hair_customdata_required(Hair *UNUSED(hair), CustomDataLayer *layer)
|
|
{
|
|
return layer->type == CD_PROP_FLOAT3 && STREQ(layer->name, HAIR_ATTR_POSITION);
|
|
}
|
|
|
|
/* Dependency Graph */
|
|
|
|
Hair *BKE_hair_new_for_eval(const Hair *hair_src, int totpoint, int totcurve)
|
|
{
|
|
Hair *hair_dst = static_cast<Hair *>(BKE_id_new_nomain(ID_HA, nullptr));
|
|
|
|
STRNCPY(hair_dst->id.name, hair_src->id.name);
|
|
hair_dst->mat = static_cast<Material **>(MEM_dupallocN(hair_src->mat));
|
|
hair_dst->totcol = hair_src->totcol;
|
|
|
|
hair_dst->totpoint = totpoint;
|
|
hair_dst->totcurve = totcurve;
|
|
CustomData_copy(&hair_src->pdata, &hair_dst->pdata, CD_MASK_ALL, CD_CALLOC, totpoint);
|
|
CustomData_copy(&hair_src->cdata, &hair_dst->cdata, CD_MASK_ALL, CD_CALLOC, totcurve);
|
|
BKE_hair_update_customdata_pointers(hair_dst);
|
|
|
|
return hair_dst;
|
|
}
|
|
|
|
Hair *BKE_hair_copy_for_eval(Hair *hair_src, bool reference)
|
|
{
|
|
int flags = LIB_ID_COPY_LOCALIZE;
|
|
|
|
if (reference) {
|
|
flags |= LIB_ID_COPY_CD_REFERENCE;
|
|
}
|
|
|
|
Hair *result = (Hair *)BKE_id_copy_ex(nullptr, &hair_src->id, nullptr, flags);
|
|
return result;
|
|
}
|
|
|
|
static Hair *hair_evaluate_modifiers(struct Depsgraph *depsgraph,
|
|
struct Scene *scene,
|
|
Object *object,
|
|
Hair *hair_input)
|
|
{
|
|
Hair *hair = hair_input;
|
|
|
|
/* Modifier evaluation modes. */
|
|
const bool use_render = (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER);
|
|
const int required_mode = use_render ? eModifierMode_Render : eModifierMode_Realtime;
|
|
ModifierApplyFlag apply_flag = use_render ? MOD_APPLY_RENDER : MOD_APPLY_USECACHE;
|
|
const ModifierEvalContext mectx = {depsgraph, object, apply_flag};
|
|
|
|
/* Get effective list of modifiers to execute. Some effects like shape keys
|
|
* are added as virtual modifiers before the user created modifiers. */
|
|
VirtualModifierData virtualModifierData;
|
|
ModifierData *md = BKE_modifiers_get_virtual_modifierlist(object, &virtualModifierData);
|
|
|
|
/* Evaluate modifiers. */
|
|
for (; md; md = md->next) {
|
|
const ModifierTypeInfo *mti = BKE_modifier_get_info(static_cast<ModifierType>(md->type));
|
|
|
|
if (!BKE_modifier_is_enabled(scene, md, required_mode)) {
|
|
continue;
|
|
}
|
|
|
|
if ((mti->type == eModifierTypeType_OnlyDeform) &&
|
|
(mti->flags & eModifierTypeFlag_AcceptsVertexCosOnly)) {
|
|
/* Ensure we are not modifying the input. */
|
|
if (hair == hair_input) {
|
|
hair = BKE_hair_copy_for_eval(hair, true);
|
|
}
|
|
|
|
/* Ensure we are not overwriting referenced data. */
|
|
CustomData_duplicate_referenced_layer_named(
|
|
&hair->pdata, CD_PROP_FLOAT3, HAIR_ATTR_POSITION, hair->totpoint);
|
|
BKE_hair_update_customdata_pointers(hair);
|
|
|
|
/* Created deformed coordinates array on demand. */
|
|
mti->deformVerts(md, &mectx, nullptr, hair->co, hair->totpoint);
|
|
}
|
|
else if (mti->modifyHair) {
|
|
/* Ensure we are not modifying the input. */
|
|
if (hair == hair_input) {
|
|
hair = BKE_hair_copy_for_eval(hair, true);
|
|
}
|
|
|
|
Hair *hair_next = mti->modifyHair(md, &mectx, hair);
|
|
|
|
if (hair_next && hair_next != hair) {
|
|
/* If the modifier returned a new hair, release the old one. */
|
|
if (hair != hair_input) {
|
|
BKE_id_free(nullptr, hair);
|
|
}
|
|
hair = hair_next;
|
|
}
|
|
}
|
|
}
|
|
|
|
return hair;
|
|
}
|
|
|
|
void BKE_hair_data_update(struct Depsgraph *depsgraph, struct Scene *scene, Object *object)
|
|
{
|
|
/* Free any evaluated data and restore original data. */
|
|
BKE_object_free_derived_caches(object);
|
|
|
|
/* Evaluate modifiers. */
|
|
Hair *hair = static_cast<Hair *>(object->data);
|
|
Hair *hair_eval = hair_evaluate_modifiers(depsgraph, scene, object, hair);
|
|
|
|
/* Assign evaluated object. */
|
|
const bool is_owned = (hair != hair_eval);
|
|
BKE_object_eval_assign_data(object, &hair_eval->id, is_owned);
|
|
}
|
|
|
|
/* Draw Cache */
|
|
|
|
void (*BKE_hair_batch_cache_dirty_tag_cb)(Hair *hair, int mode) = nullptr;
|
|
void (*BKE_hair_batch_cache_free_cb)(Hair *hair) = nullptr;
|
|
|
|
void BKE_hair_batch_cache_dirty_tag(Hair *hair, int mode)
|
|
{
|
|
if (hair->batch_cache) {
|
|
BKE_hair_batch_cache_dirty_tag_cb(hair, mode);
|
|
}
|
|
}
|
|
|
|
void BKE_hair_batch_cache_free(Hair *hair)
|
|
{
|
|
if (hair->batch_cache) {
|
|
BKE_hair_batch_cache_free_cb(hair);
|
|
}
|
|
}
|