Commit: 0e3dc92b5b5c6dda2b875d6263ce87289a7fbd53
Author: Sergey Sharybin
Date: Thu May 26 12:39:41 2016 +0200
Branches: depsgraph_cleanup
https://developer.blender.org/rB0e3dc92b5b5c6dda2b875d6263ce87289a7fbd53
Depsgraph: Cleanup of header files, amke them easier to read
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/depsgraph/intern/depsgraph_types.h
M source/blender/depsgraph/intern/nodes/deg_node_component.h
M source/blender/depsgraph/intern/nodes/deg_node_operation.h
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 09a1f82..5359cc8 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -221,6 +221,17 @@ OperationDepsNode
*DepsgraphNodeBuilder::add_operation_node(
return add_operation_node(comp_node, optype, op, opcode, description);
}
+OperationDepsNode *DepsgraphNodeBuilder::add_operation_node(
+ ID *id,
+ eDepsNode_Type comp_type,
+ eDepsOperation_Type optype,
+ DepsEvalOperationCb op,
+ eDepsOperation_Code opcode,
+ const string& description)
+{
+ return add_operation_node(id, comp_type, "", optype, op, opcode,
description);
+}
+
bool DepsgraphNodeBuilder::has_operation_node(ID *id,
eDepsNode_Type comp_type,
const string &comp_name,
@@ -241,6 +252,14 @@ OperationDepsNode
*DepsgraphNodeBuilder::find_operation_node(
return comp_node->has_operation(opcode, description);
}
+OperationDepsNode *DepsgraphNodeBuilder::find_operation_node(
+ ID *id,
+ eDepsNode_Type comp_type,
+ eDepsOperation_Code opcode,
+ const string& description)
+{
+ return find_operation_node(id, comp_type, "", opcode, description);
+}
/* **** Build functions for entity nodes **** */
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index 747c409..6ee0b84 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@ -72,20 +72,34 @@ struct DepsgraphNodeBuilder {
IDDepsNode *add_id_node(ID *id);
TimeSourceDepsNode *add_time_source(ID *id);
- ComponentDepsNode *add_component_node(ID *id, eDepsNode_Type comp_type,
const string &comp_name = "");
-
- OperationDepsNode *add_operation_node(ComponentDepsNode *comp_node,
eDepsOperation_Type optype,
- DepsEvalOperationCb op,
eDepsOperation_Code opcode, const string &description = "");
- OperationDepsNode *add_operation_node(ID *id, eDepsNode_Type comp_type,
const string &comp_name, eDepsOperation_Type optype,
- DepsEvalOperationCb op,
eDepsOperation_Code opcode, const string &description = "");
- OperationDepsNode *add_operation_node(ID *id, eDepsNode_Type comp_type,
eDepsOperation_Type optype,
- DepsEvalOperationCb op,
eDepsOperation_Code opcode, const string &description = "")
- {
- return add_operation_node(id, comp_type, "", optype, op,
opcode, description);
- }
-
- bool has_operation_node(ID *id, eDepsNode_Type comp_type, const string
&comp_name,
- eDepsOperation_Code opcode, const string
&description = "");
+ ComponentDepsNode *add_component_node(ID *id,
+ eDepsNode_Type comp_type,
+ const string& comp_name = "");
+
+ OperationDepsNode *add_operation_node(ComponentDepsNode *comp_node,
+ eDepsOperation_Type optype,
+ DepsEvalOperationCb op,
+ eDepsOperation_Code opcode,
+ const string& description = "");
+ OperationDepsNode *add_operation_node(ID *id,
+ eDepsNode_Type comp_type,
+ const string& comp_name,
+ eDepsOperation_Type optype,
+ DepsEvalOperationCb op,
+ eDepsOperation_Code opcode,
+ const string& description = "");
+ OperationDepsNode *add_operation_node(ID *id,
+ eDepsNode_Type comp_type,
+ eDepsOperation_Type optype,
+ DepsEvalOperationCb op,
+ eDepsOperation_Code opcode,
+ const string& description = "");
+
+ bool has_operation_node(ID *id,
+ eDepsNode_Type comp_type,
+ const string& comp_name,
+ eDepsOperation_Code opcode,
+ const string& description = "");
OperationDepsNode *find_operation_node(ID *id,
eDepsNode_Type comp_type,
@@ -96,10 +110,7 @@ struct DepsgraphNodeBuilder {
OperationDepsNode *find_operation_node(ID *id,
eDepsNode_Type comp_type,
eDepsOperation_Code opcode,
- const string &description = "")
- {
- return find_operation_node(id, comp_type, "", opcode,
description);
- }
+ const string &description = "");
void build_scene(Main *bmain, Scene *scene);
SubgraphDepsNode *build_subgraph(Group *group);
@@ -112,8 +123,14 @@ struct DepsgraphNodeBuilder {
void build_particles(Scene *scene, Object *ob);
void build_animdata(ID *id);
OperationDepsNode *build_driver(ID *id, FCurve *fcurve);
- void build_ik_pose(Scene *scene, Object *ob, bPoseChannel *pchan,
bConstraint *con);
- void build_splineik_pose(Scene *scene, Object *ob, bPoseChannel *pchan,
bConstraint *con);
+ void build_ik_pose(Scene *scene,
+ Object *ob,
+ bPoseChannel *pchan,
+ bConstraint *con);
+ void build_splineik_pose(Scene *scene,
+ Object *ob,
+ bPoseChannel *pchan,
+ bConstraint *con);
void build_rig(Scene *scene, Object *ob);
void build_proxy_rig(Object *ob);
void build_shapekeys(Key *key);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 5b34f48..c0bf82b 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -193,30 +193,45 @@ struct DepsgraphRelationBuilder
DepsgraphRelationBuilder(Depsgraph *graph);
template <typename KeyFrom, typename KeyTo>
- void add_relation(const KeyFrom &key_from, const KeyTo &key_to,
- eDepsRelation_Type type, const char *description);
+ void add_relation(const KeyFrom& key_from,
+ const KeyTo& key_to,
+ eDepsRelation_Type type,
+ const char *description);
template <typename KeyTo>
- void add_relation(const TimeSourceKey &key_from, const KeyTo &key_to,
- eDepsRelation_Type type, const char *description);
+ void add_relation(const TimeSourceKey& key_from,
+ const KeyTo& key_to,
+ eDepsRelation_Type type,
+ const char *description);
template <typename KeyType>
- void add_node_handle_relation(const KeyType &key_from, const
DepsNodeHandle *handle,
- eDepsRelation_Type type, const char
*description);
+ void add_node_handle_relation(const KeyType& key_from,
+ const DepsNodeHandle *handle,
+ eDepsRelation_Type type,
+ const char *description);
void build_scene(Main *bmain, Scene *scene);
void build_group(Main *bmain, Scene *scene, Object *object, Group
*group);
void build_object(Main *bmain, Scene *scene, Object *ob);
void build_object_parent(Object *ob);
- void build_constraints(Scene *scene, ID *id, eDepsNode_Type
component_type, const char *component_subdata,
- ListBase *constraints, RootPChanMap *root_map);
+ void build_constraints(Scene *scene, ID *id,
+ eDepsNode_Type component_type,
+ const char *component_subdata,
+ ListBase *constraints,
+ RootPChanMap *root_map);
void build_animdata(ID *id);
void build_driver(ID *id, FCurve *fcurve);
void build_world(World *world);
void build_rigidbody(Scene *scene);
void build_particles(Scene *scene, Object *ob);
- void build_ik_pose(Object *ob, bPoseChannel *pchan, bConstraint *con,
RootPChanMap *root_map);
- void build_splineik_pose(Object *ob, bPoseChannel *pchan, bConstraint
*con, RootPChanMap *root_map);
+ void build_ik_pose(Object *ob,
+ bPoseChannel *pchan,
+ bConstraint *con,
+ RootPChanMap *root_map);
+ void build_splineik_pose(Object *ob,
+ bPoseChannel *pchan,
+ bConstraint *con,
+ RootPChanMap *root_map);
void build_rig(Scene *scene, Object *ob);
void build_proxy_rig(Object *ob);
void build_shapekeys(ID *obdata, Key *key);
@@ -241,12 +256,17 @@ protected:
DepsNode *find_node(const RNAPathKey &key) const;
OperationDepsNode *has_node(const OperationKey &key) const;
- void add_time_relation(TimeSourceDepsNode *timesrc, DepsNode *node_to,
const char *description);
- void add_operation_relation(OperationDepsNode *node_from,
OperationDepsNode *node_to,
- eDepsRelation_Type type, const char
*description);
+ void add_time_relation(TimeSourceDepsNode *timesrc,
+ DepsNode *node_to,
+ const char *description);
+ void add_operation_relation(OperationDepsNode *node_from,
+ OperationDepsNode *node_to,
+ eDepsRelation_Type type,
+ const char *description);
template <typename KeyType>
- DepsNodeHandle create_node_handle(const KeyType &key, const string
&default_name = "");
+ DepsNodeHandle create_node_handle(const KeyType& key,
+ const string& default_name = "");
bool needs_an
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
