diff options
Diffstat (limited to 'source/blender/depsgraph/intern/node')
13 files changed, 61 insertions, 32 deletions
diff --git a/source/blender/depsgraph/intern/node/deg_node.cc b/source/blender/depsgraph/intern/node/deg_node.cc index 10760d3170b..54a22a07ee4 100644 --- a/source/blender/depsgraph/intern/node/deg_node.cc +++ b/source/blender/depsgraph/intern/node/deg_node.cc @@ -36,7 +36,8 @@ #include "intern/node/deg_node_operation.h" #include "intern/node/deg_node_time.h" -namespace DEG { +namespace blender { +namespace deg { const char *nodeClassAsString(NodeClass node_class) { @@ -340,4 +341,5 @@ void deg_register_base_depsnodes() register_node_typeinfo(&DNTI_ID_REF); } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/node/deg_node.h b/source/blender/depsgraph/intern/node/deg_node.h index f0ce38ddeae..94953c4ec5d 100644 --- a/source/blender/depsgraph/intern/node/deg_node.h +++ b/source/blender/depsgraph/intern/node/deg_node.h @@ -32,7 +32,8 @@ struct ID; struct Scene; -namespace DEG { +namespace blender { +namespace deg { struct Depsgraph; struct OperationNode; @@ -212,4 +213,5 @@ struct Node { void deg_register_base_depsnodes(); -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/node/deg_node_component.cc b/source/blender/depsgraph/intern/node/deg_node_component.cc index 87d704bb0a0..c99b3aba312 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.cc +++ b/source/blender/depsgraph/intern/node/deg_node_component.cc @@ -38,7 +38,8 @@ #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" -namespace DEG { +namespace blender { +namespace deg { /* *********** */ /* Outer Nodes */ @@ -377,4 +378,5 @@ void deg_register_component_depsnodes() register_node_typeinfo(&DNTI_SIMULATION); } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/node/deg_node_component.h b/source/blender/depsgraph/intern/node/deg_node_component.h index 036baa9d46c..3757a1dea5b 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.h +++ b/source/blender/depsgraph/intern/node/deg_node_component.h @@ -32,7 +32,8 @@ struct ID; struct bPoseChannel; -namespace DEG { +namespace blender { +namespace deg { struct BoneComponentNode; struct Depsgraph; @@ -83,12 +84,9 @@ struct ComponentNode : public Node { * when node may have been partially created earlier (e.g. parent ref before * parent item is added) * - * \param type: Operation node type (corresponding to context/component that - * it operates in) - * \param optype: Role that operation plays within component - * (i.e. where in eval process) - * \param op: The operation to perform - * \param name: Identifier for operation - used to find/locate it again */ + * \param opcode: The operation to perform. + * \param name: Identifier for operation - used to find/locate it again. + */ OperationNode *add_operation(const DepsEvalOperationCb &op, OperationCode opcode, const char *name, @@ -203,4 +201,5 @@ struct BoneComponentNode : public ComponentNode { void deg_register_component_depsnodes(); -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/node/deg_node_factory.cc b/source/blender/depsgraph/intern/node/deg_node_factory.cc index 9dfd018b4fd..9bb093139a1 100644 --- a/source/blender/depsgraph/intern/node/deg_node_factory.cc +++ b/source/blender/depsgraph/intern/node/deg_node_factory.cc @@ -23,7 +23,8 @@ #include "intern/node/deg_node_factory.h" -namespace DEG { +namespace blender { +namespace deg { /* Global type registry */ static DepsNodeFactory *node_typeinfo_registry[static_cast<int>(NodeType::NUM_TYPES)] = {nullptr}; @@ -42,4 +43,5 @@ DepsNodeFactory *type_get_factory(const NodeType type) return node_typeinfo_registry[type_as_int]; } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/node/deg_node_factory.h b/source/blender/depsgraph/intern/node/deg_node_factory.h index db2c3bb2f44..125f340a0fa 100644 --- a/source/blender/depsgraph/intern/node/deg_node_factory.h +++ b/source/blender/depsgraph/intern/node/deg_node_factory.h @@ -30,7 +30,8 @@ struct ID; -namespace DEG { +namespace blender { +namespace deg { struct DepsNodeFactory { virtual NodeType type() const = 0; @@ -56,6 +57,7 @@ void register_node_typeinfo(DepsNodeFactory *factory); /* Get typeinfo for specified type */ DepsNodeFactory *type_get_factory(const NodeType type); -} // namespace DEG +} // namespace deg +} // namespace blender #include "intern/node/deg_node_factory_impl.h" diff --git a/source/blender/depsgraph/intern/node/deg_node_factory_impl.h b/source/blender/depsgraph/intern/node/deg_node_factory_impl.h index ad25ffdf26c..f5dd7122fca 100644 --- a/source/blender/depsgraph/intern/node/deg_node_factory_impl.h +++ b/source/blender/depsgraph/intern/node/deg_node_factory_impl.h @@ -27,7 +27,8 @@ struct ID; -namespace DEG { +namespace blender { +namespace deg { template<class ModeObjectType> NodeType DepsNodeFactoryImpl<ModeObjectType>::type() const { @@ -63,4 +64,5 @@ Node *DepsNodeFactoryImpl<ModeObjectType>::create_node(const ID *id, return node; } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc index 984873fbcac..843f59b446a 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.cc +++ b/source/blender/depsgraph/intern/node/deg_node_id.cc @@ -41,7 +41,8 @@ #include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_time.h" -namespace DEG { +namespace blender { +namespace deg { const char *linkedStateAsString(eDepsNode_LinkedState_Type linked_state) { @@ -212,4 +213,5 @@ IDComponentsMask IDNode::get_visible_components_mask() const return result; } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/node/deg_node_id.h b/source/blender/depsgraph/intern/node/deg_node_id.h index 1e315195c1a..9bd6130bbdc 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.h +++ b/source/blender/depsgraph/intern/node/deg_node_id.h @@ -28,7 +28,8 @@ #include "DNA_ID.h" #include "intern/node/deg_node.h" -namespace DEG { +namespace blender { +namespace deg { struct ComponentNode; @@ -115,4 +116,5 @@ struct IDNode : public Node { DEG_DEPSNODE_DECLARE; }; -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc index 91bd0117f6c..680e7757ebb 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.cc +++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc @@ -32,7 +32,8 @@ #include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_id.h" -namespace DEG { +namespace blender { +namespace deg { const char *operationCodeAsString(OperationCode opcode) { @@ -63,8 +64,12 @@ const char *operationCodeAsString(OperationCode opcode) case OperationCode::AUDIO_VOLUME: return "AUDIO_VOLUME"; /* Object related. */ + case OperationCode::OBJECT_FROM_LAYER_ENTRY: + return "OBJECT_FROM_LAYER_ENTRY"; case OperationCode::OBJECT_BASE_FLAGS: return "OBJECT_BASE_FLAGS"; + case OperationCode::OBJECT_FROM_LAYER_EXIT: + return "OBJECT_FROM_LAYER_EXIT"; case OperationCode::DIMENSIONS: return "DIMENSIONS"; /* Transform. */ @@ -266,4 +271,5 @@ void deg_register_operation_depsnodes() register_node_typeinfo(&DNTI_OPERATION); } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h b/source/blender/depsgraph/intern/node/deg_node_operation.h index 6b14e6af02f..87168fc3659 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.h +++ b/source/blender/depsgraph/intern/node/deg_node_operation.h @@ -29,7 +29,8 @@ struct Depsgraph; -namespace DEG { +namespace blender { +namespace deg { struct ComponentNode; @@ -63,7 +64,9 @@ enum class OperationCode { AUDIO_VOLUME, /* Object related. ------------------------------------------------------ */ + OBJECT_FROM_LAYER_ENTRY, OBJECT_BASE_FLAGS, + OBJECT_FROM_LAYER_EXIT, DIMENSIONS, /* Transform. ----------------------------------------------------------- */ @@ -274,4 +277,5 @@ struct OperationNode : public Node { void deg_register_operation_depsnodes(); -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/node/deg_node_time.cc b/source/blender/depsgraph/intern/node/deg_node_time.cc index ff3e950bb44..af931fbae34 100644 --- a/source/blender/depsgraph/intern/node/deg_node_time.cc +++ b/source/blender/depsgraph/intern/node/deg_node_time.cc @@ -28,7 +28,8 @@ #include "intern/depsgraph.h" #include "intern/depsgraph_relation.h" -namespace DEG { +namespace blender { +namespace deg { void TimeSourceNode::tag_update(Depsgraph *graph, eUpdateSource /*source*/) { @@ -38,4 +39,5 @@ void TimeSourceNode::tag_update(Depsgraph *graph, eUpdateSource /*source*/) } } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/node/deg_node_time.h b/source/blender/depsgraph/intern/node/deg_node_time.h index 684414f7780..364c214b014 100644 --- a/source/blender/depsgraph/intern/node/deg_node_time.h +++ b/source/blender/depsgraph/intern/node/deg_node_time.h @@ -25,7 +25,8 @@ #include "intern/node/deg_node.h" -namespace DEG { +namespace blender { +namespace deg { /* Time Source Node. */ struct TimeSourceNode : public Node { @@ -42,4 +43,5 @@ struct TimeSourceNode : public Node { DEG_DEPSNODE_DECLARE; }; -} // namespace DEG +} // namespace deg +} // namespace blender |