[Bf-blender-cvs] [8d751d48e17] temp-lineart-contained: Cleanup: Naming fixes in obj load patch.
YimingWu
noreply at git.blender.org
Mon May 24 08:28:19 CEST 2021
Commit: 8d751d48e173d49417e2c865d88a70535dc08f31
Author: YimingWu
Date: Mon May 24 14:26:18 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB8d751d48e173d49417e2c865d88a70535dc08f31
Cleanup: Naming fixes in obj load patch.
===================================================================
M source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
index 7e980669a33..c4fbdf49605 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
+++ b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
@@ -400,11 +400,11 @@ typedef struct LineartObjectInfo {
struct LineartObjectInfo *next;
struct Object *original_ob;
struct BMesh *original_bm;
- double new_mvp[4][4];
- double new_mv[4][4];
+ double model_view_proj[4][4];
+ double model_view[4][4];
double normal[4][4];
- LineartElementLinkNode *v_reln;
- int override_usage;
+ LineartElementLinkNode *eln;
+ int usage;
unsigned char override_intersection_mask;
int global_i_offset;
@@ -430,7 +430,7 @@ typedef struct LineartObjectLoadTaskInfo {
/* LinkNode styled list */
LineartObjectInfo *pending;
/* Used to spread the load across several threads. This can not overflow. */
- long unsigned int total_faces;
+ uint64_t total_faces;
} LineartObjectLoadTaskInfo;
/**
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index e052f06cf8b..853f9e6c161 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -673,55 +673,55 @@ static bool lineart_point_inside_triangle3d(double v[3], double v0[3], double v1
*/
static LineartElementLinkNode *lineart_memory_get_triangle_space(LineartRenderBuffer *rb)
{
- LineartElementLinkNode *reln;
+ LineartElementLinkNode *eln;
/* We don't need to allocate a whole bunch of triangles because the amount of clipped triangles
* are relatively small. */
LineartTriangle *render_triangles = lineart_mem_acquire(&rb->render_data_pool,
64 * rb->triangle_size);
- reln = lineart_list_append_pointer_pool_sized(&rb->triangle_buffer_pointers,
- &rb->render_data_pool,
- render_triangles,
- sizeof(LineartElementLinkNode));
- reln->element_count = 64;
- reln->flags |= LRT_ELEMENT_IS_ADDITIONAL;
+ eln = lineart_list_append_pointer_pool_sized(&rb->triangle_buffer_pointers,
+ &rb->render_data_pool,
+ render_triangles,
+ sizeof(LineartElementLinkNode));
+ eln->element_count = 64;
+ eln->flags |= LRT_ELEMENT_IS_ADDITIONAL;
- return reln;
+ return eln;
}
static LineartElementLinkNode *lineart_memory_get_vert_space(LineartRenderBuffer *rb)
{
- LineartElementLinkNode *reln;
+ LineartElementLinkNode *eln;
LineartVert *render_vertices = lineart_mem_acquire(&rb->render_data_pool,
sizeof(LineartVert) * 64);
- reln = lineart_list_append_pointer_pool_sized(&rb->vertex_buffer_pointers,
- &rb->render_data_pool,
- render_vertices,
- sizeof(LineartElementLinkNode));
- reln->element_count = 64;
- reln->flags |= LRT_ELEMENT_IS_ADDITIONAL;
+ eln = lineart_list_append_pointer_pool_sized(&rb->vertex_buffer_pointers,
+ &rb->render_data_pool,
+ render_vertices,
+ sizeof(LineartElementLinkNode));
+ eln->element_count = 64;
+ eln->flags |= LRT_ELEMENT_IS_ADDITIONAL;
- return reln;
+ return eln;
}
static LineartElementLinkNode *lineart_memory_get_edge_space(LineartRenderBuffer *rb)
{
- LineartElementLinkNode *reln;
+ LineartElementLinkNode *eln;
LineartEdge *render_edges = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartEdge) * 64);
- reln = lineart_list_append_pointer_pool_sized(&rb->line_buffer_pointers,
- &rb->render_data_pool,
- render_edges,
- sizeof(LineartElementLinkNode));
- reln->element_count = 64;
- reln->crease_threshold = rb->crease_threshold;
- reln->flags |= LRT_ELEMENT_IS_ADDITIONAL;
+ eln = lineart_list_append_pointer_pool_sized(&rb->line_buffer_pointers,
+ &rb->render_data_pool,
+ render_edges,
+ sizeof(LineartElementLinkNode));
+ eln->element_count = 64;
+ eln->crease_threshold = rb->crease_threshold;
+ eln->flags |= LRT_ELEMENT_IS_ADDITIONAL;
- return reln;
+ return eln;
}
static void lineart_triangle_post(LineartTriangle *rt, LineartTriangle *orig)
@@ -1314,14 +1314,14 @@ static void lineart_main_cull_triangles(LineartRenderBuffer *rb, bool clip_far)
}
/* Then go through all the other triangles. */
- LISTBASE_FOREACH (LineartElementLinkNode *, reln, &rb->triangle_buffer_pointers) {
- if (reln->flags & LRT_ELEMENT_IS_ADDITIONAL) {
+ LISTBASE_FOREACH (LineartElementLinkNode *, eln, &rb->triangle_buffer_pointers) {
+ if (eln->flags & LRT_ELEMENT_IS_ADDITIONAL) {
continue;
}
- ob = reln->object_ref;
- for (i = 0; i < reln->element_count; i++) {
+ ob = eln->object_ref;
+ for (i = 0; i < eln->element_count; i++) {
/* Select the triangle in the array. */
- rt = (void *)(((uchar *)reln->pointer) + rb->triangle_size * i);
+ rt = (void *)(((uchar *)eln->pointer) + rb->triangle_size * i);
LRT_CULL_DECIDE_INSIDE
LRT_CULL_ENSURE_MEMORY
@@ -1360,10 +1360,10 @@ static void lineart_main_free_adjacent_data(LineartRenderBuffer *rb)
while ((ld = BLI_pophead(&rb->triangle_adjacent_pointers)) != NULL) {
MEM_freeN(ld->data);
}
- LISTBASE_FOREACH (LineartElementLinkNode *, reln, &rb->triangle_buffer_pointers) {
- LineartTriangle *rt = reln->pointer;
+ LISTBASE_FOREACH (LineartElementLinkNode *, eln, &rb->triangle_buffer_pointers) {
+ LineartTriangle *rt = eln->pointer;
int i;
- for (i = 0; i < reln->element_count; i++) {
+ for (i = 0; i < eln->element_count; i++) {
/* See definition of rt->intersecting_verts and the usage in
* lineart_geometry_object_load() for detailed. */
rt->intersecting_verts = NULL;
@@ -1381,9 +1381,9 @@ static void lineart_main_perspective_division(LineartRenderBuffer *rb)
return;
}
- LISTBASE_FOREACH (LineartElementLinkNode *, reln, &rb->vertex_buffer_pointers) {
- rv = reln->pointer;
- for (i = 0; i < reln->element_count; i++) {
+ LISTBASE_FOREACH (LineartElementLinkNode *, eln, &rb->vertex_buffer_pointers) {
+ rv = eln->pointer;
+ for (i = 0; i < eln->element_count; i++) {
/* Do not divide Z, we use Z to back transform cut points in later chaining process. */
rv[i].fbcoord[0] /= rv[i].fbcoord[3];
rv[i].fbcoord[1] /= rv[i].fbcoord[3];
@@ -1667,8 +1667,9 @@ static void lineart_geometry_object_load(LineartObjectInfo *obi, LineartRenderBu
LineartLineSegment *la_s;
LineartTriangle *rt;
LineartTriangleAdjacent *orta;
- double(*new_mvp)[4] = obi->new_mvp, (*new_mv)[4] = obi->new_mv, (*normal)[4] = obi->normal;
- LineartElementLinkNode *reln;
+ double(*model_view_proj)[4] = obi->model_view_proj, (*model_view)[4] = obi->model_view,
+ (*normal)[4] = obi->normal;
+ LineartElementLinkNode *eln;
LineartVert *orv;
LineartEdge *o_la_e;
LineartLineSegment *o_la_s;
@@ -1679,7 +1680,7 @@ static void lineart_geometry_object_load(LineartObjectInfo *obi, LineartRenderBu
int i;
float use_crease = 0;
- int usage = obi->override_usage;
+ int usage = obi->usage;
bm = obi->original_bm;
@@ -1725,13 +1726,13 @@ static void lineart_geometry_object_load(LineartObjectInfo *obi, LineartRenderBu
orig_ob = obi->original_ob;
BLI_spin_lock(&rb->lock_task);
- reln = lineart_list_append_pointer_pool_sized_thread(
+ eln = lineart_list_append_pointer_pool_sized_thread(
&rb->vertex_buffer_pointers, &rb->render_data_pool, orv, sizeof(LineartElementLinkNode));
BLI_spin_unlock(&rb->lock_task);
- reln->element_count = bm->totvert;
- reln->object_ref = orig_ob;
- obi->v_reln = reln;
+ eln->element_count = bm->totvert;
+ eln->object_ref = orig_ob;
+ obi->eln = eln;
if (orig_ob->lineart.flags & OBJECT_LRT_OWN_CREASE) {
use_crease = cosf(M_PI - orig_ob->lineart.crease_threshold);
@@ -1743,17 +1744,17 @@ static void lineart_geometry_object_load(LineartObjectInfo *obi, LineartRenderBu
/* FIXME(Yiming): Hack for getting clean 3D text, the seam that extruded text object creates
* erroneous detection on creases. Future configuration should allow options. */
if (orig_ob->type == OB_FONT) {
- reln->flags |= LRT_ELEMENT_BORDER_ONLY;
+ eln->flags |= LRT_ELEMENT_BORDER_ONLY;
}
BLI_spin_lock(&rb->lock_task);
- reln = lineart_list_append_pointer_pool_sized_thread(
+ eln = lineart_list_append_pointer_pool_sized_thread(
&rb->triangle_buffer_pointers, &rb->render_data_pool, ort, sizeof(LineartElementLinkNode));
BLI_spin_unlock(&rb->lock_task);
- reln->element_count = bm->totface;
- reln->object_ref = orig_ob;
- reln->flags |= (usage == OBJECT_LRT_NO_INTERSECTION ? LRT_ELEMENT_NO_INTERSECTION : 0);
+ eln->element_count = bm->totface;
+ eln->object_ref = orig_ob;
+ eln->flags |= (usage == OBJECT_LRT_NO_INTERSECTION ? LRT_ELEMENT_NO_INTERSECTION : 0);
/* Note this memory is not from pool, will be deleted after culling. */
orta = MEM_callocN(sizeof(LineartTriangleAdjacent) * bm->totface, "LineartTriangleAdjacent");
@@ -1765,7 +1766,7 @@ static void lineart_geometry_object_load(LineartObjectInfo *obi, LineartRenderBu
for (i = 0; i < bm->totvert; i++) {
v = BM_vert_at_index(bm, i);
- lineart_vert_transform(v, i, orv, new_mv, new_mvp);
+ lineart_vert_transform(v, i, orv, model_view, model_view_proj);
orv[
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list