Jeroen Bakker
6418cd92b2
Fix for 34494 Blender 2.65 regression test error - compo_map_uv_cubes.blend - stripe/artifact between cubes Hue and saturation node has an early break when saturarion is 0. When this happened the input 1 color needed to be used. This behaviour was not merged. When no FSAA is used in the ZCombine. a mask will be created, this mask will be antialiased and based on this mask the colors between the two images are blended. This was also behaviour that was not merged correctly. Now it is back making much better z-combines. Hope nobody uses these gabs as a work around. - At Mind - Jeroen & Monique
74 lines
2.0 KiB
C++
74 lines
2.0 KiB
C++
/*
|
|
* Copyright 2011, Blender Foundation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* Contributor:
|
|
* Jeroen Bakker
|
|
* Monique Dewanchand
|
|
*/
|
|
|
|
#ifndef _COM_ZCombineOperation_h
|
|
#define _COM_ZCombineOperation_h
|
|
#include "COM_MixBaseOperation.h"
|
|
|
|
|
|
/**
|
|
* this program converts an input color to an output value.
|
|
* it assumes we are in sRGB color space.
|
|
*/
|
|
class ZCombineOperation : public NodeOperation {
|
|
protected:
|
|
SocketReader *m_image1Reader;
|
|
SocketReader *m_depth1Reader;
|
|
SocketReader *m_image2Reader;
|
|
SocketReader *m_depth2Reader;
|
|
public:
|
|
/**
|
|
* Default constructor
|
|
*/
|
|
ZCombineOperation();
|
|
|
|
void initExecution();
|
|
void deinitExecution();
|
|
|
|
/**
|
|
* the inner loop of this program
|
|
*/
|
|
void executePixel(float output[4], float x, float y, PixelSampler sampler);
|
|
};
|
|
|
|
class ZCombineAlphaOperation : public ZCombineOperation {
|
|
void executePixel(float output[4], float x, float y, PixelSampler sampler);
|
|
};
|
|
|
|
class ZCombineMaskOperation : public NodeOperation {
|
|
protected:
|
|
SocketReader *m_maskReader;
|
|
SocketReader *m_image1Reader;
|
|
SocketReader *m_image2Reader;
|
|
public:
|
|
ZCombineMaskOperation();
|
|
|
|
void initExecution();
|
|
void deinitExecution();
|
|
void executePixel(float output[4], float x, float y, PixelSampler sampler);
|
|
};
|
|
class ZCombineMaskAlphaOperation : public ZCombineMaskOperation {
|
|
void executePixel(float output[4], float x, float y, PixelSampler sampler);
|
|
};
|
|
|
|
#endif
|