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

style cleanup: compositor, pointer syntax, function brace placement, line length

Browse Source
This commit is contained in:
Campbell Barton
2012-05-17 22:55:28 +00:00
parent 69b95e1a8a
commit 7862b2fa13
441 changed files with 2927 additions and 1972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
View File

@@ -31,7 +31,8 @@ extern "C" {
#include "RE_render_ext.h"
}
RenderLayersBaseProg::RenderLayersBaseProg(int renderpass, int elementsize): NodeOperation() {
RenderLayersBaseProg::RenderLayersBaseProg(int renderpass, int elementsize): NodeOperation()
{
this->renderpass = renderpass;
this->setScene(NULL);
this->inputBuffer = NULL;
@@ -39,27 +40,28 @@ RenderLayersBaseProg::RenderLayersBaseProg(int renderpass, int elementsize): Nod
}
void RenderLayersBaseProg::initExecution() {
void RenderLayersBaseProg::initExecution()
{
Scene * scene = this->getScene();
Render *re= (scene)? RE_GetRender(scene->id.name): NULL;
RenderResult *rr= NULL;
Render *re = (scene)? RE_GetRender(scene->id.name): NULL;
RenderResult *rr = NULL;
if (re)
rr= RE_AcquireResultRead(re);
rr = RE_AcquireResultRead(re);
if (rr) {
SceneRenderLayer *srl= (SceneRenderLayer*)BLI_findlink(&scene->r.layers, getLayerId());
SceneRenderLayer *srl = (SceneRenderLayer*)BLI_findlink(&scene->r.layers, getLayerId());
if (srl) {
RenderLayer *rl= RE_GetRenderLayer(rr, srl->name);
if (rl && rl->rectf) {
this->inputBuffer = RE_RenderLayerGetPass(rl, renderpass);
if (this->inputBuffer == NULL || renderpass == SCE_PASS_COMBINED) {
this->inputBuffer = rl->rectf;
}
}
}
RenderLayer *rl = RE_GetRenderLayer(rr, srl->name);
if (rl && rl->rectf) {
this->inputBuffer = RE_RenderLayerGetPass(rl, renderpass);
if (this->inputBuffer == NULL || renderpass == SCE_PASS_COMBINED) {
this->inputBuffer = rl->rectf;
}
}
}
}
if (re) {
RE_ReleaseResult(re);
@@ -67,7 +69,8 @@ void RenderLayersBaseProg::initExecution() {
}
}
void RenderLayersBaseProg::executePixel(float* output, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) {
void RenderLayersBaseProg::executePixel(float *output, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
{
int ix = x;
int iy = y;
@@ -100,34 +103,36 @@ void RenderLayersBaseProg::executePixel(float* output, float x, float y, PixelSa
}
}
void RenderLayersBaseProg::deinitExecution() {
void RenderLayersBaseProg::deinitExecution()
{
this->inputBuffer = NULL;
}
void RenderLayersBaseProg::determineResolution(unsigned int resolution[], unsigned int preferredResolution[]) {
Scene *sce= this->getScene();
Render *re= (sce)? RE_GetRender(sce->id.name): NULL;
RenderResult *rr= NULL;
void RenderLayersBaseProg::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
{
Scene *sce = this->getScene();
Render *re = (sce) ? RE_GetRender(sce->id.name) : NULL;
RenderResult *rr = NULL;
resolution[0] = 0;
resolution[1] = 0;
if (re)
rr= RE_AcquireResultRead(re);
rr = RE_AcquireResultRead(re);
if (rr) {
SceneRenderLayer *srl= (SceneRenderLayer*)BLI_findlink(&sce->r.layers, getLayerId());
SceneRenderLayer *srl = (SceneRenderLayer*)BLI_findlink(&sce->r.layers, getLayerId());
if (srl) {
RenderLayer *rl= RE_GetRenderLayer(rr, srl->name);
if (rl && rl->rectf) {
resolution[0]=rl->rectx;
resolution[1]=rl->recty;
}
RenderLayer *rl = RE_GetRenderLayer(rr, srl->name);
if (rl && rl->rectf) {
resolution[0]=rl->rectx;
resolution[1]=rl->recty;
}
}
}
if (re)
RE_ReleaseResult(re);
RE_ReleaseResult(re);
}