[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47876] trunk/blender/source/blender/ compositor: Removed the actual data type concept as it was never used.
Jeroen Bakker
j.bakker at atmind.nl
Thu Jun 14 11:41:42 CEST 2012
Revision: 47876
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47876
Author: jbakker
Date: 2012-06-14 09:41:41 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
Removed the actual data type concept as it was never used.
Modified Paths:
--------------
trunk/blender/source/blender/compositor/COM_defines.h
trunk/blender/source/blender/compositor/intern/COM_Converter.cpp
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
trunk/blender/source/blender/compositor/intern/COM_InputSocket.cpp
trunk/blender/source/blender/compositor/intern/COM_InputSocket.h
trunk/blender/source/blender/compositor/intern/COM_NodeBase.cpp
trunk/blender/source/blender/compositor/intern/COM_NodeBase.h
trunk/blender/source/blender/compositor/intern/COM_OutputSocket.cpp
trunk/blender/source/blender/compositor/intern/COM_OutputSocket.h
trunk/blender/source/blender/compositor/intern/COM_Socket.cpp
trunk/blender/source/blender/compositor/intern/COM_Socket.h
trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_OutputFileNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_SwitchNode.cpp
trunk/blender/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SocketProxyOperation.h
Modified: trunk/blender/source/blender/compositor/COM_defines.h
===================================================================
--- trunk/blender/source/blender/compositor/COM_defines.h 2012-06-14 09:40:36 UTC (rev 47875)
+++ trunk/blender/source/blender/compositor/COM_defines.h 2012-06-14 09:41:41 UTC (rev 47876)
@@ -28,8 +28,6 @@
* @ingroup Model
*/
typedef enum DataType {
- /** @brief Unknown data type (or not yet known) */
- COM_DT_UNKNOWN = 0,
/** @brief Value data type */
COM_DT_VALUE = 1,
/** @brief Vector data type */
@@ -69,8 +67,8 @@
// chunk size determination
#define COM_PREVIEW_SIZE 140.0f
-//#define COM_OPENCL_ENABLED
-//#define COM_DEBUG
+#define COM_OPENCL_ENABLED
+#define COM_DEBUG
// workscheduler threading models
/**
Modified: trunk/blender/source/blender/compositor/intern/COM_Converter.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_Converter.cpp 2012-06-14 09:40:36 UTC (rev 47875)
+++ trunk/blender/source/blender/compositor/intern/COM_Converter.cpp 2012-06-14 09:41:41 UTC (rev 47876)
@@ -362,8 +362,8 @@
{
OutputSocket *outputSocket = connection->getFromSocket();
InputSocket *inputSocket = connection->getToSocket();
- DataType fromDatatype = outputSocket->getActualDataType();
- DataType toDatatype = inputSocket->getActualDataType();
+ DataType fromDatatype = outputSocket->getDataType();
+ DataType toDatatype = inputSocket->getDataType();
NodeOperation * converter = NULL;
if (fromDatatype == COM_DT_VALUE && toDatatype == COM_DT_COLOR) {
converter = new ConvertValueToColourProg();
Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp 2012-06-14 09:40:36 UTC (rev 47875)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp 2012-06-14 09:41:41 UTC (rev 47876)
@@ -229,19 +229,15 @@
void ExecutionSystem::convertToOperations()
{
unsigned int index;
- // first determine data types of the nodes, this can be used by the node to convert to a different operation system
- this->determineActualSocketDataTypes((vector<NodeBase*>&)this->nodes);
for (index = 0; index < this->nodes.size(); index++) {
Node *node = (Node*)this->nodes[index];
node->convertToOperations(this, &this->context);
}
- // update the socket types of the operations. this will be used to add conversion operations in the system
- this->determineActualSocketDataTypes((vector<NodeBase*>&)this->operations);
for (index = 0 ; index < this->connections.size(); index ++) {
SocketConnection *connection = this->connections[index];
if (connection->isValid()) {
- if (connection->getFromSocket()->getActualDataType() != connection->getToSocket()->getActualDataType()) {
+ if (connection->getFromSocket()->getDataType() != connection->getToSocket()->getDataType()) {
Converter::convertDataType(connection, this);
}
}
@@ -307,26 +303,6 @@
}
-void ExecutionSystem::determineActualSocketDataTypes(vector<NodeBase*> &nodes)
-{
- unsigned int index;
- /* first do all input nodes */
- for (index = 0; index < nodes.size(); index++) {
- NodeBase *node = nodes[index];
- if (node->isInputNode()) {
- node->determineActualSocketDataTypes();
- }
- }
-
- /* then all other nodes */
- for (index = 0; index < nodes.size(); index++) {
- NodeBase *node = nodes[index];
- if (!node->isInputNode()) {
- node->determineActualSocketDataTypes();
- }
- }
-}
-
void ExecutionSystem::findOutputExecutionGroup(vector<ExecutionGroup*> *result, CompositorPriority priority) const
{
unsigned int index;
Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp 2012-06-14 09:40:36 UTC (rev 47875)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp 2012-06-14 09:41:41 UTC (rev 47876)
@@ -218,7 +218,7 @@
printf("|");
}
printf("<IN_%p>", socket);
- switch (socket->getActualDataType()) {
+ switch (socket->getDataType()) {
case COM_DT_VALUE:
printf("Value");
break;
@@ -228,9 +228,6 @@
case COM_DT_COLOR:
printf("Color");
break;
- case COM_DT_UNKNOWN:
- printf("Unknown");
- break;
}
}
printf("}");
@@ -270,7 +267,7 @@
printf("|");
}
printf("<OUT_%p>", socket);
- switch (socket->getActualDataType()) {
+ switch (socket->getDataType()) {
case COM_DT_VALUE:
printf("Value");
break;
@@ -280,9 +277,6 @@
case COM_DT_COLOR:
printf("Color");
break;
- case COM_DT_UNKNOWN:
- printf("Unknown");
- break;
}
}
printf("}");
@@ -317,7 +311,7 @@
printf(" [color=red]");
}
else {
- switch (connection->getFromSocket()->getActualDataType()) {
+ switch (connection->getFromSocket()->getDataType()) {
case COM_DT_VALUE:
printf(" [color=grey]");
break;
@@ -327,9 +321,6 @@
case COM_DT_COLOR:
printf(" [color=orange]");
break;
- case COM_DT_UNKNOWN:
- printf(" [color=black]");
- break;
}
}
printf("\r\n");
Modified: trunk/blender/source/blender/compositor/intern/COM_InputSocket.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_InputSocket.cpp 2012-06-14 09:40:36 UTC (rev 47875)
+++ trunk/blender/source/blender/compositor/intern/COM_InputSocket.cpp 2012-06-14 09:41:41 UTC (rev 47876)
@@ -64,68 +64,6 @@
}
}
-DataType InputSocket::convertToSupportedDataType(DataType datatype)
-{
- int supportedDataTypes = getDataType();
- if (supportedDataTypes&datatype) {
- return datatype;
- }
- bool candoValue = supportedDataTypes&COM_DT_VALUE;
- bool candoVector = supportedDataTypes&COM_DT_VECTOR;
- bool candoColor = supportedDataTypes&COM_DT_COLOR;
-
- if (datatype == COM_DT_VALUE) {
- if (candoColor) {
- return COM_DT_COLOR;
- }
- else if (candoVector) {
- return COM_DT_VECTOR;
- }
- }
- else if (datatype == COM_DT_VECTOR) {
- if (candoColor) {
- return COM_DT_COLOR;
- }
- else if (candoValue) {
- return COM_DT_VALUE;
- }
- }
- else if (datatype == COM_DT_COLOR) {
- if (candoVector) {
- return COM_DT_VECTOR;
- }
- else if (candoValue) {
- return COM_DT_VALUE;
- }
- }
- return this->getDataType();
-}
-
-void InputSocket::determineActualDataType()
-{
- /// @note: this method is only called for inputsocket that are not connected.
- /// @note: passes COM_DT_COLOR, the convertToSupportedDataType converts this to a capable DataType
- this->setActualDataType(this->convertToSupportedDataType(COM_DT_COLOR));
- #if 0 // XXX TODO check for proxy node and use output data type?
- if (this->getGroupOutputSocket()) {
- if (!this->isInsideOfGroupNode()) {
- this->getGroupOutputSocket()->determineActualDataType();
- }
- }
- #endif
-}
-
-void InputSocket::notifyActualInputType(DataType datatype)
-{
- DataType supportedDataType = convertToSupportedDataType(datatype);
- this->setActualDataType(supportedDataType);
- this->fireActualDataTypeSet();
-}
-
-void InputSocket::fireActualDataTypeSet()
-{
- this->getNode()->notifyActualDataTypeSet(this, this->getActualDataType());
-}
void InputSocket::relinkConnections(InputSocket *relinkToSocket)
{
if (!isConnected()) {
@@ -141,8 +79,7 @@
{
if (!this->isConnected()) {
Node *node = (Node*)this->getNode();
- switch (this->getActualDataType()) {
- case COM_DT_UNKNOWN:
+ switch (this->getDataType()) {
case COM_DT_COLOR:
node->addSetColorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
break;
@@ -171,8 +108,7 @@
}
else {
Node *node = (Node*)this->getNode();
- switch (this->getActualDataType()) {
- case COM_DT_UNKNOWN:
+ switch (this->getDataType()) {
case COM_DT_COLOR:
node->addSetColorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
break;
@@ -186,16 +122,6 @@
}
}
-const ChannelInfo *InputSocket::getChannelInfo(const int channelnumber)
-{
- if (this->isConnected() && this->connection->getFromSocket()) {
- return this->connection->getFromSocket()->getChannelInfo(channelnumber);
- }
- else {
- return NULL;
- }
-}
-
bool InputSocket::isStatic()
{
if (isConnected()) {
Modified: trunk/blender/source/blender/compositor/intern/COM_InputSocket.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_InputSocket.h 2012-06-14 09:40:36 UTC (rev 47875)
+++ trunk/blender/source/blender/compositor/intern/COM_InputSocket.h 2012-06-14 09:41:41 UTC (rev 47876)
@@ -73,19 +73,6 @@
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);
@@ -104,8 +91,6 @@
*/
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
Modified: trunk/blender/source/blender/compositor/intern/COM_NodeBase.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_NodeBase.cpp 2012-06-14 09:40:36 UTC (rev 47875)
+++ trunk/blender/source/blender/compositor/intern/COM_NodeBase.cpp 2012-06-14 09:41:41 UTC (rev 47876)
@@ -89,55 +89,3 @@
{
return this->inputsockets[index];
}
-
-
-void NodeBase::determineActualSocketDataTypes()
-{
- unsigned int index;
- for (index = 0 ; index < this->outputsockets.size() ; index ++) {
- OutputSocket *socket = this->outputsockets[index];
- if (socket->getActualDataType() ==COM_DT_UNKNOWN && socket->isConnected()) {
- socket->determineActualDataType();
- }
- }
- for (index = 0 ; index < this->inputsockets.size() ; index ++) {
- InputSocket *socket = this->inputsockets[index];
- if (socket->getActualDataType() ==COM_DT_UNKNOWN) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list