____

`````|````` | |        |                        ..'''' 
     |      | |        |______               .''       
     |      | |        |                  ..'          
     |      | |_______ |___________ ....''             
               merge to TRUNK!

 * The old compositor is still available (Debug Menu: 200)

This commit was brought to you by:

Developers:
 * Monique Dewanchand
 * Jeroen Bakker
 * Dalai Felinto
 * Lukas Tönne

Review:
 * Brecht van Lommel

Testers:
 * Nate Wiebe
 * Wolfgang Faehnle
 * Carlo Andreacchio
 * Daniel Salazar
 * Artur Mag
 * Christian Krupa
 * Francesco Siddi
 * Dan McGrath
 * Bassam Kurdali

But mostly by the community:
Gold:

    Joshua Faulkner
    Michael Tiemann
    Francesco Paglia
    Blender Guru
    Blender Developers Fund

Silver:

    Pablo Vazquez
    Joel Heethaar
    Amrein Olivier
    Ilias Karasavvidis
    Thomas Kumlehn
    Sebastian Koenig
    Hannu Hoffrén
    Benjamin Dansie
    Fred M'ule
    Michel Vilain
    Bradley Cathey
    Gianmichele Mariani
    Gottfried Hofmann
    Bjørnar Frøyse
    Valentijn Bruning
    Paul Holmes
    Clemens Rudolph
    Juris Graphix
    David Strebel
    Ronan Zeegers
    François Tarlier
    Felipe Andres Esquivel Reed
    Olaf Beckman
    Jesus Alberto Olmos Linares
    Kajimba
    Maria Figueiredo
    Alexandr Galperin
    Francesco Siddi
    Julio Iglesias Lopez
    Kjartan Tysdal
    Thomas Torfs
    Film Works
    Teruyuki Nakamura
    Roger Luethi
    Benoit Bolsee
    Stefan Abrahamsen
    Andreas Mattijat
    Xavier Bouchoux
    Blender 3D Graphics and Animation
    Henk Vostermans
    Daniel Blanco Delgado
    BlenderDay/2011
    Bradley Cathey
    Matthieu Dupont de Dinechin
    Gianmichele Mariani
    Jérôme Scaillet

Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó, 
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli, 
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein, 
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio, 
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel, 
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey, 
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter, 
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini, 
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch, 
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson, 
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song, 
Dylan Urquidi ) 

1 files changed, 162 insertions, 0 deletions

diff --git a/source/blender/compositor/intern/COM_InputSocket.h b/source/blender/compositor/intern/COM_InputSocket.h
new file mode 100644
index 00000000000..340cfa98ef6
--- /dev/null
+++ b/source/blender/compositor/intern/COM_InputSocket.h
@@ -0,0 +1,162 @@
+/*
+ * 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_InputSocket_h
+#define _COM_InputSocket_h
+
+#include <vector>
+#include "COM_Socket.h"
+#include "COM_SocketReader.h"
+
+using namespace std;
+class SocketConnection;
+class Node;
+class ExecutionSystem;
+class OutputSocket;
+class ChannelInfo;
+class NodeOperation;
+
+/**
+  * @brief Resize modes of inputsockets
+  * How are the input and working resolutions matched
+  * @ingroup Model
+  */
+typedef enum InputSocketResizeMode {
+	/** @brief Center the input image to the center of the working area of the node, no resizing occurs */
+	COM_SC_CENTER = NS_CR_CENTER,
+	/** @brief The bottom left of the input image is the bottom left of the working area of the node, no resizing occurs */
+	COM_SC_NO_RESIZE = NS_CR_NONE,
+	/** @brief Fit the width of the input image to the width of the working area of the node */
+	COM_SC_FIT_WIDTH = NS_CR_FIT_WIDTH,
+	/** @brief Fit the height of the input image to the height of the working area of the node */
+	COM_SC_FIT_HEIGHT = NS_CR_FIT_HEIGHT,
+	/** @brief Fit the width or the height of the input image to the width or height of the working area of the node, image will be larger than the working area */
+	COM_SC_FIT = NS_CR_FIT,
+	/** @brief Fit the width and the height of the input image to the width and height of the working area of the node, image will be equally larger than the working area */
+	COM_SC_STRETCH = NS_CR_STRETCH
+} InputSocketResizeMode;
+
+/**
+  * @brief InputSocket are sockets that can receive data/input
+  * @ingroup Model
+  */
+class InputSocket : public Socket {
+private:
+	/**
+	  * @brief connection connected to this InputSocket.
+	  * An input socket can only have a single connection
+	  */
+	SocketConnection* connection;
+	
+	/**
+	  * @brief resize mode of this socket
+	  */
+	InputSocketResizeMode resizeMode;
+	
+	
+	/**
+	  * @brief convert a data type to a by the socket supported data type.
+	  *
+	  * @param datatype the datatype that needs to be checked
+	  * @section data-conversion
+	  */
+	DataType convertToSupportedDataType(DataType datatype);
+	
+	/**
+	  * @brief called when the ActualDataType is set. notifies other parties
+	  */
+	void fireActualDataTypeSet();
+
+public:
+	InputSocket(DataType datatype);
+	InputSocket(DataType datatype, InputSocketResizeMode resizeMode);
+	InputSocket(InputSocket* from);
+	
+	void setConnection(SocketConnection* connection);
+	SocketConnection* getConnection();
+	
+	const int isConnected() const;
+	int isInputSocket() const;
+	
+	/**
+	  * @brief determine the resolution of this data going through this socket
+	  * @param resolution the result of this operation
+	  * @param preferredResolution the preferrable resolution as no resolution could be determined
+	  */
+	void determineResolution(unsigned int resolution[],unsigned int preferredResolution[]);
+	
+	void determineActualDataType();
+	
+	/**
+	  * @brief Notifies the Input of the data type (via a SocketConnection)
+	  * @param datatype the datatype to evaluate
+	  */
+	void notifyActualInputType(DataType datatype);
+	
+	/**
+	  * @brief move all connections of this input socket to another socket
+	  * only use this method when already checked the availability of a SocketConnection
+	  * @param relinkToSocket the socket to move to connections to
+	  */
+	void relinkConnections(InputSocket *relinkToSocket);
+	
+	/**
+	  * @brief move all connections of this input socket to another socket
+	  * @param relinkToSocket the socket to move to connections to
+	  * @param autoconnect will a set operation be added when no connections exist
+	  * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection)
+	  * @param system ExecutionSystem to update to
+	  */
+	void relinkConnections(InputSocket *relinkToSocket, bool autoconnect, int editorNodeInputSocketIndex, ExecutionSystem* system);
+	
+	/**
+	  * @brief move all connections of this input socket to another socket
+	  * @param relinkToSocket the socket to move to connections to
+	  * @param autoconnect will a set operation be added when no connections exist
+	  * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection)
+	  * @param duplicate instead of move do a copy of the connection.
+	  * @param system ExecutionSystem to update to
+	  */
+	void relinkConnections(InputSocket *relinkToSocket, bool autoconnect, int editorNodeInputSocketIndex, bool duplicate, ExecutionSystem* system);
+	
+	/**
+	  * @brief set the resize mode
+	  * @param resizeMode the new resize mode.
+	  */
+	void setResizeMode(InputSocketResizeMode resizeMode) {this->resizeMode = resizeMode;}
+	
+	/**
+	  * @brief get the resize mode of this socket
+	  * @return InputSocketResizeMode
+	  */
+	InputSocketResizeMode getResizeMode() const {return this->resizeMode;}
+	
+	const ChannelInfo* getChannelInfo(const int channelnumber);
+	
+	bool isStatic();
+	
+	float* getStaticValues();
+	SocketReader* getReader();
+	NodeOperation* getOperation() const;
+};
+
+#endif