[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45875] branches/tile/source/blender/ compositor: TileBranch
Jeroen Bakker
j.bakker at atmind.nl
Mon Apr 23 11:01:27 CEST 2012
Revision: 45875
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45875
Author: jbakker
Date: 2012-04-23 09:01:27 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
TileBranch
* added defocus node
- only preview options do not work, as they are replaced by the Compositor tree quality settings
Modified Paths:
--------------
branches/tile/source/blender/compositor/CMakeLists.txt
branches/tile/source/blender/compositor/COM_defines.h
branches/tile/source/blender/compositor/intern/COM_Converter.cpp
branches/tile/source/blender/compositor/operations/COM_BokehImageOperation.cpp
branches/tile/source/blender/compositor/operations/COM_BokehImageOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersDepthProg.h
branches/tile/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/tile/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
Added Paths:
-----------
branches/tile/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/tile/source/blender/compositor/nodes/COM_DefocusNode.h
branches/tile/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
branches/tile/source/blender/compositor/operations/COM_GammaCorrectOperation.h
Modified: branches/tile/source/blender/compositor/CMakeLists.txt
===================================================================
--- branches/tile/source/blender/compositor/CMakeLists.txt 2012-04-23 08:24:03 UTC (rev 45874)
+++ branches/tile/source/blender/compositor/CMakeLists.txt 2012-04-23 09:01:27 UTC (rev 45875)
@@ -29,88 +29,88 @@
../blenkernel
../blenlib
../makesdna
- ../render/extern/include
- ../render/intern/include
- ../makesrna
- ../blenloader
- ../blenlib
- ../windowmanager
- ../imbuf
- ../../../intern/guardedalloc
- nodes
- ../nodes/
- ../nodes/composite
- ../nodes/intern
- intern
- operations
- ../opencl
+ ../render/extern/include
+ ../render/intern/include
+ ../makesrna
+ ../blenloader
+ ../blenlib
+ ../windowmanager
+ ../imbuf
+ ../../../intern/guardedalloc
+ nodes
+ ../nodes/
+ ../nodes/composite
+ ../nodes/intern
+ intern
+ operations
+ ../opencl
)
set(SRC
- COM_compositor.h
- COM_defines.h
+ COM_compositor.h
+ COM_defines.h
- intern/COM_compositor.cpp
- intern/COM_ExecutionSystem.cpp
- intern/COM_ExecutionSystem.h
- intern/COM_ExecutionSystemHelper.cpp
- intern/COM_ExecutionSystemHelper.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_NodeBase.cpp
- intern/COM_NodeBase.h
- intern/COM_NodeOperation.cpp
- intern/COM_NodeOperation.h
- intern/COM_Socket.cpp
- intern/COM_Socket.h
- intern/COM_SocketReader.cpp
- intern/COM_SocketReader.h
- intern/COM_InputSocket.cpp
- intern/COM_InputSocket.h
- intern/COM_OutputSocket.cpp
- intern/COM_OutputSocket.h
- intern/COM_SocketConnection.cpp
- intern/COM_SocketConnection.h
- intern/COM_MemoryProxy.cpp
- intern/COM_MemoryProxy.h
- intern/COM_MemoryBuffer.cpp
- intern/COM_MemoryBuffer.h
- intern/COM_MemoryManager.cpp
- intern/COM_MemoryManager.h
- intern/COM_MemoryManagerState.cpp
- intern/COM_MemoryManagerState.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_ChannelInfo.cpp
- intern/COM_ChannelInfo.h
- operations/COM_QualityStepHelper.h
- operations/COM_QualityStepHelper.cpp
+ intern/COM_compositor.cpp
+ intern/COM_ExecutionSystem.cpp
+ intern/COM_ExecutionSystem.h
+ intern/COM_ExecutionSystemHelper.cpp
+ intern/COM_ExecutionSystemHelper.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_NodeBase.cpp
+ intern/COM_NodeBase.h
+ intern/COM_NodeOperation.cpp
+ intern/COM_NodeOperation.h
+ intern/COM_Socket.cpp
+ intern/COM_Socket.h
+ intern/COM_SocketReader.cpp
+ intern/COM_SocketReader.h
+ intern/COM_InputSocket.cpp
+ intern/COM_InputSocket.h
+ intern/COM_OutputSocket.cpp
+ intern/COM_OutputSocket.h
+ intern/COM_SocketConnection.cpp
+ intern/COM_SocketConnection.h
+ intern/COM_MemoryProxy.cpp
+ intern/COM_MemoryProxy.h
+ intern/COM_MemoryBuffer.cpp
+ intern/COM_MemoryBuffer.h
+ intern/COM_MemoryManager.cpp
+ intern/COM_MemoryManager.h
+ intern/COM_MemoryManagerState.cpp
+ intern/COM_MemoryManagerState.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_ChannelInfo.cpp
+ intern/COM_ChannelInfo.h
+ operations/COM_QualityStepHelper.h
+ operations/COM_QualityStepHelper.cpp
# Internal nodes
- nodes/COM_MuteNode.cpp
- nodes/COM_MuteNode.h
- nodes/COM_GroupNode.cpp
- nodes/COM_GroupNode.h
- nodes/COM_SocketProxyNode.cpp
- nodes/COM_SocketProxyNode.h
+ nodes/COM_MuteNode.cpp
+ nodes/COM_MuteNode.h
+ nodes/COM_GroupNode.cpp
+ nodes/COM_GroupNode.h
+ nodes/COM_SocketProxyNode.cpp
+ nodes/COM_SocketProxyNode.h
# input nodes
nodes/COM_RenderLayersNode.cpp
@@ -135,12 +135,12 @@
nodes/COM_OutputFileNode.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_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
@@ -149,48 +149,50 @@
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_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_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_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_GlareNode.cpp
+ nodes/COM_GlareNode.h
- operations/COM_LensGlowOperation.cpp
- operations/COM_LensGlowOperation.h
- operations/COM_LensGhostOperation.cpp
- operations/COM_LensGhostOperation.h
+ operations/COM_LensGlowOperation.cpp
+ operations/COM_LensGlowOperation.h
+ operations/COM_LensGhostOperation.cpp
+ operations/COM_LensGhostOperation.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
@@ -306,6 +308,8 @@
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
Modified: branches/tile/source/blender/compositor/COM_defines.h
===================================================================
--- branches/tile/source/blender/compositor/COM_defines.h 2012-04-23 08:24:03 UTC (rev 45874)
+++ branches/tile/source/blender/compositor/COM_defines.h 2012-04-23 09:01:27 UTC (rev 45875)
@@ -73,7 +73,6 @@
* COM_CURRENT_THREADING_MODEL can be one of the above, COM_TM_QUEUE is currently default.
*/
#define COM_CURRENT_THREADING_MODEL COM_TM_QUEUE
-
// chunk order
/**
* @brief The order of chunks to be scheduled
Modified: branches/tile/source/blender/compositor/intern/COM_Converter.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_Converter.cpp 2012-04-23 08:24:03 UTC (rev 45874)
+++ branches/tile/source/blender/compositor/intern/COM_Converter.cpp 2012-04-23 09:01:27 UTC (rev 45875)
@@ -110,6 +110,7 @@
#include "COM_VectorBlurNode.h"
#include "COM_MovieDistortionNode.h"
#include "COM_ViewLevelsNode.h"
+#include "COM_DefocusNode.h"
Node* Converter::convert(bNode *bNode) {
Node * node;
@@ -339,9 +340,11 @@
case CMP_NODE_VIEW_LEVELS:
node = new ViewLevelsNode(bNode);
break;
+ case CMP_NODE_DEFOCUS:
+ node = new DefocusNode(bNode);
+ break;
/* not inplemented yet */
case CMP_NODE_DOUBLEEDGEMASK:
- case CMP_NODE_DEFOCUS:
case CMP_NODE_CROP:
default:
node = new MuteNode(bNode);
Added: branches/tile/source/blender/compositor/nodes/COM_DefocusNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_DefocusNode.cpp (rev 0)
+++ branches/tile/source/blender/compositor/nodes/COM_DefocusNode.cpp 2012-04-23 09:01:27 UTC (rev 45875)
@@ -0,0 +1,110 @@
+/*
+ * 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
+ */
+
+#include "COM_DefocusNode.h"
+#include "DNA_scene_types.h"
+#include "DNA_camera_types.h"
+#include "DNA_object_types.h"
+#include "DNA_node_types.h"
+#include "COM_ExecutionSystem.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list