diff options
Diffstat (limited to 'source')
226 files changed, 3183 insertions, 3191 deletions
diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h index b33a48464e1..4789fed2efd 100644 --- a/source/blender/compositor/COM_compositor.h +++ b/source/blender/compositor/COM_compositor.h @@ -21,256 +21,256 @@ */ #ifdef __cplusplus - extern "C" { +extern "C" { #endif #include "DNA_node_types.h" /** - * @defgroup Model The data model of the compositor - * @defgroup Memory The memory management stuff - * @defgroup Execution The execution logic - * @defgroup Conversion Conversion logic - * @defgroup Node All nodes of the compositor - * @defgroup Operation All operations of the compositor - * - * @mainpage Introduction of the Blender Compositor - * - * @section bcomp Blender compositor - * This project redesigns the interals of Blender's compositor. The project has been executed in 2011 by At Mind. - * At Mind is a technology company located in Amsterdam, The Netherlands. - * The project has been crowdfunded. This code has been released under GPL2 to be used in Blender. - * - * @section goals The goals of the project - * the new compositor has 2 goals. - * - Make a faster compositor (speed of calculation) - * - Make the compositor work faster for you (workflow) - * - * @section speed Faster compositor - * The speedup has been done by making better use of the hardware Blenders is working on. The previous compositor only - * used a single threaded model to calculate a node. The only exception to this is the Defocus node. - * Only when it is possible to calculate two full nodes in parallel a second thread was used. - * Current workstations have 8-16 threads available, and most of the time these are idle. - * - * In the new compositor we want to use as much of threads as possible. Even new OpenCL capable GPU-hardware can be - * used for calculation. - * - * @section workflow Work faster - * The previous compositor only showed the final image. The compositor could wait a long time before seeing the result - * of his work. The new compositor will work in a way that it will focus on getting information back to the user. - * It will prioritise its work to get earlier user feedback. - * - * @page memory Memory model - * The main issue is the type of memory model to use. Blender is used by consumers and professionals. - * Ranging from low-end machines to very high-end machines. - * The system should work on high-end machines and on low-end machines. - * - * - * @page executing Executing - * @section prepare Prepare execution - * - * during the preparation of the execution All ReadBufferOperation will receive an offset. - * This offset is used during execution as an optimization trick - * Next all operations will be initialized for execution @see NodeOperation.initExecution - * Next all ExecutionGroup's will be initialized for execution @see ExecutionGroup.initExecution - * this all is controlled from @see ExecutionSystem.execute - * - * @section priority Render priority - * Render priority is an priority of an output node. A user has a different need of Render priorities of output nodes - * than during editing. - * for example. the Active ViewerNode has top priority during editing, but during rendering a CompositeNode has. - * All NodeOperation has a setting for their renderpriority, but only for output NodeOperation these have effect. - * In ExecutionSystem.execute all priorities are checked. For every priority the ExecutionGroup's are check if the - * priority do match. - * When match the ExecutionGroup will be executed (this happens in serial) - * - * @see ExecutionSystem.execute control of the Render priority - * @see NodeOperation.getRenderPriority receive the render priority - * @see ExecutionGroup.execute the main loop to execute a whole ExecutionGroup - * - * @section order Chunk order - * - * When a ExecutionGroup is executed, first the order of chunks are determined. - * The settings are stored in the ViewerNode inside the ExecutionGroup. ExecutionGroups that have no viewernode, - * will use a default one. - * There are several possible chunk orders - * - [@ref OrderOfChunks.COM_TO_CENTER_OUT]: Start calculating from a configurable point and order by nearest chunk - * - [@ref OrderOfChunks.COM_TO_RANDOM]: Randomize all chunks. - * - [@ref OrderOfChunks.COM_TO_TOP_DOWN]: Start calculation from the bottom to the top of the image - * - [@ref OrderOfChunks.COM_TO_RULE_OF_THIRDS]: Experimental order based on 9 hotspots in the image - * - * When the chunkorder is determined, the first few chunks will be checked if they can be scheduled. - * Chunks can have three states: - * - [@ref ChunkExecutionState.COM_ES_NOT_SCHEDULED]: Chunk is not yet scheduled, or dependacies are not met - * - [@ref ChunkExecutionState.COM_ES_SCHEDULED]: All dependacies are met, chunk is scheduled, but not finished - * - [@ref ChunkExecutionState.COM_ES_EXECUTED]: Chunk is finished - * - * @see ExecutionGroup.execute - * @see ViewerBaseOperation.getChunkOrder - * @see OrderOfChunks - * - * @section interest Area of interest - * An ExecutionGroup can have dependancies to other ExecutionGroup's. Data passing from one ExecutionGroup to another - * one are stored in 'chunks'. - * If not all input chunks are available the chunk execution will not be scheduled. - * <pre> - * +-------------------------------------+ +--------------------------------------+ - * | ExecutionGroup A | | ExecutionGroup B | - * | +----------------+ +-------------+ | | +------------+ +-----------------+ | - * | | NodeOperation a| | WriteBuffer | | | | ReadBuffer | | ViewerOperation | | - * | | *==* Operation | | | | Operation *===* | | - * | | | | | | | | | | | | - * | +----------------+ +-------------+ | | +------------+ +-----------------+ | - * | | | | | | - * +--------------------------------|----+ +---|----------------------------------+ - * | | - * | | - * +---------------------------+ - * | MemoryProxy | - * | +----------+ +---------+ | - * | | Chunk a | | Chunk b | | - * | | | | | | - * | +----------+ +---------+ | - * | | - * +---------------------------+ - * </pre> - * - * In the above example ExecutionGroup B has an outputoperation (ViewerOperation) and is being executed. - * The first chunk is evaluated [@ref ExecutionGroup.scheduleChunkWhenPossible], - * but not all input chunks are available. The relevant ExecutionGroup (that can calculate the missing chunks; - * ExecutionGroup A) is asked to calculate the area ExecutionGroup B is missing. - * [@ref ExecutionGroup.scheduleAreaWhenPossible] - * ExecutionGroup B checks what chunks the area spans, and tries to schedule these chunks. - * If all input data is available these chunks are scheduled [@ref ExecutionGroup.scheduleChunk] - * - * <pre> - * - * +-------------------------+ +----------------+ +----------------+ - * | ExecutionSystem.execute | | ExecutionGroup | | ExecutionGroup | - * +-------------------------+ | (B) | | (A) | - * O +----------------+ +----------------+ - * O | | - * O ExecutionGroup.execute | | - * O------------------------------->O | - * . O | - * . O-------\ | - * . . | ExecutionGroup.scheduleChunkWhenPossible - * . . O----/ (*) | - * . . O | - * . . O | - * . . O ExecutionGroup.scheduleAreaWhenPossible| - * . . O---------------------------------------->O - * . . . O----------\ ExecutionGroup.scheduleChunkWhenPossible - * . . . . | (*) - * . . . . O-------/ - * . . . . O - * . . . . O - * . . . . O-------\ ExecutionGroup.scheduleChunk - * . . . . . | - * . . . . . O----/ - * . . . . O<=O - * . . . O<=O - * . . . O - * . . O<========================================O - * . . O | - * . O<=O | - * . O | - * . O | - * </pre> - * - * This happens until all chunks of (ExecutionGroup B) are finished executing or the user break's the process. - * - * NodeOperation like the ScaleOperation can influence the area of interest by reimplementing the - * [@ref NodeOperation.determineAreaOfInterest] method - * - * <pre> - * - * +--------------------------+ +---------------------------------+ - * | ExecutionGroup A | | ExecutionGroup B | - * | | | | - * +--------------------------+ +---------------------------------+ - * Needed chunks from ExecutionGroup A | Chunk of ExecutionGroup B (to be evaluated) - * +-------+ +-------+ | +--------+ - * |Chunk 1| |Chunk 2| +----------------+ |Chunk 1 | - * | | | | | ScaleOperation | | | - * +-------+ +-------+ +----------------+ +--------+ - * - * +-------+ +-------+ - * |Chunk 3| |Chunk 4| - * | | | | - * +-------+ +-------+ - * - * </pre> - * - * @see ExecutionGroup.execute Execute a complete ExecutionGroup. Halts until finished or breaked by user - * @see ExecutionGroup.scheduleChunkWhenPossible Tries to schedule a single chunk, - * checks if all input data is available. Can trigger dependant chunks to be calculated - * @see ExecutionGroup.scheduleAreaWhenPossible Tries to schedule an area. This can be multiple chunks - * (is called from [@ref ExecutionGroup.scheduleChunkWhenPossible]) - * @see ExecutionGroup.scheduleChunk Schedule a chunk on the WorkScheduler - * @see NodeOperation.determineDependingAreaOfInterest Influence the area of interest of a chunk. - * @see WriteBufferOperation NodeOperation to write to a MemoryProxy/MemoryBuffer - * @see ReadBufferOperation NodeOperation to read from a MemoryProxy/MemoryBuffer - * @see MemoryProxy proxy for information about memory image (a image consist out of multiple chunks) - * @see MemoryBuffer Allocated memory for a single chunk - * - * @section workscheduler WorkScheduler - * the WorkScheduler is implemented as a static class. the responsibility of the WorkScheduler is to balance - * WorkPackages to the available and free devices. - * the workscheduler can work in 2 states. For witching these between the state you need to recompile blender - * - * @subsection multithread Multi threaded - * Default the workscheduler will place all work as WorkPackage in a queue. - * For every CPUcore a working thread is created. These working threads will ask the WorkScheduler if there is work - * for a specific Device. - * the workscheduler will find work for the device and the device will be asked to execute the WorkPackage + * @defgroup Model The data model of the compositor + * @defgroup Memory The memory management stuff + * @defgroup Execution The execution logic + * @defgroup Conversion Conversion logic + * @defgroup Node All nodes of the compositor + * @defgroup Operation All operations of the compositor + * + * @mainpage Introduction of the Blender Compositor + * + * @section bcomp Blender compositor + * This project redesigns the interals of Blender's compositor. The project has been executed in 2011 by At Mind. + * At Mind is a technology company located in Amsterdam, The Netherlands. + * The project has been crowdfunded. This code has been released under GPL2 to be used in Blender. + * + * @section goals The goals of the project + * the new compositor has 2 goals. + * - Make a faster compositor (speed of calculation) + * - Make the compositor work faster for you (workflow) + * + * @section speed Faster compositor + * The speedup has been done by making better use of the hardware Blenders is working on. The previous compositor only + * used a single threaded model to calculate a node. The only exception to this is the Defocus node. + * Only when it is possible to calculate two full nodes in parallel a second thread was used. + * Current workstations have 8-16 threads available, and most of the time these are idle. + * + * In the new compositor we want to use as much of threads as possible. Even new OpenCL capable GPU-hardware can be + * used for calculation. + * + * @section workflow Work faster + * The previous compositor only showed the final image. The compositor could wait a long time before seeing the result + * of his work. The new compositor will work in a way that it will focus on getting information back to the user. + * It will prioritise its work to get earlier user feedback. + * + * @page memory Memory model + * The main issue is the type of memory model to use. Blender is used by consumers and professionals. + * Ranging from low-end machines to very high-end machines. + * The system should work on high-end machines and on low-end machines. + * + * + * @page executing Executing + * @section prepare Prepare execution + * + * during the preparation of the execution All ReadBufferOperation will receive an offset. + * This offset is used during execution as an optimization trick + * Next all operations will be initialized for execution @see NodeOperation.initExecution + * Next all ExecutionGroup's will be initialized for execution @see ExecutionGroup.initExecution + * this all is controlled from @see ExecutionSystem.execute + * + * @section priority Render priority + * Render priority is an priority of an output node. A user has a different need of Render priorities of output nodes + * than during editing. + * for example. the Active ViewerNode has top priority during editing, but during rendering a CompositeNode has. + * All NodeOperation has a setting for their renderpriority, but only for output NodeOperation these have effect. + * In ExecutionSystem.execute all priorities are checked. For every priority the ExecutionGroup's are check if the + * priority do match. + * When match the ExecutionGroup will be executed (this happens in serial) + * + * @see ExecutionSystem.execute control of the Render priority + * @see NodeOperation.getRenderPriority receive the render priority + * @see ExecutionGroup.execute the main loop to execute a whole ExecutionGroup + * + * @section order Chunk order + * + * When a ExecutionGroup is executed, first the order of chunks are determined. + * The settings are stored in the ViewerNode inside the ExecutionGroup. ExecutionGroups that have no viewernode, + * will use a default one. + * There are several possible chunk orders + * - [@ref OrderOfChunks.COM_TO_CENTER_OUT]: Start calculating from a configurable point and order by nearest chunk + * - [@ref OrderOfChunks.COM_TO_RANDOM]: Randomize all chunks. + * - [@ref OrderOfChunks.COM_TO_TOP_DOWN]: Start calculation from the bottom to the top of the image + * - [@ref OrderOfChunks.COM_TO_RULE_OF_THIRDS]: Experimental order based on 9 hotspots in the image + * + * When the chunkorder is determined, the first few chunks will be checked if they can be scheduled. + * Chunks can have three states: + * - [@ref ChunkExecutionState.COM_ES_NOT_SCHEDULED]: Chunk is not yet scheduled, or dependacies are not met + * - [@ref ChunkExecutionState.COM_ES_SCHEDULED]: All dependacies are met, chunk is scheduled, but not finished + * - [@ref ChunkExecutionState.COM_ES_EXECUTED]: Chunk is finished + * + * @see ExecutionGroup.execute + * @see ViewerBaseOperation.getChunkOrder + * @see OrderOfChunks + * + * @section interest Area of interest + * An ExecutionGroup can have dependancies to other ExecutionGroup's. Data passing from one ExecutionGroup to another + * one are stored in 'chunks'. + * If not all input chunks are available the chunk execution will not be scheduled. + * <pre> + * +-------------------------------------+ +--------------------------------------+ + * | ExecutionGroup A | | ExecutionGroup B | + * | +----------------+ +-------------+ | | +------------+ +-----------------+ | + * | | NodeOperation a| | WriteBuffer | | | | ReadBuffer | | ViewerOperation | | + * | | *==* Operation | | | | Operation *===* | | + * | | | | | | | | | | | | + * | +----------------+ +-------------+ | | +------------+ +-----------------+ | + * | | | | | | + * +--------------------------------|----+ +---|----------------------------------+ + * | | + * | | + * +---------------------------+ + * | MemoryProxy | + * | +----------+ +---------+ | + * | | Chunk a | | Chunk b | | + * | | | | | | + * | +----------+ +---------+ | + * | | + * +---------------------------+ + * </pre> + * + * In the above example ExecutionGroup B has an outputoperation (ViewerOperation) and is being executed. + * The first chunk is evaluated [@ref ExecutionGroup.scheduleChunkWhenPossible], + * but not all input chunks are available. The relevant ExecutionGroup (that can calculate the missing chunks; + * ExecutionGroup A) is asked to calculate the area ExecutionGroup B is missing. + * [@ref ExecutionGroup.scheduleAreaWhenPossible] + * ExecutionGroup B checks what chunks the area spans, and tries to schedule these chunks. + * If all input data is available these chunks are scheduled [@ref ExecutionGroup.scheduleChunk] + * + * <pre> + * + * +-------------------------+ +----------------+ +----------------+ + * | ExecutionSystem.execute | | ExecutionGroup | | ExecutionGroup | + * +-------------------------+ | (B) | | (A) | + * O +----------------+ +----------------+ + * O | | + * O ExecutionGroup.execute | | + * O------------------------------->O | + * . O | + * . O-------\ | + * . . | ExecutionGroup.scheduleChunkWhenPossible + * . . O----/ (*) | + * . . O | + * . . O | + * . . O ExecutionGroup.scheduleAreaWhenPossible| + * . . O---------------------------------------->O + * . . . O----------\ ExecutionGroup.scheduleChunkWhenPossible + * . . . . | (*) + * . . . . O-------/ + * . . . . O + * . . . . O + * . . . . O-------\ ExecutionGroup.scheduleChunk + * . . . . . | + * . . . . . O----/ + * . . . . O<=O + * . . . O<=O + * . . . O + * . . O<========================================O + * . . O | + * . O<=O | + * . O | + * . O | + * </pre> + * + * This happens until all chunks of (ExecutionGroup B) are finished executing or the user break's the process. + * + * NodeOperation like the ScaleOperation can influence the area of interest by reimplementing the + * [@ref NodeOperation.determineAreaOfInterest] method + * + * <pre> + * + * +--------------------------+ +---------------------------------+ + * | ExecutionGroup A | | ExecutionGroup B | + * | | | | + * +--------------------------+ +---------------------------------+ + * Needed chunks from ExecutionGroup A | Chunk of ExecutionGroup B (to be evaluated) + * +-------+ +-------+ | +--------+ + * |Chunk 1| |Chunk 2| +----------------+ |Chunk 1 | + * | | | | | ScaleOperation | | | + * +-------+ +-------+ +----------------+ +--------+ + * + * +-------+ +-------+ + * |Chunk 3| |Chunk 4| + * | | | | + * +-------+ +-------+ + * + * </pre> + * + * @see ExecutionGroup.execute Execute a complete ExecutionGroup. Halts until finished or breaked by user + * @see ExecutionGroup.scheduleChunkWhenPossible Tries to schedule a single chunk, + * checks if all input data is available. Can trigger dependant chunks to be calculated + * @see ExecutionGroup.scheduleAreaWhenPossible Tries to schedule an area. This can be multiple chunks + * (is called from [@ref ExecutionGroup.scheduleChunkWhenPossible]) + * @see ExecutionGroup.scheduleChunk Schedule a chunk on the WorkScheduler + * @see NodeOperation.determineDependingAreaOfInterest Influence the area of interest of a chunk. + * @see WriteBufferOperation NodeOperation to write to a MemoryProxy/MemoryBuffer + * @see ReadBufferOperation NodeOperation to read from a MemoryProxy/MemoryBuffer + * @see MemoryProxy proxy for information about memory image (a image consist out of multiple chunks) + * @see MemoryBuffer Allocated memory for a single chunk + * + * @section workscheduler WorkScheduler + * the WorkScheduler is implemented as a static class. the responsibility of the WorkScheduler is to balance + * WorkPackages to the available and free devices. + * the workscheduler can work in 2 states. For witching these between the state you need to recompile blender + * + * @subsection multithread Multi threaded + * Default the workscheduler will place all work as WorkPackage in a queue. + * For every CPUcore a working thread is created. These working threads will ask the WorkScheduler if there is work + * for a specific Device. + * the workscheduler will find work for the device and the device will be asked to execute the WorkPackage - * @subsection singlethread Single threaded - * For debugging reasons the multi-threading can be disabled. This is done by changing the COM_CURRENT_THREADING_MODEL - * to COM_TM_NOTHREAD. When compiling the workscheduler - * will be changes to support no threading and run everything on the CPU. - * - * @section devices Devices - * A Device within the compositor context is a Hardware component that can used to calculate chunks. - * This chunk is encapseled in a WorkPackage. - * the WorkScheduler controls the devices and selects the device where a WorkPackage will be calculated. - * - * @subsection WS_Devices Workscheduler - * The WorkScheduler controls all Devices. When initializing the compositor the WorkScheduler selects - * all devices that will be used during compositor. - * There are two types of Devices, CPUDevice and OpenCLDevice. - * When an ExecutionGroup schedules a Chunk the schedule method of the WorkScheduler - * The Workscheduler determines if the chunk can be run on an OpenCLDevice - * (and that there are available OpenCLDevice). If this is the case the chunk will be added to the worklist for - * OpenCLDevice's - * otherwise the chunk will be added to the worklist of CPUDevices. - * - * A thread will read the work-list and sends a workpackage to its device. - * - * @see WorkScheduler.schedule method that is called to schedule a chunk - * @see Device.execute method called to execute a chunk - * - * @subsection CPUDevice CPUDevice - * When a CPUDevice gets a WorkPackage the Device will get the inputbuffer that is needed to calculate the chunk. - * Allocation is already done by the ExecutionGroup. - * The outputbuffer of the chunk is being created. - * The OutputOperation of the ExecutionGroup is called to execute the area of the outputbuffer. - * - * @see ExecutionGroup - * @see NodeOperation.executeRegion executes a single chunk of a NodeOperation - * @see CPUDevice.execute - * - * @subsection GPUDevice OpenCLDevice - * - * To be completed! - * @see NodeOperation.executeOpenCLRegion - * @see OpenCLDevice.execute - * - * @section executePixel executing a pixel - * Finally the last step, the node functionality :) + * @subsection singlethread Single threaded + * For debugging reasons the multi-threading can be disabled. This is done by changing the COM_CURRENT_THREADING_MODEL + * to COM_TM_NOTHREAD. When compiling the workscheduler + * will be changes to support no threading and run everything on the CPU. + * + * @section devices Devices + * A Device within the compositor context is a Hardware component that can used to calculate chunks. + * This chunk is encapseled in a WorkPackage. + * the WorkScheduler controls the devices and selects the device where a WorkPackage will be calculated. + * + * @subsection WS_Devices Workscheduler + * The WorkScheduler controls all Devices. When initializing the compositor the WorkScheduler selects + * all devices that will be used during compositor. + * There are two types of Devices, CPUDevice and OpenCLDevice. + * When an ExecutionGroup schedules a Chunk the schedule method of the WorkScheduler + * The Workscheduler determines if the chunk can be run on an OpenCLDevice + * (and that there are available OpenCLDevice). If this is the case the chunk will be added to the worklist for + * OpenCLDevice's + * otherwise the chunk will be added to the worklist of CPUDevices. + * + * A thread will read the work-list and sends a workpackage to its device. + * + * @see WorkScheduler.schedule method that is called to schedule a chunk + * @see Device.execute method called to execute a chunk + * + * @subsection CPUDevice CPUDevice + * When a CPUDevice gets a WorkPackage the Device will get the inputbuffer that is needed to calculate the chunk. + * Allocation is already done by the ExecutionGroup. + * The outputbuffer of the chunk is being created. + * The OutputOperation of the ExecutionGroup is called to execute the area of the outputbuffer. + * + * @see ExecutionGroup + * @see NodeOperation.executeRegion executes a single chunk of a NodeOperation + * @see CPUDevice.execute + * + * @subsection GPUDevice OpenCLDevice + * + * To be completed! + * @see NodeOperation.executeOpenCLRegion + * @see OpenCLDevice.execute + * + * @section executePixel executing a pixel + * Finally the last step, the node functionality :) - * @page newnode Creating new nodes - */ + * @page newnode Creating new nodes + */ /** * @brief The main method that is used to execute the compositor tree. diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h index 1aa023bea3a..d072b4ca727 100644 --- a/source/blender/compositor/COM_defines.h +++ b/source/blender/compositor/COM_defines.h @@ -24,9 +24,9 @@ #define _COM_defines_h_ /** - * @brief possible data types for SocketConnection - * @ingroup Model - */ + * @brief possible data types for SocketConnection + * @ingroup Model + */ typedef enum DataType { /** @brief Unknown data type (or not yet known) */ COM_DT_UNKNOWN = 0, @@ -39,13 +39,13 @@ typedef enum DataType { } DataType; /** - * @brief Possible quality settings - * @see CompositorContext.quality - * @ingroup Execution - */ + * @brief Possible quality settings + * @see CompositorContext.quality + * @ingroup Execution + */ typedef enum CompositorQuality { /** @brief High quality setting */ - COM_QUALITY_HIGH = 0 , + COM_QUALITY_HIGH = 0, /** @brief Medium quality setting */ COM_QUALITY_MEDIUM = 1, /** @brief Low quality setting */ @@ -53,12 +53,12 @@ typedef enum CompositorQuality { } CompositorQuality; /** - * @brief Possible priority settings - * @ingroup Execution - */ + * @brief Possible priority settings + * @ingroup Execution + */ typedef enum CompositorPriority { /** @brief High quality setting */ - COM_PRIORITY_HIGH = 2 , + COM_PRIORITY_HIGH = 2, /** @brief Medium quality setting */ COM_PRIORITY_MEDIUM = 1, /** @brief Low quality setting */ @@ -74,24 +74,24 @@ 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 /** - * COM_CURRENT_THREADING_MODEL can be one of the above, COM_TM_QUEUE is currently default. - */ + * COM_CURRENT_THREADING_MODEL can be one of the above, COM_TM_QUEUE is currently default. + */ #define COM_CURRENT_THREADING_MODEL COM_TM_QUEUE // chunk order /** - * @brief The order of chunks to be scheduled - * @ingroup Execution - */ + * @brief The order of chunks to be scheduled + * @ingroup Execution + */ typedef enum OrderOfChunks { /** @brief order from a distance to centerX/centerY */ COM_TO_CENTER_OUT = 0, diff --git a/source/blender/compositor/intern/COM_CPUDevice.h b/source/blender/compositor/intern/COM_CPUDevice.h index f577e2b8926..3dc8fff66a3 100644 --- a/source/blender/compositor/intern/COM_CPUDevice.h +++ b/source/blender/compositor/intern/COM_CPUDevice.h @@ -26,15 +26,15 @@ #include "COM_Device.h" /** - * @brief class representing a CPU device. - * @note for every hardware thread in the system a CPUDevice instance will exist in the workscheduler - */ -class CPUDevice: public Device { + * @brief class representing a CPU device. + * @note for every hardware thread in the system a CPUDevice instance will exist in the workscheduler + */ +class CPUDevice : public Device { public: /** - * @brief execute a WorkPackage - * @param work the WorkPackage to execute - */ + * @brief execute a WorkPackage + * @param work the WorkPackage to execute + */ void execute(WorkPackage *work); }; diff --git a/source/blender/compositor/intern/COM_ChannelInfo.h b/source/blender/compositor/intern/COM_ChannelInfo.h index 40933bce6f5..399fdc62fa2 100644 --- a/source/blender/compositor/intern/COM_ChannelInfo.h +++ b/source/blender/compositor/intern/COM_ChannelInfo.h @@ -32,9 +32,9 @@ using namespace std; /** - * @brief List of possible channel types - * @ingroup Model - */ + * @brief List of possible channel types + * @ingroup Model + */ typedef enum ChannelType { COM_CT_ColorComponent /** @brief this channel is contains color information. Specific used is determined by channelnumber, and in the future color space */, COM_CT_Alpha /** @brief this channel is contains transparency value */, @@ -47,31 +47,31 @@ typedef enum ChannelType { } ChannelType; /** - * @brief ChannelInfo holds information about a channel. - * - * Channels are transported from node to node via a SocketConnection. - * ChannelInfo holds specific setting of these channels in order that the to-node of the connection - * Can handle specific logic per channel setting. - * - * @note currently this is not used, but a future place to implement color spacing and other things. - * @ingroup Model - */ + * @brief ChannelInfo holds information about a channel. + * + * Channels are transported from node to node via a SocketConnection. + * ChannelInfo holds specific setting of these channels in order that the to-node of the connection + * Can handle specific logic per channel setting. + * + * @note currently this is not used, but a future place to implement color spacing and other things. + * @ingroup Model + */ class ChannelInfo { private: /** - * @brief the channel number, in the connection. [0-3] - */ + * @brief the channel number, in the connection. [0-3] + */ int number; /** - * @brief type of channel - */ + * @brief type of channel + */ ChannelType type; /** - * @brieg Is this value in this channel premultiplied with its alpha - * @note only valid if type = ColorComponent; - */ + * @brieg Is this value in this channel premultiplied with its alpha + * @note only valid if type = ColorComponent; + */ bool premultiplied; // /** @@ -82,39 +82,39 @@ private: public: /** - * @brief creates a new ChannelInfo and set default values - */ + * @brief creates a new ChannelInfo and set default values + */ ChannelInfo(); /** - * @brief set the index of this channel in the SocketConnection - */ + * @brief set the index of this channel in the SocketConnection + */ void setNumber(const int number) { this->number = number; } /** - * @brief get the index of this channel in the SocketConnection - */ - const int getNumber() const {return this->number; } + * @brief get the index of this channel in the SocketConnection + */ + const int getNumber() const { return this->number; } /** - * @brief set the type of channel - */ + * @brief set the type of channel + */ void setType(const ChannelType type) { this->type = type; } /** - * @brief get the type of channel - */ - const ChannelType getType() const {return this->type; } + * @brief get the type of channel + */ + const ChannelType getType() const { return this->type; } /** - * @brief set the premultiplicatioin of this channel - */ + * @brief set the premultiplicatioin of this channel + */ void setPremultiplied(const bool premultiplied) { this->premultiplied = premultiplied; } /** - * @brief is this channel premultiplied - */ - const bool isPremultiplied() const {return this->premultiplied;} + * @brief is this channel premultiplied + */ + const bool isPremultiplied() const { return this->premultiplied; } }; diff --git a/source/blender/compositor/intern/COM_ChunkOrder.h b/source/blender/compositor/intern/COM_ChunkOrder.h index 3dbb4ae8080..f096ebeebfe 100644 --- a/source/blender/compositor/intern/COM_ChunkOrder.h +++ b/source/blender/compositor/intern/COM_ChunkOrder.h @@ -35,11 +35,11 @@ public: void determineDistance(ChunkOrderHotspot **hotspots, unsigned int numberOfHotspots); friend bool operator<(const ChunkOrder& a, const ChunkOrder& b); - void setChunkNumber(unsigned int chunknumber) {this->number = chunknumber;} - void setX(int x) {this->x = x;} - void setY(int y) {this->y = y;} - unsigned int getChunkNumber() {return this->number;} - double getDistance() {return this->distance;} + void setChunkNumber(unsigned int chunknumber) { this->number = chunknumber; } + void setX(int x) { this->x = x; } + void setY(int y) { this->y = y; } + unsigned int getChunkNumber() { return this->number; } + double getDistance() { return this->distance; } }; #endif diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h index 8425030aec2..93872f4839f 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.h +++ b/source/blender/compositor/intern/COM_CompositorContext.h @@ -32,36 +32,36 @@ #include "COM_defines.h" /** - * @brief Overall context of the compositor - */ + * @brief Overall context of the compositor + */ 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. - * @see ExecutionSystem - */ + * @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 rendering; /** - * @brief The quality of the composite. - * This field is initialized in ExecutionSystem and must only be read from that point on. - * @see ExecutionSystem - */ + * @brief The quality of the composite. + * This field is initialized in ExecutionSystem and must only be read from that point on. + * @see ExecutionSystem + */ CompositorQuality quality; /** - * @brief Reference to the scene that is being composited. - * This field is initialized in ExecutionSystem and must only be read from that point on. - * @see ExecutionSystem - */ + * @brief Reference to the scene that is being composited. + * This field is initialized in ExecutionSystem and must only be read from that point on. + * @see ExecutionSystem + */ Scene *scene; /** - * @brief reference to the bNodeTree - * This field is initialized in ExecutionSystem and must only be read from that point on. - * @see ExecutionSystem - */ + * @brief reference to the bNodeTree + * This field is initialized in ExecutionSystem and must only be read from that point on. + * @see ExecutionSystem + */ bNodeTree *bnodetree; /** @@ -70,90 +70,90 @@ private: bNode *activegNode; /** - * @brief does this system have active opencl devices? - */ + * @brief does this system have active opencl devices? + */ bool hasActiveOpenCLDevices; public: /** - * @brief constructor initializes the context with default values. - */ + * @brief constructor initializes the context with default values. + */ CompositorContext(); /** - * @brief set the rendering field of the context - */ + * @brief set the rendering field of the context + */ void setRendering(bool rendering) { this->rendering = rendering; } /** - * @brief get the rendering field of the context - */ - bool isRendering() const {return this->rendering;} + * @brief get the rendering field of the context + */ + bool isRendering() const { return this->rendering; } /** - * @brief set the scene of the context - */ - void setScene(Scene *scene) {this->scene = scene;} + * @brief set the scene of the context + */ + void setScene(Scene *scene) { this->scene = scene; } /** - * @brief set the bnodetree of the context - */ - void setbNodeTree(bNodeTree *bnodetree) {this->bnodetree = bnodetree;} + * @brief set the bnodetree of the context + */ + void setbNodeTree(bNodeTree *bnodetree) { this->bnodetree = bnodetree; } /** - * @brief get the bnodetree of the context - */ - const bNodeTree * getbNodeTree() const {return this->bnodetree;} + * @brief get the bnodetree of the context + */ + const bNodeTree *getbNodeTree() const { return this->bnodetree; } /** - * @brief set the active groupnode of the context - */ - void setActivegNode(bNode *gnode) {this->activegNode = gnode;} + * @brief set the active groupnode of the context + */ + void setActivegNode(bNode *gnode) { this->activegNode = gnode; } /** - * @brief get the active groupnode of the context - */ - const bNode * getActivegNode() const {return this->activegNode;} + * @brief get the active groupnode of the context + */ + const bNode *getActivegNode() const { return this->activegNode; } /** - * @brief get the scene of the context - */ - const Scene *getScene() const {return this->scene;} + * @brief get the scene of the context + */ + const Scene *getScene() const { return this->scene; } /** - * @brief set the quality - */ + * @brief set the quality + */ void setQuality(CompositorQuality quality) { this->quality = quality; } /** - * @brief get the quality - */ + * @brief get the quality + */ const CompositorQuality getQuality() const { return quality; } /** - * @brief get the current framenumber of the scene in this context - */ + * @brief get the current framenumber of the scene in this context + */ const int getFramenumber() const; /** - * @brief has this system active openclDevices? - */ + * @brief has this system active openclDevices? + */ const bool getHasActiveOpenCLDevices() const { return this->hasActiveOpenCLDevices; } /** - * @brief set has this system active openclDevices? - */ + * @brief set has this system active openclDevices? + */ void setHasActiveOpenCLDevices(bool hasAvtiveOpenCLDevices) { this->hasActiveOpenCLDevices = hasAvtiveOpenCLDevices; } - int getChunksize() {return this->getbNodeTree()->chunksize;} + int getChunksize() { return this->getbNodeTree()->chunksize; } const int isColorManaged() const; }; diff --git a/source/blender/compositor/intern/COM_Converter.h b/source/blender/compositor/intern/COM_Converter.h index fa12be4e79a..d01556cc79c 100644 --- a/source/blender/compositor/intern/COM_Converter.h +++ b/source/blender/compositor/intern/COM_Converter.h @@ -32,39 +32,39 @@ class Converter { public: /** - * @brief Convert/wraps a bNode in its Node instance. - * - * For all nodetypes a wrapper class is created. - * Muted nodes are wrapped with MuteNode. - * - * @note When adding a new node to blender, this method needs to be changed to return the correct Node instance. - * - * @see Node - * @see MuteNode - */ + * @brief Convert/wraps a bNode in its Node instance. + * + * For all nodetypes a wrapper class is created. + * Muted nodes are wrapped with MuteNode. + * + * @note When adding a new node to blender, this method needs to be changed to return the correct Node instance. + * + * @see Node + * @see MuteNode + */ static Node *convert(bNode *bNode); /** - * @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. - * - * @param connection the SocketConnection what needs conversion - * @param system the ExecutionSystem to add the conversion to. - * @see SocketConnection - a link between two sockets - */ + * @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. + * + * @param connection the SocketConnection what needs conversion + * @param system the ExecutionSystem to add the conversion to. + * @see SocketConnection - a link between two sockets + */ static void convertDataType(SocketConnection *connection, ExecutionSystem *system); /** - * @brief This method will add a resolution rule based on the settings of the InputSocket. - * - * @note Conversion logic is implemented in this method - * @see InputSocketResizeMode for the possible conversions. - - * @param connection the SocketConnection what needs conversion - * @param system the ExecutionSystem to add the conversion to. - * @see SocketConnection - a link between two sockets - */ + * @brief This method will add a resolution rule based on the settings of the InputSocket. + * + * @note Conversion logic is implemented in this method + * @see InputSocketResizeMode for the possible conversions. + + * @param connection the SocketConnection what needs conversion + * @param system the ExecutionSystem to add the conversion to. + * @see SocketConnection - a link between two sockets + */ static void convertResolution(SocketConnection *connection, ExecutionSystem *system); }; #endif diff --git a/source/blender/compositor/intern/COM_Device.h b/source/blender/compositor/intern/COM_Device.h index 74a9400f8f3..08fdb5bb578 100644 --- a/source/blender/compositor/intern/COM_Device.h +++ b/source/blender/compositor/intern/COM_Device.h @@ -30,26 +30,26 @@ #include "COM_MemoryBuffer.h" /** - * @brief Abstract class for device implementations to be used by the Compositor. - * devices are queried, initialized and used by the WorkScheduler. - * work are packaged as a WorkPackage instance. - */ + * @brief Abstract class for device implementations to be used by the Compositor. + * devices are queried, initialized and used by the WorkScheduler. + * work are packaged as a WorkPackage instance. + */ class Device { public: /** - * @brief initialize the device - */ - virtual bool initialize() {return true;} + * @brief initialize the device + */ + virtual bool initialize() { return true; } /** - * @brief deinitialize the device - */ + * @brief deinitialize the device + */ virtual void deinitialize() {} /** - * @brief execute a WorkPackage - * @param work the WorkPackage to execute - */ + * @brief execute a WorkPackage + * @param work the WorkPackage to execute + */ virtual void execute(WorkPackage *work) = 0; }; diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index 1698890cc34..541b3e4866d 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -33,21 +33,21 @@ /** - * @brief the execution state of a chunk in an ExecutionGroup - * @ingroup Execution - */ + * @brief the execution state of a chunk in an ExecutionGroup + * @ingroup Execution + */ typedef enum ChunkExecutionState { /** - * @brief chunk is not yet scheduled - */ + * @brief chunk is not yet scheduled + */ COM_ES_NOT_SCHEDULED = 0, /** - * @brief chunk is scheduled, but not yet executed - */ + * @brief chunk is scheduled, but not yet executed + */ COM_ES_SCHEDULED = 1, /** - * @brief chunk is executed. - */ + * @brief chunk is executed. + */ COM_ES_EXECUTED = 2 } ChunkExecutionState; @@ -56,64 +56,64 @@ class ReadBufferOperation; class Device; /** - * @brief Class ExecutionGroup is a group of NodeOperations that are executed as one. - * This grouping is used to combine Operations that can be executed as one whole when multi-processing. - * @ingroup Execution - */ + * @brief Class ExecutionGroup is a group of NodeOperations that are executed as one. + * This grouping is used to combine Operations that can be executed as one whole when multi-processing. + * @ingroup Execution + */ class ExecutionGroup { private: // fields /** - * @brief list of operations in this ExecutionGroup - */ - vector<NodeOperation*> operations; + * @brief list of operations in this ExecutionGroup + */ + vector<NodeOperation *> operations; /** - * @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) - */ + * @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) + */ int isOutput; /** - * @brief Width of the output - */ + * @brief Width of the output + */ unsigned int width; /** - * @brief Height of the output - */ + * @brief Height of the output + */ unsigned int height; /** - * @brief size of a single chunk, being Width or of height - * a chunk is always a square, except at the edges of the MemoryBuffer - */ + * @brief size of a single chunk, being Width or of height + * a chunk is always a square, except at the edges of the MemoryBuffer + */ unsigned int chunkSize; /** - * @brief number of chunks in the x-axis - */ + * @brief number of chunks in the x-axis + */ unsigned int numberOfXChunks; /** - * @brief number of chunks in the y-axis - */ + * @brief number of chunks in the y-axis + */ unsigned int numberOfYChunks; /** - * @brief total number of chunks - */ + * @brief total number of chunks + */ unsigned int numberOfChunks; /** - * @brief contains this ExecutionGroup a complex NodeOperation. - */ + * @brief contains this ExecutionGroup a complex NodeOperation. + */ bool complex; /** - * @brief can this ExecutionGroup be scheduled on an OpenCLDevice - */ + * @brief can this ExecutionGroup be scheduled on an OpenCLDevice + */ bool openCL; /** @@ -122,113 +122,113 @@ private: bool singleThreaded; /** - * @brief what is the maximum number field of all ReadBufferOperation in this ExecutionGroup. - * @note this is used to construct the MemoryBuffers that will be passed during execution. - */ + * @brief what is the maximum number field of all ReadBufferOperation in this ExecutionGroup. + * @note this is used to construct the MemoryBuffers that will be passed during execution. + */ unsigned int cachedMaxReadBufferOffset; /** - * @brief a cached vector of all read operations in the execution group. - */ - vector<NodeOperation*> cachedReadOperations; + * @brief a cached vector of all read operations in the execution group. + */ + vector<NodeOperation *> 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 - */ - const bNodeTree * bTree; + * @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 *bTree; /** - * @brief total number of chunks that have been calculated for this ExecutionGroup - */ + * @brief total number of chunks that have been calculated for this ExecutionGroup + */ unsigned int chunksFinished; /** - * @brief the chunkExecutionStates holds per chunk the execution state. this state can be - * - COM_ES_NOT_SCHEDULED: not scheduled - * - COM_ES_SCHEDULED: scheduled - * - COM_ES_EXECUTED: executed - */ + * @brief the chunkExecutionStates holds per chunk the execution state. this state can be + * - COM_ES_NOT_SCHEDULED: not scheduled + * - COM_ES_SCHEDULED: scheduled + * - COM_ES_EXECUTED: executed + */ ChunkExecutionState *chunkExecutionStates; /** - * @brief indicator when this ExecutionGroup has valid NodeOperations in its vector for Execution - * @note When building the ExecutionGroup NodeOperations 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. + * @brief indicator when this ExecutionGroup has valid NodeOperations in its vector for Execution + * @note When building the ExecutionGroup NodeOperations 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. * @see complex - * @see openCL - */ + * @see openCL + */ bool initialized; // methods /** - * @brief check whether parameter operation can be added to the execution group - * @param operation the operation to be added - */ + * @brief check whether parameter operation can be added to the execution group + * @param operation the operation to be added + */ bool canContainOperation(NodeOperation *operation); /** - * @brief calculate the actual chunk size of this execution group. - * @note A chunk size is an unsigned int that is both the height and width of a chunk. - * @note The chunk size will not be stored in the chunkSize field. This needs to be done - * @note by the calling method. - */ + * @brief calculate the actual chunk size of this execution group. + * @note A chunk size is an unsigned int that is both the height and width of a chunk. + * @note The chunk size will not be stored in the chunkSize field. This needs to be done + * @note by the calling method. + */ unsigned int determineChunkSize(); /** - * @brief Determine the rect (minx, maxx, miny, maxy) of a chunk at a position. - * @note Only gives usefull results ater the determination of the chunksize - * @see determineChunkSize() - */ + * @brief Determine the rect (minx, maxx, miny, maxy) of a chunk at a position. + * @note Only gives usefull results ater the determination of the chunksize + * @see determineChunkSize() + */ void determineChunkRect(rcti *rect, const unsigned int xChunk, const unsigned int yChunk) const; /** - * @brief determine the number of chunks, based on the chunkSize, width and height. - * @note The result are stored in the fields numberOfChunks, numberOfXChunks, numberOfYChunks - */ + * @brief determine the number of chunks, based on the chunkSize, width and height. + * @note The result are stored in the fields numberOfChunks, numberOfXChunks, numberOfYChunks + */ void determineNumberOfChunks(); /** - * @brief try to schedule a specific chunk. - * @note scheduling succeeds when all input requirements are met and the chunks hasen't been scheduled yet. - * @param graph - * @param xChunk - * @param yChunk - * @return [true:false] - * true: package(s) are scheduled - * false: scheduling is deferred (depending workpackages are scheduled) - */ - bool scheduleChunkWhenPossible(ExecutionSystem * graph, int xChunk, int yChunk); - - /** - * @brief try to schedule a specific area. - * @note Check if a certain area is available, when not available this are will be checked. - * @note This method is called from other ExecutionGroup's. - * @param graph - * @param rect - * @return [true:false] - * true: package(s) are scheduled - * false: scheduling is deferred (depending workpackages are scheduled) - */ - bool scheduleAreaWhenPossible(ExecutionSystem * graph, rcti * rect); - - /** - * @brief add a chunk to the WorkScheduler. - * @param chunknumber - */ + * @brief try to schedule a specific chunk. + * @note scheduling succeeds when all input requirements are met and the chunks hasen't been scheduled yet. + * @param graph + * @param xChunk + * @param yChunk + * @return [true:false] + * true: package(s) are scheduled + * false: scheduling is deferred (depending workpackages are scheduled) + */ + bool scheduleChunkWhenPossible(ExecutionSystem *graph, int xChunk, int yChunk); + + /** + * @brief try to schedule a specific area. + * @note Check if a certain area is available, when not available this are will be checked. + * @note This method is called from other ExecutionGroup's. + * @param graph + * @param rect + * @return [true:false] + * true: package(s) are scheduled + * false: scheduling is deferred (depending workpackages are scheduled) + */ + bool scheduleAreaWhenPossible(ExecutionSystem *graph, rcti *rect); + + /** + * @brief add a chunk to the WorkScheduler. + * @param chunknumber + */ bool scheduleChunk(unsigned int chunkNumber); /** - * @brief determine the area of interest of a certain input area - * @note This method only evaluates a single ReadBufferOperation - * @param input the input area - * @param readOperation The ReadBufferOperation where the area needs to be evaluated - * @param output the area needed of the ReadBufferOperation. Result - */ - void determineDependingAreaOfInterest(rcti * input, ReadBufferOperation *readOperation, rcti *output); + * @brief determine the area of interest of a certain input area + * @note This method only evaluates a single ReadBufferOperation + * @param input the input area + * @param readOperation The ReadBufferOperation where the area needs to be evaluated + * @param output the area needed of the ReadBufferOperation. Result + */ + void determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); public: @@ -237,162 +237,162 @@ public: // methods /** - * @brief check to see if a NodeOperation is already inside this execution group - * @param operation the NodeOperation to check - * @return [true,false] - */ + * @brief check to see if a NodeOperation is already inside this execution group + * @param operation the NodeOperation to check + * @return [true,false] + */ bool containsOperation(NodeOperation *operation); /** - * @brief add an operation to this ExecutionGroup - * @note this method will add input of the operations recursivly - * @note this method can create multiple ExecutionGroup's - * @param system - * @param operation - */ + * @brief add an operation to this ExecutionGroup + * @note this method will add input of the operations recursivly + * @note this method can create multiple ExecutionGroup's + * @param system + * @param operation + */ void addOperation(ExecutionSystem *system, NodeOperation *operation); /** - * @brief is this ExecutionGroup an output ExecutionGroup - * @note An OutputExecution group are groups containing a - * @note ViewerOperation, CompositeOperation, PreviewOperation. - * @see NodeOperation.isOutputOperation - */ - const int isOutputExecutionGroup() const {return this->isOutput;} - + * @brief is this ExecutionGroup an output ExecutionGroup + * @note An OutputExecution group are groups containing a + * @note ViewerOperation, CompositeOperation, PreviewOperation. + * @see NodeOperation.isOutputOperation + */ + const int isOutputExecutionGroup() const { return this->isOutput; } + /** - * @brief set whether this ExecutionGroup is an output - * @param isOutput - */ - void setOutputExecutionGroup(int isOutput) {this->isOutput = isOutput;} - + * @brief set whether this ExecutionGroup is an output + * @param isOutput + */ + void setOutputExecutionGroup(int isOutput) { this->isOutput = isOutput; } + /** - * @brief determine the resolution of this ExecutionGroup - * @param resolution - */ + * @brief determine the resolution of this ExecutionGroup + * @param resolution + */ void determineResolution(unsigned int resolution[]); /** - * @brief set the resolution of this executiongroup - * @param resolution - */ - void setResolution(unsigned int resolution[]) {this->width = resolution[0];this->height = resolution[1];} + * @brief set the resolution of this executiongroup + * @param resolution + */ + void setResolution(unsigned int resolution[]) { this->width = resolution[0]; this->height = resolution[1]; } /** - * @brief get the width of this execution group - */ - const unsigned int getWidth() {return this->width;} + * @brief get the width of this execution group + */ + const unsigned int getWidth() { return this->width; } /** - * @brief get the height of this execution group - */ - const unsigned int getHeight() {return this->height;} + * @brief get the height of this execution group + */ + const unsigned int getHeight() { return this->height; } /** - * @brief does this ExecutionGroup contains a complex NodeOperation - */ + * @brief does this ExecutionGroup contains a complex NodeOperation + */ const bool isComplex() const; /** - * @brief get the output operation of this ExecutionGroup - * @return NodeOperation *output operation - */ - NodeOperation *getOutputNodeOperation() const; + * @brief get the output operation of this ExecutionGroup + * @return NodeOperation *output operation + */ + NodeOperation *getOutputNodeOperation() const; /** - * @brief compose multiple chunks into a single chunk - * @return Memorybuffer *consolidated chunk - */ + * @brief compose multiple chunks into a single chunk + * @return Memorybuffer *consolidated chunk + */ MemoryBuffer *constructConsolidatedMemoryBuffer(MemoryProxy *memoryProxy, rcti *output); /** - * @brief initExecution is called just before the execution of the whole graph will be done. - * @note The implementation will calculate the chunkSize of this execution group. - */ + * @brief initExecution is called just before the execution of the whole graph will be done. + * @note The implementation will calculate the chunkSize of this execution group. + */ void initExecution(); /** - * @brief get all inputbuffers needed to calculate an chunk - * @note all inputbuffers must be executed - * @param chunkNumber the chunk to be calculated - * @return MemoryBuffer** the inputbuffers - */ - MemoryBuffer** getInputBuffersCPU(); + * @brief get all inputbuffers needed to calculate an chunk + * @note all inputbuffers must be executed + * @param chunkNumber the chunk to be calculated + * @return MemoryBuffer** the inputbuffers + */ + MemoryBuffer **getInputBuffersCPU(); /** - * @brief get all inputbuffers needed to calculate an chunk - * @note all inputbuffers must be executed - * @param chunkNumber the chunk to be calculated - * @return MemoryBuffer** the inputbuffers - */ - MemoryBuffer** getInputBuffersOpenCL(int chunkNumber); + * @brief get all inputbuffers needed to calculate an chunk + * @note all inputbuffers must be executed + * @param chunkNumber the chunk to be calculated + * @return MemoryBuffer** the inputbuffers + */ + MemoryBuffer **getInputBuffersOpenCL(int chunkNumber); /** - * @brief allocate the outputbuffer of a chunk - * @param chunkNumber the number of the chunk in the ExecutionGroup - * @param rect the rect of that chunk - * @see determineChunkRect - */ + * @brief allocate the outputbuffer of a chunk + * @param chunkNumber the number of the chunk in the ExecutionGroup + * @param rect the rect of that chunk + * @see determineChunkRect + */ MemoryBuffer *allocateOutputBuffer(int chunkNumber, rcti *rect); /** - * @brief after a chunk is executed the needed resources can be freed or unlocked. - * @param chunknumber - * @param memorybuffers - */ - void finalizeChunkExecution(int chunkNumber, MemoryBuffer** memoryBuffers); + * @brief after a chunk is executed the needed resources can be freed or unlocked. + * @param chunknumber + * @param memorybuffers + */ + void finalizeChunkExecution(int chunkNumber, MemoryBuffer **memoryBuffers); /** - * @brief deinitExecution is called just after execution the whole graph. - * @note It will release all needed resources - */ + * @brief deinitExecution is called just after execution the whole graph. + * @note It will release all needed resources + */ void deinitExecution(); /** - * @brief schedule an ExecutionGroup - * @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. - * - ChunkOrdering - * - CenterX - * - CenterY - * - * After determining the order of the chunks the chunks will be scheduled - * - * @see ViewerOperation - * @param system - */ + * @brief schedule an ExecutionGroup + * @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. + * - ChunkOrdering + * - CenterX + * - CenterY + * + * After determining the order of the chunks the chunks will be scheduled + * + * @see ViewerOperation + * @param system + */ void execute(ExecutionSystem *system); /** - * @brief this method determines the MemoryProxy's where this execution group depends on. - * @note After this method determineDependingAreaOfInterest can be called to determine - * @note the area of the MemoryProxy.creator thas has to be executed. - * @param memoryProxies result - */ - void determineDependingMemoryProxies(vector<MemoryProxy*> *memoryProxies); + * @brief this method determines the MemoryProxy's where this execution group depends on. + * @note After this method determineDependingAreaOfInterest can be called to determine + * @note the area of the MemoryProxy.creator thas has to be executed. + * @param memoryProxies result + */ + void determineDependingMemoryProxies(vector<MemoryProxy *> *memoryProxies); /** - * @brief Determine the rect (minx, maxx, miny, maxy) of a chunk. - * @note Only gives usefull results ater the determination of the chunksize - * @see determineChunkSize() - */ + * @brief Determine the rect (minx, maxx, miny, maxy) of a chunk. + * @note Only gives usefull results ater the determination of the chunksize + * @see determineChunkSize() + */ void determineChunkRect(rcti *rect, const unsigned int chunkNumber) const; /** - * @brief can this ExecutionGroup be scheduled on an OpenCLDevice - * @see WorkScheduler.schedule - */ + * @brief can this ExecutionGroup be scheduled on an OpenCLDevice + * @see WorkScheduler.schedule + */ bool isOpenCL(); - void setChunksize(int chunksize) {this->chunkSize = chunksize;} + void setChunksize(int chunksize) { this->chunkSize = chunksize; } /** - * @brief get the Render priority of this ExecutionGroup - * @see ExecutionSystem.execute - */ + * @brief get the Render priority of this ExecutionGroup + * @see ExecutionSystem.execute + */ CompositorPriority getRenderPriotrity(); }; diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index 510e58ba1bb..70fd94ca57f 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -36,69 +36,69 @@ class ExecutionGroup; using namespace std; /** - * @page execution Execution model - * In order to get to an efficient model for execution, serveral 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. - * - * @see ExecutionSystem - * @see Converter.convert - * @see Node - * - * @section EM_Step2 Step2: translating nodes to operations - * Ungrouping the GroupNodes. Group nodes are node_tree's in node_tree's. The new system only supports a single level of node_tree. We will 'flatten' the system in a single level. - * @see GroupNode - * @see ExecutionSystemHelper.ungroup - * - * Every node has the ability to convert itself to operations. The node itself is responsible to create a correct NodeOperation setup based on its internal settings. - * Most Node only need to convert it to its NodeOperation. Like a ColorToBWNode doesn't check anything, but replaces itself with a ConvertColorToBWOperation. - * More complex nodes can use different NodeOperation based on settings; like MixNode. based on the selected Mixtype a different operation will be used. - * for more information see the page about creating new Nodes. [@subpage newnode] - * - * @see ExecutionSystem.convertToOperations - * @see Node.convertToOperations - * @see NodeOperation base class for all operations in the system - * - * @section EM_Step3 Step3: add additional conversions to the operation system - * - Data type conversions: the system has 3 data types COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR. The user can connect a Value socket to a color socket. As values are ordered differently than colors a conversion happens. - * - * - Image size conversions: the system can automatically convert when resolutions do not match. An InputSocket has a resize mode. This can be any of the folowing settings. - * - [@ref InputSocketResizeMode.COM_SC_CENTER]: The center of both images are aligned - * - [@ref InputSocketResizeMode.COM_SC_FIT_WIDTH]: The width of both images are aligned - * - [@ref InputSocketResizeMode.COM_SC_FIT_HEIGHT]: the height of both images are aligned - * - [@ref InputSocketResizeMode.COM_SC_FIT]: The width, or the height of both images are aligned to make sure that it fits. - * - [@ref InputSocketResizeMode.COM_SC_STRETCH]: The width and the height of both images are aligned - * - [@ref InputSocketResizeMode.COM_SC_NO_RESIZE]: bottom left of the images are aligned. - * - * @see Converter.convertDataType Datatype conversions - * @see Converter.convertResolution Image size conversions - * - * @section EM_Step4 Step4: group operations in executions groups - * ExecutionGroup are groups of operations that are calculated as being one bigger operation. All operations will be part of an ExecutionGroup. - * Complex nodes will be added to separate groups. Between ExecutionGroup's the data will be stored in MemoryBuffers. ReadBufferOperations and WriteBufferOperations are added where needed. - * - * <pre> - * - * +------------------------------+ +----------------+ - * | ExecutionGroup A | |ExecutionGroup B| ExecutionGroup - * | +----------+ +----------+| |+----------+ | - * /----->| Operation|---->| Operation|-\ /--->| Operation|-\ | NodeOperation - * | | | A | | B ||| | || C | | | - * | | | cFFA | /->| cFFA ||| | || cFFA | | | - * | | +----------+ | +----------+|| | |+----------+ | | - * | +---------------|--------------+v | +-------------v--+ - * +-*----+ +---*--+ +--*-*--+ +--*----+ - * |inputA| |inputB| |outputA| |outputB| MemoryBuffer - * |cFAA | |cFAA | |cFAA | |cFAA | - * +------+ +------+ +-------+ +-------+ - * </pre> - * @see ExecutionSystem.groupOperations method doing this step - * @see ExecutionSystem.addReadWriteBufferOperations - * @see NodeOperation.isComplex - * @see ExecutionGroup class representing the ExecutionGroup - */ + * @page execution Execution model + * In order to get to an efficient model for execution, serveral 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. + * + * @see ExecutionSystem + * @see Converter.convert + * @see Node + * + * @section EM_Step2 Step2: translating nodes to operations + * Ungrouping the GroupNodes. Group nodes are node_tree's in node_tree's. The new system only supports a single level of node_tree. We will 'flatten' the system in a single level. + * @see GroupNode + * @see ExecutionSystemHelper.ungroup + * + * Every node has the ability to convert itself to operations. The node itself is responsible to create a correct NodeOperation setup based on its internal settings. + * Most Node only need to convert it to its NodeOperation. Like a ColorToBWNode doesn't check anything, but replaces itself with a ConvertColorToBWOperation. + * More complex nodes can use different NodeOperation based on settings; like MixNode. based on the selected Mixtype a different operation will be used. + * for more information see the page about creating new Nodes. [@subpage newnode] + * + * @see ExecutionSystem.convertToOperations + * @see Node.convertToOperations + * @see NodeOperation base class for all operations in the system + * + * @section EM_Step3 Step3: add additional conversions to the operation system + * - Data type conversions: the system has 3 data types COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR. The user can connect a Value socket to a color socket. As values are ordered differently than colors a conversion happens. + * + * - Image size conversions: the system can automatically convert when resolutions do not match. An InputSocket has a resize mode. This can be any of the folowing settings. + * - [@ref InputSocketResizeMode.COM_SC_CENTER]: The center of both images are aligned + * - [@ref InputSocketResizeMode.COM_SC_FIT_WIDTH]: The width of both images are aligned + * - [@ref InputSocketResizeMode.COM_SC_FIT_HEIGHT]: the height of both images are aligned + * - [@ref InputSocketResizeMode.COM_SC_FIT]: The width, or the height of both images are aligned to make sure that it fits. + * - [@ref InputSocketResizeMode.COM_SC_STRETCH]: The width and the height of both images are aligned + * - [@ref InputSocketResizeMode.COM_SC_NO_RESIZE]: bottom left of the images are aligned. + * + * @see Converter.convertDataType Datatype conversions + * @see Converter.convertResolution Image size conversions + * + * @section EM_Step4 Step4: group operations in executions groups + * ExecutionGroup are groups of operations that are calculated as being one bigger operation. All operations will be part of an ExecutionGroup. + * Complex nodes will be added to separate groups. Between ExecutionGroup's the data will be stored in MemoryBuffers. ReadBufferOperations and WriteBufferOperations are added where needed. + * + * <pre> + * + * +------------------------------+ +----------------+ + * | ExecutionGroup A | |ExecutionGroup B| ExecutionGroup + * | +----------+ +----------+| |+----------+ | + * /----->| Operation|---->| Operation|-\ /--->| Operation|-\ | NodeOperation + * | | | A | | B ||| | || C | | | + * | | | cFFA | /->| cFFA ||| | || cFFA | | | + * | | +----------+ | +----------+|| | |+----------+ | | + * | +---------------|--------------+v | +-------------v--+ + * +-*----+ +---*--+ +--*-*--+ +--*----+ + * |inputA| |inputB| |outputA| |outputB| MemoryBuffer + * |cFAA | |cFAA | |cFAA | |cFAA | + * +------+ +------+ +-------+ +-------+ + * </pre> + * @see ExecutionSystem.groupOperations method doing this step + * @see ExecutionSystem.addReadWriteBufferOperations + * @see NodeOperation.isComplex + * @see ExecutionGroup class representing the ExecutionGroup + */ /** * @brief the ExecutionSystem contains the whole compositor tree. @@ -106,129 +106,129 @@ using namespace std; class ExecutionSystem { private: /** - * @brief the context used during execution - */ + * @brief the context used during execution + */ CompositorContext context; /** - * @brief vector of nodes - */ - vector<Node*> nodes; + * @brief vector of nodes + */ + vector<Node *> nodes; /** - * @brief vector of operations - */ - vector<NodeOperation*> operations; + * @brief vector of operations + */ + vector<NodeOperation *> operations; /** - * @brief vector of groups - */ - vector<ExecutionGroup*> groups + * @brief vector of groups + */ + vector<ExecutionGroup *> groups /** - * @brief vector of connections - */; - vector<SocketConnection*> connections; + * @brief vector of connections + */; + vector<SocketConnection *> connections; private: //methods /** - * @brief add ReadBufferOperation and WriteBufferOperation around an operation - * @param operation the operation to add the bufferoperations around. - */ + * @brief add ReadBufferOperation and WriteBufferOperation around an operation + * @param operation the operation to add the bufferoperations around. + */ void addReadWriteBufferOperations(NodeOperation *operation); /** - * find all execution group with output nodes - */ - void findOutputExecutionGroup(vector<ExecutionGroup*> *result, CompositorPriority priority) const; + * find all execution group with output nodes + */ + void findOutputExecutionGroup(vector<ExecutionGroup *> *result, CompositorPriority priority) const; /** - * find all execution group with output nodes - */ - void findOutputExecutionGroup(vector<ExecutionGroup*> *result) const; + * find all execution group with output nodes + */ + void findOutputExecutionGroup(vector<ExecutionGroup *> *result) const; public: /** - * @brief Create a new ExecutionSystem and initialize it with the - * editingtree. - * - * @param editingtree [bNodeTree*] - * @param rendering [true false] - */ + * @brief Create a new ExecutionSystem and initialize it with the + * editingtree. + * + * @param editingtree [bNodeTree*] + * @param rendering [true false] + */ ExecutionSystem(bNodeTree *editingtree, bool rendering); /** - * Destructor - */ + * Destructor + */ ~ExecutionSystem(); /** - * @brief execute this system - * - initialize the NodeOperation's and ExecutionGroup's - * - schedule the output ExecutionGroup's based on their priority - * - deinitialize the ExecutionGroup's and NodeOperation's - */ + * @brief execute this system + * - initialize the NodeOperation's and ExecutionGroup's + * - schedule the output ExecutionGroup's based on their priority + * - deinitialize the ExecutionGroup's and NodeOperation's + */ void execute(); /** - * @brief Add an operation to the operation list - * - * @param operation the operation to add - */ + * @brief Add an operation to the operation list + * + * @param operation the operation to add + */ void addOperation(NodeOperation *operation); /** - * Add an editor link to the system. convert it to an socketconnection (CPP-representative) - * this converted socket is returned. - */ + * Add an editor link to the system. convert it to an socketconnection (CPP-representative) + * this converted socket is returned. + */ SocketConnection *addNodeLink(bNodeLink *bNodeLink); void addSocketConnection(SocketConnection *connection); /** - * @brief Convert all nodes to operations - */ + * @brief Convert all nodes to operations + */ void convertToOperations(); /** - * @brief group operations in ExecutionGroup's - * @see ExecutionGroup - */ + * @brief group operations in ExecutionGroup's + * @see ExecutionGroup + */ void groupOperations(); /** - * @brief get the reference to the compositor context - */ - CompositorContext& getContext() {return this->context;} + * @brief get the reference to the compositor context + */ + CompositorContext& getContext() { return this->context; } /** - * @brief get the reference to the compositor nodes - */ - vector<Node*>& getNodes() {return this->nodes;} + * @brief get the reference to the compositor nodes + */ + vector<Node *>& getNodes() { return this->nodes; } /** - * @brief get the reference to the compositor connections - */ - vector<SocketConnection*>& getConnections() {return this->connections;} + * @brief get the reference to the compositor connections + */ + vector<SocketConnection *>& getConnections() { return this->connections; } /** - * @brief get the reference to the list of execution groups - */ - vector<ExecutionGroup*>& getExecutionGroups() {return this->groups;} + * @brief get the reference to the list of execution groups + */ + vector<ExecutionGroup *>& getExecutionGroups() { return this->groups; } /** - * @brief get the reference to the list of operations - */ - vector<NodeOperation*>& getOperations() {return this->operations;} + * @brief get the reference to the list of operations + */ + vector<NodeOperation *>& getOperations() { return this->operations; } private: /** - * @brief determine the actual data types of all sockets - * @param nodes list of nodes or operations to do the data type determination - */ - void determineActualSocketDataTypes(vector<NodeBase*> &nodes); + * @brief determine the actual data types of all sockets + * @param nodes list of nodes or operations to do the data type determination + */ + void determineActualSocketDataTypes(vector<NodeBase *> &nodes); void executeGroups(CompositorPriority priority); diff --git a/source/blender/compositor/intern/COM_ExecutionSystemHelper.h b/source/blender/compositor/intern/COM_ExecutionSystemHelper.h index 9321cb571e8..99a05472075 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystemHelper.h +++ b/source/blender/compositor/intern/COM_ExecutionSystemHelper.h @@ -42,86 +42,86 @@ class ExecutionSystemHelper { public: /** - * @brief add an bNodeTree to the nodes list and connections - * @param system Execution system - * @param nodes_start Starting index in the system's nodes list for nodes in this tree. - * @param tree bNodeTree to add - * @return Node representing the "Compositor node" of the maintree. or NULL when a subtree is added - */ - static Node *addbNodeTree(ExecutionSystem &system, int nodes_start, bNodeTree* tree, bNode *groupnode); - + * @brief add an bNodeTree to the nodes list and connections + * @param system Execution system + * @param nodes_start Starting index in the system's nodes list for nodes in this tree. + * @param tree bNodeTree to add + * @return Node representing the "Compositor node" of the maintree. or NULL when a subtree is added + */ + static Node *addbNodeTree(ExecutionSystem &system, int nodes_start, bNodeTree *tree, bNode *groupnode); + /** - * @brief add an editor node to the system. - * this node is converted to a Node instance. - * and the converted node is returned - * - * @param bNode node to add - * @return Node that represents the bNode or null when not able to convert. - */ - static Node *addNode(vector<Node*>& nodes, bNode *bNode, bool isInActiveGroup); - + * @brief add an editor node to the system. + * this node is converted to a Node instance. + * and the converted node is returned + * + * @param bNode node to add + * @return Node that represents the bNode or null when not able to convert. + */ + static Node *addNode(vector<Node *>& nodes, bNode *bNode, bool isInActiveGroup); + /** - * @brief Add a Node to a list - * - * @param nodes the list where the node needs to be added to - * @param node the node to be added - */ - static void addNode(vector<Node*>& nodes, Node *node); - + * @brief Add a Node to a list + * + * @param nodes the list where the node needs to be added to + * @param node the node to be added + */ + static void addNode(vector<Node *>& nodes, Node *node); + /** - * @brief Add an operation to the operation list - * - * The id of the operation is updated. - * - * @param operations the list where the operation need to be added to - * @param operation the operation to add - */ - static void addOperation(vector<NodeOperation*> &operations, NodeOperation *operation); - + * @brief Add an operation to the operation list + * + * The id of the operation is updated. + * + * @param operations the list where the operation need to be added to + * @param operation the operation to add + */ + static void addOperation(vector<NodeOperation *> &operations, NodeOperation *operation); + /** - * @brief Add an ExecutionGroup to a list - * - * The id of the ExecutionGroup is updated. - * - * @param executionGroups the list where the executionGroup need to be added to - * @param executionGroup the ExecutionGroup to add - */ - static void addExecutionGroup(vector<ExecutionGroup*>& executionGroups, ExecutionGroup *executionGroup); - + * @brief Add an ExecutionGroup to a list + * + * The id of the ExecutionGroup is updated. + * + * @param executionGroups the list where the executionGroup need to be added to + * @param executionGroup the ExecutionGroup to add + */ + static void addExecutionGroup(vector<ExecutionGroup *>& executionGroups, ExecutionGroup *executionGroup); + /** - * Find all Node Operations that needs to be executed. - * @param rendering - * the rendering parameter will tell what type of execution we are doing - * FALSE is editing, TRUE is rendering - */ - static void findOutputNodeOperations(vector<NodeOperation*>* result, vector<NodeOperation*>& operations , bool rendering); - + * Find all Node Operations that needs to be executed. + * @param rendering + * the rendering parameter will tell what type of execution we are doing + * FALSE is editing, TRUE is rendering + */ + static void findOutputNodeOperations(vector<NodeOperation *> *result, vector<NodeOperation *>& operations, bool rendering); + /** - * @brief add a bNodeLink to the list of links - * the bNodeLink will be wrapped in a SocketConnection - * - * @note Cyclic links will be ignored - * - * @param node_range list of possible nodes for lookup. - * @param links list of links to add the bNodeLink to - * @param bNodeLink the link to be added - * @return the created SocketConnection or NULL - */ - static SocketConnection *addNodeLink(NodeRange &node_range, vector<SocketConnection*>& links, bNodeLink *bNodeLink); - + * @brief add a bNodeLink to the list of links + * the bNodeLink will be wrapped in a SocketConnection + * + * @note Cyclic links will be ignored + * + * @param node_range list of possible nodes for lookup. + * @param links list of links to add the bNodeLink to + * @param bNodeLink the link to be added + * @return the created SocketConnection or NULL + */ + static SocketConnection *addNodeLink(NodeRange &node_range, vector<SocketConnection *>& links, bNodeLink *bNodeLink); + /** - * @brief create a new SocketConnection and add to a vector of links - * @param links the vector of links - * @param fromSocket the startpoint of the connection - * @param toSocket the endpoint of the connection - * @return the new created SocketConnection - */ - static SocketConnection *addLink(vector<SocketConnection*>& links, OutputSocket *fromSocket, InputSocket *toSocket); - + * @brief create a new SocketConnection and add to a vector of links + * @param links the vector of links + * @param fromSocket the startpoint of the connection + * @param toSocket the endpoint of the connection + * @return the new created SocketConnection + */ + static SocketConnection *addLink(vector<SocketConnection *>& links, OutputSocket *fromSocket, InputSocket *toSocket); + /** - * @brief dumps the content of the execution system to standard out - * @param system the execution system to dump - */ + * @brief dumps the content of the execution system to standard out + * @param system the execution system to dump + */ static void debugDump(ExecutionSystem *system); }; #endif diff --git a/source/blender/compositor/intern/COM_InputSocket.h b/source/blender/compositor/intern/COM_InputSocket.h index b1c75e34844..6ac6ad09126 100644 --- a/source/blender/compositor/intern/COM_InputSocket.h +++ b/source/blender/compositor/intern/COM_InputSocket.h @@ -36,10 +36,10 @@ class ChannelInfo; class NodeOperation; /** - * @brief Resize modes of inputsockets - * How are the input and working resolutions matched - * @ingroup Model - */ + * @brief Resize modes of inputsockets + * How are the input and working resolutions matched + * @ingroup Model + */ typedef enum InputSocketResizeMode { /** @brief Center the input image to the center of the working area of the node, no resizing occurs */ COM_SC_CENTER = NS_CR_CENTER, @@ -56,34 +56,34 @@ typedef enum InputSocketResizeMode { } InputSocketResizeMode; /** - * @brief InputSocket are sockets that can receive data/input - * @ingroup Model - */ + * @brief InputSocket are sockets that can receive data/input + * @ingroup Model + */ class InputSocket : public Socket { private: /** - * @brief connection connected to this InputSocket. - * An input socket can only have a single connection - */ + * @brief connection connected to this InputSocket. + * An input socket can only have a single connection + */ SocketConnection *connection; /** - * @brief resize mode of this socket - */ + * @brief resize mode of this socket + */ InputSocketResizeMode resizeMode; /** - * @brief convert a data type to a by the socket supported data type. - * - * @param datatype the datatype that needs to be checked - * @section data-conversion - */ + * @brief convert a data type to a by the socket supported data type. + * + * @param datatype the datatype that needs to be checked + * @section data-conversion + */ DataType convertToSupportedDataType(DataType datatype); /** - * @brief called when the ActualDataType is set. notifies other parties - */ + * @brief called when the ActualDataType is set. notifies other parties + */ void fireActualDataTypeSet(); public: @@ -98,55 +98,59 @@ public: int isInputSocket() const; /** - * @brief determine the resolution of this data going through this socket - * @param resolution the result of this operation - * @param preferredResolution the preferrable resolution as no resolution could be determined - */ - void determineResolution(unsigned int resolution[],unsigned int preferredResolution[]); + * @brief determine the resolution of this data going through this socket + * @param resolution the result of this operation + * @param preferredResolution the preferrable resolution as no resolution could be determined + */ + void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); void determineActualDataType(); /** - * @brief Notifies the Input of the data type (via a SocketConnection) - * @param datatype the datatype to evaluate - */ + * @brief Notifies the Input of the data type (via a SocketConnection) + * @param datatype the datatype to evaluate + */ void notifyActualInputType(DataType datatype); /** - * @brief move all connections of this input socket to another socket - * only use this method when already checked the availability of a SocketConnection - * @param relinkToSocket the socket to move to connections to - */ + * @brief move all connections of this input socket to another socket + * only use this method when already checked the availability of a SocketConnection + * @param relinkToSocket the socket to move to connections to + */ void relinkConnections(InputSocket *relinkToSocket); /** - * @brief move all connections of this input socket to another socket - * @param relinkToSocket the socket to move to connections to - * @param autoconnect will a set operation be added when no connections exist - * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection) - * @param system ExecutionSystem to update to - */ + * @brief move all connections of this input socket to another socket + * @param relinkToSocket the socket to move to connections to + * @param autoconnect will a set operation be added when no connections exist + * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection) + * @param system ExecutionSystem to update to + */ void relinkConnections(InputSocket *relinkToSocket, int editorNodeInputSocketIndex, ExecutionSystem *system); /** - * @brief move all connections of this input socket to another socket - * @param relinkToSocket the socket to move to connections to - * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection) - * @param system ExecutionSystem to update to - */ + * @brief move all connections of this input socket to another socket + * @param relinkToSocket the socket to move to connections to + * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection) + * @param system ExecutionSystem to update to + */ void relinkConnectionsDuplicate(InputSocket *relinkToSocket, int editorNodeInputSocketIndex, ExecutionSystem *system); /** - * @brief set the resize mode - * @param resizeMode the new resize mode. - */ - void setResizeMode(InputSocketResizeMode resizeMode) {this->resizeMode = resizeMode;} + * @brief set the resize mode + * @param resizeMode the new resize mode. + */ + void setResizeMode(InputSocketResizeMode resizeMode) { + this->resizeMode = resizeMode; + } /** - * @brief get the resize mode of this socket - * @return InputSocketResizeMode - */ - InputSocketResizeMode getResizeMode() const {return this->resizeMode;} + * @brief get the resize mode of this socket + * @return InputSocketResizeMode + */ + InputSocketResizeMode getResizeMode() const { + return this->resizeMode; + } const ChannelInfo *getChannelInfo(const int channelnumber); diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h index fd90e5fcb5a..dee2c9b771f 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.h +++ b/source/blender/compositor/intern/COM_MemoryBuffer.h @@ -34,9 +34,9 @@ extern "C" { #include <vector> /** - * @brief state of a memory buffer - * @ingroup Memory - */ + * @brief state of a memory buffer + * @ingroup Memory + */ typedef enum MemoryBufferState { /** @brief memory has been allocated on creator device and CPU machine, but kernel has not been executed */ COM_MB_ALLOCATED = 1, @@ -49,77 +49,77 @@ typedef enum MemoryBufferState { class MemoryProxy; /** - * @brief a MemoryBuffer contains access to the data of a chunk - */ + * @brief a MemoryBuffer contains access to the data of a chunk + */ class MemoryBuffer { private: /** - * @brief proxy of the memory (same for all chunks in the same buffer) - */ - MemoryProxy * memoryProxy; + * @brief proxy of the memory (same for all chunks in the same buffer) + */ + MemoryProxy *memoryProxy; /** - * @brief the type of buffer COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR - */ + * @brief the type of buffer COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR + */ DataType datatype; /** - * @brief region of this buffer inside reative to the MemoryProxy - */ + * @brief region of this buffer inside reative to the MemoryProxy + */ rcti rect; /** - * brief refers to the chunknumber within the executiongroup where related to the MemoryProxy - * @see memoryProxy - */ + * brief refers to the chunknumber within the executiongroup where related to the MemoryProxy + * @see memoryProxy + */ unsigned int chunkNumber; /** - * @brief width of the chunk - */ + * @brief width of the chunk + */ unsigned int chunkWidth; /** - * @brief state of the buffer - */ + * @brief state of the buffer + */ MemoryBufferState state; /** - * @brief the actual float buffer/data - */ + * @brief the actual float buffer/data + */ float *buffer; public: /** - * @brief construct new MemoryBuffer for a chunk - */ + * @brief construct new MemoryBuffer for a chunk + */ MemoryBuffer(MemoryProxy *memoryProxy, unsigned int chunkNumber, rcti *rect); /** - * @brief construct new temporarily MemoryBuffer for an area - */ + * @brief construct new temporarily MemoryBuffer for an area + */ MemoryBuffer(MemoryProxy *memoryProxy, rcti *rect); /** - * @brief destructor - */ + * @brief destructor + */ ~MemoryBuffer(); /** - * @brief read the ChunkNumber of this MemoryBuffer - */ - unsigned int getChunkNumber() {return this->chunkNumber;} + * @brief read the ChunkNumber of this MemoryBuffer + */ + unsigned int getChunkNumber() { return this->chunkNumber; } /** - * @brief get the data of this MemoryBuffer - * @note buffer should already be available in memory - */ - float *getBuffer() {return this->buffer;} + * @brief get the data of this MemoryBuffer + * @note buffer should already be available in memory + */ + float *getBuffer() { return this->buffer; } /** - * @brief after execution the state will be set to available by calling this method - */ + * @brief after execution the state will be set to available by calling this method + */ void setCreatedState() { this->state = COM_MB_AVAILABLE; } @@ -130,34 +130,34 @@ public: void readEWA(float result[4], float fx, float fy, float dx, float dy); /** - * @brief is this MemoryBuffer a temporarily buffer (based on an area, not on a chunk) - */ - inline const bool isTemporarily() const {return this->state == COM_MB_TEMPORARILY;} + * @brief is this MemoryBuffer a temporarily buffer (based on an area, not on a chunk) + */ + inline const bool isTemporarily() const { return this->state == COM_MB_TEMPORARILY; } /** - * @brief add the content from otherBuffer to this MemoryBuffer - * @param otherBuffer source buffer - */ + * @brief add the content from otherBuffer to this MemoryBuffer + * @param otherBuffer source buffer + */ void copyContentFrom(MemoryBuffer *otherBuffer); /** - * @brief get the rect of this MemoryBuffer - */ - rcti *getRect() {return &this->rect;} + * @brief get the rect of this MemoryBuffer + */ + rcti *getRect() { return &this->rect; } /** - * @brief get the width of this MemoryBuffer - */ + * @brief get the width of this MemoryBuffer + */ int getWidth() const; /** - * @brief get the height of this MemoryBuffer - */ + * @brief get the height of this MemoryBuffer + */ int getHeight() const; /** - * @brief clear the buffer. Make all pixels black transparant. - */ + * @brief clear the buffer. Make all pixels black transparant. + */ void clear(); MemoryBuffer *duplicate(); diff --git a/source/blender/compositor/intern/COM_MemoryProxy.h b/source/blender/compositor/intern/COM_MemoryProxy.h index e0ac72de0d3..e7e7f1cf3a0 100644 --- a/source/blender/compositor/intern/COM_MemoryProxy.h +++ b/source/blender/compositor/intern/COM_MemoryProxy.h @@ -30,78 +30,78 @@ class MemoryProxy; class ExecutionGroup; /** - * @brief A MemoryProxy is a unique identifier for a memory buffer. - * A single MemoryProxy is used among all chunks of the same buffer, - * the MemoryBuffer only stores the data of a single chunk. - * @ingroup Memory - */ + * @brief A MemoryProxy is a unique identifier for a memory buffer. + * A single MemoryProxy is used among all chunks of the same buffer, + * the MemoryBuffer only stores the data of a single chunk. + * @ingroup Memory + */ class MemoryProxy { private: /** - * @brief reference to the ouput operation of the executiongroup - */ + * @brief reference to the ouput operation of the executiongroup + */ WriteBufferOperation *writeBufferOperation; /** - * @brief reference to the executor. the Execution group that can fill a chunk - */ + * @brief reference to the executor. the Execution group that can fill a chunk + */ ExecutionGroup *executor; /** - * @brief datatype of this MemoryProxy - */ + * @brief datatype of this MemoryProxy + */ DataType datatype; /** - * @brief channel information of this buffer - */ + * @brief channel information of this buffer + */ ChannelInfo channelInfo[COM_NUMBER_OF_CHANNELS]; /** - * @brief the allocated memory - */ - MemoryBuffer* buffer; + * @brief the allocated memory + */ + MemoryBuffer *buffer; public: MemoryProxy(); /** - * @brief set the ExecutionGroup that can be scheduled to calculate a certain chunk. - * @param group the ExecutionGroup to set - */ - void setExecutor(ExecutionGroup *executor) {this->executor = executor;} - + * @brief set the ExecutionGroup that can be scheduled to calculate a certain chunk. + * @param group the ExecutionGroup to set + */ + void setExecutor(ExecutionGroup *executor) { this->executor = executor; } + /** - * @brief get the ExecutionGroup that can be scheduled to calculate a certain chunk. - */ - ExecutionGroup *getExecutor() {return this->executor;} - + * @brief get the ExecutionGroup that can be scheduled to calculate a certain chunk. + */ + ExecutionGroup *getExecutor() { return this->executor; } + /** - * @brief set the WriteBufferOperation that is responsible for writing to this MemoryProxy - * @param operation - */ - void setWriteBufferOperation(WriteBufferOperation *operation) {this->writeBufferOperation = operation;} - + * @brief set the WriteBufferOperation that is responsible for writing to this MemoryProxy + * @param operation + */ + void setWriteBufferOperation(WriteBufferOperation *operation) { this->writeBufferOperation = operation; } + /** - * @brief get the WriteBufferOperation that is responsible for writing to this MemoryProxy - * @return WriteBufferOperation - */ - WriteBufferOperation *getWriteBufferOperation() {return this->writeBufferOperation;} + * @brief get the WriteBufferOperation that is responsible for writing to this MemoryProxy + * @return WriteBufferOperation + */ + WriteBufferOperation *getWriteBufferOperation() { return this->writeBufferOperation; } /** - * @brief allocate memory of size widht x height - */ + * @brief allocate memory of size widht x height + */ void allocate(unsigned int width, unsigned int height); /** - * @brief free the allocated memory - */ + * @brief free the allocated memory + */ void free(); /** - * @brief get the allocated memory - */ - inline MemoryBuffer* getBuffer() {return this->buffer;} + * @brief get the allocated memory + */ + inline MemoryBuffer *getBuffer() { return this->buffer; } }; #endif diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h index 0546062f790..12baa26cd6e 100644 --- a/source/blender/compositor/intern/COM_Node.h +++ b/source/blender/compositor/intern/COM_Node.h @@ -38,18 +38,18 @@ class Node; class NodeOperation; class ExecutionSystem; -typedef vector<Node*> NodeList; +typedef vector<Node *> NodeList; typedef NodeList::iterator NodeIterator; typedef pair<NodeIterator, NodeIterator> NodeRange; /** - * My node documentation. - */ -class Node:public NodeBase { + * My node documentation. + */ +class Node : public NodeBase { private: /** - * @brief stores the reference to the SDNA bNode struct - */ + * @brief stores the reference to the SDNA bNode struct + */ bNode *editorNode; /** @@ -58,18 +58,18 @@ private: bool inActiveGroup; public: - Node(bNode *editorNode, bool create_sockets=true); + Node(bNode *editorNode, bool create_sockets = true); /** - * @brief get the reference to the SDNA bNode struct - */ + * @brief get the reference to the SDNA bNode struct + */ bNode *getbNode(); /** * @brief Is this node in the active group (the group that is being edited) * @param isInActiveGroup */ - void setIsInActiveGroup(bool isInActiveGroup) {this->inActiveGroup = isInActiveGroup; } + void setIsInActiveGroup(bool isInActiveGroup) { this->inActiveGroup = isInActiveGroup; } /** * @brief Is this node part of the active group @@ -77,63 +77,63 @@ public: * the active group will be the main tree (all nodes that are not part of a group will be active) * @return bool [false:true] */ - inline bool isInActiveGroup() {return this->inActiveGroup;} - + inline bool isInActiveGroup() { return this->inActiveGroup; } + /** - * @brief convert node to operation - * - * @todo this must be described furter - * - * @param system the ExecutionSystem where the operations need to be added - * @param context reference to the CompositorContext - */ - virtual void convertToOperations(ExecutionSystem *system, CompositorContext * context) =0; + * @brief convert node to operation + * + * @todo this must be described furter + * + * @param system the ExecutionSystem where the operations need to be added + * @param context reference to the CompositorContext + */ + virtual void convertToOperations(ExecutionSystem *system, CompositorContext *context) = 0; /** - * this method adds a SetValueOperation as input of the input socket. - * This can only be used from the convertToOperation method. all other usages are not allowed - */ + * this method adds a SetValueOperation as input of the input socket. + * This can only be used from the convertToOperation method. all other usages are not allowed + */ void addSetValueOperation(ExecutionSystem *graph, InputSocket *inputsocket, int editorNodeInputSocketIndex); /** - * this method adds a SetColorOperation as input of the input socket. - * This can only be used from the convertToOperation method. all other usages are not allowed - */ + * this method adds a SetColorOperation as input of the input socket. + * This can only be used from the convertToOperation method. all other usages are not allowed + */ void addSetColorOperation(ExecutionSystem *graph, InputSocket *inputsocket, int editorNodeInputSocketIndex); /** - * this method adds a SetVectorOperation as input of the input socket. - * This can only be used from the convertToOperation method. all other usages are not allowed - */ + * this method adds a SetVectorOperation as input of the input socket. + * This can only be used from the convertToOperation method. all other usages are not allowed + */ void addSetVectorOperation(ExecutionSystem *graph, InputSocket *inputsocket, int editorNodeInputSocketIndex); /** - * Creates a new link between an outputSocket and inputSocket and registrates the link to the graph - * @return the new created link - */ + * Creates a new link between an outputSocket and inputSocket and registrates the link to the graph + * @return the new created link + */ SocketConnection *addLink(ExecutionSystem *graph, OutputSocket *outputSocket, InputSocket *inputsocket); /** - * is this node a group node. - */ + * is this node a group node. + */ virtual bool isGroupNode() const { return false; } /** - * is this node a proxy node. - */ + * is this node a proxy node. + */ virtual bool isProxyNode() const { return false; } /** - * @brief find the InputSocket by bNodeSocket - * - * @param socket - */ + * @brief find the InputSocket by bNodeSocket + * + * @param socket + */ InputSocket *findInputSocketBybNodeSocket(bNodeSocket *socket); /** - * @brief find the OutputSocket by bNodeSocket - * - * @param socket - */ + * @brief find the OutputSocket by bNodeSocket + * + * @param socket + */ OutputSocket *findOutputSocketBybNodeSocket(bNodeSocket *socket); protected: diff --git a/source/blender/compositor/intern/COM_NodeBase.h b/source/blender/compositor/intern/COM_NodeBase.h index 123797c780a..3917904afe3 100644 --- a/source/blender/compositor/intern/COM_NodeBase.h +++ b/source/blender/compositor/intern/COM_NodeBase.h @@ -37,136 +37,136 @@ class NodeOperation; class ExecutionSystem; /** - * @brief The NodeBase class is the super-class of all node related objects like @see Node @see NodeOperation - * the reason for the existence of this class is to support graph-nodes when using ExecutionSystem - * the NodeBase also contains the reference to InputSocket and OutputSocket. - * @ingroup Model - */ + * @brief The NodeBase class is the super-class of all node related objects like @see Node @see NodeOperation + * the reason for the existence of this class is to support graph-nodes when using ExecutionSystem + * the NodeBase also contains the reference to InputSocket and OutputSocket. + * @ingroup Model + */ class NodeBase { private: /** - * @brief the list of actual inputsockets @see InputSocket - */ - vector<InputSocket*> inputsockets; + * @brief the list of actual inputsockets @see InputSocket + */ + vector<InputSocket *> inputsockets; /** - * @brief the list of actual outputsockets @see OutputSocket - */ - vector<OutputSocket*> outputsockets; + * @brief the list of actual outputsockets @see OutputSocket + */ + vector<OutputSocket *> outputsockets; protected: /** - * @brief get access to the vector of input sockets - */ - inline vector<InputSocket*>& getInputSockets() {return this->inputsockets;} + * @brief get access to the vector of input sockets + */ + inline vector<InputSocket *>& getInputSockets() { return this->inputsockets; } /** - * @brief get access to the vector of input sockets - */ - inline vector<OutputSocket*>& getOutputSockets() {return this->outputsockets;} + * @brief get access to the vector of input sockets + */ + inline vector<OutputSocket *>& getOutputSockets() { return this->outputsockets; } public: /** - * @brief destructor - * clean up memory related to this NodeBase. - */ + * @brief destructor + * clean up memory related to this NodeBase. + */ virtual ~NodeBase(); /** - * @brief determine the actual socket data types that will go through the system - */ + * @brief determine the actual socket data types that will go through the system + */ virtual void determineActualSocketDataTypes(); /** - * @brief determine the actual socket data types of a specific outputsocket - * - * @param outputsocket - * a reference to the actual outputsocket where the datatype must be determined from - * - * @return - * COM_DT_VALUE if it is a value (1 float buffer) - * COM_DT_COLOR if it is a value (4 float buffer) - * COM_DT_VECTOR if it is a value (3 float buffer) - */ + * @brief determine the actual socket data types of a specific outputsocket + * + * @param outputsocket + * a reference to the actual outputsocket where the datatype must be determined from + * + * @return + * COM_DT_VALUE if it is a value (1 float buffer) + * COM_DT_COLOR if it is a value (4 float buffer) + * COM_DT_VECTOR if it is a value (3 float buffer) + */ virtual DataType determineActualDataType(OutputSocket *outputsocket); /** - * @brief is this node an operation? - * This is true when the instance is of the subclass NodeOperation. - * @return [true:false] - * @see NodeOperation - */ - virtual const int isOperation() const {return false;} + * @brief is this node an operation? + * This is true when the instance is of the subclass NodeOperation. + * @return [true:false] + * @see NodeOperation + */ + virtual const int isOperation() const { return false; } /** - * @brief check if this is an input node - * An input node is a node that only has output sockets and no input sockets - * @return [false..true] - */ + * @brief check if this is an input node + * An input node is a node that only has output sockets and no input sockets + * @return [false..true] + */ const bool isInputNode() const; /** - * @brief Return the number of input sockets of this node. - */ - const unsigned int getNumberOfInputSockets() const {return this->inputsockets.size();} - + * @brief Return the number of input sockets of this node. + */ + const unsigned int getNumberOfInputSockets() const { return this->inputsockets.size(); } + /** - * @brief Return the number of output sockets of this node. - */ - const unsigned int getNumberOfOutputSockets() const {return this->outputsockets.size();} - + * @brief Return the number of output sockets of this node. + */ + const unsigned int getNumberOfOutputSockets() const { return this->outputsockets.size(); } + /** - * after the data has been determined of an outputsocket that has a connection with an inputsocket this method is called on the - * node that contains the inputsocket. - * @param socket - * the reference of the inputsocket where connected data type is found - * @param actualType [COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR] - * the actual data type that is coming from the connected output socket - */ + * after the data has been determined of an outputsocket that has a connection with an inputsocket this method is called on the + * node that contains the inputsocket. + * @param socket + * the reference of the inputsocket where connected data type is found + * @param actualType [COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR] + * the actual data type that is coming from the connected output socket + */ virtual void notifyActualDataTypeSet(InputSocket *socket, const DataType actualType); /** - * get the reference to a certain outputsocket - * @param index - * the index of the needed outputsocket - */ + * get the reference to a certain outputsocket + * @param index + * the index of the needed outputsocket + */ OutputSocket *getOutputSocket(const int index); /** - * get the reference to the first outputsocket - * @param index - * the index of the needed outputsocket - */ - inline OutputSocket *getOutputSocket() {return getOutputSocket(0);} + * get the reference to the first outputsocket + * @param index + * the index of the needed outputsocket + */ + inline OutputSocket *getOutputSocket() { return getOutputSocket(0); } /** - * get the reference to a certain inputsocket - * @param index - * the index of the needed inputsocket - */ + * get the reference to a certain inputsocket + * @param index + * the index of the needed inputsocket + */ InputSocket *getInputSocket(const int index); - virtual bool isStatic() const {return false;} - void getStaticValues(float *result) const {} + virtual bool isStatic() const { return false; } + void getStaticValues(float *result) const { } protected: NodeBase(); /** - * @brief add an InputSocket to the collection of inputsockets - * @note may only be called in an constructor - * @param socket the InputSocket to add - */ + * @brief add an InputSocket to the collection of inputsockets + * @note may only be called in an constructor + * @param socket the InputSocket to add + */ void addInputSocket(DataType datatype); void addInputSocket(DataType datatype, InputSocketResizeMode resizeMode); void addInputSocket(DataType datatype, InputSocketResizeMode resizeMode, bNodeSocket *socket); /** - * @brief add an OutputSocket to the collection of outputsockets - * @note may only be called in an constructor - * @param socket the OutputSocket to add - */ + * @brief add an OutputSocket to the collection of outputsockets + * @note may only be called in an constructor + * @param socket the OutputSocket to add + */ void addOutputSocket(DataType datatype); void addOutputSocket(DataType datatype, bNodeSocket *socket); }; diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index e56ac7bd51f..30731572712 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -41,41 +41,41 @@ class NodeOperation; class ReadBufferOperation; /** - * @brief NodeOperation are contains calculation logic - * - * Subclasses needs to implement the execution method (defined in SocketReader) to implement logic. - * @ingroup Model - */ + * @brief NodeOperation are contains calculation logic + * + * Subclasses needs to implement the execution method (defined in SocketReader) to implement logic. + * @ingroup Model + */ class NodeOperation : public NodeBase, public SocketReader { private: /** - * @brief the index of the input socket that will be used to determine the resolution - */ + * @brief the index of the input socket that will be used to determine the resolution + */ unsigned int resolutionInputSocketIndex; /** - * @brief is this operation a complex one. - * - * Complex operations are typically doing many reads to calculate the output of a single pixel. - * Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true. - */ + * @brief is this operation a complex one. + * + * Complex operations are typically doing many reads to calculate the output of a single pixel. + * Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true. + */ bool complex; /** - * @brief can this operation be scheduled on an OpenCL device. - * @note Only applicable if complex is True - */ + * @brief can this operation be scheduled on an OpenCL device. + * @note Only applicable if complex is True + */ bool openCL; /** - * @brief mutex reference for very special node initializations - * @note only use when you really know what you are doing. - * this mutex is used to share data among chunks in the same operation - * @see TonemapOperation for an example of usage - * @see NodeOperation.initMutex initializes this mutex - * @see NodeOperation.deinitMutex deinitializes this mutex - * @see NodeOperation.getMutex retrieve a pointer to this mutex. - */ + * @brief mutex reference for very special node initializations + * @note only use when you really know what you are doing. + * this mutex is used to share data among chunks in the same operation + * @see TonemapOperation for an example of usage + * @see NodeOperation.initMutex initializes this mutex + * @see NodeOperation.deinitMutex deinitializes this mutex + * @see NodeOperation.getMutex retrieve a pointer to this mutex. + */ ThreadMutex mutex; /** @@ -85,87 +85,87 @@ private: public: /** - * @brief is this node an operation? - * This is true when the instance is of the subclass NodeOperation. - * @return [true:false] - * @see NodeBase - */ - const int isOperation() const {return true;} + * @brief is this node an operation? + * This is true when the instance is of the subclass NodeOperation. + * @return [true:false] + * @see NodeBase + */ + const int isOperation() const { return true; } /** - * @brief determine the resolution of this node - * @note this method will not set the resolution, this is the responsibility of the caller - * @param resolution the result of this operation - * @param preferredResolution the preferrable resolution as no resolution could be determined - */ + * @brief determine the resolution of this node + * @note this method will not set the resolution, this is the responsibility of the caller + * @param resolution the result of this operation + * @param preferredResolution the preferrable resolution as no resolution could be determined + */ virtual void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); /** - * @brief isOutputOperation determines whether this operation is an output of the ExecutionSystem during rendering or editing. - * - * Default behaviour if not overriden, this operation will not be evaluated as being an output of the ExecutionSystem. - * - * @see ExecutionSystem - * @group check - * @param rendering [true false] - * true: rendering - * false: editing - * - * @return bool the result of this method - */ - virtual bool isOutputOperation(bool rendering) const {return false;} + * @brief isOutputOperation determines whether this operation is an output of the ExecutionSystem during rendering or editing. + * + * Default behaviour if not overriden, this operation will not be evaluated as being an output of the ExecutionSystem. + * + * @see ExecutionSystem + * @group check + * @param rendering [true false] + * true: rendering + * false: editing + * + * @return bool the result of this method + */ + virtual bool isOutputOperation(bool rendering) const { return false; } /** - * isBufferOperation returns if this is an operation that work directly on buffers. - * - * there are only 2 implementation where this is true: - * @see ReadBufferOperation - * @see WriteBufferOperation - * for all other operations this will result in false. - */ - virtual int isBufferOperation() {return false;} - virtual int isSingleThreaded() {return false;} - - void setbNodeTree(const bNodeTree * tree) {this->btree = tree;} + * isBufferOperation returns if this is an operation that work directly on buffers. + * + * there are only 2 implementation where this is true: + * @see ReadBufferOperation + * @see WriteBufferOperation + * for all other operations this will result in false. + */ + virtual int isBufferOperation() { return false; } + virtual int isSingleThreaded() { return false; } + + void setbNodeTree(const bNodeTree *tree) { this->btree = tree; } virtual void initExecution(); /** - * @brief when a chunk is executed by a CPUDevice, this method is called - * @ingroup execution - * @param rect the rectangle of the chunk (location and size) - * @param chunkNumber the chunkNumber to be calculated - * @param memoryBuffers all input MemoryBuffer's needed - */ - virtual void executeRegion(rcti *rect, unsigned int chunkNumber, MemoryBuffer** memoryBuffers) {} + * @brief when a chunk is executed by a CPUDevice, this method is called + * @ingroup execution + * @param rect the rectangle of the chunk (location and size) + * @param chunkNumber the chunkNumber to be calculated + * @param memoryBuffers all input MemoryBuffer's needed + */ + virtual void executeRegion(rcti *rect, unsigned int chunkNumber, MemoryBuffer **memoryBuffers) {} /** - * @brief when a chunk is executed by an OpenCLDevice, this method is called - * @ingroup execution - * @note this method is only implemented in WriteBufferOperation - * @param context the OpenCL context - * @param program the OpenCL program containing all compositor kernels - * @param queue the OpenCL command queue of the device the chunk is executed on - * @param rect the rectangle of the chunk (location and size) - * @param chunkNumber the chunkNumber to be calculated - * @param memoryBuffers all input MemoryBuffer's needed - * @param outputBuffer the outputbuffer to write to - */ + * @brief when a chunk is executed by an OpenCLDevice, this method is called + * @ingroup execution + * @note this method is only implemented in WriteBufferOperation + * @param context the OpenCL context + * @param program the OpenCL program containing all compositor kernels + * @param queue the OpenCL command queue of the device the chunk is executed on + * @param rect the rectangle of the chunk (location and size) + * @param chunkNumber the chunkNumber to be calculated + * @param memoryBuffers all input MemoryBuffer's needed + * @param outputBuffer the outputbuffer to write to + */ virtual void executeOpenCLRegion(cl_context context, cl_program program, cl_command_queue queue, rcti *rect, - unsigned int chunkNumber, MemoryBuffer** memoryBuffers, MemoryBuffer* outputBuffer) {} + unsigned int chunkNumber, MemoryBuffer **memoryBuffers, MemoryBuffer *outputBuffer) {} /** - * @brief custom handle to add new tasks to the OpenCL command queue in order to execute a chunk on an GPUDevice - * @ingroup execution - * @param context the OpenCL context - * @param program the OpenCL program containing all compositor kernels - * @param queue the OpenCL command queue of the device the chunk is executed on - * @param outputMemoryBuffer the allocated memory buffer in main CPU memory - * @param clOutputBuffer the allocated memory buffer in OpenCLDevice memory - * @param inputMemoryBuffers all input MemoryBuffer's needed - * @param clMemToCleanUp all created cl_mem references must be added to this list. Framework will clean this after execution - * @param clKernelsToCleanUp all created cl_kernel references must be added to this list. Framework will clean this after execution - */ - virtual void executeOpenCL(cl_context context,cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer** inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp) {} + * @brief custom handle to add new tasks to the OpenCL command queue in order to execute a chunk on an GPUDevice + * @ingroup execution + * @param context the OpenCL context + * @param program the OpenCL program containing all compositor kernels + * @param queue the OpenCL command queue of the device the chunk is executed on + * @param outputMemoryBuffer the allocated memory buffer in main CPU memory + * @param clOutputBuffer the allocated memory buffer in OpenCLDevice memory + * @param inputMemoryBuffers all input MemoryBuffer's needed + * @param clMemToCleanUp all created cl_mem references must be added to this list. Framework will clean this after execution + * @param clKernelsToCleanUp all created cl_kernel references must be added to this list. Framework will clean this after execution + */ + virtual void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp) {} virtual void deinitExecution(); bool isResolutionSet() { @@ -173,9 +173,9 @@ public: } /** - * @brief set the resolution - * @param resolution the resolution to set - */ + * @brief set the resolution + * @param resolution the resolution to set + */ void setResolution(unsigned int resolution[]) { if (!isResolutionSet()) { this->width = resolution[0]; @@ -184,63 +184,63 @@ public: } - void getConnectedInputSockets(vector<InputSocket*> *sockets); + void getConnectedInputSockets(vector<InputSocket *> *sockets); /** - * @brief is this operation complex - * - * Complex operations are typically doing many reads to calculate the output of a single pixel. - * Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true. - */ - const bool isComplex() const {return this->complex;} - virtual const bool isSetOperation() const {return false;} + * @brief is this operation complex + * + * Complex operations are typically doing many reads to calculate the output of a single pixel. + * Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true. + */ + const bool isComplex() const { return this->complex; } + virtual const bool isSetOperation() const { return false; } /** - * @brief is this operation of type ReadBufferOperation - * @return [true:false] - * @see ReadBufferOperation - */ - virtual const bool isReadBufferOperation() const {return false;} + * @brief is this operation of type ReadBufferOperation + * @return [true:false] + * @see ReadBufferOperation + */ + virtual const bool isReadBufferOperation() const { return false; } /** - * @brief is this operation of type WriteBufferOperation - * @return [true:false] - * @see WriteBufferOperation - */ - virtual const bool isWriteBufferOperation() const {return false;} + * @brief is this operation of type WriteBufferOperation + * @return [true:false] + * @see WriteBufferOperation + */ + virtual const bool isWriteBufferOperation() const { return false; } /** - * @brief is this operation the active viewer output - * user can select an ViewerNode to be active (the result of this node will be drawn on the backdrop) - * @return [true:false] - * @see BaseViewerOperation - */ - virtual const bool isActiveViewerOutput() const {return false;} + * @brief is this operation the active viewer output + * user can select an ViewerNode to be active (the result of this node will be drawn on the backdrop) + * @return [true:false] + * @see BaseViewerOperation + */ + virtual const bool isActiveViewerOutput() const { return false; } - virtual bool determineDependingAreaOfInterest(rcti * input, ReadBufferOperation *readOperation, rcti *output); + virtual bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); /** - * @brief set the index of the input socket that will determine the resolution of this operation - * @param index the index to set - */ + * @brief set the index of the input socket that will determine the resolution of this operation + * @param index the index to set + */ void setResolutionInputSocketIndex(unsigned int index); /** - * @brief get the render priority of this node. - * @note only applicable for output operations like ViewerOperation - * @return CompositorPriority - */ - virtual const CompositorPriority getRenderPriority() const {return COM_PRIORITY_LOW;} + * @brief get the render priority of this node. + * @note only applicable for output operations like ViewerOperation + * @return CompositorPriority + */ + virtual const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; } /** - * @brief can this NodeOperation be scheduled on an OpenCLDevice - * @see WorkScheduler.schedule - * @see ExecutionGroup.addOperation - */ + * @brief can this NodeOperation be scheduled on an OpenCLDevice + * @see WorkScheduler.schedule + * @see ExecutionGroup.addOperation + */ bool isOpenCL() { return this->openCL; } - virtual bool isViewerOperation() {return false;} - virtual bool isPreviewOperation() {return false;} + virtual bool isViewerOperation() { return false; } + virtual bool isPreviewOperation() { return false; } inline bool isBreaked() { return btree->test_break(btree->tbh); @@ -249,8 +249,8 @@ public: protected: NodeOperation(); - void setWidth(unsigned int width) {this->width = width;} - void setHeight(unsigned int height) {this->height = height;} + void setWidth(unsigned int width) { this->width = width; } + void setHeight(unsigned int height) { this->height = height; } SocketReader *getInputSocketReader(unsigned int inputSocketindex); NodeOperation *getInputOperation(unsigned int inputSocketindex); @@ -261,25 +261,25 @@ protected: /** - * @brief set whether this operation is complex - * - * Complex operations are typically doing many reads to calculate the output of a single pixel. - * Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true. - */ - void setComplex(bool complex) {this->complex = complex;} + * @brief set whether this operation is complex + * + * Complex operations are typically doing many reads to calculate the output of a single pixel. + * Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true. + */ + void setComplex(bool complex) { this->complex = complex; } /** - * @brief set if this NodeOperation can be scheduled on a OpenCLDevice - */ - void setOpenCL(bool openCL) {this->openCL = openCL;} + * @brief set if this NodeOperation can be scheduled on a OpenCLDevice + */ + void setOpenCL(bool openCL) { this->openCL = openCL; } - static cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_context context, cl_kernel kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer **inputMemoryBuffers, SocketReader* reader); + static cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_context context, cl_kernel kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer **inputMemoryBuffers, SocketReader *reader); static void COM_clAttachMemoryBufferOffsetToKernelParameter(cl_kernel kernel, int offsetIndex, MemoryBuffer *memoryBuffers); static void COM_clAttachOutputMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, cl_mem clOutputMemoryBuffer); void COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex); - static void COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer* outputMemoryBuffer); + static void COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer); void COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex); - cl_kernel COM_clCreateKernel(cl_program program, const char* kernelname, list<cl_kernel> *clKernelsToCleanUp); + cl_kernel COM_clCreateKernel(cl_program program, const char *kernelname, list<cl_kernel> *clKernelsToCleanUp); }; diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h index f61c555558d..75c326eda23 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.h +++ b/source/blender/compositor/intern/COM_OpenCLDevice.h @@ -31,57 +31,57 @@ class OpenCLDevice; /** - * @brief device representing an GPU OpenCL device. - * an instance of this class represents a single cl_device - */ -class OpenCLDevice: public Device { + * @brief device representing an GPU OpenCL device. + * an instance of this class represents a single cl_device + */ +class OpenCLDevice : public Device { private: /** - *@brief opencl context - */ + *@brief opencl context + */ cl_context context; /** - *@brief opencl device - */ + *@brief opencl device + */ cl_device_id device; /** - *@brief opencl program - */ + *@brief opencl program + */ cl_program program; /** - *@brief opencl command queue - */ + *@brief opencl command queue + */ cl_command_queue queue; public: /** - *@brief constructor with opencl device - *@param context - *@param device - */ + *@brief constructor with opencl device + *@param context + *@param device + */ OpenCLDevice(cl_context context, cl_device_id device, cl_program program); /** - * @brief initialize the device - * During initialization the OpenCL cl_command_queue is created - * the command queue is stored in the field queue. - * @see queue - */ + * @brief initialize the device + * During initialization the OpenCL cl_command_queue is created + * the command queue is stored in the field queue. + * @see queue + */ bool initialize(); /** - * @brief deinitialize the device - * During deintiialization the command queue is cleared - */ + * @brief deinitialize the device + * During deintiialization the command queue is cleared + */ void deinitialize(); /** - * @brief execute a WorkPackage - * @param work the WorkPackage to execute - */ + * @brief execute a WorkPackage + * @param work the WorkPackage to execute + */ void execute(WorkPackage *work); }; diff --git a/source/blender/compositor/intern/COM_OutputSocket.h b/source/blender/compositor/intern/COM_OutputSocket.h index 640588417b4..e008d651046 100644 --- a/source/blender/compositor/intern/COM_OutputSocket.h +++ b/source/blender/compositor/intern/COM_OutputSocket.h @@ -37,18 +37,18 @@ class WriteBufferOperation; //#define COM_ST_OUTPUT 1 /** - * @brief OutputSocket are sockets that can send data/input - * @ingroup Model - */ + * @brief OutputSocket are sockets that can send data/input + * @ingroup Model + */ class OutputSocket : public Socket { private: - vector<SocketConnection*> connections; + vector<SocketConnection *> connections; /** - * @brief index of the inputsocket that determines the datatype of this outputsocket - * -1 will not use any inputsocket to determine the datatype, but use the outputsocket - * default datatype. - */ + * @brief index of the inputsocket that determines the datatype of this outputsocket + * -1 will not use any inputsocket to determine the datatype, but use the outputsocket + * default datatype. + */ int inputSocketDataTypeDeterminatorIndex; ChannelInfo channelinfo[4]; @@ -56,47 +56,47 @@ private: public: OutputSocket(DataType datatype); OutputSocket(DataType datatype, int inputSocketDataTypeDeterminatorIndex); - OutputSocket(OutputSocket * from); + OutputSocket(OutputSocket *from); void addConnection(SocketConnection *connection); - SocketConnection *getConnection(unsigned int index) {return this->connections[index];} + SocketConnection *getConnection(unsigned int index) { return this->connections[index]; } const int isConnected() const; int isOutputSocket() const; /** - * @brief determine the resolution of this socket - * @param resolution the result of this operation - * @param preferredResolution the preferrable resolution as no resolution could be determined - */ + * @brief determine the resolution of this socket + * @param resolution the result of this operation + * @param preferredResolution the preferrable resolution as no resolution could be determined + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); /** - * @brief determine the actual data type and channel info. - */ + * @brief determine the actual data type and channel info. + */ void determineActualDataType(); - void relinkConnections(OutputSocket *relinkToSocket) {this->relinkConnections(relinkToSocket, false);}; + void relinkConnections(OutputSocket *relinkToSocket) { this->relinkConnections(relinkToSocket, false); }; void relinkConnections(OutputSocket *relinkToSocket, bool single); bool isActualDataTypeDeterminedByInputSocket() { - return this->inputSocketDataTypeDeterminatorIndex>-1; + return this->inputSocketDataTypeDeterminatorIndex > -1; } - const int getNumberOfConnections() {return connections.size();} + const int getNumberOfConnections() { return connections.size(); } /** - * @brief get the index of the inputsocket that determines the datatype of this outputsocket - */ - int getInputSocketDataTypeDeterminatorIndex() {return this->inputSocketDataTypeDeterminatorIndex;} + * @brief get the index of the inputsocket that determines the datatype of this outputsocket + */ + int getInputSocketDataTypeDeterminatorIndex() { return this->inputSocketDataTypeDeterminatorIndex; } void clearConnections(); /** - * @brief find a connected write buffer operation to this OutputSocket - * @return WriteBufferOperation or NULL - */ + * @brief find a connected write buffer operation to this OutputSocket + * @return WriteBufferOperation or NULL + */ WriteBufferOperation *findAttachedWriteBufferOperation() const; ChannelInfo *getChannelInfo(const int channelnumber); /** - * @brief trigger determine actual data type to all connected sockets - * @note will only be triggered just after the actual data type is set. - */ + * @brief trigger determine actual data type to all connected sockets + * @note will only be triggered just after the actual data type is set. + */ void fireActualDataType(); private: diff --git a/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h index ace48365752..b1bf28c9c07 100644 --- a/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h +++ b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h @@ -37,24 +37,24 @@ public: SingleThreadedNodeOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); - virtual MemoryBuffer* createMemoryBuffer(rcti *rect, MemoryBuffer **memoryBuffers) = 0; + virtual MemoryBuffer *createMemoryBuffer(rcti *rect, MemoryBuffer **memoryBuffers) = 0; - int isSingleThreaded() {return true;} + int isSingleThreaded() { return true; } }; #endif diff --git a/source/blender/compositor/intern/COM_Socket.h b/source/blender/compositor/intern/COM_Socket.h index 8ad7a5c7fde..0be21a6b1b8 100644 --- a/source/blender/compositor/intern/COM_Socket.h +++ b/source/blender/compositor/intern/COM_Socket.h @@ -34,33 +34,33 @@ class SocketConnection; class NodeBase; /** - * @brief Base class for InputSocket and OutputSocket. - * - * A socket are the points on an node where the user can make a connection between. - * Sockets are always part of a node or an operation. - * - * @see InputSocket - * @see OutputSocket - * @see SocketConnection - a connection between an InputSocket and an OutputSocket - * @ingroup Model - */ + * @brief Base class for InputSocket and OutputSocket. + * + * A socket are the points on an node where the user can make a connection between. + * Sockets are always part of a node or an operation. + * + * @see InputSocket + * @see OutputSocket + * @see SocketConnection - a connection between an InputSocket and an OutputSocket + * @ingroup Model + */ class Socket { private: /** - * Reference to the node where this Socket belongs to - */ + * Reference to the node where this Socket belongs to + */ NodeBase *node; /** - * the datatype of this socket. Is used for automatically data transformation. - * @section data-conversion - */ + * the datatype of this socket. Is used for automatically data transformation. + * @section data-conversion + */ DataType datatype; /** - * the actual data type during execution. This can be different than the field datatype, based on the conversion rules of the node - * @section data-conversion - */ + * the actual data type during execution. This can be different than the field datatype, based on the conversion rules of the node + * @section data-conversion + */ DataType actualType; bNodeSocket *editorSocket; @@ -72,17 +72,17 @@ public: NodeBase *getNode() const; /** - * @brief get the actual data type - * - * @note The actual data type can differ from the data type this socket expects. - * @return actual DataType - */ + * @brief get the actual data type + * + * @note The actual data type can differ from the data type this socket expects. + * @return actual DataType + */ DataType getActualDataType() const; /** - * @brief set the actual data type - * @param actualType the new actual type - */ + * @brief set the actual data type + * @param actualType the new actual type + */ void setActualDataType(DataType actualType); const virtual int isConnected() const; @@ -90,9 +90,9 @@ public: int isOutputSocket() const; virtual void determineResolution(int resolution[], unsigned int preferredResolution[]) {} virtual void determineActualDataType() {} - - void setEditorSocket(bNodeSocket *editorSocket) {this->editorSocket = editorSocket;} - bNodeSocket *getbNodeSocket() const {return this->editorSocket;} + + void setEditorSocket(bNodeSocket *editorSocket) { this->editorSocket = editorSocket; } + bNodeSocket *getbNodeSocket() const { return this->editorSocket; } }; diff --git a/source/blender/compositor/intern/COM_SocketConnection.h b/source/blender/compositor/intern/COM_SocketConnection.h index 1c4dcebfe07..5385c5be49b 100644 --- a/source/blender/compositor/intern/COM_SocketConnection.h +++ b/source/blender/compositor/intern/COM_SocketConnection.h @@ -29,94 +29,94 @@ #include "COM_ChannelInfo.h" /** - * @brief An SocketConnection is an connection between an InputSocket and an OutputSocket. - * - * <pre> - * +----------+ To InputSocket +----------+ - * | From | SocketConnection \| To Node | - * | Node *====================* | - * | |\ | | - * | | From OutputSocket +----------+ - * +----------+ - * </pre> - * @ingroup Model - * @see InputSocket - * @see OutputSocket - */ + * @brief An SocketConnection is an connection between an InputSocket and an OutputSocket. + * + * <pre> + * +----------+ To InputSocket +----------+ + * | From | SocketConnection \| To Node | + * | Node *====================* | + * | |\ | | + * | | From OutputSocket +----------+ + * +----------+ + * </pre> + * @ingroup Model + * @see InputSocket + * @see OutputSocket + */ class SocketConnection { private: /** - * @brief Startpoint of the connection - */ + * @brief Startpoint of the connection + */ OutputSocket *fromSocket; /** - * @brief Endpoint of the connection - */ + * @brief Endpoint of the connection + */ InputSocket *toSocket; /** - * @brief has the resize already been done for this connection - */ + * @brief has the resize already been done for this connection + */ bool ignoreResizeCheck; public: SocketConnection(); /** - * @brief set the startpoint of the connection - * @param fromsocket - */ + * @brief set the startpoint of the connection + * @param fromsocket + */ void setFromSocket(OutputSocket *fromsocket); /** - * @brief get the startpoint of the connection - * @return from OutputSocket - */ + * @brief get the startpoint of the connection + * @return from OutputSocket + */ OutputSocket *getFromSocket() const; /** - * @brief set the endpoint of the connection - * @param tosocket - */ + * @brief set the endpoint of the connection + * @param tosocket + */ void setToSocket(InputSocket *tosocket); /** - * @brief get the endpoint of the connection - * @return to InputSocket - */ + * @brief get the endpoint of the connection + * @return to InputSocket + */ InputSocket *getToSocket() const; /** - * @brief check if this connection is valid - */ + * @brief check if this connection is valid + */ bool isValid() const; /** - * @brief return the Node where this connection is connected from - */ - NodeBase * getFromNode() const; + * @brief return the Node where this connection is connected from + */ + NodeBase *getFromNode() const; /** - * @brief return the Node where this connection is connected to - */ - NodeBase * getToNode() const; + * @brief return the Node where this connection is connected to + */ + NodeBase *getToNode() const; /** - * @brief set, whether the resize has already been done for this SocketConnection - */ - void setIgnoreResizeCheck(bool check) {this->ignoreResizeCheck = check;} + * @brief set, whether the resize has already been done for this SocketConnection + */ + void setIgnoreResizeCheck(bool check) { this->ignoreResizeCheck = check; } /** - * @brief has the resize already been done for this SocketConnection - */ - bool isIgnoreResizeCheck() const { return this->ignoreResizeCheck;} + * @brief has the resize already been done for this SocketConnection + */ + bool isIgnoreResizeCheck() const { return this->ignoreResizeCheck; } /** - * @brief does this SocketConnection need resolution conversion - * @note PreviewOperation's will be ignored - * @note Already converted SocketConnection's will be ignored - * @return needs conversion [true:false] - */ + * @brief does this SocketConnection need resolution conversion + * @note PreviewOperation's will be ignored + * @note Already converted SocketConnection's will be ignored + * @return needs conversion [true:false] + */ bool needsResolutionConversion() const; }; diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h index 24322847517..3eb39e4bf02 100644 --- a/source/blender/compositor/intern/COM_SocketReader.h +++ b/source/blender/compositor/intern/COM_SocketReader.h @@ -33,43 +33,43 @@ typedef enum PixelSampler { class MemoryBuffer; /** - * @brief Helper class for reading socket data. - * Only use this class for dispatching (un-ary and n-ary) executions. - * @ingroup Execution - */ + * @brief Helper class for reading socket data. + * Only use this class for dispatching (un-ary and n-ary) executions. + * @ingroup Execution + */ class SocketReader { private: protected: /** - * @brief Holds the width of the output of this operation. - */ + * @brief Holds the width of the output of this operation. + */ unsigned int width; /** - * @brief Holds the height of the output of this operation. - */ + * @brief Holds the height of the output of this operation. + */ unsigned int height; /** - * @brief calculate a single pixel - * @note this method is called for non-complex - * @param result is a float[4] array to store the result - * @param x the x-coordinate of the pixel to calculate in image space - * @param y the y-coordinate of the pixel to calculate in image space - * @param inputBuffers chunks that can be read by their ReadBufferOperation. - */ + * @brief calculate a single pixel + * @note this method is called for non-complex + * @param result is a float[4] array to store the result + * @param x the x-coordinate of the pixel to calculate in image space + * @param y the y-coordinate of the pixel to calculate in image space + * @param inputBuffers chunks that can be read by their ReadBufferOperation. + */ virtual void executePixel(float *result, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) {} /** - * @brief calculate a single pixel - * @note this method is called for complex - * @param result is a float[4] array to store the result - * @param x the x-coordinate of the pixel to calculate in image space - * @param y the y-coordinate of the pixel to calculate in image space - * @param inputBuffers chunks that can be read by their ReadBufferOperation. - * @param chunkData chunk specific data a during execution time. - */ + * @brief calculate a single pixel + * @note this method is called for complex + * @param result is a float[4] array to store the result + * @param x the x-coordinate of the pixel to calculate in image space + * @param y the y-coordinate of the pixel to calculate in image space + * @param inputBuffers chunks that can be read by their ReadBufferOperation. + * @param chunkData chunk specific data a during execution time. + */ virtual void executePixel(float *result, int x, int y, MemoryBuffer *inputBuffers[], void *chunkData) { executePixel(result, x, y, COM_PS_NEAREST, inputBuffers); } @@ -97,17 +97,15 @@ public: executePixel(result, x, y, dx, dy, inputBuffers); } - virtual void *initializeTileData(rcti *rect, MemoryBuffer** memoryBuffers) { - return 0; - } - virtual void deinitializeTileData(rcti *rect, MemoryBuffer** memoryBuffers, void *data) { + virtual void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers) { return 0; } + virtual void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data) { } - virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer** memoryBuffers) {return 0;} + virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return 0; } - inline const unsigned int getWidth() const {return this->width;} - inline const unsigned int getHeight() const {return this->height;} + inline const unsigned int getWidth() const { return this->width; } + inline const unsigned int getHeight() const { return this->height; } }; #endif diff --git a/source/blender/compositor/intern/COM_WorkPackage.h b/source/blender/compositor/intern/COM_WorkPackage.h index 8bdf21499cf..18d83cc151c 100644 --- a/source/blender/compositor/intern/COM_WorkPackage.h +++ b/source/blender/compositor/intern/COM_WorkPackage.h @@ -28,37 +28,37 @@ class WorkPackage; #include "COM_ExecutionGroup.h" /** - * @brief contains data about work that can be scheduled - * @see WorkScheduler - */ + * @brief contains data about work that can be scheduled + * @see WorkScheduler + */ class WorkPackage { private: /** - * @brief executionGroup with the operations-setup to be evaluated - */ + * @brief executionGroup with the operations-setup to be evaluated + */ ExecutionGroup *executionGroup; /** - * @brief number of the chunk to be executed - */ + * @brief number of the chunk to be executed + */ unsigned int chunkNumber; public: /** - * @constructor - * @param group the ExecutionGroup - * @param chunkNumber the number of the chunk - */ + * @constructor + * @param group the ExecutionGroup + * @param chunkNumber the number of the chunk + */ WorkPackage(ExecutionGroup *group, unsigned int chunkNumber); /** - * @brief get the ExecutionGroup - */ - ExecutionGroup *getExecutionGroup() const {return this->executionGroup;} + * @brief get the ExecutionGroup + */ + ExecutionGroup *getExecutionGroup() const { return this->executionGroup; } /** - * @brief get the number of the chunk - */ - unsigned int getChunkNumber() const {return this->chunkNumber;} + * @brief get the number of the chunk + */ + unsigned int getChunkNumber() const { return this->chunkNumber; } }; #endif diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h index b03b514d139..e52e0295607 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.h +++ b/source/blender/compositor/intern/COM_WorkScheduler.h @@ -32,83 +32,83 @@ extern "C" { #include "COM_Device.h" /** @brief the workscheduler - * @ingroup execution - */ + * @ingroup execution + */ class WorkScheduler { #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE /** - * @brief are we being stopped. - */ + * @brief are we being stopped. + */ static bool isStopping(); /** - * @brief main thread loop for cpudevices - * inside this loop new work is queried and being executed - */ + * @brief main thread loop for cpudevices + * inside this loop new work is queried and being executed + */ static void *thread_execute_cpu(void *data); /** - * @brief main thread loop for gpudevices - * inside this loop new work is queried and being executed - */ + * @brief main thread loop for gpudevices + * inside this loop new work is queried and being executed + */ static void *thread_execute_gpu(void *data); #endif public: /** - * @brief schedule a chunk of a group to be calculated. - * An execution group schedules a chunk in the WorkScheduler - * when ExecutionGroup.isOpenCL is set the work will be handled by a OpenCLDevice - * otherwide the work is scheduled for an CPUDevice - * @see ExecutionGroup.execute - * @param group the execution group - * @param chunkNumber the number of the chunk in the group to be executed - */ + * @brief schedule a chunk of a group to be calculated. + * An execution group schedules a chunk in the WorkScheduler + * when ExecutionGroup.isOpenCL is set the work will be handled by a OpenCLDevice + * otherwide the work is scheduled for an CPUDevice + * @see ExecutionGroup.execute + * @param group the execution group + * @param chunkNumber the number of the chunk in the group to be executed + */ static void schedule(ExecutionGroup *group, int chunkNumber); /** - * @brief initialize the WorkScheduler - * - * during initialization the mutexes are initialized. - * there are two mutexes (for every device type one) - * After mutex initialization the system is queried in order to count the number of CPUDevices and GPUDevices to be created. - * For every hardware thread a CPUDevice and for every OpenCL GPU device a OpenCLDevice is created. - * these devices are stored in a separate list (cpudevices & gpudevices) - */ + * @brief initialize the WorkScheduler + * + * during initialization the mutexes are initialized. + * there are two mutexes (for every device type one) + * After mutex initialization the system is queried in order to count the number of CPUDevices and GPUDevices to be created. + * For every hardware thread a CPUDevice and for every OpenCL GPU device a OpenCLDevice is created. + * these devices are stored in a separate list (cpudevices & gpudevices) + */ static void initialize(); /** - * @brief deinitialize the WorkScheduler - * free all allocated resources - */ + * @brief deinitialize the WorkScheduler + * free all allocated resources + */ static void deinitialize(); /** - * @brief Start the execution - * this methods will start the WorkScheduler. Inside this method all threads are initialized. - * for every device a thread is created. - * @see initialize Initialization and query of the number of devices - */ + * @brief Start the execution + * this methods will start the WorkScheduler. Inside this method all threads are initialized. + * for every device a thread is created. + * @see initialize Initialization and query of the number of devices + */ static void start(CompositorContext &context); /** - * @brief stop the execution - * All created thread by the start method are destroyed. - * @see start - */ + * @brief stop the execution + * All created thread by the start method are destroyed. + * @see start + */ static void stop(); /** - * @brief wait for all work to be completed. - */ + * @brief wait for all work to be completed. + */ static void finish(); /** - * @brief Are there OpenCL capable GPU devices initialized? - * the result of this method is stored in the CompositorContext - * A node can generate a different operation tree when OpenCLDevices exists. - * @see CompositorContext.getHasActiveOpenCLDevices - */ + * @brief Are there OpenCL capable GPU devices initialized? + * the result of this method is stored in the CompositorContext + * A node can generate a different operation tree when OpenCLDevices exists. + * @see CompositorContext.getHasActiveOpenCLDevices + */ static bool hasGPUDevices(); }; #endif diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.h b/source/blender/compositor/nodes/COM_AlphaOverNode.h index 64f78e76837..f7375d9a7c5 100644 --- a/source/blender/compositor/nodes/COM_AlphaOverNode.h +++ b/source/blender/compositor/nodes/COM_AlphaOverNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief AlphaOverNode - * @ingroup Node - */ -class AlphaOverNode: public Node { + * @brief AlphaOverNode + * @ingroup Node + */ +class AlphaOverNode : public Node { public: - AlphaOverNode(bNode *editorNode) :Node(editorNode) {} - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + AlphaOverNode(bNode *editorNode) : Node(editorNode) {} + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.h b/source/blender/compositor/nodes/COM_BilateralBlurNode.h index a92de0eaa62..e6f9242fa32 100644 --- a/source/blender/compositor/nodes/COM_BilateralBlurNode.h +++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief BilateralBlurNode - * @ingroup Node - */ -class BilateralBlurNode: public Node { + * @brief BilateralBlurNode + * @ingroup Node + */ +class BilateralBlurNode : public Node { public: BilateralBlurNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_BlurNode.h b/source/blender/compositor/nodes/COM_BlurNode.h index 04a680c32cf..e7daff1c414 100644 --- a/source/blender/compositor/nodes/COM_BlurNode.h +++ b/source/blender/compositor/nodes/COM_BlurNode.h @@ -26,14 +26,14 @@ #include "COM_Node.h" /** - * @brief BlurNode - * @ingroup Node - */ + * @brief BlurNode + * @ingroup Node + */ -class BlurNode: public Node { +class BlurNode : public Node { public: BlurNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.h b/source/blender/compositor/nodes/COM_BokehBlurNode.h index eb9fada5112..5ce75a7d42b 100644 --- a/source/blender/compositor/nodes/COM_BokehBlurNode.h +++ b/source/blender/compositor/nodes/COM_BokehBlurNode.h @@ -26,14 +26,14 @@ #include "COM_Node.h" /** - * @brief BokehBlurNode - * @ingroup Node - */ + * @brief BokehBlurNode + * @ingroup Node + */ -class BokehBlurNode: public Node { +class BokehBlurNode : public Node { public: BokehBlurNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.h b/source/blender/compositor/nodes/COM_BokehImageNode.h index d4fabf0e516..a4bfe2bedc0 100644 --- a/source/blender/compositor/nodes/COM_BokehImageNode.h +++ b/source/blender/compositor/nodes/COM_BokehImageNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief BokehImageNode - * @ingroup Node - */ -class BokehImageNode: public Node { + * @brief BokehImageNode + * @ingroup Node + */ +class BokehImageNode : public Node { public: BokehImageNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.h b/source/blender/compositor/nodes/COM_BoxMaskNode.h index c71c6a18388..9ebe2cc755a 100644 --- a/source/blender/compositor/nodes/COM_BoxMaskNode.h +++ b/source/blender/compositor/nodes/COM_BoxMaskNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief BoxMaskNode - * @ingroup Node - */ -class BoxMaskNode: public Node { + * @brief BoxMaskNode + * @ingroup Node + */ +class BoxMaskNode : public Node { public: BoxMaskNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.h b/source/blender/compositor/nodes/COM_BrightnessNode.h index 4c3b6421322..a10372049f0 100644 --- a/source/blender/compositor/nodes/COM_BrightnessNode.h +++ b/source/blender/compositor/nodes/COM_BrightnessNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief BrightnessNode - * @ingroup Node - */ -class BrightnessNode: public Node { + * @brief BrightnessNode + * @ingroup Node + */ +class BrightnessNode : public Node { public: BrightnessNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.h b/source/blender/compositor/nodes/COM_ChannelMatteNode.h index cb67ac604b2..45d03e18a6a 100644 --- a/source/blender/compositor/nodes/COM_ChannelMatteNode.h +++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.h @@ -25,9 +25,9 @@ #include "COM_Node.h" /** - * @brief ChannelMatteNode - * @ingroup Node - */ + * @brief ChannelMatteNode + * @ingroup Node + */ class ChannelMatteNode : public Node { public: diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.h b/source/blender/compositor/nodes/COM_ChromaMatteNode.h index 6008137b4a7..ed8250b0329 100644 --- a/source/blender/compositor/nodes/COM_ChromaMatteNode.h +++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.h @@ -25,9 +25,9 @@ #include "COM_Node.h" /** - * @brief ChromaMatteNode - * @ingroup Node - */ + * @brief ChromaMatteNode + * @ingroup Node + */ class ChromaMatteNode : public Node { public: diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.h b/source/blender/compositor/nodes/COM_ColorBalanceNode.h index 61a09d28c01..c2bdc306e20 100644 --- a/source/blender/compositor/nodes/COM_ColorBalanceNode.h +++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.h @@ -26,9 +26,9 @@ #include "COM_Node.h" /** - * @brief ColorBalanceNode - * @ingroup Node - */ + * @brief ColorBalanceNode + * @ingroup Node + */ class ColorBalanceNode : public Node { public: diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.h b/source/blender/compositor/nodes/COM_ColorCorrectionNode.h index 46b7fe5e0bc..f1b0f69bec5 100644 --- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.h +++ b/source/blender/compositor/nodes/COM_ColorCorrectionNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief ColorCorrectionNode - * @ingroup Node - */ -class ColorCorrectionNode: public Node { + * @brief ColorCorrectionNode + * @ingroup Node + */ +class ColorCorrectionNode : public Node { public: ColorCorrectionNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.h b/source/blender/compositor/nodes/COM_ColorCurveNode.h index 264e2691566..ecfae1f86f8 100644 --- a/source/blender/compositor/nodes/COM_ColorCurveNode.h +++ b/source/blender/compositor/nodes/COM_ColorCurveNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief ColorCurveNode - * @ingroup Node - */ -class ColorCurveNode: public Node { + * @brief ColorCurveNode + * @ingroup Node + */ +class ColorCurveNode : public Node { public: ColorCurveNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_ColorMatteNode.h b/source/blender/compositor/nodes/COM_ColorMatteNode.h index af64616d054..375c914a122 100644 --- a/source/blender/compositor/nodes/COM_ColorMatteNode.h +++ b/source/blender/compositor/nodes/COM_ColorMatteNode.h @@ -25,9 +25,9 @@ #include "COM_Node.h" /** - * @brief ColorMatteNode - * @ingroup Node - */ + * @brief ColorMatteNode + * @ingroup Node + */ class ColorMatteNode : public Node { public: diff --git a/source/blender/compositor/nodes/COM_ColorNode.h b/source/blender/compositor/nodes/COM_ColorNode.h index 937979dd961..3e3df63e90a 100644 --- a/source/blender/compositor/nodes/COM_ColorNode.h +++ b/source/blender/compositor/nodes/COM_ColorNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief ColorNode - * @ingroup Node - */ -class ColorNode: public Node { + * @brief ColorNode + * @ingroup Node + */ +class ColorNode : public Node { public: ColorNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.h b/source/blender/compositor/nodes/COM_ColorRampNode.h index 53fff2b0d98..4d706e126e1 100644 --- a/source/blender/compositor/nodes/COM_ColorRampNode.h +++ b/source/blender/compositor/nodes/COM_ColorRampNode.h @@ -26,14 +26,14 @@ #include "COM_Node.h" /** - * @brief ColorRampNode - * @ingroup Node - */ + * @brief ColorRampNode + * @ingroup Node + */ class ColorRampNode : public Node { public: ColorRampNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif // COM_ColorRampNODE_H diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.h b/source/blender/compositor/nodes/COM_ColorSpillNode.h index ed0e33b0742..d8ce6878fa0 100644 --- a/source/blender/compositor/nodes/COM_ColorSpillNode.h +++ b/source/blender/compositor/nodes/COM_ColorSpillNode.h @@ -26,9 +26,9 @@ #include "COM_Node.h" /** - * @brief ColorSpillNode - * @ingroup Node - */ + * @brief ColorSpillNode + * @ingroup Node + */ class ColorSpillNode : public Node { public: diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.h b/source/blender/compositor/nodes/COM_ColorToBWNode.h index e2badd1b104..34a157c73d8 100644 --- a/source/blender/compositor/nodes/COM_ColorToBWNode.h +++ b/source/blender/compositor/nodes/COM_ColorToBWNode.h @@ -26,12 +26,12 @@ #include "COM_Node.h" #include "DNA_node_types.h" /** - * @brief ColourToBWNode - * @ingroup Node - */ + * @brief ColourToBWNode + * @ingroup Node + */ class ColourToBWNode : public Node { public: ColourToBWNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_CombineHSVANode.h b/source/blender/compositor/nodes/COM_CombineHSVANode.h index fabd6f91f7e..d8aba71d456 100644 --- a/source/blender/compositor/nodes/COM_CombineHSVANode.h +++ b/source/blender/compositor/nodes/COM_CombineHSVANode.h @@ -27,12 +27,12 @@ #include "DNA_node_types.h" #include "COM_CombineRGBANode.h" /** - * @brief CombineHSVANode - * @ingroup Node - */ + * @brief CombineHSVANode + * @ingroup Node + */ class CombineHSVANode : public CombineRGBANode { public: CombineHSVANode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_CombineRGBANode.h b/source/blender/compositor/nodes/COM_CombineRGBANode.h index 182bfece6d3..1f25d8deed9 100644 --- a/source/blender/compositor/nodes/COM_CombineRGBANode.h +++ b/source/blender/compositor/nodes/COM_CombineRGBANode.h @@ -26,12 +26,12 @@ #include "COM_Node.h" #include "DNA_node_types.h" /** - * @brief CombineRGBANode - * @ingroup Node - */ + * @brief CombineRGBANode + * @ingroup Node + */ class CombineRGBANode : public Node { public: CombineRGBANode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_CombineYCCANode.h b/source/blender/compositor/nodes/COM_CombineYCCANode.h index 86e2d50e950..3b143aabc7f 100644 --- a/source/blender/compositor/nodes/COM_CombineYCCANode.h +++ b/source/blender/compositor/nodes/COM_CombineYCCANode.h @@ -26,9 +26,9 @@ #include "DNA_node_types.h" #include "COM_CombineRGBANode.h" /** - * @brief CombineYCCANode - * @ingroup Node - */ + * @brief CombineYCCANode + * @ingroup Node + */ class CombineYCCANode : public CombineRGBANode { public: CombineYCCANode(bNode *editorNode); diff --git a/source/blender/compositor/nodes/COM_CombineYUVANode.h b/source/blender/compositor/nodes/COM_CombineYUVANode.h index 7d2f9cddf7e..1eae44c83a5 100644 --- a/source/blender/compositor/nodes/COM_CombineYUVANode.h +++ b/source/blender/compositor/nodes/COM_CombineYUVANode.h @@ -26,9 +26,9 @@ #include "DNA_node_types.h" #include "COM_CombineRGBANode.h" /** - * @brief CombineYUVANode - * @ingroup Node - */ + * @brief CombineYUVANode + * @ingroup Node + */ class CombineYUVANode : public CombineRGBANode { public: CombineYUVANode(bNode *editorNode); diff --git a/source/blender/compositor/nodes/COM_CompositorNode.h b/source/blender/compositor/nodes/COM_CompositorNode.h index e77d1d2f225..585dae7761e 100644 --- a/source/blender/compositor/nodes/COM_CompositorNode.h +++ b/source/blender/compositor/nodes/COM_CompositorNode.h @@ -26,12 +26,12 @@ #include "COM_Node.h" #include "DNA_node_types.h" /** - * @brief CompositorNode - * @ingroup Node - */ + * @brief CompositorNode + * @ingroup Node + */ class CompositorNode : public Node { public: CompositorNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.h b/source/blender/compositor/nodes/COM_ConvertAlphaNode.h index 2e3fe743f4e..d9077c23a02 100644 --- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.h +++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.h @@ -25,13 +25,13 @@ #include "COM_Node.h" /** - * @brief ConvertAlphaNode - * @ingroup Node - */ -class ConvertAlphaNode: public Node { + * @brief ConvertAlphaNode + * @ingroup Node + */ +class ConvertAlphaNode : public Node { public: - ConvertAlphaNode(bNode *editorNode) :Node(editorNode) {} - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + ConvertAlphaNode(bNode *editorNode) : Node(editorNode) {} + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_CropNode.h b/source/blender/compositor/nodes/COM_CropNode.h index 0bdfffc8fec..44fdeecc180 100644 --- a/source/blender/compositor/nodes/COM_CropNode.h +++ b/source/blender/compositor/nodes/COM_CropNode.h @@ -25,10 +25,10 @@ #include "COM_Node.h" -class CropNode: public Node { +class CropNode : public Node { public: CropNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_DefocusNode.h b/source/blender/compositor/nodes/COM_DefocusNode.h index d52ee3da77b..a3cffbd98c4 100644 --- a/source/blender/compositor/nodes/COM_DefocusNode.h +++ b/source/blender/compositor/nodes/COM_DefocusNode.h @@ -26,14 +26,14 @@ #include "COM_Node.h" /** - * @brief DefocusNode - * @ingroup Node - */ + * @brief DefocusNode + * @ingroup Node + */ -class DefocusNode: public Node { +class DefocusNode : public Node { public: DefocusNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.h b/source/blender/compositor/nodes/COM_DifferenceMatteNode.h index 3b270ebc3b7..faaf235bf34 100644 --- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.h +++ b/source/blender/compositor/nodes/COM_DifferenceMatteNode.h @@ -26,14 +26,14 @@ #include "COM_Node.h" /** - * @brief DifferenceMatteNode - * @ingroup Node - */ + * @brief DifferenceMatteNode + * @ingroup Node + */ class DifferenceMatteNode : public Node { public: DifferenceMatteNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif // COM_DifferenceMatteNODE_H diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.h b/source/blender/compositor/nodes/COM_DilateErodeNode.h index 496bd0203dd..fa4e368e00d 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.h +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief DilateErodeNode - * @ingroup Node - */ -class DilateErodeNode: public Node { + * @brief DilateErodeNode + * @ingroup Node + */ +class DilateErodeNode : public Node { public: DilateErodeNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.h b/source/blender/compositor/nodes/COM_DirectionalBlurNode.h index 1cf36fdeae7..d387ecf81dc 100644 --- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.h +++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief DirectionalBlurNode - * @ingroup Node - */ -class DirectionalBlurNode: public Node { + * @brief DirectionalBlurNode + * @ingroup Node + */ +class DirectionalBlurNode : public Node { public: DirectionalBlurNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.h b/source/blender/compositor/nodes/COM_DisplaceNode.h index 3451f05dd1f..ecbe07b06b9 100644 --- a/source/blender/compositor/nodes/COM_DisplaceNode.h +++ b/source/blender/compositor/nodes/COM_DisplaceNode.h @@ -31,6 +31,6 @@ class DisplaceNode : public Node { public: DisplaceNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.h b/source/blender/compositor/nodes/COM_DistanceMatteNode.h index 740eb767a71..42582ef10a0 100644 --- a/source/blender/compositor/nodes/COM_DistanceMatteNode.h +++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.h @@ -25,9 +25,9 @@ #include "COM_Node.h" /** - * @brief DistanceMatteNode - * @ingroup Node - */ + * @brief DistanceMatteNode + * @ingroup Node + */ class DistanceMatteNode : public Node { public: diff --git a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h index 2c52e988946..ebcddc06b05 100644 --- a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h +++ b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief DoubleEdgeMaskNode - * @ingroup Node - */ -class DoubleEdgeMaskNode: public Node { + * @brief DoubleEdgeMaskNode + * @ingroup Node + */ +class DoubleEdgeMaskNode : public Node { public: DoubleEdgeMaskNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.h b/source/blender/compositor/nodes/COM_EllipseMaskNode.h index be6956e30b5..3e534451b13 100644 --- a/source/blender/compositor/nodes/COM_EllipseMaskNode.h +++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief EllipseMaskNode - * @ingroup Node - */ -class EllipseMaskNode: public Node { + * @brief EllipseMaskNode + * @ingroup Node + */ +class EllipseMaskNode : public Node { public: EllipseMaskNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_FilterNode.h b/source/blender/compositor/nodes/COM_FilterNode.h index 080682dcefe..17f590b9cfc 100644 --- a/source/blender/compositor/nodes/COM_FilterNode.h +++ b/source/blender/compositor/nodes/COM_FilterNode.h @@ -26,14 +26,14 @@ #include "COM_Node.h" /** - * @brief FilterNode - * @ingroup Node - */ + * @brief FilterNode + * @ingroup Node + */ class FilterNode : public Node { public: FilterNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif // COM_FILTERNODE_H diff --git a/source/blender/compositor/nodes/COM_FlipNode.h b/source/blender/compositor/nodes/COM_FlipNode.h index 53bcc504f80..1e372a80b57 100644 --- a/source/blender/compositor/nodes/COM_FlipNode.h +++ b/source/blender/compositor/nodes/COM_FlipNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief FlipNode - * @ingroup Node - */ -class FlipNode: public Node { + * @brief FlipNode + * @ingroup Node + */ +class FlipNode : public Node { public: FlipNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_GammaNode.h b/source/blender/compositor/nodes/COM_GammaNode.h index 121d99cbd57..d4e1f0abd5a 100644 --- a/source/blender/compositor/nodes/COM_GammaNode.h +++ b/source/blender/compositor/nodes/COM_GammaNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief GammaNode - * @ingroup Node - */ -class GammaNode: public Node { + * @brief GammaNode + * @ingroup Node + */ +class GammaNode : public Node { public: GammaNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_GlareNode.h b/source/blender/compositor/nodes/COM_GlareNode.h index 97a75445db7..beb01db733a 100644 --- a/source/blender/compositor/nodes/COM_GlareNode.h +++ b/source/blender/compositor/nodes/COM_GlareNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief GlareNode - * @ingroup Node - */ -class GlareNode: public Node { + * @brief GlareNode + * @ingroup Node + */ +class GlareNode : public Node { public: GlareNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_GroupNode.h b/source/blender/compositor/nodes/COM_GroupNode.h index e35c9cbce33..ba270eaf16c 100644 --- a/source/blender/compositor/nodes/COM_GroupNode.h +++ b/source/blender/compositor/nodes/COM_GroupNode.h @@ -27,30 +27,30 @@ #include "COM_ExecutionSystem.h" /** - * @brief Represents a group node - * @ingroup Node - */ -class GroupNode: public Node { + * @brief Represents a group node + * @ingroup Node + */ +class GroupNode : public Node { public: GroupNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); /** - * @brief check if this node a group node. - * @returns true - */ + * @brief check if this node a group node. + * @returns true + */ bool isGroupNode() const { return true; } /** - * @brief ungroup this group node. - * during ungroup the subtree (internal nodes and links) of the group node - * are added to the ExecutionSystem. - * - * Between the main tree and the subtree proxy nodes will be added - * to translate between InputSocket and OutputSocket - * - * @param system the ExecutionSystem where to add the subtree - */ + * @brief ungroup this group node. + * during ungroup the subtree (internal nodes and links) of the group node + * are added to the ExecutionSystem. + * + * Between the main tree and the subtree proxy nodes will be added + * to translate between InputSocket and OutputSocket + * + * @param system the ExecutionSystem where to add the subtree + */ void ungroup(ExecutionSystem &system); }; diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h index d69990f712c..ed5f2b51ce3 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h +++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h @@ -26,12 +26,12 @@ #include "COM_Node.h" /** - * @brief HueSaturationValueCorrectNode - * @ingroup Node - */ + * @brief HueSaturationValueCorrectNode + * @ingroup Node + */ class HueSaturationValueCorrectNode : public Node { public: HueSaturationValueCorrectNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.h b/source/blender/compositor/nodes/COM_HueSaturationValueNode.h index 4fa1a4f547c..92c18019196 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.h +++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.h @@ -26,12 +26,12 @@ #include "COM_Node.h" /** - * @brief HueSaturationValueNode - * @ingroup Node - */ + * @brief HueSaturationValueNode + * @ingroup Node + */ class HueSaturationValueNode : public Node { public: HueSaturationValueNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.h b/source/blender/compositor/nodes/COM_IDMaskNode.h index 2ccbbc08f9a..9fd52be2120 100644 --- a/source/blender/compositor/nodes/COM_IDMaskNode.h +++ b/source/blender/compositor/nodes/COM_IDMaskNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief IDMaskNode - * @ingroup Node - */ -class IDMaskNode: public Node { + * @brief IDMaskNode + * @ingroup Node + */ +class IDMaskNode : public Node { public: IDMaskNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h index 70c3ab7f4b0..384dd6c09ff 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.h +++ b/source/blender/compositor/nodes/COM_ImageNode.h @@ -30,15 +30,15 @@ extern "C" { } /** - * @brief ImageNode - * @ingroup Node - */ + * @brief ImageNode + * @ingroup Node + */ class ImageNode : public Node { private: NodeOperation *doMultilayerCheck(ExecutionSystem *system, RenderLayer *rl, Image *image, ImageUser *user, int framenumber, int outputsocketIndex, int pass, DataType datatype); public: ImageNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; diff --git a/source/blender/compositor/nodes/COM_InvertNode.h b/source/blender/compositor/nodes/COM_InvertNode.h index 570e86445e6..d061f1c12bd 100644 --- a/source/blender/compositor/nodes/COM_InvertNode.h +++ b/source/blender/compositor/nodes/COM_InvertNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief InvertNode - * @ingroup Node - */ -class InvertNode: public Node { + * @brief InvertNode + * @ingroup Node + */ +class InvertNode : public Node { public: InvertNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.h b/source/blender/compositor/nodes/COM_LensDistortionNode.h index 64de740fde8..52529823441 100644 --- a/source/blender/compositor/nodes/COM_LensDistortionNode.h +++ b/source/blender/compositor/nodes/COM_LensDistortionNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief LensDistortionNode - * @ingroup Node - */ -class LensDistortionNode: public Node { + * @brief LensDistortionNode + * @ingroup Node + */ +class LensDistortionNode : public Node { public: LensDistortionNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.h b/source/blender/compositor/nodes/COM_LuminanceMatteNode.h index e2dd8b47833..c699a0d1168 100644 --- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.h +++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.h @@ -25,9 +25,9 @@ #include "COM_Node.h" /** - * @brief LuminanceMatteNode - * @ingroup Node - */ + * @brief LuminanceMatteNode + * @ingroup Node + */ class LuminanceMatteNode : public Node { public: diff --git a/source/blender/compositor/nodes/COM_MapUVNode.h b/source/blender/compositor/nodes/COM_MapUVNode.h index 3092e84990f..a1df790f192 100644 --- a/source/blender/compositor/nodes/COM_MapUVNode.h +++ b/source/blender/compositor/nodes/COM_MapUVNode.h @@ -31,6 +31,6 @@ class MapUVNode : public Node { public: MapUVNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_MapValueNode.h b/source/blender/compositor/nodes/COM_MapValueNode.h index 47a6ea6adce..c7a842dff95 100644 --- a/source/blender/compositor/nodes/COM_MapValueNode.h +++ b/source/blender/compositor/nodes/COM_MapValueNode.h @@ -26,12 +26,12 @@ #include "COM_Node.h" #include "DNA_node_types.h" /** - * @brief MapValueNode - * @ingroup Node - */ + * @brief MapValueNode + * @ingroup Node + */ class MapValueNode : public Node { public: MapValueNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_MaskNode.h b/source/blender/compositor/nodes/COM_MaskNode.h index 9d2ea1889d9..8a9bc50eac7 100644 --- a/source/blender/compositor/nodes/COM_MaskNode.h +++ b/source/blender/compositor/nodes/COM_MaskNode.h @@ -25,9 +25,9 @@ #include "DNA_node_types.h" /** - * @brief MaskNode - * @ingroup Node - */ + * @brief MaskNode + * @ingroup Node + */ class MaskNode : public Node { diff --git a/source/blender/compositor/nodes/COM_MathNode.h b/source/blender/compositor/nodes/COM_MathNode.h index 1e2cccda396..16d65843b0d 100644 --- a/source/blender/compositor/nodes/COM_MathNode.h +++ b/source/blender/compositor/nodes/COM_MathNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief MathNode - * @ingroup Node - */ -class MathNode: public Node { + * @brief MathNode + * @ingroup Node + */ +class MathNode : public Node { public: - MathNode(bNode *editorNode) :Node(editorNode) {} - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + MathNode(bNode *editorNode) : Node(editorNode) {} + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_MixNode.h b/source/blender/compositor/nodes/COM_MixNode.h index 4b57bdbc02a..99e8b4d48f0 100644 --- a/source/blender/compositor/nodes/COM_MixNode.h +++ b/source/blender/compositor/nodes/COM_MixNode.h @@ -26,12 +26,12 @@ #include "COM_Node.h" #include "DNA_node_types.h" /** - * @brief MixNode - * @ingroup Node - */ + * @brief MixNode + * @ingroup Node + */ class MixNode : public Node { public: MixNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.h b/source/blender/compositor/nodes/COM_MovieClipNode.h index 8ad2fa8cbb0..d70881a6725 100644 --- a/source/blender/compositor/nodes/COM_MovieClipNode.h +++ b/source/blender/compositor/nodes/COM_MovieClipNode.h @@ -24,14 +24,14 @@ #include "DNA_node_types.h" /** - * @brief MovieClipNode - * @ingroup Node - */ + * @brief MovieClipNode + * @ingroup Node + */ class MovieClipNode : public Node { public: MovieClipNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.h b/source/blender/compositor/nodes/COM_MovieDistortionNode.h index 5ee328c9df3..b97600bb64e 100644 --- a/source/blender/compositor/nodes/COM_MovieDistortionNode.h +++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief MovieDistortionNode - * @ingroup Node - */ -class MovieDistortionNode: public Node { + * @brief MovieDistortionNode + * @ingroup Node + */ +class MovieDistortionNode : public Node { public: MovieDistortionNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_MuteNode.h b/source/blender/compositor/nodes/COM_MuteNode.h index 2dfc786ef2b..aab37e5f888 100644 --- a/source/blender/compositor/nodes/COM_MuteNode.h +++ b/source/blender/compositor/nodes/COM_MuteNode.h @@ -26,15 +26,15 @@ #include "COM_Node.h" /** - * @brief MuteNode - * @ingroup Node - */ -class MuteNode: public Node { + * @brief MuteNode + * @ingroup Node + */ +class MuteNode : public Node { public: MuteNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); private: - void reconnect(ExecutionSystem *graph, OutputSocket * output); + void reconnect(ExecutionSystem *graph, OutputSocket *output); }; #endif diff --git a/source/blender/compositor/nodes/COM_NormalNode.h b/source/blender/compositor/nodes/COM_NormalNode.h index 1e7c7c584c3..bf684298e65 100644 --- a/source/blender/compositor/nodes/COM_NormalNode.h +++ b/source/blender/compositor/nodes/COM_NormalNode.h @@ -26,14 +26,14 @@ #include "COM_Node.h" /** - * @brief NormalNode - * @ingroup Node - */ + * @brief NormalNode + * @ingroup Node + */ class NormalNode : public Node { public: NormalNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif // COM_NormalNODE_H diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.h b/source/blender/compositor/nodes/COM_NormalizeNode.h index ce7a6e1f7ab..ea1497efdc6 100644 --- a/source/blender/compositor/nodes/COM_NormalizeNode.h +++ b/source/blender/compositor/nodes/COM_NormalizeNode.h @@ -25,13 +25,13 @@ #include "COM_Node.h" /** - * @brief NormalizeNode - * @ingroup Node - */ -class NormalizeNode: public Node { + * @brief NormalizeNode + * @ingroup Node + */ +class NormalizeNode : public Node { public: NormalizeNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.h b/source/blender/compositor/nodes/COM_OutputFileNode.h index 10cbba7d50f..79c9b577643 100644 --- a/source/blender/compositor/nodes/COM_OutputFileNode.h +++ b/source/blender/compositor/nodes/COM_OutputFileNode.h @@ -28,13 +28,13 @@ #include "DNA_node_types.h" /** - * @brief OutputFileNode - * @ingroup Node - */ + * @brief OutputFileNode + * @ingroup Node + */ class OutputFileNode : public Node { public: OutputFileNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.h b/source/blender/compositor/nodes/COM_RenderLayersNode.h index f796a7147d9..32672c8ba2d 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.h +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.h @@ -25,13 +25,13 @@ #include "COM_RenderLayersBaseProg.h" /** - * @brief RenderLayersNode - * @ingroup Node - */ + * @brief RenderLayersNode + * @ingroup Node + */ class RenderLayersNode : public Node { public: RenderLayersNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); private: - void testSocketConnection(ExecutionSystem *graph, int outputSocketNumber, RenderLayersBaseProg * operation); + void testSocketConnection(ExecutionSystem *graph, int outputSocketNumber, RenderLayersBaseProg *operation); }; diff --git a/source/blender/compositor/nodes/COM_RotateNode.h b/source/blender/compositor/nodes/COM_RotateNode.h index 9b471742aab..6e3801e5353 100644 --- a/source/blender/compositor/nodes/COM_RotateNode.h +++ b/source/blender/compositor/nodes/COM_RotateNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief RotateNode - * @ingroup Node - */ -class RotateNode: public Node { + * @brief RotateNode + * @ingroup Node + */ +class RotateNode : public Node { public: RotateNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_ScaleNode.h b/source/blender/compositor/nodes/COM_ScaleNode.h index 310ae96a65e..17c7b672a59 100644 --- a/source/blender/compositor/nodes/COM_ScaleNode.h +++ b/source/blender/compositor/nodes/COM_ScaleNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief ScaleNode - * @ingroup Node - */ -class ScaleNode: public Node { + * @brief ScaleNode + * @ingroup Node + */ +class ScaleNode : public Node { public: ScaleNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_SeparateHSVANode.h b/source/blender/compositor/nodes/COM_SeparateHSVANode.h index 9fbd0212509..4a7e86849dc 100644 --- a/source/blender/compositor/nodes/COM_SeparateHSVANode.h +++ b/source/blender/compositor/nodes/COM_SeparateHSVANode.h @@ -28,12 +28,12 @@ #include "COM_SeparateRGBANode.h" /** - * @brief SeparateHSVANode - * @ingroup Node - */ + * @brief SeparateHSVANode + * @ingroup Node + */ class SeparateHSVANode : public SeparateRGBANode { public: SeparateHSVANode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_SeparateRGBANode.h b/source/blender/compositor/nodes/COM_SeparateRGBANode.h index 5fb00600790..c1be02753da 100644 --- a/source/blender/compositor/nodes/COM_SeparateRGBANode.h +++ b/source/blender/compositor/nodes/COM_SeparateRGBANode.h @@ -26,12 +26,12 @@ #include "COM_Node.h" #include "DNA_node_types.h" /** - * @brief SeparateRGBANode - * @ingroup Node - */ + * @brief SeparateRGBANode + * @ingroup Node + */ class SeparateRGBANode : public Node { public: SeparateRGBANode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_SeparateYCCANode.h b/source/blender/compositor/nodes/COM_SeparateYCCANode.h index 441eba9bc93..4b216841e2a 100644 --- a/source/blender/compositor/nodes/COM_SeparateYCCANode.h +++ b/source/blender/compositor/nodes/COM_SeparateYCCANode.h @@ -27,9 +27,9 @@ #include "COM_SeparateRGBANode.h" /** - * @brief SeparateYCCANode - * @ingroup Node - */ + * @brief SeparateYCCANode + * @ingroup Node + */ class SeparateYCCANode : public SeparateRGBANode { public: SeparateYCCANode(bNode *editorNode); diff --git a/source/blender/compositor/nodes/COM_SeparateYUVANode.h b/source/blender/compositor/nodes/COM_SeparateYUVANode.h index 136ce1b4f20..e1763e37dff 100644 --- a/source/blender/compositor/nodes/COM_SeparateYUVANode.h +++ b/source/blender/compositor/nodes/COM_SeparateYUVANode.h @@ -27,9 +27,9 @@ #include "COM_SeparateRGBANode.h" /** - * @brief SeparateYUVANode - * @ingroup Node - */ + * @brief SeparateYUVANode + * @ingroup Node + */ class SeparateYUVANode : public SeparateRGBANode { public: SeparateYUVANode(bNode *editorNode); diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.h b/source/blender/compositor/nodes/COM_SetAlphaNode.h index c6b603049c5..0707cf5dac1 100644 --- a/source/blender/compositor/nodes/COM_SetAlphaNode.h +++ b/source/blender/compositor/nodes/COM_SetAlphaNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief SetAlphaNode - * @ingroup Node - */ -class SetAlphaNode: public Node { + * @brief SetAlphaNode + * @ingroup Node + */ +class SetAlphaNode : public Node { public: - SetAlphaNode(bNode *editorNode) :Node(editorNode) {} - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + SetAlphaNode(bNode *editorNode) : Node(editorNode) {} + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.h b/source/blender/compositor/nodes/COM_SocketProxyNode.h index b73ca24a45e..ea50be418e2 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.h +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief SocketProxyNode - * @ingroup Node - */ -class SocketProxyNode: public Node { + * @brief SocketProxyNode + * @ingroup Node + */ +class SocketProxyNode : public Node { public: SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); virtual bool isProxyNode() const { return true; } }; diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.h b/source/blender/compositor/nodes/COM_SplitViewerNode.h index e2d7a8c0dc9..6c532d4e813 100644 --- a/source/blender/compositor/nodes/COM_SplitViewerNode.h +++ b/source/blender/compositor/nodes/COM_SplitViewerNode.h @@ -26,12 +26,12 @@ #include "COM_Node.h" #include "DNA_node_types.h" /** - * @brief SplitViewerNode - * @ingroup Node - */ + * @brief SplitViewerNode + * @ingroup Node + */ class SplitViewerNode : public Node { public: SplitViewerNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.h b/source/blender/compositor/nodes/COM_Stabilize2dNode.h index 63bf50b4d69..589e090b48c 100644 --- a/source/blender/compositor/nodes/COM_Stabilize2dNode.h +++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.h @@ -24,11 +24,11 @@ #include "DNA_node_types.h" /** - * @brief Stabilize2dNode - * @ingroup Node - */ + * @brief Stabilize2dNode + * @ingroup Node + */ class Stabilize2dNode : public Node { public: Stabilize2dNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; diff --git a/source/blender/compositor/nodes/COM_SwitchNode.h b/source/blender/compositor/nodes/COM_SwitchNode.h index da93af42489..be3d54c3000 100644 --- a/source/blender/compositor/nodes/COM_SwitchNode.h +++ b/source/blender/compositor/nodes/COM_SwitchNode.h @@ -27,12 +27,12 @@ #include "COM_NodeOperation.h" #include "DNA_node_types.h" /** - * @brief SwitchNode - * @ingroup Node - */ + * @brief SwitchNode + * @ingroup Node + */ class SwitchNode : public Node { public: SwitchNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_TextureNode.h b/source/blender/compositor/nodes/COM_TextureNode.h index 15c39db9077..e0d931c65da 100644 --- a/source/blender/compositor/nodes/COM_TextureNode.h +++ b/source/blender/compositor/nodes/COM_TextureNode.h @@ -24,11 +24,11 @@ #include "DNA_node_types.h" /** - * @brief TextureNode - * @ingroup Node - */ + * @brief TextureNode + * @ingroup Node + */ class TextureNode : public Node { public: TextureNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; diff --git a/source/blender/compositor/nodes/COM_TimeNode.h b/source/blender/compositor/nodes/COM_TimeNode.h index 26751f6f104..df3cf024714 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.h +++ b/source/blender/compositor/nodes/COM_TimeNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief TimeNode - * @ingroup Node - */ -class TimeNode: public Node { + * @brief TimeNode + * @ingroup Node + */ +class TimeNode : public Node { public: TimeNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_TonemapNode.h b/source/blender/compositor/nodes/COM_TonemapNode.h index d6dd8474afa..ad0d218826a 100644 --- a/source/blender/compositor/nodes/COM_TonemapNode.h +++ b/source/blender/compositor/nodes/COM_TonemapNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief TonemapNode - * @ingroup Node - */ -class TonemapNode: public Node { + * @brief TonemapNode + * @ingroup Node + */ +class TonemapNode : public Node { public: TonemapNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_TransformNode.h b/source/blender/compositor/nodes/COM_TransformNode.h index 237da44afd9..da40b655f29 100644 --- a/source/blender/compositor/nodes/COM_TransformNode.h +++ b/source/blender/compositor/nodes/COM_TransformNode.h @@ -24,11 +24,11 @@ #include "DNA_node_types.h" /** - * @brief TransformNode - * @ingroup Node - */ + * @brief TransformNode + * @ingroup Node + */ class TransformNode : public Node { public: TransformNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; diff --git a/source/blender/compositor/nodes/COM_TranslateNode.h b/source/blender/compositor/nodes/COM_TranslateNode.h index 295024d6beb..8c350e9cfb3 100644 --- a/source/blender/compositor/nodes/COM_TranslateNode.h +++ b/source/blender/compositor/nodes/COM_TranslateNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief TranslateNode - * @ingroup Node - */ -class TranslateNode: public Node { + * @brief TranslateNode + * @ingroup Node + */ +class TranslateNode : public Node { public: TranslateNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_ValueNode.h b/source/blender/compositor/nodes/COM_ValueNode.h index 4faf193fc8e..4f478ae93af 100644 --- a/source/blender/compositor/nodes/COM_ValueNode.h +++ b/source/blender/compositor/nodes/COM_ValueNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief ValueNode - * @ingroup Node - */ -class ValueNode: public Node { + * @brief ValueNode + * @ingroup Node + */ +class ValueNode : public Node { public: ValueNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.h b/source/blender/compositor/nodes/COM_VectorBlurNode.h index 1df945731ce..6b5d277a54b 100644 --- a/source/blender/compositor/nodes/COM_VectorBlurNode.h +++ b/source/blender/compositor/nodes/COM_VectorBlurNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief VectorBlurNode - * @ingroup Node - */ -class VectorBlurNode: public Node { + * @brief VectorBlurNode + * @ingroup Node + */ +class VectorBlurNode : public Node { public: VectorBlurNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.h b/source/blender/compositor/nodes/COM_VectorCurveNode.h index 9fbcfd50156..3201090df14 100644 --- a/source/blender/compositor/nodes/COM_VectorCurveNode.h +++ b/source/blender/compositor/nodes/COM_VectorCurveNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief VectorCurveNode - * @ingroup Node - */ -class VectorCurveNode: public Node { + * @brief VectorCurveNode + * @ingroup Node + */ +class VectorCurveNode : public Node { public: VectorCurveNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.h b/source/blender/compositor/nodes/COM_ViewLevelsNode.h index 11be6216cba..2ac84fad22f 100644 --- a/source/blender/compositor/nodes/COM_ViewLevelsNode.h +++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief ViewLevelsNode - * @ingroup Node - */ -class ViewLevelsNode: public Node { + * @brief ViewLevelsNode + * @ingroup Node + */ +class ViewLevelsNode : public Node { public: ViewLevelsNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_ViewerNode.h b/source/blender/compositor/nodes/COM_ViewerNode.h index 59371f04e87..e1f1226f1f1 100644 --- a/source/blender/compositor/nodes/COM_ViewerNode.h +++ b/source/blender/compositor/nodes/COM_ViewerNode.h @@ -26,12 +26,12 @@ #include "COM_Node.h" #include "DNA_node_types.h" /** - * @brief ViewerNode - * @ingroup Node - */ + * @brief ViewerNode + * @ingroup Node + */ class ViewerNode : public Node { public: ViewerNode(bNode *editorNode); - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.h b/source/blender/compositor/nodes/COM_ZCombineNode.h index e9ce2f27469..a2ceedfc2cd 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.h +++ b/source/blender/compositor/nodes/COM_ZCombineNode.h @@ -26,13 +26,13 @@ #include "COM_Node.h" /** - * @brief ZCombineNode - * @ingroup Node - */ -class ZCombineNode: public Node { + * @brief ZCombineNode + * @ingroup Node + */ +class ZCombineNode : public Node { public: - ZCombineNode(bNode *editorNode) :Node(editorNode) {} - void convertToOperations(ExecutionSystem *graph, CompositorContext * context); + ZCombineNode(bNode *editorNode) : Node(editorNode) {} + void convertToOperations(ExecutionSystem *graph, CompositorContext *context); }; #endif diff --git a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h index d3077a05706..e5b1f56f06c 100644 --- a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h +++ b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h @@ -26,19 +26,19 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class AlphaOverKeyOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ AlphaOverKeyOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h index 92936a20b79..2807b3b489a 100644 --- a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h +++ b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h @@ -26,23 +26,23 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class AlphaOverMixedOperation : public MixBaseOperation { private: float x; public: /** - * Default constructor - */ + * Default constructor + */ AlphaOverMixedOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); - void setX(float x) {this->x = x;} + void setX(float x) { this->x = x; } }; #endif diff --git a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h index 2fe4422d03e..bba3b714f6b 100644 --- a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h +++ b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class AlphaOverPremultiplyOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ AlphaOverPremultiplyOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.h b/source/blender/compositor/operations/COM_AntiAliasOperation.h index fe160763828..906da598da1 100644 --- a/source/blender/compositor/operations/COM_AntiAliasOperation.h +++ b/source/blender/compositor/operations/COM_AntiAliasOperation.h @@ -26,35 +26,35 @@ #include "DNA_node_types.h" /** - * @brief AntiAlias operations - * it only supports anti aliasing on BW buffers. - * @ingroup operation - */ + * @brief AntiAlias operations + * it only supports anti aliasing on BW buffers. + * @ingroup operation + */ class AntiAliasOperation : public NodeOperation { protected: /** - * @brief Cached reference to the reader - */ - SocketReader * valueReader; + * @brief Cached reference to the reader + */ + SocketReader *valueReader; char *buffer; public: AntiAliasOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); }; diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.h b/source/blender/compositor/operations/COM_BilateralBlurOperation.h index 8ec1ba8df99..08b379dc4ea 100644 --- a/source/blender/compositor/operations/COM_BilateralBlurOperation.h +++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.h @@ -36,22 +36,22 @@ public: BilateralBlurOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void setData(NodeBilateralBlurData *data) {this->data = data;} + void setData(NodeBilateralBlurData *data) { this->data = data; } }; #endif diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.h b/source/blender/compositor/operations/COM_BlurBaseOperation.h index 24002588413..84fc243a5af 100644 --- a/source/blender/compositor/operations/COM_BlurBaseOperation.h +++ b/source/blender/compositor/operations/COM_BlurBaseOperation.h @@ -30,11 +30,11 @@ private: protected: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ SocketReader *inputProgram; SocketReader *inputSize; - NodeBlurData * data; + NodeBlurData *data; BlurBaseOperation(); float *make_gausstab(int rad); float size; @@ -43,19 +43,19 @@ protected: void updateSize(MemoryBuffer **memoryBuffers); public: /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeBlurData *data) {this->data = data;} - - void deleteDataWhenFinished() {this->deleteData = true;} + void setData(NodeBlurData *data) { this->data = data; } + + void deleteDataWhenFinished() { this->deleteData = true; } - void setSize(float size) {this->size = size; sizeavailable = true;} + void setSize(float size) { this->size = size; sizeavailable = true; } }; #endif diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.h b/source/blender/compositor/operations/COM_BokehBlurOperation.h index 3cdd995b1df..3ec61c5ce01 100644 --- a/source/blender/compositor/operations/COM_BokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_BokehBlurOperation.h @@ -39,23 +39,23 @@ public: void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void setSize(float size) {this->size = size;} + void setSize(float size) { this->size = size; } void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp); }; diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.h b/source/blender/compositor/operations/COM_BokehImageOperation.h index 516cc1da4f0..8edd32a4f77 100644 --- a/source/blender/compositor/operations/COM_BokehImageOperation.h +++ b/source/blender/compositor/operations/COM_BokehImageOperation.h @@ -45,23 +45,23 @@ public: BokehImageOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - void setData(NodeBokehImage *data) {this->data = data;} - void deleteDataOnFinish() {this->deleteData = true;} + void setData(NodeBokehImage *data) { this->data = data; } + void deleteDataOnFinish() { this->deleteData = true; } }; #endif diff --git a/source/blender/compositor/operations/COM_BoxMaskOperation.h b/source/blender/compositor/operations/COM_BoxMaskOperation.h index c3af95578d4..65327abc9a6 100644 --- a/source/blender/compositor/operations/COM_BoxMaskOperation.h +++ b/source/blender/compositor/operations/COM_BoxMaskOperation.h @@ -28,10 +28,10 @@ class BoxMaskOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputMask; - SocketReader * inputValue; + * Cached reference to the inputProgram + */ + SocketReader *inputMask; + SocketReader *inputValue; float sine; float cosine; @@ -43,23 +43,23 @@ public: BoxMaskOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeBoxMask *data) {this->data = data;} - - void setMaskType(int maskType) {this->maskType = maskType;} + void setData(NodeBoxMask *data) { this->data = data; } + + void setMaskType(int maskType) { this->maskType = maskType; } }; #endif diff --git a/source/blender/compositor/operations/COM_BrightnessOperation.h b/source/blender/compositor/operations/COM_BrightnessOperation.h index 0c718a8b131..74c648fd8fb 100644 --- a/source/blender/compositor/operations/COM_BrightnessOperation.h +++ b/source/blender/compositor/operations/COM_BrightnessOperation.h @@ -28,8 +28,8 @@ class BrightnessOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ SocketReader *inputProgram; SocketReader *inputBrightnessProgram; SocketReader *inputContrastProgram; @@ -38,18 +38,18 @@ public: BrightnessOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.h b/source/blender/compositor/operations/COM_CalculateMeanOperation.h index b21743aa8bc..7a28eb3774a 100644 --- a/source/blender/compositor/operations/COM_CalculateMeanOperation.h +++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.h @@ -26,15 +26,15 @@ #include "DNA_node_types.h" /** - * @brief base class of CalculateMean, implementing the simple CalculateMean - * @ingroup operation - */ + * @brief base class of CalculateMean, implementing the simple CalculateMean + * @ingroup operation + */ class CalculateMeanOperation : public NodeOperation { protected: /** - * @brief Cached reference to the reader - */ - SocketReader * imageReader; + * @brief Cached reference to the reader + */ + SocketReader *imageReader; bool iscalculated; float result; @@ -44,24 +44,24 @@ public: CalculateMeanOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void setSetting(int setting) {this->setting = setting;} + void setSetting(int setting) { this->setting = setting; } protected: void calculateMean(MemoryBuffer *tile); diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h index 05c94401c86..d3163d4cc32 100644 --- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h +++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h @@ -26,9 +26,9 @@ #include "DNA_node_types.h" #include "COM_CalculateMeanOperation.h" /** - * @brief base class of CalculateStandardDeviation, implementing the simple CalculateStandardDeviation - * @ingroup operation - */ + * @brief base class of CalculateStandardDeviation, implementing the simple CalculateStandardDeviation + * @ingroup operation + */ class CalculateStandardDeviationOperation : public CalculateMeanOperation { protected: float standardDeviation; @@ -37,9 +37,9 @@ public: CalculateStandardDeviationOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); diff --git a/source/blender/compositor/operations/COM_ChangeHSVOperation.h b/source/blender/compositor/operations/COM_ChangeHSVOperation.h index a89487f9d7b..a2a6c034a82 100644 --- a/source/blender/compositor/operations/COM_ChangeHSVOperation.h +++ b/source/blender/compositor/operations/COM_ChangeHSVOperation.h @@ -26,12 +26,12 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ChangeHSVOperation : public NodeOperation { private: - SocketReader * inputOperation; + SocketReader *inputOperation; float hue; float saturation; @@ -39,21 +39,21 @@ private: public: /** - * Default constructor - */ + * Default constructor + */ ChangeHSVOperation(); void initExecution(); void deinitExecution(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); - - void setHue(float hue) {this->hue = hue;} - void setSaturation(float saturation) {this->saturation = saturation;} - void setValue(float value) {this->value = value;} + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); + + void setHue(float hue) { this->hue = hue; } + void setSaturation(float saturation) { this->saturation = saturation; } + void setValue(float value) { this->value = value; } }; #endif diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.h b/source/blender/compositor/operations/COM_ChannelMatteOperation.h index a4b5f454f92..17db0f9ffe2 100644 --- a/source/blender/compositor/operations/COM_ChannelMatteOperation.h +++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.h @@ -25,9 +25,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ChannelMatteOperation : public NodeOperation { private: SocketReader *inputImageProgram; @@ -42,24 +42,24 @@ private: float limit_range; /** ids to use for the operations (max and simple) - * alpha = in[ids[0]] - max(in[ids[1]], in[ids[2]]) - * the simple operation is using: - * alpha = in[ids[0]] - in[ids[1]] - * but to use the same formula and operation for both we do: - * ids[2] = ids[1] - * alpha = in[ids[0]] - max(in[ids[1]], in[ids[2]]) - */ + * alpha = in[ids[0]] - max(in[ids[1]], in[ids[2]]) + * the simple operation is using: + * alpha = in[ids[0]] - in[ids[1]] + * but to use the same formula and operation for both we do: + * ids[2] = ids[1] + * alpha = in[ids[0]] - max(in[ids[1]], in[ids[2]]) + */ int ids[3]; public: /** - * Default constructor - */ + * Default constructor + */ ChannelMatteOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_ChromaMatteOperation.h b/source/blender/compositor/operations/COM_ChromaMatteOperation.h index 9c5a5ff997b..a09203f29b3 100644 --- a/source/blender/compositor/operations/COM_ChromaMatteOperation.h +++ b/source/blender/compositor/operations/COM_ChromaMatteOperation.h @@ -25,9 +25,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ChromaMatteOperation : public NodeOperation { private: NodeChroma *settings; @@ -35,18 +35,18 @@ private: SocketReader *inputKeyProgram; public: /** - * Default constructor - */ + * Default constructor + */ ChromaMatteOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;} + void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; } }; #endif diff --git a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h index fb973e75c15..9e7db59d99d 100644 --- a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h +++ b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h @@ -24,18 +24,17 @@ #define _COM_ColorBalanceASCCDLOperation_h #include "COM_NodeOperation.h" - /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ColorBalanceASCCDLOperation : public NodeOperation { protected: /** - * Prefetched reference to the inputProgram - */ - SocketReader * inputValueOperation; - SocketReader * inputColorOperation; + * Prefetched reference to the inputProgram + */ + SocketReader *inputValueOperation; + SocketReader *inputColorOperation; float gain[3]; float lift[3]; @@ -43,39 +42,27 @@ protected: public: /** - * Default constructor - */ + * Default constructor + */ ColorBalanceASCCDLOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setGain(float gain[3]) { - this->gain[0] = gain[0]; - this->gain[1] = gain[1]; - this->gain[2] = gain[2]; - } - void setLift(float lift[3]) { - this->lift[0] = lift[0]; - this->lift[1] = lift[1]; - this->lift[2] = lift[2]; - } - void setGamma(float gamma[3]) { - this->gamma[0] = gamma[0]; - this->gamma[1] = gamma[1]; - this->gamma[2] = gamma[2]; - } + void setGain(float gain[3]) { copy_v3_v3(this->gain, gain); } + void setLift(float lift[3]) { copy_v3_v3(this->lift, lift); } + void setGamma(float gamma[3]) { copy_v3_v3(this->gamma, gamma); } }; #endif diff --git a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h index e0df76cf2c5..54cfb49327f 100644 --- a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h +++ b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h @@ -26,16 +26,16 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ColorBalanceLGGOperation : public NodeOperation { protected: /** - * Prefetched reference to the inputProgram - */ - SocketReader * inputValueOperation; - SocketReader * inputColorOperation; + * Prefetched reference to the inputProgram + */ + SocketReader *inputValueOperation; + SocketReader *inputColorOperation; float gain[3]; float lift[3]; @@ -43,23 +43,23 @@ protected: public: /** - * Default constructor - */ + * Default constructor + */ ColorBalanceLGGOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void setGain(float gain[3]) { diff --git a/source/blender/compositor/operations/COM_ColorCorrectionOperation.h b/source/blender/compositor/operations/COM_ColorCorrectionOperation.h index 89107150ebd..c0c33f7f2fa 100644 --- a/source/blender/compositor/operations/COM_ColorCorrectionOperation.h +++ b/source/blender/compositor/operations/COM_ColorCorrectionOperation.h @@ -28,8 +28,8 @@ class ColorCorrectionOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ SocketReader *inputImage; SocketReader *inputMask; NodeColorCorrection *data; @@ -42,23 +42,23 @@ public: ColorCorrectionOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeColorCorrection * data) {this->data = data;} - void setRedChannelEnabled(bool enabled) {this->redChannelEnabled = enabled;} - void setGreenChannelEnabled(bool enabled) {this->greenChannelEnabled = enabled;} - void setBlueChannelEnabled(bool enabled) {this->blueChannelEnabled = enabled;} + void setData(NodeColorCorrection *data) { this->data = data; } + void setRedChannelEnabled(bool enabled) { this->redChannelEnabled = enabled; } + void setGreenChannelEnabled(bool enabled) { this->greenChannelEnabled = enabled; } + void setBlueChannelEnabled(bool enabled) { this->blueChannelEnabled = enabled; } }; #endif diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.h b/source/blender/compositor/operations/COM_ColorCurveOperation.h index 6ce5befb14a..fcd78be8372 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.h +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.h @@ -29,38 +29,38 @@ class ColorCurveOperation : public CurveBaseOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputFacProgram; - SocketReader * inputImageProgram; - SocketReader * inputBlackProgram; - SocketReader * inputWhiteProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputFacProgram; + SocketReader *inputImageProgram; + SocketReader *inputBlackProgram; + SocketReader *inputWhiteProgram; public: ColorCurveOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; class ConstantLevelColorCurveOperation : public CurveBaseOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputFacProgram; - SocketReader * inputImageProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputFacProgram; + SocketReader *inputImageProgram; float black[3]; float white[3]; @@ -68,22 +68,22 @@ public: ConstantLevelColorCurveOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setBlackLevel(float black[3]) {this->black[0] =black[0];this->black[1] =black[1];this->black[2] =black[2]; } - void setWhiteLevel(float white[3]) {this->white[0] =white[0];this->white[1] =white[1];this->white[2] =white[2]; } + void setBlackLevel(float black[3]) { this->black[0] = black[0]; this->black[1] = black[1]; this->black[2] = black[2]; } + void setWhiteLevel(float white[3]) { this->white[0] = white[0]; this->white[1] = white[1]; this->white[2] = white[2]; } }; #endif diff --git a/source/blender/compositor/operations/COM_ColorMatteOperation.h b/source/blender/compositor/operations/COM_ColorMatteOperation.h index 904a51128c8..e5dd9efd820 100644 --- a/source/blender/compositor/operations/COM_ColorMatteOperation.h +++ b/source/blender/compositor/operations/COM_ColorMatteOperation.h @@ -25,9 +25,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ColorMatteOperation : public NodeOperation { private: NodeChroma *settings; @@ -35,18 +35,18 @@ private: SocketReader *inputKeyProgram; public: /** - * Default constructor - */ + * Default constructor + */ ColorMatteOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;} + void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; } }; #endif diff --git a/source/blender/compositor/operations/COM_ColorRampOperation.h b/source/blender/compositor/operations/COM_ColorRampOperation.h index 8b8635cc5cd..eef5321eb19 100644 --- a/source/blender/compositor/operations/COM_ColorRampOperation.h +++ b/source/blender/compositor/operations/COM_ColorRampOperation.h @@ -28,29 +28,31 @@ class ColorRampOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; ColorBand *colorBand; public: ColorRampOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setColorBand(ColorBand *colorBand) {this->colorBand = colorBand;} + void setColorBand(ColorBand *colorBand) { + this->colorBand = colorBand; + } }; diff --git a/source/blender/compositor/operations/COM_ColorSpillOperation.h b/source/blender/compositor/operations/COM_ColorSpillOperation.h index 69f51882496..e890a1e1564 100644 --- a/source/blender/compositor/operations/COM_ColorSpillOperation.h +++ b/source/blender/compositor/operations/COM_ColorSpillOperation.h @@ -25,9 +25,9 @@ #include "COM_NodeOperation.h" /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ColorSpillOperation : public NodeOperation { protected: NodeColorspill *settings; @@ -39,25 +39,25 @@ protected: float rmut, gmut, bmut; public: /** - * Default constructor - */ + * Default constructor + */ ColorSpillOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setSettings(NodeColorspill *nodeColorSpill) {this->settings = nodeColorSpill;} - void setSpillChannel(int channel) {this->spillChannel = channel;} + void setSettings(NodeColorspill *nodeColorSpill) { this->settings = nodeColorSpill; } + void setSpillChannel(int channel) { this->spillChannel = channel; } float calculateMapValue(float fac, float *input); }; -class ColorSpillAverageOperation: public ColorSpillOperation { +class ColorSpillAverageOperation : public ColorSpillOperation { public: float calculateMapValue(float fac, float *input); }; diff --git a/source/blender/compositor/operations/COM_CombineChannelsOperation.h b/source/blender/compositor/operations/COM_CombineChannelsOperation.h index 18dd1fd2ec9..d2977155e14 100644 --- a/source/blender/compositor/operations/COM_CombineChannelsOperation.h +++ b/source/blender/compositor/operations/COM_CombineChannelsOperation.h @@ -25,7 +25,7 @@ #include "COM_NodeOperation.h" -class CombineChannelsOperation: public NodeOperation { +class CombineChannelsOperation : public NodeOperation { private: SocketReader *inputChannel1Operation; SocketReader *inputChannel2Operation; @@ -33,7 +33,7 @@ private: SocketReader *inputChannel4Operation; public: CombineChannelsOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h index 1868de6d815..b11a06f7749 100644 --- a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h +++ b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h @@ -26,53 +26,53 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertColorProfileOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; /** - * @brief color profile where to convert from - */ + * @brief color profile where to convert from + */ int fromProfile; /** - * @brief color profile where to convert to - */ + * @brief color profile where to convert to + */ int toProfile; /** - * @brief is color predivided - */ + * @brief is color predivided + */ bool predivided; public: /** - * Default constructor - */ + * Default constructor + */ ConvertColorProfileOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setFromColorProfile(int colorProfile) {this->fromProfile = colorProfile;} - void setToColorProfile(int colorProfile) {this->toProfile = colorProfile;} - void setPredivided(bool predivided) {this->predivided = predivided;} + void setFromColorProfile(int colorProfile) { this->fromProfile = colorProfile; } + void setToColorProfile(int colorProfile) { this->toProfile = colorProfile; } + void setPredivided(bool predivided) { this->predivided = predivided; } }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h b/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h index 616cf0f2d01..814c0c2e808 100644 --- a/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h +++ b/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertColorToBWOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertColorToBWOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h b/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h index 11a1bf30a07..1167b565a8e 100644 --- a/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h +++ b/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertColorToVectorOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertColorToVectorOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertColourToValueProg.h b/source/blender/compositor/operations/COM_ConvertColourToValueProg.h index 7aa07dd46f2..9c43ec47604 100644 --- a/source/blender/compositor/operations/COM_ConvertColourToValueProg.h +++ b/source/blender/compositor/operations/COM_ConvertColourToValueProg.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertColourToValueProg : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertColourToValueProg(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h index c199ea87fe3..c6da6bc94a9 100644 --- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h +++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h @@ -26,15 +26,15 @@ #include "DNA_object_types.h" /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertDepthToRadiusOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; float fStop; float aspect; float maxRadius; @@ -45,28 +45,28 @@ private: Object *cameraObject; public: /** - * Default constructor - */ + * Default constructor + */ ConvertDepthToRadiusOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setfStop(float fStop) {this->fStop = fStop;} - void setMaxRadius(float maxRadius) {this->maxRadius = maxRadius;} - void setCameraObject(Object *camera) {this->cameraObject = camera;} + void setfStop(float fStop) { this->fStop = fStop; } + void setMaxRadius(float maxRadius) { this->maxRadius = maxRadius; } + void setCameraObject(Object *camera) { this->cameraObject = camera; } float determineFocalDistance(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h b/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h index 327b4089934..29c82361d12 100644 --- a/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h +++ b/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertHSVToRGBOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertHSVToRGBOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h b/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h index 1d5a1c1c4a6..fe0586f7a88 100644 --- a/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h +++ b/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h @@ -25,22 +25,22 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertKeyToPremulOperation : public NodeOperation { private: SocketReader *inputColor; public: /** - * Default constructor - */ + * Default constructor + */ ConvertKeyToPremulOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h b/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h index 17597fa8f15..093f28df3e5 100644 --- a/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h +++ b/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h @@ -25,22 +25,22 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertPremulToKeyOperation : public NodeOperation { private: SocketReader *inputColor; public: /** - * Default constructor - */ + * Default constructor + */ ConvertPremulToKeyOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h b/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h index 5064bd06993..61270539e70 100644 --- a/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h +++ b/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertRGBToHSVOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertRGBToHSVOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h b/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h index a952627893b..33075cda509 100644 --- a/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h +++ b/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h @@ -25,44 +25,44 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertRGBToYCCOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; /** - * YCbCr mode (Jpeg, ITU601, ITU709) - */ + * YCbCr mode (Jpeg, ITU601, ITU709) + */ int mode; public: /** - * Default constructor - */ + * Default constructor + */ ConvertRGBToYCCOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); /** - * Set the YCC mode - */ + * Set the YCC mode + */ void setMode(int mode); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h b/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h index 5bc763dde00..4fc525456f8 100644 --- a/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h +++ b/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h @@ -25,34 +25,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertRGBToYUVOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertRGBToYUVOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_ConvertValueToColourProg.h b/source/blender/compositor/operations/COM_ConvertValueToColourProg.h index 4956f7196f5..ff1d1aaeae7 100644 --- a/source/blender/compositor/operations/COM_ConvertValueToColourProg.h +++ b/source/blender/compositor/operations/COM_ConvertValueToColourProg.h @@ -28,25 +28,25 @@ class ConvertValueToColourProg : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ SocketReader *inputProgram; public: ConvertValueToColourProg(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h b/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h index 1e6a7d4b3e7..fbb294d6a26 100644 --- a/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h +++ b/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertValueToVectorOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertValueToVectorOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h b/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h index 45ffd0675bd..c26adc5a6b1 100644 --- a/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h +++ b/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertVectorToColorOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertVectorToColorOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h b/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h index 59bae18ed26..dd29d1bb9a9 100644 --- a/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h +++ b/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h @@ -26,34 +26,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertVectorToValueOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertVectorToValueOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h b/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h index a13c2826a79..d7ddd910ed7 100644 --- a/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h +++ b/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h @@ -25,44 +25,44 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertYCCToRGBOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; /** - * YCbCr mode (Jpeg, ITU601, ITU709) - */ + * YCbCr mode (Jpeg, ITU601, ITU709) + */ int mode; public: /** - * Default constructor - */ + * Default constructor + */ ConvertYCCToRGBOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); /** - * Set the YCC mode - */ + * Set the YCC mode + */ void setMode(int mode); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h b/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h index 380510d0100..f77954606cf 100644 --- a/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h +++ b/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h @@ -25,34 +25,34 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ConvertYUVToRGBOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; public: /** - * Default constructor - */ + * Default constructor + */ ConvertYUVToRGBOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h index a0f9c1b3452..92e45c7104f 100644 --- a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h +++ b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h @@ -25,10 +25,10 @@ #include "COM_ConvolutionFilterOperation.h" -class ConvolutionEdgeFilterOperation: public ConvolutionFilterOperation { +class ConvolutionEdgeFilterOperation : public ConvolutionFilterOperation { public: ConvolutionEdgeFilterOperation(); - void executePixel(float *color,int x, int y, MemoryBuffer *inputBuffers[], void *data); + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); }; #endif diff --git a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h index 3276038726b..f3347eb583a 100644 --- a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h +++ b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h @@ -25,7 +25,7 @@ #include "COM_NodeOperation.h" -class ConvolutionFilterOperation: public NodeOperation { +class ConvolutionFilterOperation : public NodeOperation { private: int filterWidth; int filterHeight; @@ -39,7 +39,7 @@ public: ConvolutionFilterOperation(); void set3x3Filter(float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void executePixel(float *color,int x, int y, MemoryBuffer *inputBuffers[], void *data); + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_CropOperation.h b/source/blender/compositor/operations/COM_CropOperation.h index e8edabf08ed..48e5ab7f75b 100644 --- a/source/blender/compositor/operations/COM_CropOperation.h +++ b/source/blender/compositor/operations/COM_CropOperation.h @@ -25,7 +25,7 @@ #include "COM_NodeOperation.h" -class CropBaseOperation: public NodeOperation { +class CropBaseOperation : public NodeOperation { protected: SocketReader *inputOperation; NodeTwoXYs *settings; @@ -40,24 +40,24 @@ public: CropBaseOperation(); void initExecution(); void deinitExecution(); - void setCropSettings(NodeTwoXYs *settings) {this->settings = settings;} - void setRelative(bool rel) {this->relative = rel;} + void setCropSettings(NodeTwoXYs *settings) { this->settings = settings; } + void setRelative(bool rel) { this->relative = rel; } }; -class CropOperation: public CropBaseOperation { +class CropOperation : public CropBaseOperation { private: public: CropOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class CropImageOperation: public CropBaseOperation { +class CropImageOperation : public CropBaseOperation { private: public: CropImageOperation(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); void determineResolution(unsigned int resolution[], unsigned int preferedResolution[]); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_CurveBaseOperation.h b/source/blender/compositor/operations/COM_CurveBaseOperation.h index 366af5b07cb..9cddb3be46b 100644 --- a/source/blender/compositor/operations/COM_CurveBaseOperation.h +++ b/source/blender/compositor/operations/COM_CurveBaseOperation.h @@ -28,8 +28,8 @@ class CurveBaseOperation : public NodeOperation { protected: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ CurveMapping *curveMapping; public: CurveBaseOperation(); @@ -39,6 +39,6 @@ public: */ void initExecution(); - void setCurveMapping(CurveMapping *mapping) {this->curveMapping = mapping;} + void setCurveMapping(CurveMapping *mapping) { this->curveMapping = mapping; } }; #endif diff --git a/source/blender/compositor/operations/COM_DifferenceMatteOperation.h b/source/blender/compositor/operations/COM_DifferenceMatteOperation.h index 95ebed6f63d..3bdc3384556 100644 --- a/source/blender/compositor/operations/COM_DifferenceMatteOperation.h +++ b/source/blender/compositor/operations/COM_DifferenceMatteOperation.h @@ -26,28 +26,28 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class DifferenceMatteOperation : public NodeOperation { private: NodeChroma *settings; - SocketReader * inputImage1Program; + SocketReader *inputImage1Program; SocketReader *inputImage2Program; public: /** - * Default constructor - */ + * Default constructor + */ DifferenceMatteOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;} + void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; } }; #endif diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.h b/source/blender/compositor/operations/COM_DilateErodeOperation.h index 63cee4c333a..b11356129b4 100644 --- a/source/blender/compositor/operations/COM_DilateErodeOperation.h +++ b/source/blender/compositor/operations/COM_DilateErodeOperation.h @@ -28,41 +28,41 @@ class DilateErodeThresholdOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; float distance; float _switch; float inset; /** - * determines the area of interest to track pixels - * keep this one as small as possible for speed gain. - */ + * determines the area of interest to track pixels + * keep this one as small as possible for speed gain. + */ int scope; public: DilateErodeThresholdOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setDistance(float distance) {this->distance = distance;} - void setSwitch(float sw) {this->_switch = sw;} - void setInset(float inset) {this->inset = inset;} + void setDistance(float distance) { this->distance = distance; } + void setSwitch(float sw) { this->_switch = sw; } + void setInset(float inset) { this->inset = inset; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); @@ -72,46 +72,46 @@ class DilateDistanceOperation : public NodeOperation { private: protected: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; float distance; int scope; public: DilateDistanceOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setDistance(float distance) {this->distance = distance;} + void setDistance(float distance) { this->distance = distance; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, - MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, - list<cl_kernel> *clKernelsToCleanUp); + MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, + list<cl_kernel> *clKernelsToCleanUp); }; class ErodeDistanceOperation : public DilateDistanceOperation { public: ErodeDistanceOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, @@ -122,9 +122,9 @@ public: class DilateStepOperation : public NodeOperation { protected: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; int iterations; @@ -133,22 +133,22 @@ public: DilateStepOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setIterations(int iterations) {this->iterations = iterations;} + void setIterations(int iterations) { this->iterations = iterations; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); }; diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h index 280e9247c1b..9cc0a4361f1 100644 --- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h +++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h @@ -38,22 +38,22 @@ public: DirectionalBlurOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void setData(NodeDBlurData *data) {this->data = data;} + void setData(NodeDBlurData *data) { this->data = data; } }; #endif diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.h b/source/blender/compositor/operations/COM_DisplaceOperation.h index 9c59c928854..82788e37e3a 100644 --- a/source/blender/compositor/operations/COM_DisplaceOperation.h +++ b/source/blender/compositor/operations/COM_DisplaceOperation.h @@ -41,14 +41,14 @@ public: DisplaceOperation(); /** - * we need a 2x2 differential filter for Vector Input and full buffer for the image - */ + * we need a 2x2 differential filter for Vector Input and full buffer for the image + */ bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); /** * the inner loop of this program */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** * Initialize the execution diff --git a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h index 0e3bcc1b1f0..1ebb238855b 100644 --- a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h +++ b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h @@ -41,14 +41,14 @@ public: DisplaceSimpleOperation(); /** - * we need a full buffer for the image - */ + * we need a full buffer for the image + */ bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); /** * the inner loop of this program */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** * Initialize the execution diff --git a/source/blender/compositor/operations/COM_DistanceMatteOperation.h b/source/blender/compositor/operations/COM_DistanceMatteOperation.h index 2a668f31f8f..cf1172a8c11 100644 --- a/source/blender/compositor/operations/COM_DistanceMatteOperation.h +++ b/source/blender/compositor/operations/COM_DistanceMatteOperation.h @@ -25,9 +25,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class DistanceMatteOperation : public NodeOperation { private: NodeChroma *settings; @@ -35,18 +35,18 @@ private: SocketReader *inputKeyProgram; public: /** - * Default constructor - */ + * Default constructor + */ DistanceMatteOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;} + void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; } }; #endif diff --git a/source/blender/compositor/operations/COM_DotproductOperation.h b/source/blender/compositor/operations/COM_DotproductOperation.h index 0244fffa110..849dc83a9cd 100644 --- a/source/blender/compositor/operations/COM_DotproductOperation.h +++ b/source/blender/compositor/operations/COM_DotproductOperation.h @@ -25,13 +25,13 @@ #include "COM_NodeOperation.h" -class DotproductOperation: public NodeOperation { +class DotproductOperation : public NodeOperation { private: SocketReader *input1Operation; SocketReader *input2Operation; public: DotproductOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h index 85c4fd9e5b7..a18d59ae5a2 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h @@ -28,10 +28,10 @@ class DoubleEdgeMaskOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOuterMask; - SocketReader * inputInnerMask; + * Cached reference to the inputProgram + */ + SocketReader *inputOuterMask; + SocketReader *inputInnerMask; bool adjecentOnly; bool keepInside; float *cachedInstance; @@ -40,25 +40,25 @@ public: void doDoubleEdgeMask(float *inner, float *outer, float *res); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void setAdjecentOnly(bool adjecentOnly) {this->adjecentOnly = adjecentOnly;} - void setKeepInside(bool keepInside) {this->keepInside = keepInside;} + void setAdjecentOnly(bool adjecentOnly) { this->adjecentOnly = adjecentOnly; } + void setKeepInside(bool keepInside) { this->keepInside = keepInside; } }; #endif diff --git a/source/blender/compositor/operations/COM_EllipseMaskOperation.h b/source/blender/compositor/operations/COM_EllipseMaskOperation.h index bff94941190..61d724c2f15 100644 --- a/source/blender/compositor/operations/COM_EllipseMaskOperation.h +++ b/source/blender/compositor/operations/COM_EllipseMaskOperation.h @@ -28,10 +28,10 @@ class EllipseMaskOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputMask; - SocketReader * inputValue; + * Cached reference to the inputProgram + */ + SocketReader *inputMask; + SocketReader *inputValue; float sine; float cosine; @@ -43,23 +43,23 @@ public: EllipseMaskOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeEllipseMask *data) {this->data = data;} - - void setMaskType(int maskType) {this->maskType = maskType;} + void setData(NodeEllipseMask *data) { this->data = data; } + + void setMaskType(int maskType) { this->maskType = maskType; } }; #endif diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h index 1f71fe7f9ed..9c8973f6a3a 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h @@ -26,11 +26,11 @@ #include "COM_BlurBaseOperation.h" #include "DNA_node_types.h" -class FastGaussianBlurOperation: public BlurBaseOperation { +class FastGaussianBlurOperation : public BlurBaseOperation { private: float sx; float sy; - MemoryBuffer* iirgaus; + MemoryBuffer *iirgaus; public: FastGaussianBlurOperation(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); diff --git a/source/blender/compositor/operations/COM_FlipOperation.h b/source/blender/compositor/operations/COM_FlipOperation.h index 9774cfd7bcd..f83fa6ac3a8 100644 --- a/source/blender/compositor/operations/COM_FlipOperation.h +++ b/source/blender/compositor/operations/COM_FlipOperation.h @@ -25,7 +25,7 @@ #include "COM_NodeOperation.h" -class FlipOperation: public NodeOperation { +class FlipOperation : public NodeOperation { private: SocketReader *inputOperation; bool flipX; @@ -33,12 +33,12 @@ private: public: FlipOperation(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setFlipX(bool flipX) {this->flipX = flipX;} - void setFlipY(bool flipY) {this->flipY = flipY;} + void setFlipX(bool flipX) { this->flipX = flipX; } + void setFlipY(bool flipY) { this->flipY = flipY; } }; #endif diff --git a/source/blender/compositor/operations/COM_FogGlowImageOperation.h b/source/blender/compositor/operations/COM_FogGlowImageOperation.h index d0fc107638e..8330115718f 100644 --- a/source/blender/compositor/operations/COM_FogGlowImageOperation.h +++ b/source/blender/compositor/operations/COM_FogGlowImageOperation.h @@ -30,9 +30,9 @@ public: FogGlowImageOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); }; diff --git a/source/blender/compositor/operations/COM_GammaCorrectOperation.h b/source/blender/compositor/operations/COM_GammaCorrectOperation.h index 6132f04edba..4bf03eac0a1 100644 --- a/source/blender/compositor/operations/COM_GammaCorrectOperation.h +++ b/source/blender/compositor/operations/COM_GammaCorrectOperation.h @@ -28,52 +28,52 @@ class GammaCorrectOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; public: GammaCorrectOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; class GammaUncorrectOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; public: GammaUncorrectOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_GammaOperation.h b/source/blender/compositor/operations/COM_GammaOperation.h index 2f3d8cdf9f7..8c007d27843 100644 --- a/source/blender/compositor/operations/COM_GammaOperation.h +++ b/source/blender/compositor/operations/COM_GammaOperation.h @@ -28,27 +28,27 @@ class GammaOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; SocketReader *inputGammaProgram; public: GammaOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h index 78c6437eac6..616a6539ad4 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h @@ -37,13 +37,13 @@ public: void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h index a957b8c12af..5dc896fafaa 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h @@ -34,18 +34,18 @@ public: GaussianXBlurOperation(); /** - *@brief the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + *@brief the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - *@brief initialize the execution - */ + *@brief initialize the execution + */ void initExecution(); /** - *@brief Deinitialize the execution - */ + *@brief Deinitialize the execution + */ void deinitExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h index f33d38de14e..e8d362e4c32 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h @@ -34,18 +34,18 @@ public: GaussianYBlurOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - *@brief initialize the execution - */ + * @brief initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.h b/source/blender/compositor/operations/COM_GlareBaseOperation.h index 0d20dd363c7..2ef413a936b 100644 --- a/source/blender/compositor/operations/COM_GlareBaseOperation.h +++ b/source/blender/compositor/operations/COM_GlareBaseOperation.h @@ -30,29 +30,31 @@ /* utility functions used by glare, tonemap and lens distortion */ /* soms macros for color handling */ typedef float fRGB[4]; + +/* TODO - replace with BLI_math_vector */ /* clear color */ -#define fRGB_clear(c) { c[0]=c[1]=c[2]=0.f; } (void)0 +#define fRGB_clear(c) { c[0] = c[1] = c[2] = 0.f; } (void)0 /* copy c2 to c1 */ -#define fRGB_copy(c1, c2) { c1[0]=c2[0]; c1[1]=c2[1]; c1[2]=c2[2]; c1[3]=c2[3]; } (void)0 +#define fRGB_copy(c1, c2) { c1[0] = c2[0]; c1[1] = c2[1]; c1[2] = c2[2]; c1[3] = c2[3]; } (void)0 /* add c2 to c1 */ -#define fRGB_add(c1, c2) { c1[0]+=c2[0]; c1[1]+=c2[1]; c1[2]+=c2[2]; } (void)0 +#define fRGB_add(c1, c2) { c1[0] += c2[0]; c1[1] += c2[1]; c1[2] += c2[2]; } (void)0 /* subtract c2 from c1 */ -#define fRGB_sub(c1, c2) { c1[0]-=c2[0]; c1[1]-=c2[1]; c1[2]-=c2[2]; } (void)0 +#define fRGB_sub(c1, c2) { c1[0] -= c2[0]; c1[1] -= c2[1]; c1[2] -= c2[2]; } (void)0 /* multiply c by float value s */ -#define fRGB_mult(c, s) { c[0]*=s; c[1]*=s; c[2]*=s; } (void)0 +#define fRGB_mult(c, s) { c[0] *= s; c[1] *= s; c[2] *= s; } (void)0 /* multiply c2 by s and add to c1 */ -#define fRGB_madd(c1, c2, s) { c1[0]+=c2[0]*s; c1[1]+=c2[1]*s; c1[2]+=c2[2]*s; } (void)0 +#define fRGB_madd(c1, c2, s) { c1[0] += c2[0] * s; c1[1] += c2[1] * s; c1[2] += c2[2] * s; } (void)0 /* multiply c2 by color c1 */ -#define fRGB_colormult(c, cs) { c[0]*=cs[0]; c[1]*=cs[1]; c[2]*=cs[2]; } (void)0 +#define fRGB_colormult(c, cs) { c[0] *= cs[0]; c[1] *= cs[1]; c[2] *= cs[2]; } (void)0 /* multiply c2 by color c3 and add to c1 */ -#define fRGB_colormadd(c1, c2, c3) { c1[0]+=c2[0]*c3[0]; c1[1]+=c2[1]*c3[1]; c1[2]+=c2[2]*c3[2]; } (void)0 +#define fRGB_colormadd(c1, c2, c3) { c1[0] += c2[0] * c3[0]; c1[1] += c2[1] * c3[1]; c1[2] += c2[2] * c3[2]; } (void)0 /* multiply c2 by color rgb, rgb as separate arguments */ -#define fRGB_rgbmult(c, r, g, b) { c[0]*=(r); c[1]*=(g); c[2]*=(b); } (void)0 +#define fRGB_rgbmult(c, r, g, b) { c[0] *= (r); c[1] *= (g); c[2] *= (b); } (void)0 /* swap colors c1 & c2 */ -#define fRGB_swap(c1, c2) { float _t=c1[0]; c1[0]=c2[0]; c2[0]=_t;\ - _t=c1[1]; c1[1]=c2[1]; c2[1]=_t;\ - _t=c1[2]; c1[2]=c2[2]; c2[2]=_t;\ - _t=c1[3]; c1[3]=c2[3]; c3[3]=_t;\ +#define fRGB_swap(c1, c2) { float _t = c1[0]; c1[0] = c2[0]; c2[0] = _t; \ + _t = c1[1]; c1[1] = c2[1]; c2[1] = _t; \ + _t = c1[2]; c1[2] = c2[2]; c2[2] = _t; \ + _t = c1[3]; c1[3] = c2[3]; c3[3] = _t; \ } (void)0 diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h index 860bb71a0f1..5ede0491773 100644 --- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h +++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h @@ -28,25 +28,25 @@ class HueSaturationValueCorrectOperation : public CurveBaseOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; public: HueSaturationValueCorrectOperation(); /** - * the inner loop of this program - */ - void executePixel(float *Vector, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *Vector, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_IDMaskOperation.h b/source/blender/compositor/operations/COM_IDMaskOperation.h index 9f897c53d18..229e1b2dd82 100644 --- a/source/blender/compositor/operations/COM_IDMaskOperation.h +++ b/source/blender/compositor/operations/COM_IDMaskOperation.h @@ -28,8 +28,8 @@ class IDMaskOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ SocketReader *inputProgram; float objectIndex; @@ -37,21 +37,21 @@ public: IDMaskOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setObjectIndex(float objectIndex) {this->objectIndex = objectIndex;} + void setObjectIndex(float objectIndex) { this->objectIndex = objectIndex; } }; #endif diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h index 0bd112304a8..a4645c9d504 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.h +++ b/source/blender/compositor/operations/COM_ImageOperation.h @@ -36,8 +36,8 @@ extern "C" { } /** - * @brief Base class for all image operations - */ + * @brief Base class for all image operations + */ class BaseImageOperation : public NodeOperation { protected: ImBuf *buffer; @@ -52,8 +52,8 @@ protected: BaseImageOperation(); /** - * Determine the output resolution. The resolution is retrieved from the Renderer - */ + * Determine the output resolution. The resolution is retrieved from the Renderer + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); virtual ImBuf *getImBuf(); @@ -62,33 +62,33 @@ public: void initExecution(); void deinitExecution(); - void setImage(Image *image) {this->image = image;} - void setImageUser(ImageUser *imageuser) {this->imageUser = imageuser;} - - void setFramenumber(int framenumber) {this->framenumber = framenumber;} + void setImage(Image *image) { this->image = image; } + void setImageUser(ImageUser *imageuser) { this->imageUser = imageuser; } + + void setFramenumber(int framenumber) { this->framenumber = framenumber; } }; -class ImageOperation: public BaseImageOperation { +class ImageOperation : public BaseImageOperation { public: /** - * Constructor - */ + * Constructor + */ ImageOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class ImageAlphaOperation: public BaseImageOperation { +class ImageAlphaOperation : public BaseImageOperation { public: /** - * Constructor - */ + * Constructor + */ ImageAlphaOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class ImageDepthOperation: public BaseImageOperation { +class ImageDepthOperation : public BaseImageOperation { public: /** - * Constructor - */ + * Constructor + */ ImageDepthOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_InvertOperation.h b/source/blender/compositor/operations/COM_InvertOperation.h index 27a995238c7..48432aecdd0 100644 --- a/source/blender/compositor/operations/COM_InvertOperation.h +++ b/source/blender/compositor/operations/COM_InvertOperation.h @@ -28,10 +28,10 @@ class InvertOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputValueProgram; - SocketReader * inputColorProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputValueProgram; + SocketReader *inputColorProgram; bool alpha; bool color; @@ -40,21 +40,21 @@ public: InvertOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setColor(bool color) {this->color = color;} - void setAlpha(bool alpha) {this->alpha = alpha;} + void setColor(bool color) { this->color = color; } + void setAlpha(bool alpha) { this->alpha = alpha; } }; #endif diff --git a/source/blender/compositor/operations/COM_LuminanceMatteOperation.h b/source/blender/compositor/operations/COM_LuminanceMatteOperation.h index 1c2cd2dca51..f44e32396a3 100644 --- a/source/blender/compositor/operations/COM_LuminanceMatteOperation.h +++ b/source/blender/compositor/operations/COM_LuminanceMatteOperation.h @@ -25,27 +25,27 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class LuminanceMatteOperation : public NodeOperation { private: NodeChroma *settings; SocketReader *inputImageProgram; public: /** - * Default constructor - */ + * Default constructor + */ LuminanceMatteOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;} + void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; } }; #endif diff --git a/source/blender/compositor/operations/COM_MapUVOperation.h b/source/blender/compositor/operations/COM_MapUVOperation.h index 4d7bc814dc2..22e3531e838 100644 --- a/source/blender/compositor/operations/COM_MapUVOperation.h +++ b/source/blender/compositor/operations/COM_MapUVOperation.h @@ -38,14 +38,14 @@ public: MapUVOperation(); /** - * we need a 3x3 differential filter for UV Input and full buffer for the image - */ + * we need a 3x3 differential filter for UV Input and full buffer for the image + */ bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); /** * the inner loop of this program */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** * Initialize the execution diff --git a/source/blender/compositor/operations/COM_MapValueOperation.h b/source/blender/compositor/operations/COM_MapValueOperation.h index ac320256fe4..5fae74e0a6a 100644 --- a/source/blender/compositor/operations/COM_MapValueOperation.h +++ b/source/blender/compositor/operations/COM_MapValueOperation.h @@ -26,41 +26,41 @@ #include "DNA_texture_types.h" /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MapValueOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputOperation; - TexMapping * settings; + * Cached reference to the inputProgram + */ + SocketReader *inputOperation; + TexMapping *settings; public: /** - * Default constructor - */ + * Default constructor + */ MapValueOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); /** - * @brief set the TexMapping settings - */ - void setSettings(TexMapping *settings) {this->settings = settings;} + * @brief set the TexMapping settings + */ + void setSettings(TexMapping *settings) { this->settings = settings; } }; #endif diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h index 8534cb20416..8507cb994c0 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.h +++ b/source/blender/compositor/operations/COM_MaskOperation.h @@ -32,20 +32,20 @@ #include "IMB_imbuf_types.h" /** - * Class with implementation of mask rasterization - */ + * Class with implementation of mask rasterization + */ class MaskOperation : public NodeOperation { protected: Mask *mask; int maskWidth; int maskHeight; int framenumber; - bool smooth; + bool smooth; float *rasterizedMask; /** - * Determine the output resolution. The resolution is retrieved from the Renderer - */ + * Determine the output resolution. The resolution is retrieved from the Renderer + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); public: @@ -56,11 +56,11 @@ public: void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); - void setMask(Mask *mask) {this->mask = mask;} - void setMaskWidth(int width) {this->maskWidth = width;} - void setMaskHeight(int height) {this->maskHeight = height;} - void setFramenumber(int framenumber) {this->framenumber = framenumber;} - void setSmooth(bool smooth) {this->smooth = smooth;} + void setMask(Mask *mask) { this->mask = mask; } + void setMaskWidth(int width) { this->maskWidth = width; } + void setMaskHeight(int height) { this->maskHeight = height; } + void setFramenumber(int framenumber) { this->framenumber = framenumber; } + void setSmooth(bool smooth) { this->smooth = smooth; } void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); }; diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.h b/source/blender/compositor/operations/COM_MathBaseOperation.h index 64e8c4af88f..12dc5fa36c7 100644 --- a/source/blender/compositor/operations/COM_MathBaseOperation.h +++ b/source/blender/compositor/operations/COM_MathBaseOperation.h @@ -26,129 +26,129 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MathBaseOperation : public NodeOperation { protected: /** - * Prefetched reference to the inputProgram - */ - SocketReader * inputValue1Operation; - SocketReader * inputValue2Operation; + * Prefetched reference to the inputProgram + */ + SocketReader *inputValue1Operation; + SocketReader *inputValue2Operation; protected: /** - * Default constructor - */ + * Default constructor + */ MathBaseOperation(); public: /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) = 0; + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]) = 0; /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); /** - * Determine resolution - */ + * Determine resolution + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); }; -class MathAddOperation: public MathBaseOperation { +class MathAddOperation : public MathBaseOperation { public: MathAddOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathSubtractOperation: public MathBaseOperation { +class MathSubtractOperation : public MathBaseOperation { public: MathSubtractOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathMultiplyOperation: public MathBaseOperation { +class MathMultiplyOperation : public MathBaseOperation { public: MathMultiplyOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathDivideOperation: public MathBaseOperation { +class MathDivideOperation : public MathBaseOperation { public: MathDivideOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathSineOperation: public MathBaseOperation { +class MathSineOperation : public MathBaseOperation { public: MathSineOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathCosineOperation: public MathBaseOperation { +class MathCosineOperation : public MathBaseOperation { public: MathCosineOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathTangentOperation: public MathBaseOperation { +class MathTangentOperation : public MathBaseOperation { public: MathTangentOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathArcSineOperation: public MathBaseOperation { +class MathArcSineOperation : public MathBaseOperation { public: MathArcSineOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathArcCosineOperation: public MathBaseOperation { +class MathArcCosineOperation : public MathBaseOperation { public: MathArcCosineOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathArcTangentOperation: public MathBaseOperation { +class MathArcTangentOperation : public MathBaseOperation { public: MathArcTangentOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathPowerOperation: public MathBaseOperation { +class MathPowerOperation : public MathBaseOperation { public: MathPowerOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathLogarithmOperation: public MathBaseOperation { +class MathLogarithmOperation : public MathBaseOperation { public: MathLogarithmOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathMinimumOperation: public MathBaseOperation { +class MathMinimumOperation : public MathBaseOperation { public: MathMinimumOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathMaximumOperation: public MathBaseOperation { +class MathMaximumOperation : public MathBaseOperation { public: MathMaximumOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathRoundOperation: public MathBaseOperation { +class MathRoundOperation : public MathBaseOperation { public: MathRoundOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathLessThanOperation: public MathBaseOperation { +class MathLessThanOperation : public MathBaseOperation { public: MathLessThanOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MathGreaterThanOperation: public MathBaseOperation { +class MathGreaterThanOperation : public MathBaseOperation { public: MathGreaterThanOperation() : MathBaseOperation() {} - void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixAddOperation.h b/source/blender/compositor/operations/COM_MixAddOperation.h index 99a6af67d7d..7b03802cf7e 100644 --- a/source/blender/compositor/operations/COM_MixAddOperation.h +++ b/source/blender/compositor/operations/COM_MixAddOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixAddOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixAddOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixBaseOperation.h b/source/blender/compositor/operations/COM_MixBaseOperation.h index b9bb94d58d8..3637cc9eacf 100644 --- a/source/blender/compositor/operations/COM_MixBaseOperation.h +++ b/source/blender/compositor/operations/COM_MixBaseOperation.h @@ -26,42 +26,42 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixBaseOperation : public NodeOperation { protected: /** - * Prefetched reference to the inputProgram - */ + * Prefetched reference to the inputProgram + */ SocketReader *inputValueOperation; SocketReader *inputColor1Operation; SocketReader *inputColor2Operation; bool valueAlphaMultiply; public: /** - * Default constructor - */ + * Default constructor + */ MixBaseOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - void setUseValueAlphaMultiply(const bool value) {this->valueAlphaMultiply = value;} - bool useValueAlphaMultiply() {return this->valueAlphaMultiply;} + void setUseValueAlphaMultiply(const bool value) { this->valueAlphaMultiply = value; } + bool useValueAlphaMultiply() { return this->valueAlphaMultiply; } }; #endif diff --git a/source/blender/compositor/operations/COM_MixBlendOperation.h b/source/blender/compositor/operations/COM_MixBlendOperation.h index da3342c0e4a..b906134f5cb 100644 --- a/source/blender/compositor/operations/COM_MixBlendOperation.h +++ b/source/blender/compositor/operations/COM_MixBlendOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixBlendOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixBlendOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixBurnOperation.h b/source/blender/compositor/operations/COM_MixBurnOperation.h index ff7de119605..af09772edde 100644 --- a/source/blender/compositor/operations/COM_MixBurnOperation.h +++ b/source/blender/compositor/operations/COM_MixBurnOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixBurnOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixBurnOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixColorOperation.h b/source/blender/compositor/operations/COM_MixColorOperation.h index 1a98e847ccd..9b0d93f934d 100644 --- a/source/blender/compositor/operations/COM_MixColorOperation.h +++ b/source/blender/compositor/operations/COM_MixColorOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixColorOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixColorOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixDarkenOperation.h b/source/blender/compositor/operations/COM_MixDarkenOperation.h index b1792d4930e..69fb4450458 100644 --- a/source/blender/compositor/operations/COM_MixDarkenOperation.h +++ b/source/blender/compositor/operations/COM_MixDarkenOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixDarkenOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixDarkenOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixDifferenceOperation.h b/source/blender/compositor/operations/COM_MixDifferenceOperation.h index 554d7b2f1fe..c71b22214cc 100644 --- a/source/blender/compositor/operations/COM_MixDifferenceOperation.h +++ b/source/blender/compositor/operations/COM_MixDifferenceOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixDifferenceOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixDifferenceOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixDivideOperation.h b/source/blender/compositor/operations/COM_MixDivideOperation.h index e9c4cf81cd3..375e7129e8b 100644 --- a/source/blender/compositor/operations/COM_MixDivideOperation.h +++ b/source/blender/compositor/operations/COM_MixDivideOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixDivideOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixDivideOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixDodgeOperation.h b/source/blender/compositor/operations/COM_MixDodgeOperation.h index 6baa73e8f6f..a4adf6fde47 100644 --- a/source/blender/compositor/operations/COM_MixDodgeOperation.h +++ b/source/blender/compositor/operations/COM_MixDodgeOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixDodgeOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixDodgeOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixHueOperation.h b/source/blender/compositor/operations/COM_MixHueOperation.h index d3d1717f448..56310e253c0 100644 --- a/source/blender/compositor/operations/COM_MixHueOperation.h +++ b/source/blender/compositor/operations/COM_MixHueOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixHueOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixHueOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixLightenOperation.h b/source/blender/compositor/operations/COM_MixLightenOperation.h index 73ac3e6e165..bb251a44653 100644 --- a/source/blender/compositor/operations/COM_MixLightenOperation.h +++ b/source/blender/compositor/operations/COM_MixLightenOperation.h @@ -26,19 +26,19 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixLightenOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixLightenOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixLinearLightOperation.h b/source/blender/compositor/operations/COM_MixLinearLightOperation.h index 7e26b25e5c0..39d5b6495d1 100644 --- a/source/blender/compositor/operations/COM_MixLinearLightOperation.h +++ b/source/blender/compositor/operations/COM_MixLinearLightOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixLinearLightOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixLinearLightOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixMultiplyOperation.h b/source/blender/compositor/operations/COM_MixMultiplyOperation.h index 5d4468e7271..2c12854bfa6 100644 --- a/source/blender/compositor/operations/COM_MixMultiplyOperation.h +++ b/source/blender/compositor/operations/COM_MixMultiplyOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixMultiplyOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixMultiplyOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixOverlayOperation.h b/source/blender/compositor/operations/COM_MixOverlayOperation.h index dd1d16a53d3..48d1d10a697 100644 --- a/source/blender/compositor/operations/COM_MixOverlayOperation.h +++ b/source/blender/compositor/operations/COM_MixOverlayOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixOverlayOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixOverlayOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixSaturationOperation.h b/source/blender/compositor/operations/COM_MixSaturationOperation.h index 7e746c02e09..ccb95e2f00f 100644 --- a/source/blender/compositor/operations/COM_MixSaturationOperation.h +++ b/source/blender/compositor/operations/COM_MixSaturationOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixSaturationOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixSaturationOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixScreenOperation.h b/source/blender/compositor/operations/COM_MixScreenOperation.h index 6522907f295..6b9fa302325 100644 --- a/source/blender/compositor/operations/COM_MixScreenOperation.h +++ b/source/blender/compositor/operations/COM_MixScreenOperation.h @@ -26,19 +26,19 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixScreenOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixScreenOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixSoftLightOperation.h b/source/blender/compositor/operations/COM_MixSoftLightOperation.h index fcbd8dab8b8..4189066de2c 100644 --- a/source/blender/compositor/operations/COM_MixSoftLightOperation.h +++ b/source/blender/compositor/operations/COM_MixSoftLightOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixSoftLightOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixSoftLightOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixSubtractOperation.h b/source/blender/compositor/operations/COM_MixSubtractOperation.h index 441857a8aca..b820fb1e5e1 100644 --- a/source/blender/compositor/operations/COM_MixSubtractOperation.h +++ b/source/blender/compositor/operations/COM_MixSubtractOperation.h @@ -26,20 +26,20 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixSubtractOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixSubtractOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MixValueOperation.h b/source/blender/compositor/operations/COM_MixValueOperation.h index 89461b3ba40..d12a2d2b3d6 100644 --- a/source/blender/compositor/operations/COM_MixValueOperation.h +++ b/source/blender/compositor/operations/COM_MixValueOperation.h @@ -26,19 +26,19 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MixValueOperation : public MixBaseOperation { public: /** - * Default constructor - */ + * Default constructor + */ MixValueOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h index aca2ec2eff7..b6e89fa345c 100644 --- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h +++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h @@ -32,30 +32,30 @@ typedef enum MovieClipAttribute { MCA_ANGLE } MovieClipAttribute; /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class MovieClipAttributeOperation : public NodeOperation { private: - MovieClip * clip; + MovieClip *clip; float value; bool valueSet; int framenumber; MovieClipAttribute attribute; public: /** - * Default constructor - */ + * Default constructor + */ MovieClipAttributeOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - void setMovieClip(MovieClip *clip) {this->clip = clip;} - void setFramenumber(int framenumber) {this->framenumber = framenumber;} - void setAttribute(MovieClipAttribute attribute) {this->attribute = attribute;} + void setMovieClip(MovieClip *clip) { this->clip = clip; } + void setFramenumber(int framenumber) { this->framenumber = framenumber; } + void setAttribute(MovieClipAttribute attribute) { this->attribute = attribute; } }; #endif diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.h b/source/blender/compositor/operations/COM_MovieClipOperation.h index f52a9973fc5..454c442a167 100644 --- a/source/blender/compositor/operations/COM_MovieClipOperation.h +++ b/source/blender/compositor/operations/COM_MovieClipOperation.h @@ -31,10 +31,10 @@ #include "IMB_imbuf_types.h" /** - * Base class for all renderlayeroperations - * - * @todo: rename to operation. - */ + * Base class for all renderlayeroperations + * + * @todo: rename to operation. + */ class MovieClipOperation : public NodeOperation { protected: MovieClip *movieClip; @@ -45,8 +45,8 @@ protected: int framenumber; /** - * Determine the output resolution. The resolution is retrieved from the Renderer - */ + * Determine the output resolution. The resolution is retrieved from the Renderer + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); public: @@ -54,11 +54,11 @@ public: void initExecution(); void deinitExecution(); - void setMovieClip(MovieClip *image) {this->movieClip = image;} - void setMovieClipUser(MovieClipUser *imageuser) {this->movieClipUser = imageuser;} - - void setFramenumber(int framenumber) {this->framenumber = framenumber;} - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void setMovieClip(MovieClip *image) { this->movieClip = image; } + void setMovieClipUser(MovieClipUser *imageuser) { this->movieClipUser = imageuser; } + + void setFramenumber(int framenumber) { this->framenumber = framenumber; } + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.h b/source/blender/compositor/operations/COM_MovieDistortionOperation.h index 5792248464a..9c7050e1da0 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.h +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.h @@ -57,28 +57,28 @@ public: this->calibration_width = calibration_width; this->calibration_height = calibration_height; this->inverted = inverted; - this->bufferCalculated = new int[this->width*this->height]; - this->buffer = new float[this->width*this->height*2]; - for (int i = 0 ; i < this->width*this->height ; i ++) { + this->bufferCalculated = new int[this->width * this->height]; + this->buffer = new float[this->width * this->height * 2]; + for (int i = 0; i < this->width * this->height; i++) { this->bufferCalculated[i] = 0; } } bool isCacheFor(MovieClip *movieclip, int width, int height, int calibration_width, int claibration_height, bool inverted) { return this->k1 == movieclip->tracking.camera.k1 && - this->k2 == movieclip->tracking.camera.k2 && - this->k3 == movieclip->tracking.camera.k3 && - this->principal_x == movieclip->tracking.camera.principal[0] && - this->principal_y == movieclip->tracking.camera.principal[1] && - this->pixel_aspect == movieclip->tracking.camera.pixel_aspect && - this->inverted == inverted && - this->width == width && - this->height == height && - this->calibration_width == calibration_width && - this->calibration_height == calibration_height; + this->k2 == movieclip->tracking.camera.k2 && + this->k3 == movieclip->tracking.camera.k3 && + this->principal_x == movieclip->tracking.camera.principal[0] && + this->principal_y == movieclip->tracking.camera.principal[1] && + this->pixel_aspect == movieclip->tracking.camera.pixel_aspect && + this->inverted == inverted && + this->width == width && + this->height == height && + this->calibration_width == calibration_width && + this->calibration_height == calibration_height; } - void getUV(MovieTracking *trackingData, int x, int y, float *u, float*v) { - if (x<0 || x >= this->width || y <0 || y >= this->height) { + void getUV(MovieTracking *trackingData, int x, int y, float *u, float *v) { + if (x < 0 || x >= this->width || y < 0 || y >= this->height) { *u = x; *v = y; } @@ -88,8 +88,8 @@ public: if (!bufferCalculated[offset]) { //float overscan = 0.0f; - float w = (float)this->width/* / (1 + overscan) */; - float h = (float)this->height/* / (1 + overscan) */; + float w = (float)this->width /* / (1 + overscan) */; + float h = (float)this->height /* / (1 + overscan) */; float aspx = (float)w / this->calibration_width; float aspy = (float)h / this->calibration_height; float in[2]; @@ -106,21 +106,21 @@ public: } buffer[offset2] = out[0] * aspx /* + 0.5 * overscan * w */; - buffer[offset2+1] = (out[1] * aspy /* + 0.5 * overscan * h */) * this->pixel_aspect; + buffer[offset2 + 1] = (out[1] * aspy /* + 0.5 * overscan * h */) * this->pixel_aspect; bufferCalculated[offset] = 1; } *u = buffer[offset2]; - *v = buffer[offset2+1]; + *v = buffer[offset2 + 1]; } } }; -class MovieDistortionOperation: public NodeOperation { +class MovieDistortionOperation : public NodeOperation { private: DistortionCache *cache; SocketReader *inputOperation; - MovieClip * movieClip; + MovieClip *movieClip; protected: bool distortion; @@ -129,13 +129,13 @@ protected: public: MovieDistortionOperation(bool distortion); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setMovieClip(MovieClip *clip) {this->movieClip = clip;} - void setFramenumber(int framenumber) {this->framenumber = framenumber;} + void setMovieClip(MovieClip *clip) { this->movieClip = clip; } + void setFramenumber(int framenumber) { this->framenumber = framenumber; } }; #endif diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.h b/source/blender/compositor/operations/COM_MultilayerImageOperation.h index 809253e532a..c33e65fc55b 100644 --- a/source/blender/compositor/operations/COM_MultilayerImageOperation.h +++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.h @@ -27,7 +27,7 @@ #include "COM_ImageOperation.h" -class MultilayerBaseOperation: public BaseImageOperation { +class MultilayerBaseOperation : public BaseImageOperation { private: int passId; RenderLayer *renderlayer; @@ -35,34 +35,34 @@ protected: ImBuf *getImBuf(); public: /** - * Constructor - */ + * Constructor + */ MultilayerBaseOperation(int pass); - void setRenderLayer(RenderLayer *renderlayer) {this->renderlayer = renderlayer;} + void setRenderLayer(RenderLayer *renderlayer) { this->renderlayer = renderlayer; } }; -class MultilayerColorOperation: public MultilayerBaseOperation { +class MultilayerColorOperation : public MultilayerBaseOperation { public: - MultilayerColorOperation(int pass): MultilayerBaseOperation(pass) { + MultilayerColorOperation(int pass) : MultilayerBaseOperation(pass) { this->addOutputSocket(COM_DT_COLOR); } - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MultilayerValueOperation: public MultilayerBaseOperation { +class MultilayerValueOperation : public MultilayerBaseOperation { public: - MultilayerValueOperation(int pass): MultilayerBaseOperation(pass) { + MultilayerValueOperation(int pass) : MultilayerBaseOperation(pass) { this->addOutputSocket(COM_DT_VALUE); } - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class MultilayerVectorOperation: public MultilayerBaseOperation { +class MultilayerVectorOperation : public MultilayerBaseOperation { public: - MultilayerVectorOperation(int pass): MultilayerBaseOperation(pass) { + MultilayerVectorOperation(int pass) : MultilayerBaseOperation(pass) { this->addOutputSocket(COM_DT_VECTOR); } - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.h b/source/blender/compositor/operations/COM_NormalizeOperation.h index 765b8847384..de1c4d67bba 100644 --- a/source/blender/compositor/operations/COM_NormalizeOperation.h +++ b/source/blender/compositor/operations/COM_NormalizeOperation.h @@ -25,41 +25,41 @@ #include "DNA_node_types.h" /** - * @brief base class of normalize, implementing the simple normalize - * @ingroup operation - */ + * @brief base class of normalize, implementing the simple normalize + * @ingroup operation + */ class NormalizeOperation : public NodeOperation { protected: /** - * @brief Cached reference to the reader - */ - SocketReader * imageReader; + * @brief Cached reference to the reader + */ + SocketReader *imageReader; /** - * @brief temporarily cache of the execution storage - * it stores x->min and y->mult - */ - NodeTwoFloats * cachedInstance; + * @brief temporarily cache of the execution storage + * it stores x->min and y->mult + */ + NodeTwoFloats *cachedInstance; public: NormalizeOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h index 9b9fb023467..cfc5f7e41f2 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.h +++ b/source/blender/compositor/operations/COM_OutputFileOperation.h @@ -45,18 +45,18 @@ private: public: OutputSingleLayerOperation(const Scene *scene, const bNodeTree *tree, DataType datatype, ImageFormatData *format, const char *path); - void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers); - bool isOutputOperation(bool rendering) const {return true;} + void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers); + bool isOutputOperation(bool rendering) const { return true; } void initExecution(); void deinitExecution(); - const CompositorPriority getRenderPriority() const {return COM_PRIORITY_LOW;} + const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; } }; /* extra info for OpenEXR layers */ struct OutputOpenExrLayer { OutputOpenExrLayer(const char *name, DataType datatype); - char name[EXR_TOT_MAXNAME-2]; + char name[EXR_TOT_MAXNAME - 2]; float *outputBuffer; DataType datatype; SocketReader *imageInput; @@ -79,11 +79,11 @@ public: void add_layer(const char *name, DataType datatype); - void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers); - bool isOutputOperation(bool rendering) const {return true;} + void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers); + bool isOutputOperation(bool rendering) const { return true; } void initExecution(); void deinitExecution(); - const CompositorPriority getRenderPriority() const {return COM_PRIORITY_LOW;} + const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; } }; #endif diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h index 32c0b6ecc77..f9ce0c644a1 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.h +++ b/source/blender/compositor/operations/COM_PreviewOperation.h @@ -31,24 +31,24 @@ protected: unsigned char *outputBuffer; /** - * @brief holds reference to the SDNA bNode, where this nodes will render the preview image for - */ + * @brief holds reference to the SDNA bNode, where this nodes will render the preview image for + */ bNode *node; SocketReader *input; float divider; public: PreviewOperation(); - bool isOutputOperation(bool rendering) const {return true;} + bool isOutputOperation(bool rendering) const { return true; } void initExecution(); void deinitExecution(); const CompositorPriority getRenderPriority() const; void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - void setbNode(bNode *node) { this->node = node;} + void setbNode(bNode *node) { this->node = node; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - bool isPreviewOperation() {return true;} + bool isPreviewOperation() { return true; } }; #endif diff --git a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h index c8788e100c8..2e188617ab5 100644 --- a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h +++ b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h @@ -28,11 +28,11 @@ class ProjectorLensDistortionOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; - NodeLensDist * data; + NodeLensDist *data; float dispersion; float kr, kr2; @@ -40,23 +40,23 @@ public: ProjectorLensDistortionOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeLensDist *data) {this->data = data;} - void setDispertion(float dispersion) {this->dispersion = dispersion;} + void setData(NodeLensDist *data) { this->data = data; } + void setDispertion(float dispersion) { this->dispersion = dispersion; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); diff --git a/source/blender/compositor/operations/COM_QualityStepHelper.h b/source/blender/compositor/operations/COM_QualityStepHelper.h index 80b25684c5e..aef80e22e38 100644 --- a/source/blender/compositor/operations/COM_QualityStepHelper.h +++ b/source/blender/compositor/operations/COM_QualityStepHelper.h @@ -37,17 +37,17 @@ private: protected: /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(QualityHelper helper); - inline int getStep() const {return this->step;} - inline int getOffsetAdd() const {return this->offsetadd;} + inline int getStep() const { return this->step; } + inline int getOffsetAdd() const { return this->offsetadd; } public: QualityStepHelper(); - void setQuality(CompositorQuality quality) {this->quality = quality;} + void setQuality(CompositorQuality quality) { this->quality = quality; } }; #endif diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.h b/source/blender/compositor/operations/COM_ReadBufferOperation.h index 449b4a82618..576aa194bc5 100644 --- a/source/blender/compositor/operations/COM_ReadBufferOperation.h +++ b/source/blender/compositor/operations/COM_ReadBufferOperation.h @@ -26,25 +26,25 @@ #include "COM_NodeOperation.h" #include "COM_MemoryProxy.h" -class ReadBufferOperation: public NodeOperation { +class ReadBufferOperation : public NodeOperation { private: MemoryProxy *memoryProxy; unsigned int offset; public: ReadBufferOperation(); - int isBufferOperation() {return true;} - void setMemoryProxy(MemoryProxy *memoryProxy) {this->memoryProxy = memoryProxy;} - MemoryProxy *getMemoryProxy() {return this->memoryProxy;} + int isBufferOperation() { return true; } + void setMemoryProxy(MemoryProxy *memoryProxy) { this->memoryProxy = memoryProxy; } + MemoryProxy *getMemoryProxy() { return this->memoryProxy; } void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); - void executePixel(float *color, float x, float y, float dx, float dy, MemoryBuffer *inputBuffers[]); - const bool isReadBufferOperation() const {return true;} - void setOffset(unsigned int offset) {this->offset = offset;} - unsigned int getOffset() {return this->offset;} - bool determineDependingAreaOfInterest(rcti * input, ReadBufferOperation *readOperation, rcti *output); - MemoryBuffer *getInputMemoryBuffer(MemoryBuffer** memoryBuffers) {return memoryBuffers[offset];} + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); + void executePixel(float *color, float x, float y, float dx, float dy, MemoryBuffer * inputBuffers[]); + const bool isReadBufferOperation() const { return true; } + void setOffset(unsigned int offset) { this->offset = offset; } + unsigned int getOffset() { return this->offset; } + bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); + MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return memoryBuffers[offset]; } void readResolutionFromWriteBuffer(); }; diff --git a/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h b/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h index da808f49fdf..846e337c572 100644 --- a/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h +++ b/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h @@ -28,7 +28,7 @@ class RenderLayersAlphaProg : public RenderLayersBaseProg { public: RenderLayersAlphaProg(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; diff --git a/source/blender/compositor/operations/COM_RenderLayersBaseProg.h b/source/blender/compositor/operations/COM_RenderLayersBaseProg.h index 64e2496621f..ce2b8f767b6 100644 --- a/source/blender/compositor/operations/COM_RenderLayersBaseProg.h +++ b/source/blender/compositor/operations/COM_RenderLayersBaseProg.h @@ -36,64 +36,63 @@ extern "C" { } /** - * Base class for all renderlayeroperations - * - * @todo: rename to operation. - */ + * Base class for all renderlayeroperations + * + * @todo: rename to operation. + */ class RenderLayersBaseProg : public NodeOperation { private: /** - * Reference to the scene object. - */ + * Reference to the scene object. + */ Scene *scene; /** - * layerId of the layer where this operation needs to get its data from - */ + * layerId of the layer where this operation needs to get its data from + */ short layerId; /** - * cached instance to the float buffer inside the layer - */ + * cached instance to the float buffer inside the layer + */ float *inputBuffer; /** - * renderpass where this operation needs to get its data from - */ + * renderpass where this operation needs to get its data from + */ int renderpass; int elementsize; protected: /** - * Constructor - */ + * Constructor + */ RenderLayersBaseProg(int renderpass, int elementsize); /** - * Determine the output resolution. The resolution is retrieved from the Renderer - */ + * Determine the output resolution. The resolution is retrieved from the Renderer + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); /** - * retrieve the reference to the float buffer of the renderer. - */ - inline float *getInputBuffer() {return this->inputBuffer;} + * retrieve the reference to the float buffer of the renderer. + */ + inline float *getInputBuffer() { return this->inputBuffer; } public: /** - * setter for the scene field. Will be called from - * @see RenderLayerNode to set the actual scene where - * the data will be retrieved from. - */ - void setScene(Scene *scene) {this->scene = scene;} - Scene *getScene() {return this->scene;} - void setLayerId(short layerId) {this->layerId = layerId;} - short getLayerId() {return this->layerId;} + * setter for the scene field. Will be called from + * @see RenderLayerNode to set the actual scene where + * the data will be retrieved from. + */ + void setScene(Scene *scene) { this->scene = scene; } + Scene *getScene() { return this->scene; } + void setLayerId(short layerId) { this->layerId = layerId; } + short getLayerId() { return this->layerId; } void initExecution(); void deinitExecution(); void executePixel(float *output, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); - }; #endif diff --git a/source/blender/compositor/operations/COM_RotateOperation.h b/source/blender/compositor/operations/COM_RotateOperation.h index 6afed39908b..bf7355da80e 100644 --- a/source/blender/compositor/operations/COM_RotateOperation.h +++ b/source/blender/compositor/operations/COM_RotateOperation.h @@ -25,7 +25,7 @@ #include "COM_NodeOperation.h" -class RotateOperation: public NodeOperation { +class RotateOperation : public NodeOperation { private: SocketReader *imageSocket; SocketReader *degreeSocket; @@ -38,10 +38,10 @@ private: public: RotateOperation(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setDoDegree2RadConversion(bool abool) {this->doDegree2RadConversion = abool;} + void setDoDegree2RadConversion(bool abool) { this->doDegree2RadConversion = abool; } void ensureDegree(); }; diff --git a/source/blender/compositor/operations/COM_ScaleOperation.h b/source/blender/compositor/operations/COM_ScaleOperation.h index 2c99cb63978..9e24ab3d1ca 100644 --- a/source/blender/compositor/operations/COM_ScaleOperation.h +++ b/source/blender/compositor/operations/COM_ScaleOperation.h @@ -70,8 +70,8 @@ public: void initExecution(); void deinitExecution(); - void setNewWidth(int width) {this->newWidth = width;} - void setNewHeight(int height) {this->newHeight = height;} + void setNewWidth(int width) { this->newWidth = width; } + void setNewHeight(int height) { this->newHeight = height; } }; #endif diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h index d2db55ea214..34656f38a09 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h @@ -28,11 +28,11 @@ class ScreenLensDistortionOperation : public NodeOperation { private: /** - * Cached reference to the inputProgram - */ + * Cached reference to the inputProgram + */ SocketReader *inputProgram; - NodeLensDist * data; + NodeLensDist *data; float dispersion; float distortion; @@ -46,24 +46,24 @@ public: ScreenLensDistortionOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeLensDist *data) {this->data = data;} - void setDispertion(float dispersion) {this->dispersion = dispersion;} - void setDistortion(float distortion) {this->distortion = distortion;} + void setData(NodeLensDist *data) { this->data = data; } + void setDispertion(float dispersion) { this->dispersion = dispersion; } + void setDistortion(float distortion) { this->distortion = distortion; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); diff --git a/source/blender/compositor/operations/COM_SeparateChannelOperation.h b/source/blender/compositor/operations/COM_SeparateChannelOperation.h index 3c1eed4bdd9..b1a38fd8294 100644 --- a/source/blender/compositor/operations/COM_SeparateChannelOperation.h +++ b/source/blender/compositor/operations/COM_SeparateChannelOperation.h @@ -25,18 +25,18 @@ #include "COM_NodeOperation.h" -class SeparateChannelOperation: public NodeOperation { +class SeparateChannelOperation : public NodeOperation { private: SocketReader *inputOperation; int channel; public: SeparateChannelOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - void setChannel(int channel) {this->channel = channel;} + void setChannel(int channel) { this->channel = channel; } }; #endif diff --git a/source/blender/compositor/operations/COM_SetAlphaOperation.h b/source/blender/compositor/operations/COM_SetAlphaOperation.h index 3d9caabf880..231b41f1697 100644 --- a/source/blender/compositor/operations/COM_SetAlphaOperation.h +++ b/source/blender/compositor/operations/COM_SetAlphaOperation.h @@ -26,9 +26,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class SetAlphaOperation : public NodeOperation { private: SocketReader *inputColor; @@ -36,14 +36,14 @@ private: public: /** - * Default constructor - */ + * Default constructor + */ SetAlphaOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_SetColorOperation.h b/source/blender/compositor/operations/COM_SetColorOperation.h index dad3cfd7fc9..9d28f1757db 100644 --- a/source/blender/compositor/operations/COM_SetColorOperation.h +++ b/source/blender/compositor/operations/COM_SetColorOperation.h @@ -26,9 +26,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class SetColorOperation : public NodeOperation { private: float channel1; @@ -38,8 +38,8 @@ private: public: /** - * Default constructor - */ + * Default constructor + */ SetColorOperation(); const float getChannel1() {return this->channel1;} @@ -53,12 +53,12 @@ public: void setChannels(float value[4]) {this->channel1 = value[0];this->channel2 = value[1];this->channel3 = value[2];this->channel4 = value[3];} /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - const bool isSetOperation() const {return true;} + const bool isSetOperation() const { return true; } }; #endif diff --git a/source/blender/compositor/operations/COM_SetSamplerOperation.h b/source/blender/compositor/operations/COM_SetSamplerOperation.h index 49bbae7e4ff..5dba0b3703f 100644 --- a/source/blender/compositor/operations/COM_SetSamplerOperation.h +++ b/source/blender/compositor/operations/COM_SetSamplerOperation.h @@ -26,25 +26,25 @@ /** - * this program converts an input colour to an output Sampler. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output Sampler. + * it assumes we are in sRGB colour space. + */ class SetSamplerOperation : public NodeOperation { private: PixelSampler sampler; SocketReader *reader; public: /** - * Default constructor - */ + * Default constructor + */ SetSamplerOperation(); - void setSampler(PixelSampler sampler) {this->sampler = sampler;} + void setSampler(PixelSampler sampler) { this->sampler = sampler; } /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_SetValueOperation.h b/source/blender/compositor/operations/COM_SetValueOperation.h index 25810cd7ee5..2f4a6ec0dc8 100644 --- a/source/blender/compositor/operations/COM_SetValueOperation.h +++ b/source/blender/compositor/operations/COM_SetValueOperation.h @@ -26,29 +26,29 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class SetValueOperation : public NodeOperation { private: float value; public: /** - * Default constructor - */ + * Default constructor + */ SetValueOperation(); - const float getValue() {return this->value;} - void setValue(float value) {this->value = value;} + const float getValue() { return this->value; } + void setValue(float value) { this->value = value; } /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - const bool isSetOperation() const {return true;} + const bool isSetOperation() const { return true; } }; #endif diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.h b/source/blender/compositor/operations/COM_SetVectorOperation.h index 9b5dd3ce674..49088027762 100644 --- a/source/blender/compositor/operations/COM_SetVectorOperation.h +++ b/source/blender/compositor/operations/COM_SetVectorOperation.h @@ -26,9 +26,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class SetVectorOperation : public NodeOperation { private: float x; @@ -38,26 +38,26 @@ private: public: /** - * Default constructor - */ + * Default constructor + */ SetVectorOperation(); - const float getX() {return this->x;} - void setX(float value) {this->x = value;} - const float getY() {return this->y;} - void setY(float value) {this->y = value;} - const float getZ() {return this->z;} - void setZ(float value) {this->z = value;} - const float getW() {return this->w;} - void setW(float value) {this->w = value;} + const float getX() { return this->x; } + void setX(float value) { this->x = value; } + const float getY() { return this->y; } + void setY(float value) { this->y = value; } + const float getZ() { return this->z; } + void setZ(float value) { this->z = value; } + const float getW() { return this->w; } + void setW(float value) { this->w = value; } /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); - const bool isSetOperation() const {return true;} + const bool isSetOperation() const { return true; } void setVector(float vector[3]) { setX(vector[0]); diff --git a/source/blender/compositor/operations/COM_SocketProxyOperation.h b/source/blender/compositor/operations/COM_SocketProxyOperation.h index a86134c1ea9..701a5a8f693 100644 --- a/source/blender/compositor/operations/COM_SocketProxyOperation.h +++ b/source/blender/compositor/operations/COM_SocketProxyOperation.h @@ -25,12 +25,12 @@ #include "COM_NodeOperation.h" -class SocketProxyOperation: public NodeOperation { +class SocketProxyOperation : public NodeOperation { private: SocketReader *inputOperation; public: SocketProxyOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); diff --git a/source/blender/compositor/operations/COM_SplitViewerOperation.h b/source/blender/compositor/operations/COM_SplitViewerOperation.h index 2c3163f0b0a..aba63ff190b 100644 --- a/source/blender/compositor/operations/COM_SplitViewerOperation.h +++ b/source/blender/compositor/operations/COM_SplitViewerOperation.h @@ -35,10 +35,10 @@ private: bool xSplit; public: SplitViewerOperation(); - void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers); + void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers); void initExecution(); void deinitExecution(); - void setSplitPercentage(float splitPercentage) {this->splitPercentage = splitPercentage;} - void setXSplit(bool xsplit) {this->xSplit = xsplit;} + void setSplitPercentage(float splitPercentage) { this->splitPercentage = splitPercentage; } + void setXSplit(bool xsplit) { this->xSplit = xsplit; } }; #endif diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h index de42b144730..e862a1f1910 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.h +++ b/source/blender/compositor/operations/COM_TextureOperation.h @@ -36,10 +36,10 @@ extern "C" { } /** - * Base class for all renderlayeroperations - * - * @todo: rename to operation. - */ + * Base class for all renderlayeroperations + * + * @todo: rename to operation. + */ class TextureBaseOperation : public NodeOperation { private: Tex *texture; @@ -50,33 +50,33 @@ private: protected: /** - * Determine the output resolution. The resolution is retrieved from the Renderer - */ + * Determine the output resolution. The resolution is retrieved from the Renderer + */ void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); /** - * Constructor - */ + * Constructor + */ TextureBaseOperation(); public: - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); - void setTexture(Tex *texture) {this->texture = texture;} + void setTexture(Tex *texture) { this->texture = texture; } void initExecution(); void deinitExecution(); - void setScene(const Scene *scene) {this->scene = scene;} + void setScene(const Scene *scene) { this->scene = scene; } }; -class TextureOperation:public TextureBaseOperation { +class TextureOperation : public TextureBaseOperation { public: TextureOperation(); }; -class TextureAlphaOperation:public TextureBaseOperation { +class TextureAlphaOperation : public TextureBaseOperation { public: TextureAlphaOperation(); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; diff --git a/source/blender/compositor/operations/COM_TonemapOperation.h b/source/blender/compositor/operations/COM_TonemapOperation.h index e7ea4f039f2..005f0862443 100644 --- a/source/blender/compositor/operations/COM_TonemapOperation.h +++ b/source/blender/compositor/operations/COM_TonemapOperation.h @@ -26,9 +26,9 @@ #include "DNA_node_types.h" /** - * @brief temporarily storage during execution of Tonemap - * @ingroup operation - */ + * @brief temporarily storage during execution of Tonemap + * @ingroup operation + */ typedef struct AvgLogLum { float al; float auto_key; @@ -38,48 +38,48 @@ typedef struct AvgLogLum { } AvgLogLum; /** - * @brief base class of tonemap, implementing the simple tonemap - * @ingroup operation - */ + * @brief base class of tonemap, implementing the simple tonemap + * @ingroup operation + */ class TonemapOperation : public NodeOperation { protected: /** - * @brief Cached reference to the reader - */ - SocketReader * imageReader; + * @brief Cached reference to the reader + */ + SocketReader *imageReader; /** - * @brief settings of the Tonemap - */ - NodeTonemap * data; + * @brief settings of the Tonemap + */ + NodeTonemap *data; /** - * @brief temporarily cache of the execution storage - */ - AvgLogLum * cachedInstance; + * @brief temporarily cache of the execution storage + */ + AvgLogLum *cachedInstance; public: TonemapOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); - void setData(NodeTonemap *data) {this->data = data;} + void setData(NodeTonemap *data) { this->data = data; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); @@ -87,17 +87,17 @@ public: }; /** - * @brief class of tonemap, implementing the photoreceptor tonemap - * most parts have already been done in TonemapOperation - * @ingroup operation - */ + * @brief class of tonemap, implementing the photoreceptor tonemap + * most parts have already been done in TonemapOperation + * @ingroup operation + */ class PhotoreceptorTonemapOperation : public TonemapOperation { public: /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); }; #endif diff --git a/source/blender/compositor/operations/COM_TranslateOperation.h b/source/blender/compositor/operations/COM_TranslateOperation.h index 63d6ee0d0b5..e512bd9318e 100644 --- a/source/blender/compositor/operations/COM_TranslateOperation.h +++ b/source/blender/compositor/operations/COM_TranslateOperation.h @@ -25,24 +25,24 @@ #include "COM_NodeOperation.h" -class TranslateOperation: public NodeOperation { +class TranslateOperation : public NodeOperation { private: SocketReader *inputOperation; - SocketReader*inputXOperation; - SocketReader*inputYOperation; + SocketReader *inputXOperation; + SocketReader *inputYOperation; float deltaX; float deltaY; float isDeltaSet; public: TranslateOperation(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); void initExecution(); void deinitExecution(); - float getDeltaX() {return this->deltaX;} - float getDeltaY() {return this->deltaY;} + float getDeltaX() { return this->deltaX; } + float getDeltaY() { return this->deltaY; } inline void ensureDelta() { if (!isDeltaSet) { diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h index 9c2c4b4bf68..ede8f0333b4 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h @@ -37,25 +37,25 @@ public: VariableSizeBokehBlurOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void setMaxBlur(int maxRadius) {this->maxBlur = maxRadius;} - - void setThreshold(float threshold) {this->threshold = threshold;} + void setMaxBlur(int maxRadius) { this->maxBlur = maxRadius; } + + void setThreshold(float threshold) { this->threshold = threshold; } }; diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.h b/source/blender/compositor/operations/COM_VectorBlurOperation.h index 2c45628726d..30821cdd8b2 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.h +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.h @@ -29,16 +29,16 @@ class VectorBlurOperation : public NodeOperation, public QualityStepHelper { private: /** - * @brief Cached reference to the inputProgram - */ - SocketReader * inputImageProgram; - SocketReader * inputSpeedProgram; - SocketReader * inputZProgram; + * @brief Cached reference to the inputProgram + */ + SocketReader *inputImageProgram; + SocketReader *inputSpeedProgram; + SocketReader *inputZProgram; /** - * @brief settings of the glare node. - */ - NodeBlurData * settings; + * @brief settings of the glare node. + */ + NodeBlurData *settings; float *cachedInstance; @@ -46,23 +46,23 @@ public: VectorBlurOperation(); /** - * the inner loop of this program - */ - void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data); + * the inner loop of this program + */ + void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); - void setVectorBlurSettings(NodeBlurData * settings) {this->settings = settings;} + void setVectorBlurSettings(NodeBlurData *settings) { this->settings = settings; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); protected: diff --git a/source/blender/compositor/operations/COM_VectorCurveOperation.h b/source/blender/compositor/operations/COM_VectorCurveOperation.h index 759e265220f..41faee7acf6 100644 --- a/source/blender/compositor/operations/COM_VectorCurveOperation.h +++ b/source/blender/compositor/operations/COM_VectorCurveOperation.h @@ -28,25 +28,25 @@ class VectorCurveOperation : public CurveBaseOperation { private: /** - * Cached reference to the inputProgram - */ - SocketReader * inputProgram; + * Cached reference to the inputProgram + */ + SocketReader *inputProgram; public: VectorCurveOperation(); /** - * the inner loop of this program - */ - void executePixel(float *Vector, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *Vector, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); /** - * Initialize the execution - */ + * Initialize the execution + */ void initExecution(); /** - * Deinitialize the execution - */ + * Deinitialize the execution + */ void deinitExecution(); }; #endif diff --git a/source/blender/compositor/operations/COM_ViewerBaseOperation.h b/source/blender/compositor/operations/COM_ViewerBaseOperation.h index 8864894f0ed..2aaa7d20966 100644 --- a/source/blender/compositor/operations/COM_ViewerBaseOperation.h +++ b/source/blender/compositor/operations/COM_ViewerBaseOperation.h @@ -30,8 +30,8 @@ class ViewerBaseOperation : public NodeOperation { protected: float *outputBuffer; unsigned char *outputBufferDisplay; - Image * image; - ImageUser * imageUser; + Image *image; + ImageUser *imageUser; void *lock; bool active; float centerX; @@ -41,27 +41,27 @@ protected: bool doColorPredivide; public: - bool isOutputOperation(bool rendering) const {return isActiveViewerOutput();} + bool isOutputOperation(bool rendering) const { return isActiveViewerOutput(); } void initExecution(); void deinitExecution(); - void setImage(Image *image) {this->image = image;} - void setImageUser(ImageUser *imageUser) {this->imageUser = imageUser;} - const bool isActiveViewerOutput() const {return active;} - void setActive(bool active) {this->active = active;} - void setCenterX(float centerX) {this->centerX = centerX;} - void setCenterY(float centerY) {this->centerY = centerY;} - void setChunkOrder(OrderOfChunks tileOrder) {this->chunkOrder = tileOrder;} + void setImage(Image *image) { this->image = image; } + void setImageUser(ImageUser *imageUser) { this->imageUser = imageUser; } + const bool isActiveViewerOutput() const { return active; } + void setActive(bool active) { this->active = active; } + void setCenterX(float centerX) { this->centerX = centerX;} + void setCenterY(float centerY) { this->centerY = centerY;} + void setChunkOrder(OrderOfChunks tileOrder) { this->chunkOrder = tileOrder; } float getCenterX() { return this->centerX; } float getCenterY() { return this->centerY; } OrderOfChunks getChunkOrder() { return this->chunkOrder; } const CompositorPriority getRenderPriority() const; - void setColorManagement(bool doColorManagement) {this->doColorManagement = doColorManagement;} - void setColorPredivide(bool doColorPredivide) {this->doColorPredivide = doColorPredivide;} - bool isViewerOperation() {return true;} + void setColorManagement(bool doColorManagement) { this->doColorManagement = doColorManagement; } + void setColorPredivide(bool doColorPredivide) { this->doColorPredivide = doColorPredivide; } + bool isViewerOperation() { return true; } protected: ViewerBaseOperation(); - void updateImage(rcti*rect); + void updateImage(rcti *rect); private: void initImage(); diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h index 4ffae31c131..49ef5ad4bb7 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.h +++ b/source/blender/compositor/operations/COM_ViewerOperation.h @@ -34,7 +34,7 @@ private: public: ViewerOperation(); - void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers); + void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers); void initExecution(); void deinitExecution(); }; diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.h b/source/blender/compositor/operations/COM_WriteBufferOperation.h index fff3212b410..321eed7240a 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.h +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.h @@ -27,24 +27,24 @@ #include "COM_MemoryProxy.h" #include "COM_SocketReader.h" /** - * @brief Operation to write to a tile - * @ingroup Operation - */ -class WriteBufferOperation: public NodeOperation { + * @brief Operation to write to a tile + * @ingroup Operation + */ +class WriteBufferOperation : public NodeOperation { MemoryProxy *memoryProxy; NodeOperation *input; public: WriteBufferOperation(); ~WriteBufferOperation(); - int isBufferOperation() {return true;} - MemoryProxy *getMemoryProxy() {return this->memoryProxy;} - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); - const bool isWriteBufferOperation() const {return true;} + int isBufferOperation() { return true; } + MemoryProxy *getMemoryProxy() { return this->memoryProxy; } + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); + const bool isWriteBufferOperation() const { return true; } - void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers); + void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers); void initExecution(); void deinitExecution(); - void executeOpenCLRegion(cl_context context, cl_program program, cl_command_queue queue, rcti *rect, unsigned int chunkNumber, MemoryBuffer** memoryBuffers, MemoryBuffer* outputBuffer); + void executeOpenCLRegion(cl_context context, cl_program program, cl_command_queue queue, rcti *rect, unsigned int chunkNumber, MemoryBuffer **memoryBuffers, MemoryBuffer *outputBuffer); void readResolutionFromInputSocket(); }; diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.h b/source/blender/compositor/operations/COM_ZCombineOperation.h index f9de916fce0..56ad950a3aa 100644 --- a/source/blender/compositor/operations/COM_ZCombineOperation.h +++ b/source/blender/compositor/operations/COM_ZCombineOperation.h @@ -26,9 +26,9 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. - */ + * this program converts an input colour to an output value. + * it assumes we are in sRGB colour space. + */ class ZCombineOperation : public NodeOperation { protected: SocketReader *image1Reader; @@ -37,21 +37,21 @@ protected: SocketReader *depth2Reader; public: /** - * Default constructor - */ + * Default constructor + */ ZCombineOperation(); void initExecution(); void deinitExecution(); /** - * the inner loop of this program - */ - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); + * the inner loop of this program + */ + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; -class ZCombineAlphaOperation: public ZCombineOperation { - void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]); +class ZCombineAlphaOperation : public ZCombineOperation { + void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); }; #endif |