Depsgraph: Move RNA lookup to an own query class

Currently should have no functional changes, but allows to
implement runction optimizations more localized and easily.

1 files changed, 3 insertions, 219 deletions

diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 7cde635d817..6e2b4b3e068 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -24,32 +24,21 @@
 
 #include "intern/depsgraph.h" /* own include */
 
+#include <algorithm>
+#include <cstring>
+
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
 #include "BLI_console.h"
 #include "BLI_hash.h"
 #include "BLI_ghash.h"
-#include "BLI_listbase.h"
 
 extern "C" {
-#include "DNA_action_types.h"
-#include "DNA_armature_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_key_types.h"
-#include "DNA_object_types.h"
-#include "DNA_sequence_types.h"
-
-#include "RNA_access.h"
-
 #include "BKE_scene.h"
-#include "BKE_constraint.h"
 #include "BKE_global.h"
 }
 
-#include <algorithm>
-#include <cstring>
-
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_debug.h"
 
@@ -108,211 +97,6 @@ Depsgraph::~Depsgraph()
 	BLI_spin_end(&lock);
 }
 
-/* Query Conditions from RNA ----------------------- */
-
-static bool pointer_to_component_node_criteria(
-        const PointerRNA *ptr,
-        const PropertyRNA *prop,
-        RNAPointerSource /*source*/,
-        ID **id,
-        NodeType *type,
-        const char **component_name,
-        OperationCode *operation_code,
-        const char **operation_name,
-        int *operation_name_tag)
-{
-	if (ptr->type == NULL) {
-		return false;
-	}
-	/* Set default values for returns. */
-	*id = (ID *)ptr->id.data;
-	*component_name = "";
-	*operation_code = OperationCode::OPERATION;
-	*operation_name = "";
-	*operation_name_tag = -1;
-	/* Handling of commonly known scenarios. */
-	if (ptr->type == &RNA_PoseBone) {
-		bPoseChannel *pchan = (bPoseChannel *)ptr->data;
-		if (prop != NULL && RNA_property_is_idprop(prop)) {
-			*type = NodeType::PARAMETERS;
-			*operation_code = OperationCode::ID_PROPERTY;
-			*operation_name = RNA_property_identifier((PropertyRNA *)prop);
-			*operation_name_tag = -1;
-		}
-		else {
-			/* Bone - generally, we just want the bone component. */
-			*type = NodeType::BONE;
-			*component_name = pchan->name;
-			/* But B-Bone properties should connect to the actual operation. */
-			if (!ELEM(NULL, pchan->bone, prop) && pchan->bone->segments > 1 &&
-			    STRPREFIX(RNA_property_identifier(prop), "bbone_"))
-			{
-				*operation_code = OperationCode::BONE_SEGMENTS;
-			}
-		}
-		return true;
-	}
-	else if (ptr->type == &RNA_Bone) {
-		Bone *bone = (Bone *)ptr->data;
-		/* armature-level bone, but it ends up going to bone component anyway */
-		// NOTE: the ID in this case will end up being bArmature.
-		*type = NodeType::BONE;
-		*component_name = bone->name;
-		return true;
-	}
-	else if (RNA_struct_is_a(ptr->type, &RNA_Constraint)) {
-		Object *object = (Object *)ptr->id.data;
-		bConstraint *con = (bConstraint *)ptr->data;
-		/* Check whether is object or bone constraint. */
-		/* NOTE: Currently none of the area can address transform of an object
-		 * at a given constraint, but for rigging one might use constraint
-		 * influence to be used to drive some corrective shape keys or so. */
-		if (BLI_findindex(&object->constraints, con) != -1) {
-			*type = NodeType::TRANSFORM;
-			*operation_code = OperationCode::TRANSFORM_LOCAL;
-			return true;
-		}
-		else if (object->pose != NULL) {
-			LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
-				if (BLI_findindex(&pchan->constraints, con) != -1) {
-					*type = NodeType::BONE;
-					*operation_code = OperationCode::BONE_LOCAL;
-					*component_name = pchan->name;
-					return true;
-				}
-			}
-		}
-	}
-	else if (ELEM(ptr->type, &RNA_ConstraintTarget, &RNA_ConstraintTargetBone)) {
-		Object *object = (Object *)ptr->id.data;
-		bConstraintTarget *tgt = (bConstraintTarget *)ptr->data;
-		/* Check whether is object or bone constraint. */
-		bPoseChannel *pchan = NULL;
-		bConstraint *con = BKE_constraint_find_from_target(object, tgt, &pchan);
-		if (con != NULL) {
-			if (pchan != NULL) {
-				*type = NodeType::BONE;
-				*operation_code = OperationCode::BONE_LOCAL;
-				*component_name = pchan->name;
-			}
-			else {
-				*type = NodeType::TRANSFORM;
-				*operation_code = OperationCode::TRANSFORM_LOCAL;
-			}
-			return true;
-		}
-	}
-	else if (RNA_struct_is_a(ptr->type, &RNA_Modifier)) {
-		*type = NodeType::GEOMETRY;
-		return true;
-	}
-	else if (ptr->type == &RNA_Object) {
-		/* Transforms props? */
-		if (prop != NULL) {
-			const char *prop_identifier = RNA_property_identifier((PropertyRNA *)prop);
-			/* TODO(sergey): How to optimize this? */
-			if (strstr(prop_identifier, "location") ||
-			    strstr(prop_identifier, "rotation") ||
-			    strstr(prop_identifier, "scale") ||
-			    strstr(prop_identifier, "matrix_"))
-			{
-				*type = NodeType::TRANSFORM;
-				return true;
-			}
-			else if (strstr(prop_identifier, "data")) {
-				/* We access object.data, most likely a geometry.
-				 * Might be a bone tho. */
-				*type = NodeType::GEOMETRY;
-				return true;
-			}
-		}
-	}
-	else if (ptr->type == &RNA_ShapeKey) {
-		KeyBlock *key_block = (KeyBlock *)ptr->data;
-		*id = (ID *)ptr->id.data;
-		*type = NodeType::PARAMETERS;
-		*operation_code = OperationCode::PARAMETERS_EVAL;
-		*operation_name = key_block->name;
-		return true;
-	}
-	else if (ptr->type == &RNA_Key) {
-		*id = (ID *)ptr->id.data;
-		*type = NodeType::GEOMETRY;
-		return true;
-	}
-	else if (RNA_struct_is_a(ptr->type, &RNA_Sequence)) {
-		Sequence *seq = (Sequence *)ptr->data;
-		/* Sequencer strip */
-		*type = NodeType::SEQUENCER;
-		*component_name = seq->name;
-		return true;
-	}
-	else if (RNA_struct_is_a(ptr->type, &RNA_NodeSocket)) {
-		*type = NodeType::SHADING;
-		return true;
-	}
-	else if (RNA_struct_is_a(ptr->type, &RNA_ShaderNode)) {
-		*type = NodeType::SHADING;
-		return true;
-	}
-	else if (ELEM(ptr->type, &RNA_Curve, &RNA_TextCurve)) {
-		*id = (ID *)ptr->id.data;
-		*type = NodeType::GEOMETRY;
-		return true;
-	}
-	if (prop != NULL) {
-		/* All unknown data effectively falls under "parameter evaluation". */
-		if (RNA_property_is_idprop(prop)) {
-			*type = NodeType::PARAMETERS;
-			*operation_code = OperationCode::ID_PROPERTY;
-			*operation_name = RNA_property_identifier((PropertyRNA *)prop);
-			*operation_name_tag = -1;
-		}
-		else {
-			*type = NodeType::PARAMETERS;
-			*operation_code = OperationCode::PARAMETERS_EVAL;
-			*operation_name = "";
-			*operation_name_tag = -1;
-		}
-		return true;
-	}
-	return false;
-}
-
-/* Convenience wrapper to find node given just pointer + property. */
-Node *Depsgraph::find_node_from_pointer(const PointerRNA *ptr,
-                                        const PropertyRNA *prop,
-                                        RNAPointerSource source) const
-{
-	ID *id;
-	NodeType node_type;
-	const char *component_name, *operation_name;
-	OperationCode operation_code;
-	int operation_name_tag;
-	if (pointer_to_component_node_criteria(
-	                 ptr, prop, source,
-	                 &id, &node_type, &component_name,
-	                 &operation_code, &operation_name, &operation_name_tag))
-	{
-		IDNode *id_node = find_id_node(id);
-		if (id_node == NULL) {
-			return NULL;
-		}
-		ComponentNode *comp_node =
-		        id_node->find_component(node_type, component_name);
-		if (comp_node == NULL) {
-			return NULL;
-		}
-		if (operation_code == OperationCode::OPERATION) {
-			return comp_node;
-		}
-		return comp_node->find_operation(operation_code,
-		                                 operation_name,
-		                                 operation_name_tag);
-	}
-	return NULL;
-}
-
 /* Node Management ---------------------------- */
 
 TimeSourceNode *Depsgraph::add_time_source()