diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-07-17 03:23:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-17 03:23:33 +0400 |
commit | 32cf7fcdb147d4f467279109db384b9a9d3c6708 (patch) | |
tree | a6a899e8a801c7c8975289de99137626e21143ef /source/blender/compositor | |
parent | 1f96470b5d80f05aef1dc1c262ba1a0a56a1d1fb (diff) |
code cleanup: spelling
Diffstat (limited to 'source/blender/compositor')
9 files changed, 29 insertions, 29 deletions
diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h index c65ea771477..cd1615c9094 100644 --- a/source/blender/compositor/COM_compositor.h +++ b/source/blender/compositor/COM_compositor.h @@ -37,9 +37,9 @@ extern "C" { * @mainpage Introduction of the Blender Compositor * * @section bcomp Blender compositor - * This project redesigns the interals of Blender's compositor. The project has been executed in 2011 by At Mind. + * This project redesigns the internals of Blender's compositor. The project has been executed in 2011 by At Mind. * At Mind is a technology company located in Amsterdam, The Netherlands. - * The project has been crowdfunded. This code has been released under GPL2 to be used in Blender. + * The project has been crowd-funded. This code has been released under GPL2 to be used in Blender. * * @section goals The goals of the project * the new compositor has 2 goals. @@ -58,7 +58,7 @@ extern "C" { * @section workflow Work faster * The previous compositor only showed the final image. The compositor could wait a long time before seeing the result * of his work. The new compositor will work in a way that it will focus on getting information back to the user. - * It will prioritise its work to get earlier user feedback. + * It will prioritize its work to get earlier user feedback. * * @page memory Memory model * The main issue is the type of memory model to use. Blender is used by consumers and professionals. @@ -79,7 +79,7 @@ extern "C" { * Render priority is an priority of an output node. A user has a different need of Render priorities of output nodes * than during editing. * for example. the Active ViewerNode has top priority during editing, but during rendering a CompositeNode has. - * All NodeOperation has a setting for their renderpriority, but only for output NodeOperation these have effect. + * All NodeOperation has a setting for their render-priority, but only for output NodeOperation these have effect. * In ExecutionSystem.execute all priorities are checked. For every priority the ExecutionGroup's are check if the * priority do match. * When match the ExecutionGroup will be executed (this happens in serial) @@ -91,18 +91,18 @@ extern "C" { * @section order Chunk order * * When a ExecutionGroup is executed, first the order of chunks are determined. - * The settings are stored in the ViewerNode inside the ExecutionGroup. ExecutionGroups that have no viewernode, + * The settings are stored in the ViewerNode inside the ExecutionGroup. ExecutionGroups that have no viewer-node, * will use a default one. * There are several possible chunk orders * - [@ref OrderOfChunks.COM_TO_CENTER_OUT]: Start calculating from a configurable point and order by nearest chunk * - [@ref OrderOfChunks.COM_TO_RANDOM]: Randomize all chunks. * - [@ref OrderOfChunks.COM_TO_TOP_DOWN]: Start calculation from the bottom to the top of the image - * - [@ref OrderOfChunks.COM_TO_RULE_OF_THIRDS]: Experimental order based on 9 hotspots in the image + * - [@ref OrderOfChunks.COM_TO_RULE_OF_THIRDS]: Experimental order based on 9 hot-spots in the image * - * When the chunkorder is determined, the first few chunks will be checked if they can be scheduled. + * When the chunk-order is determined, the first few chunks will be checked if they can be scheduled. * Chunks can have three states: - * - [@ref ChunkExecutionState.COM_ES_NOT_SCHEDULED]: Chunk is not yet scheduled, or dependacies are not met - * - [@ref ChunkExecutionState.COM_ES_SCHEDULED]: All dependacies are met, chunk is scheduled, but not finished + * - [@ref ChunkExecutionState.COM_ES_NOT_SCHEDULED]: Chunk is not yet scheduled, or dependencies are not met + * - [@ref ChunkExecutionState.COM_ES_SCHEDULED]: All dependencies are met, chunk is scheduled, but not finished * - [@ref ChunkExecutionState.COM_ES_EXECUTED]: Chunk is finished * * @see ExecutionGroup.execute @@ -110,7 +110,7 @@ extern "C" { * @see OrderOfChunks * * @section interest Area of interest - * An ExecutionGroup can have dependancies to other ExecutionGroup's. Data passing from one ExecutionGroup to another + * An ExecutionGroup can have dependencies to other ExecutionGroup's. Data passing from one ExecutionGroup to another * one are stored in 'chunks'. * If not all input chunks are available the chunk execution will not be scheduled. * <pre> @@ -217,22 +217,22 @@ extern "C" { * @section workscheduler WorkScheduler * the WorkScheduler is implemented as a static class. the responsibility of the WorkScheduler is to balance * WorkPackages to the available and free devices. - * the workscheduler can work in 2 states. For witching these between the state you need to recompile blender + * the work-scheduler can work in 2 states. For witching these between the state you need to recompile blender * * @subsection multithread Multi threaded - * Default the workscheduler will place all work as WorkPackage in a queue. + * Default the work-scheduler will place all work as WorkPackage in a queue. * For every CPUcore a working thread is created. These working threads will ask the WorkScheduler if there is work * for a specific Device. - * the workscheduler will find work for the device and the device will be asked to execute the WorkPackage + * the work-scheduler will find work for the device and the device will be asked to execute the WorkPackage * * @subsection singlethread Single threaded * For debugging reasons the multi-threading can be disabled. This is done by changing the COM_CURRENT_THREADING_MODEL - * to COM_TM_NOTHREAD. When compiling the workscheduler + * to COM_TM_NOTHREAD. When compiling the work-scheduler * will be changes to support no threading and run everything on the CPU. * * @section devices Devices * A Device within the compositor context is a Hardware component that can used to calculate chunks. - * This chunk is encapseled in a WorkPackage. + * This chunk is encapsulated in a WorkPackage. * the WorkScheduler controls the devices and selects the device where a WorkPackage will be calculated. * * @subsection WS_Devices Workscheduler diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index 43c2bfac52e..e890715cafe 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -180,7 +180,7 @@ private: /** * @brief Determine the rect (minx, maxx, miny, maxy) of a chunk at a position. - * @note Only gives usefull results ater the determination of the chunksize + * @note Only gives useful results ater the determination of the chunksize * @see determineChunkSize() */ void determineChunkRect(rcti *rect, const unsigned int xChunk, const unsigned int yChunk) const; @@ -376,7 +376,7 @@ public: /** * @brief Determine the rect (minx, maxx, miny, maxy) of a chunk. - * @note Only gives usefull results ater the determination of the chunksize + * @note Only gives useful results ater the determination of the chunksize * @see determineChunkSize() */ void determineChunkRect(rcti *rect, const unsigned int chunkNumber) const; diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index 209358ec786..4f6780c8d0b 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -37,7 +37,7 @@ using namespace std; /** * @page execution Execution model - * In order to get to an efficient model for execution, serveral steps are being done. these steps are explained below. + * In order to get to an efficient model for execution, several steps are being done. these steps are explained below. * * @section EM_Step1 Step 1: translating blender node system to the new compsitor system * Blenders node structure is based on C structs (DNA). These structs are not efficient in the new architecture. We want to use classes in order to simplify the system. @@ -64,7 +64,7 @@ using namespace std; * @section EM_Step3 Step3: add additional conversions to the operation system * - Data type conversions: the system has 3 data types COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR. The user can connect a Value socket to a color socket. As values are ordered differently than colors a conversion happens. * - * - Image size conversions: the system can automatically convert when resolutions do not match. An InputSocket has a resize mode. This can be any of the folowing settings. + * - Image size conversions: the system can automatically convert when resolutions do not match. An InputSocket has a resize mode. This can be any of the following settings. * - [@ref InputSocketResizeMode.COM_SC_CENTER]: The center of both images are aligned * - [@ref InputSocketResizeMode.COM_SC_FIT_WIDTH]: The width of both images are aligned * - [@ref InputSocketResizeMode.COM_SC_FIT_HEIGHT]: the height of both images are aligned diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h index eed0c796cd8..5077a9e3228 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.h +++ b/source/blender/compositor/intern/COM_MemoryBuffer.h @@ -67,7 +67,7 @@ private: /** - * @brief region of this buffer inside reative to the MemoryProxy + * @brief region of this buffer inside relative to the MemoryProxy */ rcti m_rect; @@ -218,7 +218,7 @@ public: int getHeight() const; /** - * @brief clear the buffer. Make all pixels black transparant. + * @brief clear the buffer. Make all pixels black transparent. */ void clear(); diff --git a/source/blender/compositor/intern/COM_MemoryProxy.h b/source/blender/compositor/intern/COM_MemoryProxy.h index 130c5f5057a..696c843e7c4 100644 --- a/source/blender/compositor/intern/COM_MemoryProxy.h +++ b/source/blender/compositor/intern/COM_MemoryProxy.h @@ -89,7 +89,7 @@ public: WriteBufferOperation *getWriteBufferOperation() { return this->m_writeBufferOperation; } /** - * @brief allocate memory of size widht x height + * @brief allocate memory of size width x height */ void allocate(unsigned int width, unsigned int height); diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h index bc4a25db605..e19b1d774c9 100644 --- a/source/blender/compositor/intern/COM_Node.h +++ b/source/blender/compositor/intern/COM_Node.h @@ -74,7 +74,7 @@ public: /** * @brief convert node to operation * - * @todo this must be described furter + * @todo this must be described further * * @param system the ExecutionSystem where the operations need to be added * @param context reference to the CompositorContext diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index 0de2f6aef5d..9b6d574e321 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -101,7 +101,7 @@ public: /** * @brief isOutputOperation determines whether this operation is an output of the ExecutionSystem during rendering or editing. * - * Default behaviour if not overriden, this operation will not be evaluated as being an output of the ExecutionSystem. + * Default behaviour if not overridden, this operation will not be evaluated as being an output of the ExecutionSystem. * * @see ExecutionSystem * @group check diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp index bcad974da70..f647629815b 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp @@ -894,7 +894,7 @@ static void do_createEdgeLocationBuffer(unsigned int t, unsigned int rw, unsigne int x; // x = pixel loop counter int a; // a = temporary pixel index buffer loop counter unsigned int ud; // ud = unscaled edge distance - unsigned int dmin; // dmin = minimun edge distance + unsigned int dmin; // dmin = minimum edge distance unsigned int rsl; // long used for finding fast 1.0/sqrt unsigned int gradientFillOffset; @@ -1012,7 +1012,7 @@ static void do_fillGradientBuffer(unsigned int rw, float *res, unsigned short *g unsigned int gradientFillOffset; unsigned int t; unsigned int ud; // ud = unscaled edge distance - unsigned int dmin; // dmin = minimun edge distance + unsigned int dmin; // dmin = minimum edge distance float odist; // odist = current outer edge distance float idist; // idist = current inner edge distance int dx; // dx = X-delta (used for distance proportion calculation) @@ -1070,7 +1070,7 @@ static void do_fillGradientBuffer(unsigned int rw, float *res, unsigned short *g * pixel color as |GI| / (|GI| + |GO|). Since these are reciprocals, GI serves the * purpose of GO for the proportion calculation. * - * For the purposes of the minimun distance comparisons, we only check + * For the purposes of the minimum distance comparisons, we only check * the sums-of-squares against eachother, since they are in the same * mathematical sort-order as if we did go ahead and take square roots * @@ -1116,7 +1116,7 @@ static void do_fillGradientBuffer(unsigned int rw, float *res, unsigned short *g /* * Note once again that since we are using reciprocals of distance values our * proportion is already the correct intensity, and does not need to be - * subracted from 1.0 like it would have if we used real distances. + * subtracted from 1.0 like it would have if we used real distances. */ /* diff --git a/source/blender/compositor/operations/COM_KeyingBlurOperation.h b/source/blender/compositor/operations/COM_KeyingBlurOperation.h index 84406c33c28..aaacf66a656 100644 --- a/source/blender/compositor/operations/COM_KeyingBlurOperation.h +++ b/source/blender/compositor/operations/COM_KeyingBlurOperation.h @@ -27,7 +27,7 @@ #include "COM_NodeOperation.h" /** - * Class with implementation of bluring for keying node + * Class with implementation of blurring for keying node */ class KeyingBlurOperation : public NodeOperation { protected: |