Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Compositor: Code cleanup, trailing whitespace and wrapping

Browse Source
This commit is contained in:
Sergey Sharybin
2015-02-04 13:04:09 +05:00
parent 1dddcfbaff
commit d16ac1e152
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h
View File

@@ -64,7 +64,9 @@ public:
BLI_assert(samples <= PLANE_DISTORT_MAX_SAMPLES); BLI_assert(samples <= PLANE_DISTORT_MAX_SAMPLES);
this->m_motion_blur_samples = samples; this->m_motion_blur_samples = samples;
} }
void setMotionBlurShutter(float shutter) { this->m_motion_blur_shutter = shutter; } void setMotionBlurShutter(float shutter) {
this->m_motion_blur_shutter = shutter;
}
}; };
@@ -81,20 +83,22 @@ protected:
public: public:
PlaneDistortMaskOperation(); PlaneDistortMaskOperation();
void calculateCorners(const float corners[4][2], void calculateCorners(const float corners[4][2],
bool normalized, bool normalized,
int sample); int sample);
void initExecution(); void initExecution();
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
void setMotionBlurSamples(int samples) { void setMotionBlurSamples(int samples) {
BLI_assert(samples <= PLANE_DISTORT_MAX_SAMPLES); BLI_assert(samples <= PLANE_DISTORT_MAX_SAMPLES);
this->m_motion_blur_samples = samples; this->m_motion_blur_samples = samples;
} }
void setMotionBlurShutter(float shutter) { this->m_motion_blur_shutter = shutter; } void setMotionBlurShutter(float shutter) {
this->m_motion_blur_shutter = shutter;
}
}; };
#endif #endif

10
source/blender/compositor/operations/COM_PlaneTrackOperation.cpp
View File

@@ -53,15 +53,13 @@ void PlaneTrackCommon::readCornersFromTrack(float corners[4][2], float frame)
if (!this->m_movieClip) if (!this->m_movieClip)
return; return;
tracking = &this->m_movieClip->tracking; tracking = &this->m_movieClip->tracking;
object = BKE_tracking_object_get_named(tracking, this->m_trackingObjectName); object = BKE_tracking_object_get_named(tracking, this->m_trackingObjectName);
if (object) { if (object) {
MovieTrackingPlaneTrack *plane_track; MovieTrackingPlaneTrack *plane_track;
plane_track = BKE_tracking_plane_track_get_named(tracking, object, this->m_planeTrackName); plane_track = BKE_tracking_plane_track_get_named(tracking, object, this->m_planeTrackName);
if (plane_track) { if (plane_track) {
MovieTrackingPlaneMarker *plane_marker; MovieTrackingPlaneMarker *plane_marker;
float clip_framenr = float clip_framenr =
@@ -79,14 +77,12 @@ void PlaneTrackCommon::determineResolution(unsigned int resolution[2], unsigned
{ {
resolution[0] = 0; resolution[0] = 0;
resolution[1] = 0; resolution[1] = 0;
if (this->m_movieClip) { if (this->m_movieClip) {
int width, height; int width, height;
MovieClipUser user = {0}; MovieClipUser user = {0};
BKE_movieclip_user_set_frame(&user, this->m_framenumber); BKE_movieclip_user_set_frame(&user, this->m_framenumber);
BKE_movieclip_get_size(this->m_movieClip, &user, &width, &height); BKE_movieclip_get_size(this->m_movieClip, &user, &width, &height);
resolution[0] = width; resolution[0] = width;
resolution[1] = height; resolution[1] = height;
} }

7
source/blender/compositor/operations/COM_PlaneTrackOperation.h
View File

@@ -68,7 +68,7 @@ public:
void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]) void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
{ {
PlaneTrackCommon::determineResolution(resolution, preferredResolution); PlaneTrackCommon::determineResolution(resolution, preferredResolution);
unsigned int temp[2]; unsigned int temp[2];
NodeOperation::determineResolution(temp, resolution); NodeOperation::determineResolution(temp, resolution);
} }
@@ -81,13 +81,12 @@ public:
PlaneDistortWarpImageOperation(), PlaneDistortWarpImageOperation(),
PlaneTrackCommon() PlaneTrackCommon()
{} {}
void initExecution(); void initExecution();
void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]) void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
{ {
PlaneTrackCommon::determineResolution(resolution, preferredResolution); PlaneTrackCommon::determineResolution(resolution, preferredResolution);
unsigned int temp[2]; unsigned int temp[2];
NodeOperation::determineResolution(temp, resolution); NodeOperation::determineResolution(temp, resolution);
} }