[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45576] branches/tile/source/blender/ compositor: TileBranch

[Jeroen Bakker]

Revision: 45576
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45576
Author:   jbakker
Date:     2012-04-12 15:31:48 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
TileBranch
 * added cycles passes

Modified Paths:
--------------
    branches/tile/source/blender/compositor/CMakeLists.txt
    branches/tile/source/blender/compositor/nodes/COM_RenderLayersNode.cpp

Added Paths:
-----------
    branches/tile/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
    branches/tile/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h

Modified: branches/tile/source/blender/compositor/CMakeLists.txt
===================================================================
--- branches/tile/source/blender/compositor/CMakeLists.txt	2012-04-12 15:23:34 UTC (rev 45575)
+++ branches/tile/source/blender/compositor/CMakeLists.txt	2012-04-12 15:31:48 UTC (rev 45576)
@@ -357,6 +357,8 @@
 		operations/COM_RenderLayersEnvironmentOperation.h
 		operations/COM_RenderLayersIndirectOperation.cpp
 		operations/COM_RenderLayersIndirectOperation.h
+		operations/COM_RenderLayersCyclesOperation.cpp
+		operations/COM_RenderLayersCyclesOperation.h
 
 operations/COM_ImageOperation.cpp
 operations/COM_ImageOperation.h

Modified: branches/tile/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_RenderLayersNode.cpp	2012-04-12 15:23:34 UTC (rev 45575)
+++ branches/tile/source/blender/compositor/nodes/COM_RenderLayersNode.cpp	2012-04-12 15:31:48 UTC (rev 45576)
@@ -41,6 +41,7 @@
 #include "COM_RenderLayersEnvironmentOperation.h"
 #include "COM_RenderLayersIndirectOperation.h"
 #include "COM_RenderLayersMaterialIndexOperation.h"
+#include "COM_RenderLayersCyclesOperation.h"
 #include "COM_TranslateOperation.h"
 #include "COM_RotateOperation.h"
 #include "COM_ScaleOperation.h"
@@ -142,4 +143,15 @@
 	testSocketConnection(graph, 16, new RenderLayersMistOperation());
 	testSocketConnection(graph, 17, new RenderLayersEmitOperation());
 	testSocketConnection(graph, 18, new RenderLayersEnvironmentOperation());
+	
+	// cycles passes
+	testSocketConnection(graph, 19, new RenderLayersCyclesOperation(SCE_PASS_DIFFUSE_DIRECT));
+	testSocketConnection(graph, 20, new RenderLayersCyclesOperation(SCE_PASS_DIFFUSE_INDIRECT));
+	testSocketConnection(graph, 21, new RenderLayersCyclesOperation(SCE_PASS_DIFFUSE_COLOR));
+	testSocketConnection(graph, 22, new RenderLayersCyclesOperation(SCE_PASS_GLOSSY_DIRECT));
+	testSocketConnection(graph, 23, new RenderLayersCyclesOperation(SCE_PASS_GLOSSY_INDIRECT));
+	testSocketConnection(graph, 24, new RenderLayersCyclesOperation(SCE_PASS_GLOSSY_COLOR));
+	testSocketConnection(graph, 25, new RenderLayersCyclesOperation(SCE_PASS_TRANSM_DIRECT));
+	testSocketConnection(graph, 26, new RenderLayersCyclesOperation(SCE_PASS_TRANSM_INDIRECT));
+	testSocketConnection(graph, 27, new RenderLayersCyclesOperation(SCE_PASS_TRANSM_COLOR));
 }

Added: branches/tile/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp	                        (rev 0)
+++ branches/tile/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp	2012-04-12 15:31:48 UTC (rev 45576)
@@ -0,0 +1,27 @@
+/*
+ * 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_RenderLayersCyclesOperation.h"
+
+RenderLayersCyclesOperation::RenderLayersCyclesOperation(int pass) :RenderLayersBaseProg(pass, 4) {
+    this->addOutputSocket(COM_DT_COLOR);
+}

Added: branches/tile/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h	                        (rev 0)
+++ branches/tile/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h	2012-04-12 15:31:48 UTC (rev 45576)
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+
+#ifndef _COM_RenderLayersCyclesOperation_h
+#define _COM_RenderLayersCyclesOperation_h
+
+#include "COM_RenderLayersBaseProg.h"
+
+class RenderLayersCyclesOperation : public RenderLayersBaseProg {
+public:
+    RenderLayersCyclesOperation(int pass);
+};
+
+#endif