Merge of trunk into blender 2.5:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416

Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
  later added in trunk also, but reverted partially, specifically revision
  16683. I have left out this reversion in the 2.5 branch since I think it is
  needed there.
  http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
  for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
  -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
  differently. Since this is changed so much, and I don't think those fixes
  would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
  initialized when running with -P. The code that initializes the screen there
  I had to disable, that can't work in 2.5 anymore but left it commented as a
  reminder.

Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.

Still to be done:
* Go over files and functions that were moved to a different location but could
  still use changes that were done in trunk.

1 files changed, 123 insertions, 0 deletions

diff --git a/source/gameengine/VideoTexture/ImageMix.h b/source/gameengine/VideoTexture/ImageMix.h
new file mode 100644
index 00000000000..b4842bd6b40
--- /dev/null
+++ b/source/gameengine/VideoTexture/ImageMix.h
@@ -0,0 +1,123 @@
+/* $Id$
+-----------------------------------------------------------------------------
+This source file is part of VideoTexture library
+
+Copyright (c) 2007 The Zdeno Ash Miklas
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+#if !defined IMAGEMIX_H
+#define IMAGEMIX_H
+
+
+#include "Common.h"
+
+#include "ImageBase.h"
+#include "FilterBase.h"
+
+
+/// class for source mixing
+class ImageSourceMix : public ImageSource
+{
+public:
+	/// constructor
+	ImageSourceMix (const char * id) : ImageSource(id), m_weight(0x100) {}
+	/// destructor
+	virtual ~ImageSourceMix (void) {}
+
+	/// get offset
+	long long getOffset (void) { return m_offset; }
+	/// set offset
+	void setOffset (unsigned int * firstImg) { m_offset = m_image - firstImg; }
+
+	/// get weight
+	short getWeight (void) { return m_weight; }
+	/// set weight
+	void setWeight (short weight) { m_weight = weight; }
+
+protected:
+	/// buffer offset to the first source buffer
+	long long m_offset;
+	/// source weight
+	short m_weight;
+};
+
+
+/// class for image mixer
+class ImageMix : public ImageBase
+{
+public:
+	/// constructor
+	ImageMix (void) : ImageBase(false) {}
+
+	/// destructor
+	virtual ~ImageMix (void) {}
+
+	/// get weight
+	short getWeight (const char * id);
+	/// set weight
+	bool setWeight (const char * id, short weight);
+
+protected:
+
+	/// create new source
+	virtual ImageSource * newSource (const char * id) { return new ImageSourceMix(id); }
+
+	/// calculate image from sources and set its availability
+	virtual void calcImage (unsigned int texId);
+};
+
+
+/// pixel filter for image mixer
+class FilterImageMix : public FilterBase
+{
+public:
+	/// constructor
+	FilterImageMix (ImageSourceList & sources) : m_sources(sources) {}
+	/// destructor
+	virtual ~FilterImageMix (void) {}
+
+protected:
+	/// source list
+	ImageSourceList & m_sources;
+
+	/// filter pixel, source int buffer
+	virtual unsigned int filter (unsigned int * src, short x, short y,
+		short * size, unsigned int pixSize, unsigned int val = 0)
+	{
+		// resulting pixel color
+		int color[] = {0, 0, 0, 0};
+		// iterate sources
+		for (ImageSourceList::iterator it = m_sources.begin(); it != m_sources.end(); ++it)
+		{
+			// get pointer to mixer source
+			ImageSourceMix * mixSrc = static_cast<ImageSourceMix*>(*it);
+			// add weighted source pixel to result
+			color[0] += mixSrc->getWeight() * (src[mixSrc->getOffset()] & 0xFF);
+			color[1] += mixSrc->getWeight() * ((src[mixSrc->getOffset()] >> 8) & 0xFF);
+			color[2] += mixSrc->getWeight() * ((src[mixSrc->getOffset()] >> 16) & 0xFF);
+			color[3] += mixSrc->getWeight() * ((src[mixSrc->getOffset()] >> 24) & 0xFF);
+		}
+		// return resulting color
+		return ((color[0] >> 8) & 0xFF) | (color[1] & 0xFF00)
+			| ((color[2] << 8) & 0xFF0000) | ((color[3] << 16) & 0xFF000000);
+	}
+};
+
+
+#endif
+