Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/operations/COM_TextureOperation.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/compositor/operations/COM_TextureOperation.h')
-rw-r--r--source/blender/compositor/operations/COM_TextureOperation.h76
1 files changed, 41 insertions, 35 deletions
diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h
index 463fe4cc3a0..934b6f8683f 100644
--- a/source/blender/compositor/operations/COM_TextureOperation.h
+++ b/source/blender/compositor/operations/COM_TextureOperation.h
@@ -16,7 +16,6 @@
* Copyright 2011, Blender Foundation.
*/
-
#ifndef __COM_TEXTUREOPERATION_H__
#define __COM_TEXTUREOPERATION_H__
@@ -24,10 +23,10 @@
#include "DNA_texture_types.h"
#include "BLI_listbase.h"
extern "C" {
-# include "RE_pipeline.h"
-# include "RE_shader_ext.h"
-# include "RE_render_ext.h"
-# include "MEM_guardedalloc.h"
+#include "RE_pipeline.h"
+#include "RE_shader_ext.h"
+#include "RE_render_ext.h"
+#include "MEM_guardedalloc.h"
}
/**
@@ -36,45 +35,52 @@ extern "C" {
* \todo: rename to operation.
*/
class TextureBaseOperation : public NodeOperation {
-private:
- Tex *m_texture;
- const RenderData *m_rd;
- SocketReader *m_inputSize;
- SocketReader *m_inputOffset;
- struct ImagePool *m_pool;
- bool m_sceneColorManage;
+ private:
+ Tex *m_texture;
+ const RenderData *m_rd;
+ SocketReader *m_inputSize;
+ SocketReader *m_inputOffset;
+ struct ImagePool *m_pool;
+ bool m_sceneColorManage;
-protected:
+ protected:
+ /**
+ * Determine the output resolution. The resolution is retrieved from the Renderer
+ */
+ void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
- /**
- * Determine the output resolution. The resolution is retrieved from the Renderer
- */
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ /**
+ * Constructor
+ */
+ TextureBaseOperation();
- /**
- * Constructor
- */
- TextureBaseOperation();
-public:
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ public:
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
- void setTexture(Tex *texture) { this->m_texture = texture; }
- void initExecution();
- void deinitExecution();
- void setRenderData(const RenderData *rd) { this->m_rd = rd; }
- void setSceneColorManage(bool sceneColorManage) { this->m_sceneColorManage = sceneColorManage; }
+ void setTexture(Tex *texture)
+ {
+ this->m_texture = texture;
+ }
+ void initExecution();
+ void deinitExecution();
+ void setRenderData(const RenderData *rd)
+ {
+ this->m_rd = rd;
+ }
+ void setSceneColorManage(bool sceneColorManage)
+ {
+ this->m_sceneColorManage = sceneColorManage;
+ }
};
class TextureOperation : public TextureBaseOperation {
-public:
- TextureOperation();
-
+ public:
+ TextureOperation();
};
class TextureAlphaOperation : public TextureBaseOperation {
-public:
- TextureAlphaOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
-
+ public:
+ TextureAlphaOperation();
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
};
#endif