[Bf-blender-cvs] [812e89f563b] temp-transform-conversions-split: Transform: Move node conversion to its own file
mano-wii
noreply at git.blender.org
Thu Sep 5 00:10:10 CEST 2019
Commit: 812e89f563b0c8c1db40c19fa0a1aaeaa84c7e31
Author: mano-wii
Date: Wed Sep 4 19:09:20 2019 -0300
Branches: temp-transform-conversions-split
https://developer.blender.org/rB812e89f563b0c8c1db40c19fa0a1aaeaa84c7e31
Transform: Move node conversion to its own file
===================================================================
M source/blender/editors/transform/CMakeLists.txt
M source/blender/editors/transform/transform_conversions.c
A source/blender/editors/transform/transform_conversions_node.c
===================================================================
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index ce092899f40..0db2ee884c9 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -50,6 +50,7 @@ set(SRC
transform_conversions_mball.c
transform_conversions_mesh.c
transform_conversions_nla.c
+ transform_conversions_node.c
transform_conversions_object.c
transform_conversions_particle.c
transform_conversions_sequencer.c
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 3c47ac7decc..26dc747b01a 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -2777,106 +2777,6 @@ int special_transform_moving(TransInfo *t)
/** \} */
-/* transcribe given node into TransData2D for Transforming */
-static void NodeToTransData(TransData *td, TransData2D *td2d, bNode *node, const float dpi_fac)
-{
- float locx, locy;
-
- /* account for parents (nested nodes) */
- if (node->parent) {
- nodeToView(node->parent, node->locx, node->locy, &locx, &locy);
- }
- else {
- locx = node->locx;
- locy = node->locy;
- }
-
- /* use top-left corner as the transform origin for nodes */
- /* weirdo - but the node system is a mix of free 2d elements and dpi sensitive UI */
-#ifdef USE_NODE_CENTER
- td2d->loc[0] = (locx * dpi_fac) + (BLI_rctf_size_x(&node->totr) * +0.5f);
- td2d->loc[1] = (locy * dpi_fac) + (BLI_rctf_size_y(&node->totr) * -0.5f);
-#else
- td2d->loc[0] = locx * dpi_fac;
- td2d->loc[1] = locy * dpi_fac;
-#endif
- td2d->loc[2] = 0.0f;
- td2d->loc2d = td2d->loc; /* current location */
-
- td->flag = 0;
-
- td->loc = td2d->loc;
- copy_v3_v3(td->iloc, td->loc);
- /* use node center instead of origin (top-left corner) */
- td->center[0] = td2d->loc[0];
- td->center[1] = td2d->loc[1];
- td->center[2] = 0.0f;
-
- memset(td->axismtx, 0, sizeof(td->axismtx));
- td->axismtx[2][2] = 1.0f;
-
- td->ext = NULL;
- td->val = NULL;
-
- td->flag |= TD_SELECTED;
- td->dist = 0.0;
-
- unit_m3(td->mtx);
- unit_m3(td->smtx);
-
- td->extra = node;
-}
-
-static bool is_node_parent_select(bNode *node)
-{
- while ((node = node->parent)) {
- if (node->flag & NODE_TRANSFORM) {
- return true;
- }
- }
- return false;
-}
-
-static void createTransNodeData(bContext *UNUSED(C), TransInfo *t)
-{
- const float dpi_fac = UI_DPI_FAC;
- TransData *td;
- TransData2D *td2d;
- SpaceNode *snode = t->sa->spacedata.first;
- bNode *node;
-
- TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
-
- tc->data_len = 0;
-
- if (!snode->edittree) {
- return;
- }
-
- /* nodes dont support PET and probably never will */
- t->flag &= ~T_PROP_EDIT_ALL;
-
- /* set transform flags on nodes */
- for (node = snode->edittree->nodes.first; node; node = node->next) {
- if (node->flag & NODE_SELECT && is_node_parent_select(node) == false) {
- node->flag |= NODE_TRANSFORM;
- tc->data_len++;
- }
- else {
- node->flag &= ~NODE_TRANSFORM;
- }
- }
-
- td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransNode TransData");
- td2d = tc->data_2d = MEM_callocN(tc->data_len * sizeof(TransData2D), "TransNode TransData2D");
-
- for (node = snode->edittree->nodes.first; node; node = node->next) {
- if (node->flag & NODE_TRANSFORM) {
- NodeToTransData(td++, td2d++, node, dpi_fac);
- }
- }
-}
-
/* *** CLIP EDITOR *** */
/* * motion tracking * */
diff --git a/source/blender/editors/transform/transform_conversions_node.c b/source/blender/editors/transform/transform_conversions_node.c
new file mode 100644
index 00000000000..5c8494d172e
--- /dev/null
+++ b/source/blender/editors/transform/transform_conversions_node.c
@@ -0,0 +1,144 @@
+/*
+ * 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.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ */
+
+/** \file
+ * \ingroup edtransform
+ */
+
+#include "DNA_space_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math.h"
+
+#include "BKE_context.h"
+#include "BKE_node.h"
+#include "BKE_report.h"
+
+#include "UI_interface.h"
+
+#include "transform.h"
+#include "transform_conversions.h"
+
+/* -------------------------------------------------------------------- */
+/** \name Node Transform Creation
+ *
+ * \{ */
+
+/* transcribe given node into TransData2D for Transforming */
+static void NodeToTransData(TransData *td, TransData2D *td2d, bNode *node, const float dpi_fac)
+{
+ float locx, locy;
+
+ /* account for parents (nested nodes) */
+ if (node->parent) {
+ nodeToView(node->parent, node->locx, node->locy, &locx, &locy);
+ }
+ else {
+ locx = node->locx;
+ locy = node->locy;
+ }
+
+ /* use top-left corner as the transform origin for nodes */
+ /* weirdo - but the node system is a mix of free 2d elements and dpi sensitive UI */
+#ifdef USE_NODE_CENTER
+ td2d->loc[0] = (locx * dpi_fac) + (BLI_rctf_size_x(&node->totr) * +0.5f);
+ td2d->loc[1] = (locy * dpi_fac) + (BLI_rctf_size_y(&node->totr) * -0.5f);
+#else
+ td2d->loc[0] = locx * dpi_fac;
+ td2d->loc[1] = locy * dpi_fac;
+#endif
+ td2d->loc[2] = 0.0f;
+ td2d->loc2d = td2d->loc; /* current location */
+
+ td->flag = 0;
+
+ td->loc = td2d->loc;
+ copy_v3_v3(td->iloc, td->loc);
+ /* use node center instead of origin (top-left corner) */
+ td->center[0] = td2d->loc[0];
+ td->center[1] = td2d->loc[1];
+ td->center[2] = 0.0f;
+
+ memset(td->axismtx, 0, sizeof(td->axismtx));
+ td->axismtx[2][2] = 1.0f;
+
+ td->ext = NULL;
+ td->val = NULL;
+
+ td->flag |= TD_SELECTED;
+ td->dist = 0.0;
+
+ unit_m3(td->mtx);
+ unit_m3(td->smtx);
+
+ td->extra = node;
+}
+
+static bool is_node_parent_select(bNode *node)
+{
+ while ((node = node->parent)) {
+ if (node->flag & NODE_TRANSFORM) {
+ return true;
+ }
+ }
+ return false;
+}
+
+void createTransNodeData(bContext *UNUSED(C), TransInfo *t)
+{
+ const float dpi_fac = UI_DPI_FAC;
+ TransData *td;
+ TransData2D *td2d;
+ SpaceNode *snode = t->sa->spacedata.first;
+ bNode *node;
+
+ TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
+
+ tc->data_len = 0;
+
+ if (!snode->edittree) {
+ return;
+ }
+
+ /* nodes dont support PET and probably never will */
+ t->flag &= ~T_PROP_EDIT_ALL;
+
+ /* set transform flags on nodes */
+ for (node = snode->edittree->nodes.first; node; node = node->next) {
+ if (node->flag & NODE_SELECT && is_node_parent_select(node) == false) {
+ node->flag |= NODE_TRANSFORM;
+ tc->data_len++;
+ }
+ else {
+ node->flag &= ~NODE_TRANSFORM;
+ }
+ }
+
+ td = tc->data = MEM_callocN(tc->data_len * sizeof(TransData), "TransNode TransData");
+ td2d = tc->data_2d = MEM_callocN(tc->data_len * sizeof(TransData2D), "TransNode TransData2D");
+
+ for (node = snode->edittree->nodes.first; node; node = node->next) {
+ if (node->flag & NODE_TRANSFORM) {
+ NodeToTransData(td++, td2d++, node, dpi_fac);
+ }
+ }
+}
+
+/** \} */
More information about the Bf-blender-cvs
mailing list