Revision: 58876
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58876
Author: nazgul
Date: 2013-08-03 19:53:53 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Remove plane track mask warping operation
After some thoughts, it's not needed actually.
As soon as mask is parented to a plane, Mask
input node would give you warped mask already.
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
Removed Paths:
-------------
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PlaneTrackWarpMaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PlaneTrackWarpMaskOperation.h
Modified: branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
2013-08-03 19:53:44 UTC (rev 58875)
+++ branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
2013-08-03 19:53:53 UTC (rev 58876)
@@ -606,8 +606,6 @@
operations/COM_PlaneTrackMaskOperation.h
operations/COM_PlaneTrackWarpImageOperation.cpp
operations/COM_PlaneTrackWarpImageOperation.h
- operations/COM_PlaneTrackWarpMaskOperation.cpp
- operations/COM_PlaneTrackWarpMaskOperation.h
operations/COM_DownsampleOperation.cpp
operations/COM_DownsampleOperation.h
Modified:
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
2013-08-03 19:53:44 UTC (rev 58875)
+++
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
2013-08-03 19:53:53 UTC (rev 58876)
@@ -26,7 +26,6 @@
#include "COM_PlaneTrackMaskOperation.h"
#include "COM_PlaneTrackWarpImageOperation.h"
-#include "COM_PlaneTrackWarpMaskOperation.h"
#include "COM_DownsampleOperation.h"
@@ -44,11 +43,9 @@
void PlaneTrackDeformNode::convertToOperations(ExecutionSystem *graph,
CompositorContext *context)
{
InputSocket *input_image = this->getInputSocket(0);
- InputSocket *input_mask = this->getInputSocket(1);
OutputSocket *output_warped_image = this->getOutputSocket(0);
- OutputSocket *output_warped_mask = this->getOutputSocket(1);
- OutputSocket *output_plane = this->getOutputSocket(2);
+ OutputSocket *output_plane = this->getOutputSocket(1);
bNode *editorNode = this->getbNode();
MovieClip *clip = (MovieClip *) editorNode->id;
@@ -71,19 +68,6 @@
graph->addOperation(warp_image_operation);
}
- if (output_warped_mask->isConnected()) {
- PlaneTrackWarpMaskOperation *warp_mask_operation = new
PlaneTrackWarpMaskOperation();
-
- warp_mask_operation->setMovieClip(clip);
- warp_mask_operation->setTrackingObject(data->tracking_object);
- warp_mask_operation->setPlaneTrackName(data->plane_track_name);
- warp_mask_operation->setFramenumber(frame_number);
-
-
input_mask->relinkConnections(warp_mask_operation->getInputSocket(0), 1, graph);
-
output_warped_mask->relinkConnections(warp_mask_operation->getOutputSocket());
- graph->addOperation(warp_mask_operation);
- }
-
if (output_plane->isConnected()) {
PlaneTrackMaskOperation *plane_mask_operation = new
PlaneTrackMaskOperation();
Deleted:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PlaneTrackWarpMaskOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PlaneTrackWarpMaskOperation.cpp
2013-08-03 19:53:44 UTC (rev 58875)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PlaneTrackWarpMaskOperation.cpp
2013-08-03 19:53:53 UTC (rev 58876)
@@ -1,58 +0,0 @@
-/*
- * Copyright 2013, 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:
- * Sergey Sharybin
- */
-
-#include "COM_PlaneTrackWarpMaskOperation.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_listbase.h"
-#include "BLI_math.h"
-#include "BLI_math_color.h"
-
-extern "C" {
- #include "BKE_movieclip.h"
- #include "BKE_node.h"
- #include "BKE_tracking.h"
-}
-
-PlaneTrackWarpMaskOperation::PlaneTrackWarpMaskOperation() :
PlaneTrackCommonOperation()
-{
- this->addInputSocket(COM_DT_VALUE);
- this->addOutputSocket(COM_DT_VALUE);
- this->m_pixelReader = NULL;
-}
-
-void PlaneTrackWarpMaskOperation::initExecution()
-{
- PlaneTrackCommonOperation::initExecution();
-
- this->m_pixelReader = this->getInputSocketReader(0);
-}
-
-void PlaneTrackWarpMaskOperation::deinitExecution()
-{
- this->m_pixelReader = NULL;
-}
-
-void PlaneTrackWarpMaskOperation::executePixel(float output[4], float x, float
y, PixelSampler sampler)
-{
- zero_v4(output);
-}
Deleted:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PlaneTrackWarpMaskOperation.h
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PlaneTrackWarpMaskOperation.h
2013-08-03 19:53:44 UTC (rev 58875)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PlaneTrackWarpMaskOperation.h
2013-08-03 19:53:53 UTC (rev 58876)
@@ -1,49 +0,0 @@
-
-/*
- * Copyright 2013, 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:
- * Sergey Sharybin
- */
-
-#ifndef _COM_PlaneTrackWarpMaskOperation_h
-#define _COM_PlaneTrackWarpMaskOperation_h
-
-#include <string.h>
-
-#include "COM_PlaneTrackCommonOperation.h"
-
-#include "DNA_movieclip_types.h"
-#include "DNA_tracking_types.h"
-
-#include "BLI_listbase.h"
-#include "BLI_string.h"
-
-class PlaneTrackWarpMaskOperation : public PlaneTrackCommonOperation {
-protected:
- SocketReader *m_pixelReader;
-
-public:
- PlaneTrackWarpMaskOperation();
-
- void initExecution();
- void deinitExecution();
-
- void executePixel(float output[4], float x, float y, PixelSampler
sampler);
-};
-
-#endif
Modified:
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
===================================================================
---
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
2013-08-03 19:53:44 UTC (rev 58875)
+++
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
2013-08-03 19:53:53 UTC (rev 58876)
@@ -35,13 +35,11 @@
static bNodeSocketTemplate cmp_node_planetrackdeform_in[] = {
{ SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f,
PROP_NONE},
- { SOCK_FLOAT, 1, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f,
PROP_NONE},
{ -1, 0, "" }
};
static bNodeSocketTemplate cmp_node_planetrackdeform_out[] = {
{ SOCK_RGBA, 0, N_("Image")},
- { SOCK_FLOAT, 0, N_("Mask")},
{ SOCK_FLOAT, 0, N_("Plane")},
{ -1, 0, "" }
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
