[Bf-blender-cvs] [c7041403d0e] master: Cleanup: comments (long lines) in compositor
Campbell Barton
noreply at git.blender.org
Wed May 1 03:33:50 CEST 2019
Commit: c7041403d0e52a1ddffefb1db5713dbb8e6908c7
Author: Campbell Barton
Date: Wed May 1 10:50:02 2019 +1000
Branches: master
https://developer.blender.org/rBc7041403d0e52a1ddffefb1db5713dbb8e6908c7
Cleanup: comments (long lines) in compositor
===================================================================
M source/blender/compositor/COM_defines.h
M source/blender/compositor/intern/COM_CPUDevice.h
M source/blender/compositor/intern/COM_CompositorContext.h
M source/blender/compositor/intern/COM_Converter.h
M source/blender/compositor/intern/COM_Debug.cpp
M source/blender/compositor/intern/COM_ExecutionGroup.cpp
M source/blender/compositor/intern/COM_ExecutionGroup.h
M source/blender/compositor/intern/COM_ExecutionSystem.h
M source/blender/compositor/intern/COM_MemoryBuffer.h
M source/blender/compositor/intern/COM_Node.h
M source/blender/compositor/intern/COM_NodeGraph.cpp
M source/blender/compositor/intern/COM_NodeOperation.h
M source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
M source/blender/compositor/intern/COM_WorkScheduler.cpp
M source/blender/compositor/intern/COM_WorkScheduler.h
M source/blender/compositor/nodes/COM_DilateErodeNode.cpp
M source/blender/compositor/nodes/COM_FlipNode.cpp
M source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
M source/blender/compositor/operations/COM_BokehImageOperation.h
M source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
M source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
M source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
M source/blender/compositor/operations/COM_DespeckleOperation.cpp
M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
M source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
M source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
M source/blender/compositor/operations/COM_MapRangeOperation.cpp
M source/blender/compositor/operations/COM_NormalizeOperation.cpp
M source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
M source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp
M source/blender/compositor/operations/COM_ScaleOperation.cpp
M source/blender/compositor/operations/COM_SunBeamsOperation.cpp
M source/blender/compositor/operations/COM_TextureOperation.cpp
M source/blender/compositor/operations/COM_VectorBlurOperation.cpp
M source/blender/compositor/operations/COM_WrapOperation.cpp
M source/blender/compositor/operations/COM_ZCombineOperation.cpp
===================================================================
diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h
index de731b8e0da..7a38ad721bc 100644
--- a/source/blender/compositor/COM_defines.h
+++ b/source/blender/compositor/COM_defines.h
@@ -68,12 +68,14 @@ typedef enum CompositorPriority {
// workscheduler threading models
/**
- * COM_TM_QUEUE is a multithreaded model, which uses the BLI_thread_queue pattern. This is the default option.
+ * COM_TM_QUEUE is a multithreaded model, which uses the BLI_thread_queue pattern.
+ * This is the default option.
*/
#define COM_TM_QUEUE 1
/**
- * COM_TM_NOTHREAD is a single threading model, everything is executed in the caller thread. easy for debugging
+ * COM_TM_NOTHREAD is a single threading model, everything is executed in the caller thread.
+ * easy for debugging
*/
#define COM_TM_NOTHREAD 0
diff --git a/source/blender/compositor/intern/COM_CPUDevice.h b/source/blender/compositor/intern/COM_CPUDevice.h
index d82046a729f..1d411569146 100644
--- a/source/blender/compositor/intern/COM_CPUDevice.h
+++ b/source/blender/compositor/intern/COM_CPUDevice.h
@@ -23,7 +23,8 @@
/**
* \brief class representing a CPU device.
- * \note for every hardware thread in the system a CPUDevice instance will exist in the workscheduler
+ * \note for every hardware thread in the system a CPUDevice instance
+ * will exist in the workscheduler.
*/
class CPUDevice : public Device {
public:
diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h
index 466779ec9bd..f4cd60e3ee0 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.h
+++ b/source/blender/compositor/intern/COM_CompositorContext.h
@@ -33,8 +33,8 @@
class CompositorContext {
private:
/**
- * \brief The rendering field describes if we are rendering (F12) or if we are editing (Node editor)
- * This field is initialized in ExecutionSystem and must only be read from that point on.
+ * \brief The rendering field describes if we are rendering (F12) or if we are editing (Node
+ * editor) This field is initialized in ExecutionSystem and must only be read from that point on.
* \see ExecutionSystem
*/
bool m_rendering;
diff --git a/source/blender/compositor/intern/COM_Converter.h b/source/blender/compositor/intern/COM_Converter.h
index 0d7fc40de17..1213246b9c9 100644
--- a/source/blender/compositor/intern/COM_Converter.h
+++ b/source/blender/compositor/intern/COM_Converter.h
@@ -41,7 +41,8 @@ class Converter {
*
* For all nodetypes a wrapper class is created.
*
- * \note When adding a new node to blender, this method needs to be changed to return the correct Node instance.
+ * \note When adding a new node to blender, this method needs to be changed to return the correct
+ * Node instance.
*
* \see Node
*/
@@ -55,7 +56,8 @@ class Converter {
static bool is_fast_node(bNode *b_node);
/**
- * \brief This method will add a datetype conversion rule when the to-socket does not support the from-socket actual data type.
+ * \brief This method will add a datetype conversion rule when the to-socket does not support the
+ * from-socket actual data type.
*
* \note this method is called when conversion is needed.
*
diff --git a/source/blender/compositor/intern/COM_Debug.cpp b/source/blender/compositor/intern/COM_Debug.cpp
index 8632b7ad0f0..72c1e0cf316 100644
--- a/source/blender/compositor/intern/COM_Debug.cpp
+++ b/source/blender/compositor/intern/COM_Debug.cpp
@@ -367,8 +367,12 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
system, operation, group, str + len, maxlen > len ? maxlen - len : 0);
}
- // len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "// OUTPUTOPERATION: %p\r\n", group->getOutputOperation());
- // len += snprintf(str+len, maxlen>len ? maxlen-len : 0, " O_%p\r\n", group->getOutputOperation());
+ // len += snprintf(str+len,
+ // maxlen>len ? maxlen-len : 0,
+ // "// OUTPUTOPERATION: %p\r\n", group->getOutputOperation());
+ // len += snprintf(
+ // str+len, maxlen>len ? maxlen-len : 0,
+ // " O_%p\r\n", group->getOutputOperation());
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "}\r\n");
}
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
index 367362c2c66..1718722e860 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
@@ -86,7 +86,8 @@ bool ExecutionGroup::canContainOperation(NodeOperation *operation)
if (m_complex) {
return false;
}
- /* complex ops can't be added to other groups (except their own, which they initialize, see above) */
+ /* complex ops can't be added to other groups (except their own, which they initialize, see
+ * above) */
if (operation->isComplex()) {
return false;
}
@@ -188,7 +189,8 @@ void ExecutionGroup::determineNumberOfChunks()
}
/**
- * this method is called for the top execution groups. containing the compositor node or the preview node or the viewer node)
+ * this method is called for the top execution groups. containing the compositor node or the
+ * preview node or the viewer node)
*/
void ExecutionGroup::execute(ExecutionSystem *graph)
{
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h
index ff9ac5d0582..41ae6f1c5b2 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.h
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.h
@@ -55,7 +55,8 @@ typedef enum ChunkExecutionState {
/**
* \brief Class ExecutionGroup is a group of Operations that are executed as one.
- * This grouping is used to combine Operations that can be executed as one whole when multi-processing.
+ * This grouping is used to combine Operations that can be executed as one whole when
+ * multi-processing.
* \ingroup Execution
*/
class ExecutionGroup {
@@ -72,7 +73,8 @@ class ExecutionGroup {
/**
* \brief is this ExecutionGroup an input ExecutionGroup
- * an input execution group is a group that is at the end of the calculation (the output is important for the user)
+ * an input execution group is a group that is at the end of the calculation
+ * (the output is important for the user).
*/
int m_isOutput;
@@ -134,8 +136,9 @@ class ExecutionGroup {
Operations m_cachedReadOperations;
/**
- * \brief reference to the original bNodeTree, this field is only set for the 'top' execution group.
- * \note can only be used to call the callbacks for progress, status and break
+ * \brief reference to the original bNodeTree,
+ * this field is only set for the 'top' execution group.
+ * \note can only be used to call the callbacks for progress, status and break.
*/
const bNodeTree *m_bTree;
@@ -154,7 +157,8 @@ class ExecutionGroup {
/**
* \brief indicator when this ExecutionGroup has valid Operations in its vector for Execution
- * \note When building the ExecutionGroup Operations are added via recursion. First a WriteBufferOperations is added, then the
+ * \note When building the ExecutionGroup Operations are added via recursion.
+ * First a WriteBufferOperations is added, then the.
* \note Operation containing the settings that is important for the ExecutiongGroup is added,
* \note When this occurs, these settings are copied over from the node to the ExecutionGroup
* \note and the Initialized flag is set to true.
@@ -204,7 +208,8 @@ class ExecutionGroup {
/**
* \brief try to schedule a specific chunk.
- * \note scheduling succeeds when all input requirements are met and the chunks hasn't been scheduled yet.
+ * \note scheduling succeeds when all input requirements are met and the chunks hasn't been
+ * scheduled yet.
* \param graph:
* \param xChunk:
* \param yChunk:
@@ -375,9 +380,11 @@ class ExecutionGroup {
/**
* \brief schedule an ExecutionGroup
- * \note this method will return when all chunks have been calculated, or the execution has breaked (by user)
+ * \note this method will return when all chunks have been calculated, or the execution has
+ * breaked (by user)
*
- * first the order of the chunks will be determined. This is determined by finding the ViewerOperation and get the relevant information from it.
+ * first the order of the chunks will be determined. This is determined by finding the
+ * ViewerOperation and get the relevant information from it.
* - ChunkOrdering
* - CenterX
* - CenterY
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h
index 55c2ed6c22b..009b1fb28cd 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.h
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.h
@@ -30,12 +30,13 @@ class ExecutionGroup;
/**
* \page execution Execution model
- * In order to get to an efficient model for execution, several steps are being done. these steps are explained below.
+ * In order to get to an efficient model for execution, several steps are being done. these steps
+ * are explained below.
*
* \section EM_Step1 Step 1: translating blender node system to the new compsitor system
- * Blenders node structure is based on C structs (DNA). These structs are not efficient in the new architecture.
- * We want to use classes in order to simplify the system.
- * during this step the blender node_tree is evaluated and converted to a CPP node system.
+ * Blenders node structure is based on C structs (DNA). These structs are not efficient in the new
+ * architecture. We want to use classes in order to simplify the system. during this step the
+ * blender node_tree is evaluated and converted to a CPP node system.
*
* \see ExecutionSystem
* \see Converter.convert
@@ -43,35 +44,41 @@ class ExecutionGroup;
*
* \section EM_Step2 Step2: translating nodes to operations
* Ungrouping the GroupNodes. Group nodes are node_tree's in node_tree's.
- *
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list