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, 107 insertions, 0 deletions

diff --git a/source/gameengine/VideoTexture/FilterNormal.h b/source/gameengine/VideoTexture/FilterNormal.h
new file mode 100644
index 00000000000..840043be9a1
--- /dev/null
+++ b/source/gameengine/VideoTexture/FilterNormal.h
@@ -0,0 +1,107 @@
+/* $Id$
+-----------------------------------------------------------------------------
+This source file is part of blendTex 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 FILTERNORMAL_H
+#define FILTERNORMAL_H
+
+#include "Common.h"
+
+#include "FilterBase.h"
+
+
+// scale constants for normals
+const float depthScaleKoef = 255.0;
+const float normScaleKoef = float(depthScaleKoef / 2.0);
+
+
+/// pixel filter for normal mapping
+class FilterNormal : public FilterBase
+{
+public:
+	/// constructor
+	FilterNormal (void);
+	/// destructor
+	virtual ~FilterNormal (void) {}
+
+	/// get index of color used to calculate normals
+	unsigned short getColor (void) { return m_colIdx; }
+	/// set index of color used to calculate normals
+	void setColor (unsigned short colIdx);
+
+	/// get depth
+	float getDepth (void) { return m_depth; }
+	/// set depth
+	void setDepth (float depth);
+
+protected:
+	/// depth of normal relief
+	float m_depth;
+	/// scale to calculate normals
+	float m_depthScale;
+
+	/// color index, 0=red, 1=green, 2=blue, 3=alpha
+	unsigned short m_colIdx;
+
+	/// filter pixel, source int buffer
+	template <class SRC> unsigned int tFilter (SRC * src, short x, short y,
+		short * size, unsigned int pixSize, unsigned int val = 0)
+	{
+		// get value of required color
+		int actPix = int(VT_C(val,m_colIdx));
+		int upPix = actPix;
+		int leftPix = actPix;
+		// get upper and left pixel from actual pixel
+		if (y > 0)
+		{
+			val = convertPrevious(src - pixSize * size[0], x, y - 1, size, pixSize);
+			upPix = VT_C(val,m_colIdx);
+		}
+		if (x > 0)
+		{
+			val = convertPrevious(src - pixSize, x - 1, y, size, pixSize);
+			leftPix = VT_C(val,m_colIdx);
+		}
+		// height differences (from blue color)
+		float dx = (actPix - leftPix) * m_depthScale;
+		float dy = (actPix - upPix) * m_depthScale;
+		// normalize vector
+		float dz = float(normScaleKoef / sqrt(dx * dx + dy * dy + 1.0));
+		dx = dx * dz + normScaleKoef;
+		dy = dy * dz + normScaleKoef;
+		dz += normScaleKoef;
+		// return normal vector converted to color
+		VT_RGBA(val, dx, dy, dz, 0xFF);
+		return val;
+	}
+
+	/// filter pixel, source byte buffer
+	virtual unsigned int filter (unsigned char * src, short x, short y,
+		short * size, unsigned int pixSize, unsigned int val = 0)
+	{ return tFilter(src, x, y, size, pixSize, val); }
+	/// 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)
+	{ return tFilter(src, x, y, size, pixSize, val); }
+};
+
+
+#endif