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>2012-06-14 03:31:47 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-14 03:31:47 +0400
commitbde7e6c96b9e180b293ee6e49ab813a30fac0635 (patch)
treecf9f09aa0b3bb0528553546674269f0e5e96bd93 /source/blender/compositor/operations/COM_MovieDistortionOperation.h
parent906b9e0584b93094b1c45514fbf6fd8c62e6d015 (diff)
stule cleanup: node headers
Diffstat (limited to 'source/blender/compositor/operations/COM_MovieDistortionOperation.h')
-rw-r--r--source/blender/compositor/operations/COM_MovieDistortionOperation.h48
1 files changed, 24 insertions, 24 deletions
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