Cleanup: Add namespace to compositor.

This commit is contained in:
Jeroen Bakker 2021-03-23 17:12:27 +01:00
parent 9975af5ffa
commit 25c02ea703
445 changed files with 1813 additions and 15 deletions

View File

@ -18,6 +18,8 @@
#pragma once
namespace blender::compositor {
/**
* \brief possible data types for sockets
* \ingroup Model
@ -89,3 +91,5 @@ enum class ChunkOrdering {
#define COM_NUM_CHANNELS_COLOR 4
#define COM_BLUR_BOKEH_PIXELS 512
} // namespace blender::compositor

View File

@ -18,6 +18,8 @@
#include "COM_CPUDevice.h"
namespace blender::compositor {
CPUDevice::CPUDevice(int thread_id) : m_thread_id(thread_id)
{
}
@ -34,3 +36,5 @@ void CPUDevice::execute(WorkPackage *work)
executionGroup->finalizeChunkExecution(chunkNumber, nullptr);
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Device.h"
namespace blender::compositor {
/**
* \brief class representing a CPU device.
* \note for every hardware thread in the system a CPUDevice instance
@ -43,3 +45,5 @@ class CPUDevice : public Device {
protected:
int m_thread_id;
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "BLI_math.h"
namespace blender::compositor {
void ChunkOrder::update_distance(ChunkOrderHotspot *hotspots, unsigned int len_hotspots)
{
double new_distance = DBL_MAX;
@ -36,3 +38,5 @@ bool operator<(const ChunkOrder &a, const ChunkOrder &b)
{
return a.distance < b.distance;
}
} // namespace blender::compositor

View File

@ -24,6 +24,8 @@
#include "COM_ChunkOrderHotspot.h"
namespace blender::compositor {
/** Helper to determine the order how chunks are prioritized during execution. */
struct ChunkOrder {
unsigned int index = 0;
@ -39,3 +41,5 @@ struct ChunkOrder {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:ChunkOrderHotspot")
#endif
};
} // namespace blender::compositor

View File

@ -19,6 +19,8 @@
#include "COM_ChunkOrderHotspot.h"
#include <cmath>
namespace blender::compositor {
double ChunkOrderHotspot::calc_distance(int x, int y)
{
int dx = this->x - x;
@ -27,3 +29,5 @@ double ChunkOrderHotspot::calc_distance(int x, int y)
result += (double)this->addition;
return result;
}
} // namespace blender::compositor

View File

@ -22,6 +22,8 @@
# include "MEM_guardedalloc.h"
#endif
namespace blender::compositor {
struct ChunkOrderHotspot {
int x;
int y;
@ -37,3 +39,5 @@ struct ChunkOrderHotspot {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:ChunkOrderHotspot")
#endif
};
} // namespace blender::compositor

View File

@ -22,6 +22,8 @@
#include "BLI_assert.h"
namespace blender::compositor {
CompositorContext::CompositorContext()
{
this->m_scene = nullptr;
@ -38,3 +40,5 @@ int CompositorContext::getFramenumber() const
BLI_assert(m_rd);
return m_rd->cfra;
}
} // namespace blender::compositor

View File

@ -26,6 +26,8 @@
#include <string>
#include <vector>
namespace blender::compositor {
/**
* \brief Overall context of the compositor
*/
@ -277,3 +279,5 @@ class CompositorContext {
return m_rd->size * 0.01f;
}
};
} // namespace blender::compositor

View File

@ -116,6 +116,8 @@
#include "COM_ViewerNode.h"
#include "COM_ZCombineNode.h"
namespace blender::compositor {
bool COM_bnode_is_fast_node(const bNode &b_node)
{
return !ELEM(b_node.type,
@ -567,3 +569,5 @@ void COM_convert_resolution(NodeOperationBuilder &builder,
builder.addLink(translateOperation->getOutputSocket(), toSocket);
}
}
} // namespace blender::compositor

View File

@ -18,14 +18,17 @@
#pragma once
#include "COM_NodeOperation.h"
#ifdef WITH_CXX_GUARDEDALLOC
# include "MEM_guardedalloc.h"
#endif
struct bNode;
namespace blender::compositor {
class Node;
class NodeOperation;
class NodeOperationInput;
class NodeOperationOutput;
class NodeOperationBuilder;
@ -65,3 +68,5 @@ NodeOperation *COM_convert_data_type(const NodeOperationOutput &from,
void COM_convert_resolution(NodeOperationBuilder &builder,
NodeOperationOutput *fromSocket,
NodeOperationInput *toSocket);
} // namespace blender::compositor

View File

@ -18,6 +18,8 @@
#include "COM_Debug.h"
namespace blender::compositor {
#ifdef COM_DEBUG
# include <map>
@ -495,3 +497,5 @@ void DebugInfo::graphviz(const ExecutionSystem * /*system*/)
}
#endif
} // namespace blender::compositor

View File

@ -21,10 +21,12 @@
#include <map>
#include <string>
#include "COM_NodeOperation.h"
#include "COM_defines.h"
namespace blender::compositor {
class Node;
class NodeOperation;
class ExecutionSystem;
class ExecutionGroup;
@ -81,3 +83,5 @@ class DebugInfo {
static GroupStateMap m_group_states;
#endif
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_WorkPackage.h"
namespace blender::compositor {
/**
* \brief Abstract class for device implementations to be used by the Compositor.
* devices are queried, initialized and used by the WorkScheduler.
@ -46,3 +48,5 @@ class Device {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:Device")
#endif
};
} // namespace blender::compositor

View File

@ -46,6 +46,8 @@
#include "WM_api.h"
#include "WM_types.h"
namespace blender::compositor {
ExecutionGroup::ExecutionGroup()
{
this->m_is_output = false;
@ -607,3 +609,5 @@ void ExecutionGroup::setRenderBorder(float xmin, float xmax, float ymin, float y
}
}
}
} // namespace blender::compositor

View File

@ -33,8 +33,11 @@
#include "COM_NodeOperation.h"
#include <vector>
namespace blender::compositor {
class ExecutionSystem;
class MemoryProxy;
class MemoryBuffer;
class ReadBufferOperation;
class Device;
@ -441,3 +444,5 @@ class ExecutionGroup {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionGroup")
#endif
};
} // namespace blender::compositor

View File

@ -37,6 +37,8 @@
# include "MEM_guardedalloc.h"
#endif
namespace blender::compositor {
ExecutionSystem::ExecutionSystem(RenderData *rd,
Scene *scene,
bNodeTree *editingtree,
@ -219,3 +221,5 @@ void ExecutionSystem::execute_groups(CompositorPriority priority)
}
}
}
} // namespace blender::compositor

View File

@ -31,6 +31,8 @@ class ExecutionGroup;
#include "BLI_vector.hh"
namespace blender::compositor {
/**
* \page execution Execution model
* In order to get to an efficient model for execution, several steps are being done. these steps
@ -186,3 +188,5 @@ class ExecutionSystem {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionSystem")
#endif
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "MEM_guardedalloc.h"
namespace blender::compositor {
static unsigned int determine_num_channels(DataType datatype)
{
switch (datatype) {
@ -183,3 +185,5 @@ void MemoryBuffer::readEWA(float *result, const float uv[2], const float derivat
this,
result);
}
} // namespace blender::compositor

View File

@ -16,8 +16,6 @@
* Copyright 2011, Blender Foundation.
*/
class MemoryBuffer;
#pragma once
#include "COM_ExecutionGroup.h"
@ -26,6 +24,8 @@ class MemoryBuffer;
#include "BLI_math.h"
#include "BLI_rect.h"
namespace blender::compositor {
/**
* \brief state of a memory buffer
* \ingroup Memory
@ -330,3 +330,5 @@ class MemoryBuffer {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryBuffer")
#endif
};
} // namespace blender::compositor

View File

@ -18,6 +18,12 @@
#include "COM_MemoryProxy.h"
#include "COM_MemoryBuffer.h"
#include "BLI_rect.h"
namespace blender::compositor {
MemoryProxy::MemoryProxy(DataType datatype)
{
this->m_writeBufferOperation = nullptr;
@ -43,3 +49,5 @@ void MemoryProxy::free()
this->m_buffer = nullptr;
}
}
} // namespace blender::compositor

View File

@ -16,13 +16,14 @@
* Copyright 2011, Blender Foundation.
*/
class MemoryProxy;
#pragma once
#include "COM_ExecutionGroup.h"
#include "COM_MemoryBuffer.h"
#include "COM_defines.h"
namespace blender::compositor {
/* Forward declarations. */
class MemoryBuffer;
class ExecutionGroup;
class WriteBufferOperation;
@ -119,3 +120,5 @@ class MemoryProxy {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryProxy")
#endif
};
} // namespace blender::compositor

View File

@ -24,6 +24,8 @@
#include <string_view>
namespace blender::compositor {
void MetaData::add(const blender::StringRef key, const blender::StringRef value)
{
entries_.add(key, value);
@ -104,3 +106,5 @@ void MetaDataExtractCallbackData::extract_cryptomatte_meta_data(void *_data,
data->addMetaData(META_DATA_KEY_CRYPTOMATTE_MANIFEST, propvalue);
}
}
} // namespace blender::compositor

View File

@ -28,6 +28,8 @@
/* Forward declarations. */
struct RenderResult;
namespace blender::compositor {
/* Cryptomatte includes hash in its meta data keys. The hash is generated from the render
* layer/pass name. Compositing happens without the knowledge of the original layer and pass. The
* next keys are used to transfer the cryptomatte meta data in a neutral way. The file output node
@ -69,3 +71,5 @@ struct MetaDataExtractCallbackData {
char *propvalue,
int UNUSED(len));
};
} // namespace blender::compositor

View File

@ -32,6 +32,8 @@
#include "COM_Node.h" /* own include */
namespace blender::compositor {
/**************
**** Node ****
**************/
@ -208,3 +210,5 @@ void NodeOutput::getEditorValueVector(float *value)
RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr);
return RNA_float_get_array(&ptr, "default_value", value);
}
} // namespace blender::compositor

View File

@ -29,7 +29,8 @@
#include "COM_CompositorContext.h"
#include "COM_NodeConverter.h"
class Node;
namespace blender::compositor {
class NodeOperation;
class NodeConverter;
@ -317,3 +318,5 @@ class NodeOutput {
void getEditorValueColor(float *value);
void getEditorValueVector(float *value);
};
} // namespace blender::compositor

View File

@ -29,6 +29,8 @@
#include "COM_NodeConverter.h" /* own include */
namespace blender::compositor {
NodeConverter::NodeConverter(NodeOperationBuilder *builder) : m_builder(builder)
{
}
@ -160,3 +162,5 @@ ViewerOperation *NodeConverter::active_viewer() const
{
return m_builder->active_viewer();
}
} // namespace blender::compositor

View File

@ -22,6 +22,8 @@
# include "MEM_guardedalloc.h"
#endif
namespace blender::compositor {
class NodeInput;
class NodeOutput;
@ -120,3 +122,5 @@ class NodeConverter {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeCompiler")
#endif
};
} // namespace blender::compositor

View File

@ -33,6 +33,8 @@
#include "COM_NodeGraph.h" /* own include */
namespace blender::compositor {
/*******************
**** NodeGraph ****
*******************/
@ -331,3 +333,5 @@ void NodeGraph::add_proxies_reroute(bNodeTree *b_ntree,
b_node, (bNodeSocket *)b_node->inputs.first, (bNodeSocket *)b_node->outputs.first, false);
add_node(proxy, b_ntree, key, is_active_group);
}
} // namespace blender::compositor

View File

@ -29,6 +29,8 @@
# include "MEM_guardedalloc.h"
#endif
namespace blender::compositor {
class CompositorContext;
class Node;
class NodeInput;
@ -121,3 +123,5 @@ class NodeGraph {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeGraph")
#endif
};
} // namespace blender::compositor

View File

@ -24,6 +24,8 @@
#include "COM_NodeOperation.h" /* own include */
namespace blender::compositor {
/*******************
**** NodeOperation ****
*******************/
@ -209,3 +211,5 @@ void NodeOperationOutput::determineResolution(unsigned int resolution[2],
operation.setResolution(resolution);
}
}
} // namespace blender::compositor

View File

@ -33,6 +33,8 @@
#include "clew.h"
namespace blender::compositor {
class OpenCLDevice;
class ReadBufferOperation;
class WriteBufferOperation;
@ -617,3 +619,5 @@ class NodeOperation {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeOperation")
#endif
};
} // namespace blender::compositor

View File

@ -38,6 +38,8 @@
#include "COM_NodeOperationBuilder.h" /* own include */
namespace blender::compositor {
NodeOperationBuilder::NodeOperationBuilder(const CompositorContext *context, bNodeTree *b_nodetree)
: m_context(context), m_current_node(nullptr), m_active_viewer(nullptr)
{
@ -684,3 +686,5 @@ void NodeOperationBuilder::group_operations()
}
}
}
} // namespace blender::compositor

View File

@ -24,6 +24,8 @@
#include "COM_NodeGraph.h"
namespace blender::compositor {
class CompositorContext;
class Node;
@ -157,3 +159,5 @@ class NodeOperationBuilder {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeCompilerImpl")
#endif
};
} // namespace blender::compositor

View File

@ -19,6 +19,8 @@
#include "COM_OpenCLDevice.h"
#include "COM_WorkScheduler.h"
namespace blender::compositor {
enum COM_VendorID { NVIDIA = 0x10DE, AMD = 0x1002 };
const cl_image_format IMAGE_FORMAT_COLOR = {
CL_RGBA,
@ -270,3 +272,5 @@ cl_kernel OpenCLDevice::COM_clCreateKernel(const char *kernelname,
}
return kernel;
}
} // namespace blender::compositor

View File

@ -25,6 +25,8 @@ class OpenCLDevice;
#include "COM_WorkScheduler.h"
#include "clew.h"
namespace blender::compositor {
/**
* \brief device representing an GPU OpenCL device.
* an instance of this class represents a single cl_device
@ -117,3 +119,5 @@ class OpenCLDevice : public Device {
NodeOperation *operation);
cl_kernel COM_clCreateKernel(const char *kernelname, std::list<cl_kernel> *clKernelsToCleanUp);
};
} // namespace blender::compositor

View File

@ -18,6 +18,8 @@
#include "COM_SingleThreadedOperation.h"
namespace blender::compositor {
SingleThreadedOperation::SingleThreadedOperation()
{
this->m_cachedInstance = nullptr;
@ -56,3 +58,5 @@ void *SingleThreadedOperation::initializeTileData(rcti *rect)
unlockMutex();
return this->m_cachedInstance;
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_NodeOperation.h"
namespace blender::compositor {
class SingleThreadedOperation : public NodeOperation {
private:
MemoryBuffer *m_cachedInstance;
@ -57,3 +59,5 @@ class SingleThreadedOperation : public NodeOperation {
return true;
}
};
} // namespace blender::compositor

View File

@ -18,8 +18,12 @@
#include "COM_WorkPackage.h"
namespace blender::compositor {
WorkPackage::WorkPackage(ExecutionGroup *execution_group, unsigned int chunk_number)
{
this->execution_group = execution_group;
this->chunk_number = chunk_number;
}
} // namespace blender::compositor

View File

@ -21,6 +21,8 @@
class ExecutionGroup;
#include "COM_ExecutionGroup.h"
namespace blender::compositor {
/**
* \brief contains data about work that can be scheduled
* \see WorkScheduler
@ -47,3 +49,5 @@ struct WorkPackage {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:WorkPackage")
#endif
};
} // namespace blender::compositor

View File

@ -37,6 +37,8 @@
#include "BKE_global.h"
namespace blender::compositor {
enum class ThreadingModel {
/** Everything is executed in the caller thread. easy for debugging. */
SingleThreaded,
@ -583,3 +585,5 @@ int WorkScheduler::current_thread_id()
}
/* \} */
} // namespace blender::compositor

View File

@ -24,6 +24,8 @@
#include "COM_WorkPackage.h"
#include "COM_defines.h"
namespace blender::compositor {
/** \brief the workscheduler
* \ingroup execution
*/
@ -93,3 +95,5 @@ struct WorkScheduler {
MEM_CXX_CLASS_ALLOC_FUNCS("COM:WorkScheduler")
#endif
};
} // namespace blender::compositor

View File

@ -92,12 +92,12 @@ void COM_execute(RenderData *render_data,
/* Initialize workscheduler. */
const bool use_opencl = (node_tree->flag & NTREE_COM_OPENCL) != 0;
WorkScheduler::initialize(use_opencl, BKE_render_num_threads(render_data));
blender::compositor::WorkScheduler::initialize(use_opencl, BKE_render_num_threads(render_data));
/* Execute. */
const bool twopass = (node_tree->flag & NTREE_TWO_PASS) && !rendering;
if (twopass) {
ExecutionSystem fast_pass(
blender::compositor::ExecutionSystem fast_pass(
render_data, scene, node_tree, rendering, true, viewSettings, displaySettings, viewName);
fast_pass.execute();
@ -107,7 +107,7 @@ void COM_execute(RenderData *render_data,
}
}
ExecutionSystem system(
blender::compositor::ExecutionSystem system(
render_data, scene, node_tree, rendering, false, viewSettings, displaySettings, viewName);
system.execute();
@ -118,7 +118,7 @@ void COM_deinitialize()
{
if (g_compositor.is_initialized) {
BLI_mutex_lock(&g_compositor.mutex);
WorkScheduler::deinitialize();
blender::compositor::WorkScheduler::deinitialize();
g_compositor.is_initialized = false;
BLI_mutex_unlock(&g_compositor.mutex);
BLI_mutex_end(&g_compositor.mutex);

View File

@ -26,6 +26,8 @@
#include "COM_SetValueOperation.h"
#include "DNA_material_types.h" /* the ramp types */
namespace blender::compositor {
void AlphaOverNode::convertToOperations(NodeConverter &converter,
const CompositorContext & /*context*/) const
{
@ -64,3 +66,5 @@ void AlphaOverNode::convertToOperations(NodeConverter &converter,
converter.mapInputSocket(getInputSocket(2), convertProg->getInputSocket(2));
converter.mapOutputSocket(getOutputSocket(0), convertProg->getOutputSocket(0));
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief AlphaOverNode
* \ingroup Node
@ -32,3 +34,5 @@ class AlphaOverNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -22,6 +22,8 @@
#include "COM_SMAAOperation.h"
#include "DNA_node_types.h"
namespace blender::compositor {
void AntiAliasingNode::convertToOperations(NodeConverter &converter,
const CompositorContext & /*context*/) const
{
@ -54,3 +56,5 @@ void AntiAliasingNode::convertToOperations(NodeConverter &converter,
converter.addLink(operation2->getOutputSocket(), operation3->getInputSocket(1));
converter.mapOutputSocket(getOutputSocket(0), operation3->getOutputSocket());
}
} // namespace blender::compositor

View File

@ -23,6 +23,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* @brief AntiAliasingNode
* @ingroup Node
@ -32,7 +34,10 @@ class AntiAliasingNode : public Node {
AntiAliasingNode(bNode *editorNode) : Node(editorNode)
{
}
void convertToOperations(NodeConverter &converter, const CompositorContext &context) const override;
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor
#endif

View File

@ -21,6 +21,8 @@
#include "COM_ExecutionSystem.h"
#include "DNA_node_types.h"
namespace blender::compositor {
BilateralBlurNode::BilateralBlurNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -39,3 +41,5 @@ void BilateralBlurNode::convertToOperations(NodeConverter &converter,
converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1));
converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0));
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief BilateralBlurNode
* \ingroup Node
@ -30,3 +32,5 @@ class BilateralBlurNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -29,6 +29,8 @@
#include "COM_SetValueOperation.h"
#include "DNA_node_types.h"
namespace blender::compositor {
BlurNode::BlurNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -168,3 +170,5 @@ void BlurNode::convertToOperations(NodeConverter &converter,
converter.addPreview(output_operation->getOutputSocket());
}
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief BlurNode
* \ingroup Node
@ -30,3 +32,5 @@ class BlurNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -25,6 +25,8 @@
#include "DNA_node_types.h"
#include "DNA_object_types.h"
namespace blender::compositor {
BokehBlurNode::BokehBlurNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -75,3 +77,5 @@ void BokehBlurNode::convertToOperations(NodeConverter &converter,
}
}
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief BokehBlurNode
* \ingroup Node
@ -30,3 +32,5 @@ class BokehBlurNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_BokehImageOperation.h"
#include "COM_ExecutionSystem.h"
namespace blender::compositor {
BokehImageNode::BokehImageNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -36,3 +38,5 @@ void BokehImageNode::convertToOperations(NodeConverter &converter,
converter.addPreview(operation->getOutputSocket(0));
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief BokehImageNode
* \ingroup Node
@ -30,3 +32,5 @@ class BokehImageNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -23,6 +23,8 @@
#include "COM_ScaleOperation.h"
#include "COM_SetValueOperation.h"
namespace blender::compositor {
BoxMaskNode::BoxMaskNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -70,3 +72,5 @@ void BoxMaskNode::convertToOperations(NodeConverter &converter,
converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1));
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief BoxMaskNode
* \ingroup Node
@ -30,3 +32,5 @@ class BoxMaskNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_BrightnessOperation.h"
#include "COM_ExecutionSystem.h"
namespace blender::compositor {
BrightnessNode::BrightnessNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -38,3 +40,5 @@ void BrightnessNode::convertToOperations(NodeConverter &converter,
converter.mapInputSocket(getInputSocket(2), operation->getInputSocket(2));
converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0));
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief BrightnessNode
* \ingroup Node
@ -30,3 +32,5 @@ class BrightnessNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -22,6 +22,8 @@
#include "COM_ConvertOperation.h"
#include "COM_SetAlphaMultiplyOperation.h"
namespace blender::compositor {
ChannelMatteNode::ChannelMatteNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -93,3 +95,5 @@ void ChannelMatteNode::convertToOperations(NodeConverter &converter,
converter.addPreview(operationAlpha->getOutputSocket());
}
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief ChannelMatteNode
* \ingroup Node
@ -30,3 +32,5 @@ class ChannelMatteNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -22,6 +22,8 @@
#include "COM_ConvertOperation.h"
#include "COM_SetAlphaMultiplyOperation.h"
namespace blender::compositor {
ChromaMatteNode::ChromaMatteNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -63,3 +65,5 @@ void ChromaMatteNode::convertToOperations(NodeConverter &converter,
converter.addPreview(operationAlpha->getOutputSocket());
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief ChromaMatteNode
* \ingroup Node
@ -30,3 +32,5 @@ class ChromaMatteNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -23,6 +23,8 @@
#include "COM_ExecutionSystem.h"
#include "COM_MixOperation.h"
namespace blender::compositor {
ColorBalanceNode::ColorBalanceNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -71,3 +73,5 @@ void ColorBalanceNode::convertToOperations(NodeConverter &converter,
converter.mapInputSocket(inputImageSocket, operation->getInputSocket(1));
converter.mapOutputSocket(outputSocket, operation->getOutputSocket(0));
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief ColorBalanceNode
* \ingroup Node
@ -30,3 +32,5 @@ class ColorBalanceNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_ColorCorrectionOperation.h"
#include "COM_ExecutionSystem.h"
namespace blender::compositor {
ColorCorrectionNode::ColorCorrectionNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -41,3 +43,5 @@ void ColorCorrectionNode::convertToOperations(NodeConverter &converter,
converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1));
converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0));
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief ColorCorrectionNode
* \ingroup Node
@ -30,3 +32,5 @@ class ColorCorrectionNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_ColorCurveOperation.h"
#include "COM_ExecutionSystem.h"
namespace blender::compositor {
ColorCurveNode::ColorCurveNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -55,3 +57,5 @@ void ColorCurveNode::convertToOperations(NodeConverter &converter,
converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket());
}
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief ColorCurveNode
* \ingroup Node
@ -30,3 +32,5 @@ class ColorCurveNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_ColorExposureOperation.h"
#include "COM_ExecutionSystem.h"
namespace blender::compositor {
ExposureNode::ExposureNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -35,3 +37,5 @@ void ExposureNode::convertToOperations(NodeConverter &converter,
converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1));
converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0));
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief ExposureNode
* \ingroup Node
@ -30,3 +32,5 @@ class ExposureNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -22,6 +22,8 @@
#include "COM_ConvertOperation.h"
#include "COM_SetAlphaMultiplyOperation.h"
namespace blender::compositor {
ColorMatteNode::ColorMatteNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -61,3 +63,5 @@ void ColorMatteNode::convertToOperations(NodeConverter &converter,
converter.addPreview(operationAlpha->getOutputSocket());
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief ColorMatteNode
* \ingroup Node
@ -30,3 +32,5 @@ class ColorMatteNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_ExecutionSystem.h"
#include "COM_SetColorOperation.h"
namespace blender::compositor {
ColorNode::ColorNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -37,3 +39,5 @@ void ColorNode::convertToOperations(NodeConverter &converter,
converter.mapOutputSocket(output, operation->getOutputSocket());
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief ColorNode
* \ingroup Node
@ -30,3 +32,5 @@ class ColorNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -23,6 +23,8 @@
#include "COM_ExecutionSystem.h"
#include "DNA_texture_types.h"
namespace blender::compositor {
ColorRampNode::ColorRampNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -50,3 +52,5 @@ void ColorRampNode::convertToOperations(NodeConverter &converter,
converter.addLink(operation->getOutputSocket(), operation2->getInputSocket(0));
converter.mapOutputSocket(outputSocketAlpha, operation2->getOutputSocket());
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief ColorRampNode
* \ingroup Node
@ -30,3 +32,5 @@ class ColorRampNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "BKE_node.h"
#include "COM_ColorSpillOperation.h"
namespace blender::compositor {
ColorSpillNode::ColorSpillNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -45,3 +47,5 @@ void ColorSpillNode::convertToOperations(NodeConverter &converter,
converter.mapInputSocket(inputSocketFac, operation->getInputSocket(1));
converter.mapOutputSocket(outputSocketImage, operation->getOutputSocket());
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief ColorSpillNode
* \ingroup Node
@ -30,3 +32,5 @@ class ColorSpillNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -21,6 +21,8 @@
#include "COM_ConvertOperation.h"
#include "COM_ExecutionSystem.h"
namespace blender::compositor {
ColorToBWNode::ColorToBWNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -38,3 +40,5 @@ void ColorToBWNode::convertToOperations(NodeConverter &converter,
converter.mapInputSocket(colorSocket, convertProg->getInputSocket(0));
converter.mapOutputSocket(valueSocket, convertProg->getOutputSocket(0));
}
} // namespace blender::compositor

View File

@ -20,6 +20,9 @@
#include "COM_Node.h"
#include "DNA_node_types.h"
namespace blender::compositor {
/**
* \brief ColorToBWNode
* \ingroup Node
@ -30,3 +33,5 @@ class ColorToBWNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_ConvertOperation.h"
namespace blender::compositor {
CombineColorNode::CombineColorNode(bNode *editorNode) : Node(editorNode)
{
}
@ -87,3 +89,5 @@ NodeOperation *CombineYUVANode::getColorConverter(const CompositorContext & /*co
{
return new ConvertYUVToRGBOperation();
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
class CombineColorNode : public Node {
public:
CombineColorNode(bNode *editorNode);
@ -65,3 +67,5 @@ class CombineYUVANode : public CombineColorNode {
NodeOperation *getColorConverter(const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_CompositorOperation.h"
#include "COM_ExecutionSystem.h"
namespace blender::compositor {
CompositorNode::CompositorNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -59,3 +61,5 @@ void CompositorNode::convertToOperations(NodeConverter &converter,
converter.addNodeInputPreview(imageSocket);
}
} // namespace blender::compositor

View File

@ -20,6 +20,9 @@
#include "COM_Node.h"
#include "DNA_node_types.h"
namespace blender::compositor {
/**
* \brief CompositorNode
* \ingroup Node
@ -30,3 +33,5 @@ class CompositorNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_ConvertOperation.h"
#include "COM_ExecutionSystem.h"
namespace blender::compositor {
void ConvertAlphaNode::convertToOperations(NodeConverter &converter,
const CompositorContext & /*context*/) const
{
@ -39,3 +41,5 @@ void ConvertAlphaNode::convertToOperations(NodeConverter &converter,
converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0));
converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket());
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief ConvertAlphaNode
* \ingroup Node
@ -32,3 +34,5 @@ class ConvertAlphaNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_PlaneCornerPinOperation.h"
namespace blender::compositor {
CornerPinNode::CornerPinNode(bNode *editorNode) : Node(editorNode)
{
}
@ -53,3 +55,5 @@ void CornerPinNode::convertToOperations(NodeConverter &converter,
converter.mapOutputSocket(output_warped_image, warp_image_operation->getOutputSocket());
converter.mapOutputSocket(output_plane, plane_mask_operation->getOutputSocket());
}
} // namespace blender::compositor

View File

@ -21,6 +21,8 @@
#include "DNA_node_types.h"
namespace blender::compositor {
/**
* \brief CornerPinNode
* \ingroup Node
@ -31,3 +33,5 @@ class CornerPinNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -19,6 +19,8 @@
#include "COM_CropNode.h"
#include "COM_CropOperation.h"
namespace blender::compositor {
CropNode::CropNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -45,3 +47,5 @@ void CropNode::convertToOperations(NodeConverter &converter,
converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0));
converter.mapOutputSocket(getOutputSocket(), operation->getOutputSocket());
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief CropNode
* \ingroup Node
@ -30,3 +32,5 @@ class CropNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -31,6 +31,8 @@
#include <iterator>
#include <string>
namespace blender::compositor {
/** \name Cryptomatte base
* \{ */
@ -261,3 +263,5 @@ CryptomatteOperation *CryptomatteLegacyNode::create_cryptomatte_operation(
}
/* \} */
} // namespace blender::compositor

View File

@ -24,6 +24,8 @@
#include "COM_CryptomatteOperation.h"
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief CryptomatteNode
* \ingroup Node
@ -88,3 +90,5 @@ class CryptomatteLegacyNode : public CryptomatteBaseNode {
const bNode &node,
const NodeCryptomatte *cryptomatte_settings) const override;
};
} // namespace blender::compositor

View File

@ -30,6 +30,8 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
namespace blender::compositor {
DefocusNode::DefocusNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -141,3 +143,5 @@ void DefocusNode::convertToOperations(NodeConverter &converter,
converter.mapOutputSocket(getOutputSocket(), operation->getOutputSocket());
}
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief DefocusNode
* \ingroup Node
@ -30,3 +32,5 @@ class DefocusNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -21,6 +21,8 @@
#include "COM_SetValueOperation.h"
#include "DNA_node_types.h"
namespace blender::compositor {
DenoiseNode::DenoiseNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -41,3 +43,5 @@ void DenoiseNode::convertToOperations(NodeConverter &converter,
converter.mapInputSocket(getInputSocket(2), operation->getInputSocket(2));
converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0));
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief DenoiseNode
* \ingroup Node
@ -30,3 +32,5 @@ class DenoiseNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -22,6 +22,8 @@
#include "COM_ExecutionSystem.h"
#include "DNA_scene_types.h"
namespace blender::compositor {
DespeckleNode::DespeckleNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -46,3 +48,5 @@ void DespeckleNode::convertToOperations(NodeConverter &converter,
converter.addPreview(operation->getOutputSocket(0));
}
} // namespace blender::compositor

View File

@ -20,6 +20,8 @@
#include "COM_Node.h"
namespace blender::compositor {
/**
* \brief DespeckleNode
* \ingroup Node
@ -30,3 +32,5 @@ class DespeckleNode : public Node {
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
};
} // namespace blender::compositor

View File

@ -21,6 +21,8 @@
#include "COM_DifferenceMatteOperation.h"
#include "COM_SetAlphaMultiplyOperation.h"
namespace blender::compositor {
DifferenceMatteNode::DifferenceMatteNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@ -52,3 +54,5 @@ void DifferenceMatteNode::convertToOperations(NodeConverter &converter,
converter.addPreview(operation->getOutputSocket());
}
} // namespace blender::compositor

Some files were not shown because too many files have changed in this diff Show More