diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-26 05:22:05 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-26 05:22:05 +0400 |
commit | 6a1d82490e49d1f5d73b5082516b087d44010fb8 (patch) | |
tree | 0650cce3c1d47db6c5de1f4f2ba05b619c412f09 /source/blender/compositor/intern | |
parent | 7a0ab62d3f65f3b28da2a6ba9916c21132f8ea0d (diff) |
use m_ prefix for compositor class members (all compositor operations).
Diffstat (limited to 'source/blender/compositor/intern')
-rw-r--r-- | source/blender/compositor/intern/COM_NodeOperation.cpp | 26 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_NodeOperation.h | 32 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_SocketReader.h | 8 |
3 files changed, 33 insertions, 33 deletions
diff --git a/source/blender/compositor/intern/COM_NodeOperation.cpp b/source/blender/compositor/intern/COM_NodeOperation.cpp index 33989fa5787..6ef8a5ff078 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.cpp +++ b/source/blender/compositor/intern/COM_NodeOperation.cpp @@ -30,12 +30,12 @@ NodeOperation::NodeOperation() { - this->resolutionInputSocketIndex = 0; - this->complex = false; - this->width = 0; - this->height = 0; - this->openCL = false; - this->btree = NULL; + this->m_resolutionInputSocketIndex = 0; + this->m_complex = false; + this->m_width = 0; + this->m_height = 0; + this->m_openCL = false; + this->m_btree = NULL; } void NodeOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[]) @@ -47,7 +47,7 @@ void NodeOperation::determineResolution(unsigned int resolution[], unsigned int for (unsigned int index = 0; index < inputsockets.size(); index++) { InputSocket *inputSocket = inputsockets[index]; if (inputSocket->isConnected()) { - if (index == this->resolutionInputSocketIndex) { + if (index == this->m_resolutionInputSocketIndex) { inputSocket->determineResolution(resolution, preferredResolution); temp2[0] = resolution[0]; temp2[1] = resolution[1]; @@ -58,7 +58,7 @@ void NodeOperation::determineResolution(unsigned int resolution[], unsigned int for (unsigned int index = 0; index < inputsockets.size(); index++) { InputSocket *inputSocket = inputsockets[index]; if (inputSocket->isConnected()) { - if (index != resolutionInputSocketIndex) { + if (index != this->m_resolutionInputSocketIndex) { inputSocket->determineResolution(temp, temp2); } } @@ -66,7 +66,7 @@ void NodeOperation::determineResolution(unsigned int resolution[], unsigned int } void NodeOperation::setResolutionInputSocketIndex(unsigned int index) { - this->resolutionInputSocketIndex = index; + this->m_resolutionInputSocketIndex = index; } void NodeOperation::initExecution() { @@ -75,22 +75,22 @@ void NodeOperation::initExecution() void NodeOperation::initMutex() { - BLI_mutex_init(&mutex); + BLI_mutex_init(&this->m_mutex); } void NodeOperation::lockMutex() { - BLI_mutex_lock(&mutex); + BLI_mutex_lock(&this->m_mutex); } void NodeOperation::unlockMutex() { - BLI_mutex_unlock(&mutex); + BLI_mutex_unlock(&this->m_mutex); } void NodeOperation::deinitMutex() { - BLI_mutex_end(&mutex); + BLI_mutex_end(&this->m_mutex); } void NodeOperation::deinitExecution() diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index bf2dbd8c9c0..d316cfa0aa4 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -49,7 +49,7 @@ private: /** * @brief the index of the input socket that will be used to determine the resolution */ - unsigned int resolutionInputSocketIndex; + unsigned int m_resolutionInputSocketIndex; /** * @brief is this operation a complex one. @@ -57,13 +57,13 @@ private: * 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; + bool m_complex; /** * @brief can this operation be scheduled on an OpenCL device. * @note Only applicable if complex is True */ - bool openCL; + bool m_openCL; /** * @brief mutex reference for very special node initializations @@ -74,12 +74,12 @@ private: * @see NodeOperation.deinitMutex deinitializes this mutex * @see NodeOperation.getMutex retrieve a pointer to this mutex. */ - ThreadMutex mutex; + ThreadMutex m_mutex; /** * @brief reference to the editing bNodeTree only used for break callback */ - const bNodeTree *btree; + const bNodeTree *m_btree; public: /** @@ -124,7 +124,7 @@ public: virtual int isBufferOperation() { return false; } virtual int isSingleThreaded() { return false; } - void setbNodeTree(const bNodeTree *tree) { this->btree = tree; } + void setbNodeTree(const bNodeTree *tree) { this->m_btree = tree; } virtual void initExecution(); /** @@ -167,7 +167,7 @@ public: virtual void deinitExecution(); bool isResolutionSet() { - return this->width != 0 && height != 0; + return this->m_width != 0 && this->m_height != 0; } /** @@ -176,8 +176,8 @@ public: */ void setResolution(unsigned int resolution[]) { if (!isResolutionSet()) { - this->width = resolution[0]; - this->height = resolution[1]; + this->m_width = resolution[0]; + this->m_height = resolution[1]; } } @@ -190,7 +190,7 @@ public: * 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; } + const bool isComplex() const { return this->m_complex; } virtual const bool isSetOperation() const { return false; } /** @@ -235,20 +235,20 @@ public: * @see WorkScheduler.schedule * @see ExecutionGroup.addOperation */ - bool isOpenCL() { return this->openCL; } + bool isOpenCL() { return this->m_openCL; } virtual bool isViewerOperation() { return false; } virtual bool isPreviewOperation() { return false; } inline bool isBreaked() { - return btree->test_break(btree->tbh); + return this->m_btree->test_break(this->m_btree->tbh); } protected: NodeOperation(); - void setWidth(unsigned int width) { this->width = width; } - void setHeight(unsigned int height) { this->height = height; } + void setWidth(unsigned int width) { this->m_width = width; } + void setHeight(unsigned int height) { this->m_height = height; } SocketReader *getInputSocketReader(unsigned int inputSocketindex); NodeOperation *getInputOperation(unsigned int inputSocketindex); @@ -264,12 +264,12 @@ protected: * 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; } + void setComplex(bool complex) { this->m_complex = complex; } /** * @brief set if this NodeOperation can be scheduled on a OpenCLDevice */ - void setOpenCL(bool openCL) { this->openCL = openCL; } + void setOpenCL(bool openCL) { this->m_openCL = openCL; } #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeOperation") diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h index df8899e8eea..0f35fcfb0df 100644 --- a/source/blender/compositor/intern/COM_SocketReader.h +++ b/source/blender/compositor/intern/COM_SocketReader.h @@ -47,12 +47,12 @@ protected: /** * @brief Holds the width of the output of this operation. */ - unsigned int width; + unsigned int m_width; /** * @brief Holds the height of the output of this operation. */ - unsigned int height; + unsigned int m_height; /** @@ -108,8 +108,8 @@ public: 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->m_width; } + inline const unsigned int getHeight() const { return this->m_height; } #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("COM:SocketReader") |