[Bf-blender-cvs] [8dcd387] compositor-2016: Initial commit for the new compositor

Jeroen Bakker noreply at git.blender.org
Wed Jun 1 20:30:11 CEST 2016


Commit: 8dcd387c5bd6c222913f4af2fded366c1f6aaad4
Author: Jeroen Bakker
Date:   Sun May 22 09:48:33 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB8dcd387c5bd6c222913f4af2fded366c1f6aaad4

Initial commit for the new compositor

===================================================================

M	source/blender/compositor/CMakeLists.txt
A	source/blender/compositor/cmp/cmp_compositor.cpp
A	source/blender/compositor/cmp/cmp_node.cpp
A	source/blender/compositor/cmp/cmp_node.hpp
A	source/blender/compositor/cmp/cmp_nodesocket.cpp
A	source/blender/compositor/cmp/cmp_nodesocket.hpp
A	source/blender/compositor/cmp/cmp_output.cpp
A	source/blender/compositor/cmp/cmp_output.hpp
A	source/blender/compositor/cmp/cmp_unroll.cpp
A	source/blender/compositor/cmp/cmp_unroll.hpp
A	source/blender/compositor/device/device.cpp
A	source/blender/compositor/device/device.hpp
A	source/blender/compositor/device/device_cpu.cpp
A	source/blender/compositor/device/device_cpu.hpp
A	source/blender/compositor/device/device_glsl.cpp
A	source/blender/compositor/device/device_glsl.hpp
A	source/blender/compositor/device/device_task.cpp
A	source/blender/compositor/device/device_task.hpp
M	source/blender/compositor/intern/COM_compositor.cpp
A	source/blender/compositor/kernel/cvm/cvm_node_color.h
A	source/blender/compositor/kernel/cvm/cvm_node_dummy.h
A	source/blender/compositor/kernel/cvm/cvm_node_mix.h
A	source/blender/compositor/kernel/cvm/cvm_node_value.h
A	source/blender/compositor/kernel/cvm/cvm_node_viewer.h
A	source/blender/compositor/kernel/cvm/cvm_nodes.h
A	source/blender/compositor/kernel/kernel.h
A	source/blender/compositor/kernel/kernel_constants.h
A	source/blender/compositor/kernel/kernel_functions.h
A	source/blender/compositor/kernel/kernel_types.h

===================================================================

diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 3180e7e..7e407b7 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -25,9 +25,11 @@
 
 set(INC
 	.
-	intern
-	nodes
-	operations
+	cmp
+	device
+	kernel
+	kernel/cvm
+
 	../blenkernel
 	../blenlib
 	../blentranslation
@@ -53,499 +55,21 @@ set(SRC
 	COM_compositor.h
 	COM_defines.h
 
-	intern/COM_compositor.cpp
-	intern/COM_ExecutionSystem.cpp
-	intern/COM_ExecutionSystem.h
-	intern/COM_NodeConverter.cpp
-	intern/COM_NodeConverter.h
-	intern/COM_NodeOperationBuilder.cpp
-	intern/COM_NodeOperationBuilder.h
-	intern/COM_NodeGraph.cpp
-	intern/COM_NodeGraph.h
-	intern/COM_Converter.cpp
-	intern/COM_Converter.h
-	intern/COM_ExecutionGroup.cpp
-	intern/COM_ExecutionGroup.h
-	intern/COM_Node.cpp
-	intern/COM_Node.h
-	intern/COM_NodeOperation.cpp
-	intern/COM_NodeOperation.h
-	intern/COM_SocketReader.cpp
-	intern/COM_SocketReader.h
-	intern/COM_MemoryProxy.cpp
-	intern/COM_MemoryProxy.h
-	intern/COM_MemoryBuffer.cpp
-	intern/COM_MemoryBuffer.h
-	intern/COM_WorkScheduler.cpp
-	intern/COM_WorkScheduler.h
-	intern/COM_WorkPackage.cpp
-	intern/COM_WorkPackage.h
-	intern/COM_ChunkOrder.cpp
-	intern/COM_ChunkOrder.h
-	intern/COM_ChunkOrderHotspot.cpp
-	intern/COM_ChunkOrderHotspot.h
-	intern/COM_Device.cpp
-	intern/COM_Device.h
-	intern/COM_CPUDevice.cpp
-	intern/COM_CPUDevice.h
-	intern/COM_OpenCLDevice.cpp
-	intern/COM_OpenCLDevice.h
-	intern/COM_CompositorContext.cpp
-	intern/COM_CompositorContext.h
-	intern/COM_SingleThreadedOperation.cpp
-	intern/COM_SingleThreadedOperation.h
-	intern/COM_Debug.cpp
-	intern/COM_Debug.h
-
-	operations/COM_QualityStepHelper.h
-	operations/COM_QualityStepHelper.cpp
-
-	# Internal nodes
-	nodes/COM_SocketProxyNode.cpp
-	nodes/COM_SocketProxyNode.h
-
-	# input nodes
-	nodes/COM_RenderLayersNode.cpp
-	nodes/COM_RenderLayersNode.h
-	nodes/COM_ImageNode.cpp
-	nodes/COM_ImageNode.h
-	nodes/COM_TextureNode.cpp
-	nodes/COM_TextureNode.h
-	nodes/COM_BokehImageNode.cpp
-	nodes/COM_BokehImageNode.h
-	nodes/COM_ColorNode.cpp
-	nodes/COM_ColorNode.h
-	nodes/COM_ValueNode.cpp
-	nodes/COM_ValueNode.h
-	nodes/COM_TimeNode.cpp
-	nodes/COM_TimeNode.h
-	nodes/COM_SwitchNode.cpp
-	nodes/COM_SwitchNode.h
-	nodes/COM_SwitchViewNode.cpp
-	nodes/COM_SwitchViewNode.h
-	nodes/COM_MovieClipNode.cpp
-	nodes/COM_MovieClipNode.h
-	nodes/COM_OutputFileNode.cpp
-	nodes/COM_OutputFileNode.h
-	nodes/COM_MaskNode.cpp
-	nodes/COM_MaskNode.h
-
-	# output nodes
-	nodes/COM_CompositorNode.cpp
-	nodes/COM_CompositorNode.h
-	nodes/COM_ViewerNode.cpp
-	nodes/COM_ViewerNode.h
-	nodes/COM_SplitViewerNode.cpp
-	nodes/COM_SplitViewerNode.h
-	nodes/COM_ViewLevelsNode.cpp
-	nodes/COM_ViewLevelsNode.h
-	operations/COM_CalculateStandardDeviationOperation.cpp
-	operations/COM_CalculateStandardDeviationOperation.h
-	operations/COM_CalculateMeanOperation.cpp
-	operations/COM_CalculateMeanOperation.h
-
-	# distort nodes
-	nodes/COM_TranslateNode.cpp
-	nodes/COM_TranslateNode.h
-	nodes/COM_ScaleNode.cpp
-	nodes/COM_ScaleNode.h
-	nodes/COM_RotateNode.cpp
-	nodes/COM_RotateNode.h
-	nodes/COM_FlipNode.cpp
-	nodes/COM_FlipNode.h
-
-	nodes/COM_MapUVNode.cpp
-	nodes/COM_MapUVNode.h
-	nodes/COM_DisplaceNode.cpp
-	nodes/COM_DisplaceNode.h
-
-	nodes/COM_DifferenceMatteNode.cpp
-	nodes/COM_DifferenceMatteNode.h
-	nodes/COM_LuminanceMatteNode.cpp
-	nodes/COM_LuminanceMatteNode.h
-	nodes/COM_DistanceMatteNode.cpp
-	nodes/COM_DistanceMatteNode.h
-	nodes/COM_ChromaMatteNode.cpp
-	nodes/COM_ChromaMatteNode.h
-	nodes/COM_ColorMatteNode.cpp
-	nodes/COM_ColorMatteNode.h
-	nodes/COM_ChannelMatteNode.cpp
-	nodes/COM_ChannelMatteNode.h
-	nodes/COM_LensDistortionNode.cpp
-	nodes/COM_LensDistortionNode.h
-
-	nodes/COM_GlareNode.cpp
-	nodes/COM_GlareNode.h
-
-	nodes/COM_SunBeamsNode.cpp
-	nodes/COM_SunBeamsNode.h
-	operations/COM_SunBeamsOperation.cpp
-	operations/COM_SunBeamsOperation.h
-
-	nodes/COM_CornerPinNode.cpp
-	nodes/COM_CornerPinNode.h
-	nodes/COM_PlaneTrackDeformNode.cpp
-	nodes/COM_PlaneTrackDeformNode.h
-
-	nodes/COM_CropNode.cpp
-	nodes/COM_CropNode.h
-	operations/COM_CropOperation.cpp
-	operations/COM_CropOperation.h
-
-	nodes/COM_TransformNode.cpp
-	nodes/COM_TransformNode.h
-	nodes/COM_Stabilize2dNode.cpp
-	nodes/COM_Stabilize2dNode.h
-	nodes/COM_MovieDistortionNode.cpp
-	nodes/COM_MovieDistortionNode.h
-	nodes/COM_DefocusNode.cpp
-	nodes/COM_DefocusNode.h
-
-	# color nodes
-	nodes/COM_VectorCurveNode.cpp
-	nodes/COM_VectorCurveNode.h
-	nodes/COM_ColorCurveNode.cpp
-	nodes/COM_ColorCurveNode.h
-	nodes/COM_ColorToBWNode.cpp
-	nodes/COM_ColorToBWNode.h
-	nodes/COM_ColorRampNode.cpp
-	nodes/COM_ColorRampNode.h
-	nodes/COM_MixNode.cpp
-	nodes/COM_MixNode.h
-	nodes/COM_AlphaOverNode.cpp
-	nodes/COM_AlphaOverNode.h
-	nodes/COM_ZCombineNode.cpp
-	nodes/COM_ZCombineNode.h
-	nodes/COM_BrightnessNode.cpp
-	nodes/COM_BrightnessNode.h
-	nodes/COM_ColorBalanceNode.cpp
-	nodes/COM_ColorBalanceNode.h
-	nodes/COM_InvertNode.cpp
-	nodes/COM_InvertNode.h
-	nodes/COM_GammaNode.cpp
-	nodes/COM_GammaNode.h
-	nodes/COM_SetAlphaNode.cpp
-	nodes/COM_SetAlphaNode.h
-	nodes/COM_ConvertAlphaNode.cpp
-	nodes/COM_ConvertAlphaNode.h
-	nodes/COM_HueSaturationValueNode.cpp
-	nodes/COM_HueSaturationValueNode.h
-	nodes/COM_HueSaturationValueCorrectNode.cpp
-	nodes/COM_HueSaturationValueCorrectNode.h
-	nodes/COM_ColorCorrectionNode.cpp
-	nodes/COM_ColorCorrectionNode.h
-	nodes/COM_TonemapNode.cpp
-	nodes/COM_TonemapNode.h
-	operations/COM_TonemapOperation.cpp
-	operations/COM_TonemapOperation.h
-
-	# converter nodes
-	nodes/COM_IDMaskNode.cpp
-	nodes/COM_IDMaskNode.h
-	nodes/COM_SeparateColorNode.cpp
-	nodes/COM_SeparateColorNode.h
-	nodes/COM_CombineColorNode.cpp
-	nodes/COM_CombineColorNode.h
-
-	nodes/COM_NormalNode.cpp
-	nodes/COM_NormalNode.h
-	nodes/COM_NormalizeNode.cpp
-	nodes/COM_NormalizeNode.h
-	nodes/COM_MathNode.cpp
-	nodes/COM_MathNode.h
-	nodes/COM_MapValueNode.cpp
-	nodes/COM_MapValueNode.h
-	nodes/COM_MapRangeNode.cpp
-	nodes/COM_MapRangeNode.h
-
-	operations/COM_NormalizeOperation.cpp
-	operations/COM_NormalizeOperation.h
-
-	nodes/COM_PixelateNode.cpp
-	nodes/COM_PixelateNode.h
-	operations/COM_PixelateOperation.cpp
-	operations/COM_PixelateOperation.h
-
-	# Filter nodes
-	nodes/COM_BilateralBlurNode.cpp
-	nodes/COM_BilateralBlurNode.h
-	operations/COM_BilateralBlurOperation.cpp
-	operations/COM_BilateralBlurOperation.h
-	nodes/COM_VectorBlurNode.cpp
-	nodes/COM_VectorBlurNode.h
-	operations/COM_VectorBlurOperation.cpp
-	operations/COM_VectorBlurOperation.h
-
-	nodes/COM_FilterNode.cpp
-	nodes/COM_FilterNode.h
-	nodes/COM_DespeckleNode.cpp
-	nodes/COM_DespeckleNode.h
-	nodes/COM_DilateErodeNode.cpp
-	nodes/COM_DilateErodeNode.h
-	nodes/COM_InpaintNode.cpp
-	nodes/COM_InpaintNode.h
-	nodes/COM_BlurNode.cpp
-	nodes/COM_BlurNode.h
-	nodes/COM_BokehBlurNode.cpp
-	nodes/COM_BokehBlurNode.h
-	nodes/COM_DirectionalBlurNode.cpp
-	nodes/COM_DirectionalBlurNode.h
-	operations/COM_GaussianAlphaXBlurOperation.cpp
-	operations/COM_GaussianAlphaXBlurOperation.h
-	operations/COM_GaussianAlphaYBlurOperation.cpp
-	operations/COM_GaussianAlphaYBlurOperation.h
-	operations/COM_GaussianXBlurOperation.cpp
-	operations/COM_GaussianXBlurOperation.h
-	operations/COM_GaussianYBlurOperation.cpp
-	operations/COM_GaussianYBlurOperation.h
-	operations/COM_GaussianBokehBlurOperation.cpp
-	operations/COM_GaussianBokehBlurOperation.h
-	operations/COM_BokehBlurOperation.cpp
-	operations/COM_BokehBlurOperation.h
-	operations/COM_VariableSizeBokehBlurOperation.cpp
-	operations/COM_VariableSizeBokehBlurOperation.h
-	operations/COM_FastGaussianBlurOperation.cpp
-	operations/COM_FastGaussianBlurOperation.h
-	operations/COM_BlurBaseOperation.cpp
-	operations/COM_BlurBaseOperation.h
-	operations/COM_DirectionalBlurOperation.cpp
-	operations/COM_DirectionalBlurOperation.h
-	operations/COM_MovieClipAttributeOperation.cpp
-	operations/COM_MovieClipAttributeOperation.h
-	operations/COM_MovieDistortionOperation.cpp
-	operations/COM_MovieDistortionOperation.h
-	operations/COM_GammaCorrectOperation.h
-	operations/COM_GammaCorrectOperation.cpp
-
-	# Matte nodes
-	nodes/COM_BoxMaskNode.cpp
-	nodes/COM_BoxMaskNode.h
-	nodes/COM_EllipseMaskNode.cpp
-	nodes/COM_EllipseMaskNode.h
-	nodes/COM_ColorSpillNode.cpp
-	nodes/COM_ColorSpillNode.h
-	nodes/COM_DoubleEdgeMaskNode.cpp
-	nodes/COM_DoubleEdgeMaskNode.h
-
-	operations/COM_DoubleEdgeMaskOperation.cpp
-	operations/COM_DoubleEdgeMaskOperation.h
-
-
-	nodes/COM_KeyingScreenNode.cpp
-	nodes/COM_KeyingScreenNode.h
-	operations/COM_KeyingScreenOperation.cpp
-	operations/COM_KeyingScreenOperation.h
+	cmp/cmp_compositor.cpp
+	cmp/cmp_node.cpp
+	cmp/cmp_nodesocket.cpp
+	cmp/cmp_unroll.cpp
+	cmp/cmp_output.cpp
 
-	nodes/COM_TrackPositionNode.cpp
-	nodes/COM_TrackPositionNode.h
-	operations/COM_TrackPositionOperation.cpp
-	operations/COM_TrackPositionOperation.h
-
-	nodes/COM_KeyingNode.cpp
-	nodes/COM_KeyingNode.h
-	operations/COM_KeyingOperation.cpp
-	operations/COM_KeyingOperation.h
-	operations/COM_KeyingBlurOperation.cpp
-	operations/COM_KeyingBlurOperation.h
-	operations/COM_KeyingDespillOperation.cpp
-	operations/COM_KeyingDespillOperation.h
-	operations/COM_KeyingClipOperation.cpp
-	operations/COM_KeyingClipOperation.h
-
-	operations/COM_ColorSpillOperation.cpp
-	operations/COM_ColorSpillOperation.h
-	operations/COM_RenderLayersProg.cpp
-	operations/COM_RenderLayersProg.h
-
-	operations/COM_ImageOperation.cpp
-	operations/COM_ImageOperation.h
-	operations/COM_MultilayerImageOperation.cpp
-	operations/COM_MultilayerImageOperation.h
-	operations/COM_TextureOperation.cpp
-	operations/COM_TextureOperation.h
-	operations/COM_BokehImageOperation.cpp
-	operations/COM_BokehImageOperation.h
-
-
-	operations/COM_SocketProxyOperation.h
-	operations/COM_SocketProxyOperation.cpp
-
-	operations/COM_CompositorOperation.h
-	operations/COM_CompositorOperation.cpp
-	operations/COM_OutputFileOperation.h
-	operations/COM_OutputFileOperation.cpp
-	operations/COM_OutputFileMultiViewOperation.h
-	operations/COM_OutputFileMultiViewOperation.cpp
-	operations/COM_ViewerOperation.h
-	operations/COM_ViewerOperation.cpp
-	operations/COM_PreviewOperation.h
-	operations/COM_Previ

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list