forked from bartvdbraak/blender
Spellfixes: colour -> color
This commit is contained in:
parent
16e6b7b867
commit
4d2a6a8e21
@ -37,7 +37,7 @@
|
||||
Much of the actual functionality can be found in the python scripts
|
||||
in the directory $BLENDERHOME/tools, with Blender.py defining the
|
||||
bulk of the functionality. btools.py has some helper functions, and
|
||||
bcolors.py is for the terminal colours. mstoolkit.py and crossmingw.py
|
||||
bcolors.py is for the terminal colors. mstoolkit.py and crossmingw.py
|
||||
are modules which set up SCons for the MS VC++ 2003 toolkit and
|
||||
the cross-compile toolset for compiling Windows binaries on Linux
|
||||
respectively. Note: the cross-compile doesn't work yet for Blender,
|
||||
|
@ -48,7 +48,7 @@
|
||||
% python ./scons/scons.py
|
||||
|
||||
This will start the build process with default values. Depending
|
||||
on your platform you may see colour in your output (non-Windows
|
||||
on your platform you may see color in your output (non-Windows
|
||||
machines). In the the beginning an overview of targets and arguments
|
||||
from the command-line is given, then all libraries and binaries to
|
||||
build are configured.
|
||||
@ -123,11 +123,11 @@
|
||||
|
||||
This rewrite features a cleaner output during the build process. If
|
||||
you need to see the full command-line for compiles, then you can
|
||||
change that behaviour. Also the use of colours can be changed:
|
||||
change that behaviour. Also the use of colors can be changed:
|
||||
|
||||
% python scons\scons.py BF_FANCY=0
|
||||
|
||||
This will disable the use of colours.
|
||||
This will disable the use of colors.
|
||||
|
||||
% python scons\scons.py BF_QUIET=0
|
||||
|
||||
|
@ -173,7 +173,7 @@ drawtype:
|
||||
UI_EMBOSSN 2 /* Button with no border */
|
||||
UI_EMBOSSF 3 /* Square embossed button (file select) */
|
||||
UI_EMBOSSM 4 /* Colored, for pulldown menus */
|
||||
UI_EMBOSSP 5 /* Simple borderless coloured button (like blender sensors) */
|
||||
UI_EMBOSSP 5 /* Simple borderless colored button (like blender sensors) */
|
||||
|
||||
font:
|
||||
UI_HELV 0 /* normal font */
|
||||
|
@ -94,11 +94,11 @@ Functions
|
||||
If filename starts with // the image will be saved relative to the current directory.
|
||||
If the filename contains # it will be replaced with the frame number.
|
||||
|
||||
The standalone player saves .png files. It does not support colour space conversion
|
||||
The standalone player saves .png files. It does not support color space conversion
|
||||
or gamma correction.
|
||||
|
||||
When run from Blender, makeScreenshot supports Iris, IrisZ, TGA, Raw TGA, PNG, HamX, and Jpeg.
|
||||
Gamma, Colourspace conversion and Jpeg compression are taken from the Render settings panels.
|
||||
Gamma, Colorspace conversion and Jpeg compression are taken from the Render settings panels.
|
||||
|
||||
:type filename: string
|
||||
|
||||
@ -125,14 +125,14 @@ Functions
|
||||
|
||||
.. function:: setBackgroundColor(rgba)
|
||||
|
||||
Sets the window background colour.
|
||||
Sets the window background color.
|
||||
|
||||
:type rgba: list [r, g, b, a]
|
||||
|
||||
|
||||
.. function:: setMistColor(rgb)
|
||||
|
||||
Sets the mist colour.
|
||||
Sets the mist color.
|
||||
|
||||
:type rgb: list [r, g, b]
|
||||
|
||||
@ -153,8 +153,8 @@ Functions
|
||||
|
||||
.. function:: setMistEnd(end)
|
||||
|
||||
Sets the mist end value. Objects further away from this will be coloured solid with
|
||||
the colour set by setMistColor().
|
||||
Sets the mist end value. Objects further away from this will be colored solid with
|
||||
the color set by setMistColor().
|
||||
|
||||
:type end: float
|
||||
|
||||
|
@ -1683,7 +1683,7 @@ Game Types (bge.types)
|
||||
light = co.owner
|
||||
|
||||
light.energy = 1.0
|
||||
light.colour = [1.0, 0.0, 0.0]
|
||||
light.color = [1.0, 0.0, 0.0]
|
||||
|
||||
.. data:: SPOT
|
||||
|
||||
@ -1719,15 +1719,15 @@ Game Types (bge.types)
|
||||
|
||||
:type: float
|
||||
|
||||
.. attribute:: colour
|
||||
.. attribute:: color
|
||||
|
||||
The colour of this light. Black = [0.0, 0.0, 0.0], White = [1.0, 1.0, 1.0].
|
||||
The color of this light. Black = [0.0, 0.0, 0.0], White = [1.0, 1.0, 1.0].
|
||||
|
||||
:type: list [r, g, b]
|
||||
|
||||
.. attribute:: color
|
||||
.. attribute:: colour
|
||||
|
||||
Synonym for colour.
|
||||
Synonym for color.
|
||||
|
||||
.. attribute:: lin_attenuation
|
||||
|
||||
@ -1782,7 +1782,7 @@ Game Types (bge.types)
|
||||
#. They are at the same position
|
||||
#. UV coordinates are the same
|
||||
#. Their normals are the same (both polygons are "Set Smooth")
|
||||
#. They are the same colour, for example: a cube has 24 vertices: 6 faces with 4 vertices per face.
|
||||
#. They are the same color, for example: a cube has 24 vertices: 6 faces with 4 vertices per face.
|
||||
|
||||
The correct method of iterating over every :class:`KX_VertexProxy` in a game object
|
||||
|
||||
@ -1798,8 +1798,8 @@ Game Types (bge.types)
|
||||
for v_index in range(mesh.getVertexArrayLength(m_index)):
|
||||
vertex = mesh.getVertex(m_index, v_index)
|
||||
# Do something with vertex here...
|
||||
# ... eg: colour the vertex red.
|
||||
vertex.colour = [1.0, 0.0, 0.0, 1.0]
|
||||
# ... eg: color the vertex red.
|
||||
vertex.color = [1.0, 0.0, 0.0, 1.0]
|
||||
|
||||
.. attribute:: materials
|
||||
|
||||
@ -2538,13 +2538,13 @@ Game Types (bge.types)
|
||||
|
||||
.. attribute:: diffuse
|
||||
|
||||
The diffuse colour of the material. black = [0.0, 0.0, 0.0] white = [1.0, 1.0, 1.0].
|
||||
The diffuse color of the material. black = [0.0, 0.0, 0.0] white = [1.0, 1.0, 1.0].
|
||||
|
||||
:type: list [r, g, b]
|
||||
|
||||
.. attribute:: specular
|
||||
|
||||
The specular colour of the material. black = [0.0, 0.0, 0.0] white = [1.0, 1.0, 1.0].
|
||||
The specular color of the material. black = [0.0, 0.0, 0.0] white = [1.0, 1.0, 1.0].
|
||||
|
||||
:type: list [r, g, b]
|
||||
|
||||
@ -3381,7 +3381,7 @@ Game Types (bge.types)
|
||||
|
||||
.. class:: KX_VertexProxy(SCA_IObject)
|
||||
|
||||
A vertex holds position, UV, colour and normal information.
|
||||
A vertex holds position, UV, color and normal information.
|
||||
|
||||
Note:
|
||||
The physics simulation is NOT currently updated - physics will not respond
|
||||
@ -3405,17 +3405,17 @@ Game Types (bge.types)
|
||||
|
||||
:type: list [nx, ny, nz]
|
||||
|
||||
.. attribute:: colour
|
||||
.. attribute:: color
|
||||
|
||||
The colour of the vertex.
|
||||
The color of the vertex.
|
||||
|
||||
:type: list [r, g, b, a]
|
||||
|
||||
Black = [0.0, 0.0, 0.0, 1.0], White = [1.0, 1.0, 1.0, 1.0]
|
||||
|
||||
.. attribute:: color
|
||||
.. attribute:: colour
|
||||
|
||||
Synonym for colour.
|
||||
Synonym for color.
|
||||
|
||||
.. attribute:: x
|
||||
|
||||
@ -3461,25 +3461,25 @@ Game Types (bge.types)
|
||||
|
||||
.. attribute:: r
|
||||
|
||||
The red component of the vertex colour. 0.0 <= r <= 1.0.
|
||||
The red component of the vertex color. 0.0 <= r <= 1.0.
|
||||
|
||||
:type: float
|
||||
|
||||
.. attribute:: g
|
||||
|
||||
The green component of the vertex colour. 0.0 <= g <= 1.0.
|
||||
The green component of the vertex color. 0.0 <= g <= 1.0.
|
||||
|
||||
:type: float
|
||||
|
||||
.. attribute:: b
|
||||
|
||||
The blue component of the vertex colour. 0.0 <= b <= 1.0.
|
||||
The blue component of the vertex color. 0.0 <= b <= 1.0.
|
||||
|
||||
:type: float
|
||||
|
||||
.. attribute:: a
|
||||
|
||||
The alpha component of the vertex colour. 0.0 <= a <= 1.0.
|
||||
The alpha component of the vertex color. 0.0 <= a <= 1.0.
|
||||
|
||||
:type: float
|
||||
|
||||
@ -3529,15 +3529,15 @@ Game Types (bge.types)
|
||||
|
||||
.. method:: getRGBA()
|
||||
|
||||
Gets the colour of this vertex.
|
||||
Gets the color of this vertex.
|
||||
|
||||
The colour is represented as four bytes packed into an integer value. The colour is
|
||||
The color is represented as four bytes packed into an integer value. The color is
|
||||
packed as RGBA.
|
||||
|
||||
Since Python offers no way to get each byte without shifting, you must use the struct module to
|
||||
access colour in an machine independent way.
|
||||
access color in an machine independent way.
|
||||
|
||||
Because of this, it is suggested you use the r, g, b and a attributes or the colour attribute instead.
|
||||
Because of this, it is suggested you use the r, g, b and a attributes or the color attribute instead.
|
||||
|
||||
.. code-block:: python
|
||||
|
||||
@ -3547,17 +3547,17 @@ Game Types (bge.types)
|
||||
# black = ( 0, 0, 0, 255)
|
||||
# white = (255, 255, 255, 255)
|
||||
|
||||
:return: packed colour. 4 byte integer with one byte per colour channel in RGBA format.
|
||||
:return: packed color. 4 byte integer with one byte per color channel in RGBA format.
|
||||
:rtype: integer
|
||||
|
||||
.. method:: setRGBA(col)
|
||||
|
||||
Sets the colour of this vertex.
|
||||
Sets the color of this vertex.
|
||||
|
||||
See getRGBA() for the format of col, and its relevant problems. Use the r, g, b and a attributes
|
||||
or the colour attribute instead.
|
||||
or the color attribute instead.
|
||||
|
||||
setRGBA() also accepts a four component list as argument col. The list represents the colour as [r, g, b, a]
|
||||
setRGBA() also accepts a four component list as argument col. The list represents the color as [r, g, b, a]
|
||||
with black = [0.0, 0.0, 0.0, 1.0] and white = [1.0, 1.0, 1.0, 1.0]
|
||||
|
||||
.. code-block:: python
|
||||
@ -3567,7 +3567,7 @@ Game Types (bge.types)
|
||||
v.setRGBA([1.0, 0.0, 0.0, 1.0]) # Red
|
||||
v.setRGBA([0.0, 1.0, 0.0, 1.0]) # Green on all platforms.
|
||||
|
||||
:arg col: the new colour of this vertex in packed RGBA format.
|
||||
:arg col: the new color of this vertex in packed RGBA format.
|
||||
:type col: integer or list [r, g, b, a]
|
||||
|
||||
.. method:: getNormal()
|
||||
|
@ -419,10 +419,10 @@ set(SRC
|
||||
operations/COM_PreviewOperation.cpp
|
||||
operations/COM_SplitViewerOperation.h
|
||||
operations/COM_SplitViewerOperation.cpp
|
||||
operations/COM_ConvertValueToColourProg.h
|
||||
operations/COM_ConvertValueToColourProg.cpp
|
||||
operations/COM_ConvertColourToValueProg.h
|
||||
operations/COM_ConvertColourToValueProg.cpp
|
||||
operations/COM_ConvertValueToColorProg.h
|
||||
operations/COM_ConvertValueToColorProg.cpp
|
||||
operations/COM_ConvertColorToValueProg.h
|
||||
operations/COM_ConvertColorToValueProg.cpp
|
||||
operations/COM_ConvertColorToBWOperation.h
|
||||
operations/COM_ConvertColorToBWOperation.cpp
|
||||
operations/COM_ConvertColorToVectorOperation.h
|
||||
|
@ -48,8 +48,8 @@
|
||||
#include "COM_CompositorNode.h"
|
||||
#include "COM_ConvertAlphaNode.h"
|
||||
#include "COM_ConvertColorToVectorOperation.h"
|
||||
#include "COM_ConvertColourToValueProg.h"
|
||||
#include "COM_ConvertValueToColourProg.h"
|
||||
#include "COM_ConvertColorToValueProg.h"
|
||||
#include "COM_ConvertValueToColorProg.h"
|
||||
#include "COM_ConvertValueToVectorOperation.h"
|
||||
#include "COM_ConvertVectorToColorOperation.h"
|
||||
#include "COM_ConvertVectorToValueOperation.h"
|
||||
@ -153,7 +153,7 @@ Node *Converter::convert(bNode *b_node, bool fast)
|
||||
node = new TextureNode(b_node);
|
||||
break;
|
||||
case CMP_NODE_RGBTOBW:
|
||||
node = new ColourToBWNode(b_node);
|
||||
node = new ColorToBWNode(b_node);
|
||||
break;
|
||||
case CMP_NODE_MIX_RGB:
|
||||
node = new MixNode(b_node);
|
||||
@ -392,13 +392,13 @@ void Converter::convertDataType(SocketConnection *connection, ExecutionSystem *s
|
||||
DataType toDatatype = inputSocket->getDataType();
|
||||
NodeOperation *converter = NULL;
|
||||
if (fromDatatype == COM_DT_VALUE && toDatatype == COM_DT_COLOR) {
|
||||
converter = new ConvertValueToColourProg();
|
||||
converter = new ConvertValueToColorProg();
|
||||
}
|
||||
else if (fromDatatype == COM_DT_VALUE && toDatatype == COM_DT_VECTOR) {
|
||||
converter = new ConvertValueToVectorOperation();
|
||||
}
|
||||
else if (fromDatatype == COM_DT_COLOR && toDatatype == COM_DT_VALUE) {
|
||||
converter = new ConvertColourToValueProg();
|
||||
converter = new ConvertColorToValueProg();
|
||||
}
|
||||
else if (fromDatatype == COM_DT_COLOR && toDatatype == COM_DT_VECTOR) {
|
||||
converter = new ConvertColorToVectorOperation();
|
||||
|
@ -25,18 +25,18 @@
|
||||
#include "COM_ConvertColorToBWOperation.h"
|
||||
#include "COM_ExecutionSystem.h"
|
||||
|
||||
ColourToBWNode::ColourToBWNode(bNode *editorNode) : Node(editorNode)
|
||||
ColorToBWNode::ColorToBWNode(bNode *editorNode) : Node(editorNode)
|
||||
{
|
||||
/* pass */
|
||||
}
|
||||
|
||||
void ColourToBWNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
|
||||
void ColorToBWNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
|
||||
{
|
||||
InputSocket *colourSocket = this->getInputSocket(0);
|
||||
InputSocket *colorSocket = this->getInputSocket(0);
|
||||
OutputSocket *valueSocket = this->getOutputSocket(0);
|
||||
|
||||
ConvertColorToBWOperation *convertProg = new ConvertColorToBWOperation();
|
||||
colourSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph);
|
||||
colorSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph);
|
||||
valueSocket->relinkConnections(convertProg->getOutputSocket(0));
|
||||
graph->addOperation(convertProg);
|
||||
}
|
||||
|
@ -20,18 +20,18 @@
|
||||
* Monique Dewanchand
|
||||
*/
|
||||
|
||||
#ifndef _COM_ColourToBWNode_h_
|
||||
#define _COM_ColourToBWNode_h_
|
||||
#ifndef _COM_ColorToBWNode_h_
|
||||
#define _COM_ColorToBWNode_h_
|
||||
|
||||
#include "COM_Node.h"
|
||||
#include "DNA_node_types.h"
|
||||
/**
|
||||
* @brief ColourToBWNode
|
||||
* @brief ColorToBWNode
|
||||
* @ingroup Node
|
||||
*/
|
||||
class ColourToBWNode : public Node {
|
||||
class ColorToBWNode : public Node {
|
||||
public:
|
||||
ColourToBWNode(bNode *editorNode);
|
||||
ColorToBWNode(bNode *editorNode);
|
||||
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
|
||||
};
|
||||
#endif
|
||||
|
@ -34,12 +34,12 @@ void CompositorNode::convertToOperations(ExecutionSystem *graph, CompositorConte
|
||||
InputSocket *imageSocket = this->getInputSocket(0);
|
||||
InputSocket *alphaSocket = this->getInputSocket(1);
|
||||
if (imageSocket->isConnected()) {
|
||||
CompositorOperation *colourAlphaProg = new CompositorOperation();
|
||||
colourAlphaProg->setRenderData(context->getRenderData());
|
||||
colourAlphaProg->setbNodeTree(context->getbNodeTree());
|
||||
imageSocket->relinkConnections(colourAlphaProg->getInputSocket(0));
|
||||
alphaSocket->relinkConnections(colourAlphaProg->getInputSocket(1));
|
||||
graph->addOperation(colourAlphaProg);
|
||||
addPreviewOperation(graph, colourAlphaProg->getInputSocket(0));
|
||||
CompositorOperation *colorAlphaProg = new CompositorOperation();
|
||||
colorAlphaProg->setRenderData(context->getRenderData());
|
||||
colorAlphaProg->setbNodeTree(context->getbNodeTree());
|
||||
imageSocket->relinkConnections(colorAlphaProg->getInputSocket(0));
|
||||
alphaSocket->relinkConnections(colorAlphaProg->getInputSocket(1));
|
||||
graph->addOperation(colorAlphaProg);
|
||||
addPreviewOperation(graph, colorAlphaProg->getInputSocket(0));
|
||||
}
|
||||
}
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
#include "COM_HueSaturationValueCorrectNode.h"
|
||||
|
||||
#include "COM_ConvertColourToValueProg.h"
|
||||
#include "COM_ConvertColorToValueProg.h"
|
||||
#include "COM_ExecutionSystem.h"
|
||||
#include "COM_ConvertRGBToHSVOperation.h"
|
||||
#include "COM_ConvertHSVToRGBOperation.h"
|
||||
@ -41,7 +41,7 @@ HueSaturationValueCorrectNode::HueSaturationValueCorrectNode(bNode *editorNode)
|
||||
void HueSaturationValueCorrectNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
|
||||
{
|
||||
InputSocket *valueSocket = this->getInputSocket(0);
|
||||
InputSocket *colourSocket = this->getInputSocket(1);
|
||||
InputSocket *colorSocket = this->getInputSocket(1);
|
||||
OutputSocket *outputSocket = this->getOutputSocket(0);
|
||||
bNode *editorsnode = getbNode();
|
||||
CurveMapping *storage = (CurveMapping *)editorsnode->storage;
|
||||
@ -51,7 +51,7 @@ void HueSaturationValueCorrectNode::convertToOperations(ExecutionSystem *graph,
|
||||
HueSaturationValueCorrectOperation *changeHSV = new HueSaturationValueCorrectOperation();
|
||||
MixBlendOperation *blend = new MixBlendOperation();
|
||||
|
||||
colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), 1, graph);
|
||||
colorSocket->relinkConnections(rgbToHSV->getInputSocket(0), 1, graph);
|
||||
addLink(graph, rgbToHSV->getOutputSocket(), changeHSV->getInputSocket(0));
|
||||
addLink(graph, changeHSV->getOutputSocket(), hsvToRGB->getInputSocket(0));
|
||||
addLink(graph, hsvToRGB->getOutputSocket(), blend->getInputSocket(2));
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
#include "COM_HueSaturationValueNode.h"
|
||||
|
||||
#include "COM_ConvertColourToValueProg.h"
|
||||
#include "COM_ConvertColorToValueProg.h"
|
||||
#include "COM_ExecutionSystem.h"
|
||||
#include "COM_ConvertRGBToHSVOperation.h"
|
||||
#include "COM_ConvertHSVToRGBOperation.h"
|
||||
@ -40,7 +40,7 @@ HueSaturationValueNode::HueSaturationValueNode(bNode *editorNode) : Node(editorN
|
||||
void HueSaturationValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
|
||||
{
|
||||
InputSocket *valueSocket = this->getInputSocket(0);
|
||||
InputSocket *colourSocket = this->getInputSocket(1);
|
||||
InputSocket *colorSocket = this->getInputSocket(1);
|
||||
OutputSocket *outputSocket = this->getOutputSocket(0);
|
||||
bNode *editorsnode = getbNode();
|
||||
NodeHueSat *storage = (NodeHueSat *)editorsnode->storage;
|
||||
@ -50,7 +50,7 @@ void HueSaturationValueNode::convertToOperations(ExecutionSystem *graph, Composi
|
||||
ChangeHSVOperation *changeHSV = new ChangeHSVOperation();
|
||||
MixBlendOperation *blend = new MixBlendOperation();
|
||||
|
||||
colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), 0, graph);
|
||||
colorSocket->relinkConnections(rgbToHSV->getInputSocket(0), 0, graph);
|
||||
addLink(graph, rgbToHSV->getOutputSocket(), changeHSV->getInputSocket(0));
|
||||
addLink(graph, changeHSV->getOutputSocket(), hsvToRGB->getInputSocket(0));
|
||||
addLink(graph, hsvToRGB->getOutputSocket(), blend->getInputSocket(2));
|
||||
|
@ -32,12 +32,12 @@ MapValueNode::MapValueNode(bNode *editorNode) : Node(editorNode)
|
||||
|
||||
void MapValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
|
||||
{
|
||||
InputSocket *colourSocket = this->getInputSocket(0);
|
||||
InputSocket *colorSocket = this->getInputSocket(0);
|
||||
OutputSocket *valueSocket = this->getOutputSocket(0);
|
||||
TexMapping *storage = (TexMapping *)this->getbNode()->storage;
|
||||
MapValueOperation *convertProg = new MapValueOperation();
|
||||
convertProg->setSettings(storage);
|
||||
colourSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph);
|
||||
colorSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph);
|
||||
valueSocket->relinkConnections(convertProg->getOutputSocket(0));
|
||||
graph->addOperation(convertProg);
|
||||
}
|
||||
|
@ -82,7 +82,7 @@ void RenderLayersNode::testSocketConnection(ExecutionSystem *system, int outputS
|
||||
|
||||
void RenderLayersNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
|
||||
{
|
||||
testSocketConnection(graph, 0, new RenderLayersColourProg());
|
||||
testSocketConnection(graph, 0, new RenderLayersColorProg());
|
||||
testSocketConnection(graph, 1, new RenderLayersAlphaProg());
|
||||
testSocketConnection(graph, 2, new RenderLayersDepthProg());
|
||||
testSocketConnection(graph, 3, new RenderLayersNormalOperation());
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class AlphaOverKeyOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class AlphaOverMixedOperation : public MixBaseOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class AlphaOverPremultiplyOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ChangeHSVOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ChannelMatteOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ChromaMatteOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -25,8 +25,8 @@
|
||||
#include "COM_NodeOperation.h"
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ColorBalanceASCCDLOperation : public NodeOperation {
|
||||
protected:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ColorBalanceLGGOperation : public NodeOperation {
|
||||
protected:
|
||||
|
@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ColorMatteOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -25,8 +25,8 @@
|
||||
#include "COM_NodeOperation.h"
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ColorSpillOperation : public NodeOperation {
|
||||
protected:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertColorProfileOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertColorToBWOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -20,28 +20,28 @@
|
||||
* Monique Dewanchand
|
||||
*/
|
||||
|
||||
#include "COM_ConvertColourToValueProg.h"
|
||||
#include "COM_ConvertColorToValueProg.h"
|
||||
|
||||
ConvertColourToValueProg::ConvertColourToValueProg() : NodeOperation()
|
||||
ConvertColorToValueProg::ConvertColorToValueProg() : NodeOperation()
|
||||
{
|
||||
this->addInputSocket(COM_DT_COLOR);
|
||||
this->addOutputSocket(COM_DT_VALUE);
|
||||
this->m_inputOperation = NULL;
|
||||
}
|
||||
|
||||
void ConvertColourToValueProg::initExecution()
|
||||
void ConvertColorToValueProg::initExecution()
|
||||
{
|
||||
this->m_inputOperation = this->getInputSocketReader(0);
|
||||
}
|
||||
|
||||
void ConvertColourToValueProg::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
|
||||
void ConvertColorToValueProg::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
|
||||
{
|
||||
float inputColor[4];
|
||||
this->m_inputOperation->read(&inputColor[0], x, y, sampler, inputBuffers);
|
||||
outputValue[0] = (inputColor[0] + inputColor[1] + inputColor[2]) / 3.0f;
|
||||
}
|
||||
|
||||
void ConvertColourToValueProg::deinitExecution()
|
||||
void ConvertColorToValueProg::deinitExecution()
|
||||
{
|
||||
this->m_inputOperation = NULL;
|
||||
}
|
@ -20,16 +20,16 @@
|
||||
* Monique Dewanchand
|
||||
*/
|
||||
|
||||
#ifndef _COM_ConvertColourToValueProg_h
|
||||
#define _COM_ConvertColourToValueProg_h
|
||||
#ifndef _COM_ConvertColorToValueProg_h
|
||||
#define _COM_ConvertColorToValueProg_h
|
||||
#include "COM_NodeOperation.h"
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertColourToValueProg : public NodeOperation {
|
||||
class ConvertColorToValueProg : public NodeOperation {
|
||||
private:
|
||||
/**
|
||||
* Cached reference to the inputProgram
|
||||
@ -39,7 +39,7 @@ public:
|
||||
/**
|
||||
* Default constructor
|
||||
*/
|
||||
ConvertColourToValueProg();
|
||||
ConvertColorToValueProg();
|
||||
|
||||
/**
|
||||
* the inner loop of this program
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertColorToVectorOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
#include "DNA_object_types.h"
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertDepthToRadiusOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertHSVToRGBOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertKeyToPremulOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertPremulToKeyOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertRGBToHSVOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertRGBToYCCOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertRGBToYUVOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -20,20 +20,20 @@
|
||||
* Monique Dewanchand
|
||||
*/
|
||||
|
||||
#include "COM_ConvertValueToColourProg.h"
|
||||
#include "COM_ConvertValueToColorProg.h"
|
||||
|
||||
ConvertValueToColourProg::ConvertValueToColourProg() : NodeOperation()
|
||||
ConvertValueToColorProg::ConvertValueToColorProg() : NodeOperation()
|
||||
{
|
||||
this->addInputSocket(COM_DT_VALUE);
|
||||
this->addOutputSocket(COM_DT_COLOR);
|
||||
this->m_inputProgram = NULL;
|
||||
}
|
||||
void ConvertValueToColourProg::initExecution()
|
||||
void ConvertValueToColorProg::initExecution()
|
||||
{
|
||||
this->m_inputProgram = this->getInputSocketReader(0);
|
||||
}
|
||||
|
||||
void ConvertValueToColourProg::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
|
||||
void ConvertValueToColorProg::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
|
||||
{
|
||||
float inputValue[4];
|
||||
this->m_inputProgram->read(inputValue, x, y, sampler, inputBuffers);
|
||||
@ -43,7 +43,7 @@ void ConvertValueToColourProg::executePixel(float *color, float x, float y, Pixe
|
||||
color[3] = 1.0f;
|
||||
}
|
||||
|
||||
void ConvertValueToColourProg::deinitExecution()
|
||||
void ConvertValueToColorProg::deinitExecution()
|
||||
{
|
||||
this->m_inputProgram = NULL;
|
||||
}
|
@ -20,19 +20,19 @@
|
||||
* Monique Dewanchand
|
||||
*/
|
||||
|
||||
#ifndef _COM_ConvertValueToColourProg_h
|
||||
#define _COM_ConvertValueToColourProg_h
|
||||
#ifndef _COM_ConvertValueToColorProg_h
|
||||
#define _COM_ConvertValueToColorProg_h
|
||||
#include "COM_NodeOperation.h"
|
||||
|
||||
|
||||
class ConvertValueToColourProg : public NodeOperation {
|
||||
class ConvertValueToColorProg : public NodeOperation {
|
||||
private:
|
||||
/**
|
||||
* Cached reference to the inputProgram
|
||||
*/
|
||||
SocketReader *m_inputProgram;
|
||||
public:
|
||||
ConvertValueToColourProg();
|
||||
ConvertValueToColorProg();
|
||||
|
||||
/**
|
||||
* the inner loop of this program
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertValueToVectorOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertVectorToColorOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertVectorToValueOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertYCCToRGBOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ConvertYUVToRGBOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class DifferenceMatteOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class DistanceMatteOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class LuminanceMatteOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
#include "DNA_texture_types.h"
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MapValueOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MathBaseOperation : public NodeOperation {
|
||||
protected:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixAddOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixBaseOperation : public NodeOperation {
|
||||
protected:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixBlendOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixBurnOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixColorOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixDarkenOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixDifferenceOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixDivideOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixDodgeOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixGlareOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixHueOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixLightenOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixLinearLightOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixMultiplyOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixOverlayOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixSaturationOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixScreenOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixSoftLightOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixSubtractOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MixValueOperation : public MixBaseOperation {
|
||||
public:
|
||||
|
@ -32,8 +32,8 @@ typedef enum MovieClipAttribute {
|
||||
MCA_ANGLE
|
||||
} MovieClipAttribute;
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class MovieClipAttributeOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
#include "COM_RenderLayersImageProg.h"
|
||||
|
||||
RenderLayersColourProg::RenderLayersColourProg() : RenderLayersBaseProg(SCE_PASS_COMBINED, 4)
|
||||
RenderLayersColorProg::RenderLayersColorProg() : RenderLayersBaseProg(SCE_PASS_COMBINED, 4)
|
||||
{
|
||||
this->addOutputSocket(COM_DT_COLOR);
|
||||
}
|
||||
|
@ -20,15 +20,15 @@
|
||||
* Monique Dewanchand
|
||||
*/
|
||||
|
||||
#ifndef _COM_RenderLayersColourProg_h
|
||||
#define _COM_RenderLayersColourProg_h
|
||||
#ifndef _COM_RenderLayersColorProg_h
|
||||
#define _COM_RenderLayersColorProg_h
|
||||
|
||||
#include "COM_RenderLayersBaseProg.h"
|
||||
|
||||
/// @TODO rename to image operation
|
||||
class RenderLayersColourProg : public RenderLayersBaseProg {
|
||||
class RenderLayersColorProg : public RenderLayersBaseProg {
|
||||
public:
|
||||
RenderLayersColourProg();
|
||||
RenderLayersColorProg();
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class SetAlphaOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class SetColorOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output Sampler.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output Sampler.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class SetSamplerOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class SetValueOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class SetVectorOperation : public NodeOperation {
|
||||
private:
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
|
||||
/**
|
||||
* this program converts an input colour to an output value.
|
||||
* it assumes we are in sRGB colour space.
|
||||
* this program converts an input color to an output value.
|
||||
* it assumes we are in sRGB color space.
|
||||
*/
|
||||
class ZCombineOperation : public NodeOperation {
|
||||
protected:
|
||||
|
@ -3362,7 +3362,7 @@ static void ui_ndofedit_but_HSVCIRCLE(uiBut *but, uiHandleButtonData *data, wmND
|
||||
ui_get_but_vectorf(but, rgb);
|
||||
rgb_to_hsv_compat_v(rgb, hsv);
|
||||
|
||||
/* Convert current colour on hue/sat disc to circular coordinates phi, r */
|
||||
/* Convert current color on hue/sat disc to circular coordinates phi, r */
|
||||
phi = fmodf(hsv[0] + 0.25f, 1.0f) * -2.0f * (float)M_PI;
|
||||
r = hsv[1];
|
||||
/* sqr= r>0.f?sqrtf(r):1; */ /* UNUSED */
|
||||
|
@ -1434,7 +1434,7 @@ static struct uiWidgetColors wcol_menu_back = {
|
||||
25, -20
|
||||
};
|
||||
|
||||
/* tooltip colour */
|
||||
/* tooltip color */
|
||||
static struct uiWidgetColors wcol_tooltip = {
|
||||
{0, 0, 0, 255},
|
||||
{25, 25, 25, 230},
|
||||
|
@ -537,7 +537,7 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, int compare, int
|
||||
IMB_buffer_float_from_float(srgb_frect, ibuf->rect_float,
|
||||
ibuf->channels, IB_PROFILE_SRGB, ibuf->profile, 0,
|
||||
ibuf->x, ibuf->y, ibuf->x, ibuf->x);
|
||||
/* clamp buffer colours to 1.0 to avoid artifacts due to glu for hdr images */
|
||||
/* clamp buffer colors to 1.0 to avoid artifacts due to glu for hdr images */
|
||||
IMB_buffer_float_clamp(srgb_frect, ibuf->x, ibuf->y);
|
||||
frect= srgb_frect + texwinsy*ibuf->x + texwinsx;
|
||||
}
|
||||
@ -562,7 +562,7 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, int compare, int
|
||||
IMB_buffer_float_from_float(srgb_frect, ibuf->rect_float,
|
||||
ibuf->channels, IB_PROFILE_SRGB, ibuf->profile, 0,
|
||||
ibuf->x, ibuf->y, ibuf->x, ibuf->x);
|
||||
/* clamp buffer colours to 1.0 to avoid artifacts due to glu for hdr images */
|
||||
/* clamp buffer colors to 1.0 to avoid artifacts due to glu for hdr images */
|
||||
IMB_buffer_float_clamp(srgb_frect, ibuf->x, ibuf->y);
|
||||
}
|
||||
else
|
||||
|
@ -62,7 +62,7 @@ typedef struct {
|
||||
R32 ref_high_quantity;/* reference high quantity represented */
|
||||
U8 designator1;
|
||||
U8 transfer_characteristics;
|
||||
U8 colourimetry;
|
||||
U8 colorimetry;
|
||||
U8 bits_per_pixel;
|
||||
U16 packing;
|
||||
U16 encoding;
|
||||
|
@ -53,7 +53,7 @@ fillDpxChannelInfo(DpxFile* dpx, DpxChannelInformation* chan, int des) {
|
||||
chan->ref_high_quantity = htonf(2.046);
|
||||
chan->designator1 = des;
|
||||
chan->transfer_characteristics = 0;
|
||||
chan->colourimetry = 0;
|
||||
chan->colorimetry = 0;
|
||||
chan->bits_per_pixel = 10;
|
||||
chan->packing = htons(1);
|
||||
chan->encoding = 0;
|
||||
|
@ -2303,7 +2303,7 @@ static void rna_def_space_dopesheet(BlenderRNA *brna)
|
||||
prop = RNA_def_property(srna, "show_group_colors", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SACTION_NODRAWGCOLORS);
|
||||
RNA_def_property_ui_text(prop, "Show Group Colors",
|
||||
"Draw groups and channels with colours matching their corresponding groups");
|
||||
"Draw groups and channels with colors matching their corresponding groups");
|
||||
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_DOPESHEET, NULL);
|
||||
|
||||
/* editing */
|
||||
@ -2414,7 +2414,7 @@ static void rna_def_space_graph(BlenderRNA *brna)
|
||||
prop = RNA_def_property(srna, "show_group_colors", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_NODRAWGCOLORS);
|
||||
RNA_def_property_ui_text(prop, "Show Group Colors",
|
||||
"Draw groups and channels with colours matching their corresponding groups");
|
||||
"Draw groups and channels with colors matching their corresponding groups");
|
||||
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL);
|
||||
|
||||
/* editing */
|
||||
|
Loading…
Reference in New Issue
Block a user