archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Compositor: Replace resolution concept by canvas

Browse Source 
This is a code refactor in preparation of supporting canvas
compositing. See {D12466}.

No functional changes, all canvases are at (0,0) position matching
tiled implementation.

Differential Revision: https://developer.blender.org/D12465
This commit is contained in:
Manuel Castilla
2021-09-28 19:32:49 +02:00
parent 2ecd963d87
commit 76377f0176
109 changed files with 389 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ class PlaneTrackCommon {
* implementation classes must make wrappers to use these methods, see below.
*/
void read_and_calculate_corners(PlaneDistortBaseOperation *distort_op);
void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
void determine_canvas(const rcti &preferred_area, rcti &r_area);
public:
PlaneTrackCommon();
@@ -77,13 +77,13 @@ class PlaneTrackMaskOperation : public PlaneDistortMaskOperation, public PlaneTr
void initExecution() override;
void determineResolution(unsigned int resolution[2],
unsigned int preferredResolution[2]) override
void determine_canvas(const rcti &preferred_area, rcti &r_area) override
{
PlaneTrackCommon::determineResolution(resolution, preferredResolution);
PlaneTrackCommon::determine_canvas(preferred_area, r_area);
unsigned int temp[2];
NodeOperation::determineResolution(temp, resolution);
rcti unused;
rcti &preferred = r_area;
NodeOperation::determine_canvas(preferred, unused);
}
};
@@ -98,12 +98,13 @@ class PlaneTrackWarpImageOperation : public PlaneDistortWarpImageOperation,
void initExecution() override;
void determineResolution(unsigned int resolution[2],
unsigned int preferredResolution[2]) override
void determine_canvas(const rcti &preferred_area, rcti &r_area) override
{
PlaneTrackCommon::determineResolution(resolution, preferredResolution);
unsigned int temp[2];
NodeOperation::determineResolution(temp, resolution);
PlaneTrackCommon::determine_canvas(preferred_area, r_area);
rcti unused;
rcti &preferred = r_area;
NodeOperation::determine_canvas(preferred, unused);
}
};