From 5caf2b40453941898bf530d2e9690e5e5fc12ada Mon Sep 17 00:00:00 2001
From: hybrid <hybrid@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Thu, 8 Sep 2011 22:15:27 +0000
Subject: [PATCH] Merge from trunk, revisions 3831-3909. All fixes and
 additions from the last three month.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3910 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 changes.txt                                   |   45 +-
 .../16.Quake3MapShader/Quake3MapShader.cbp    |    4 +-
 examples/23.SMeshHandling/SMeshHandling.cbp   |    6 +-
 include/ESceneNodeTypes.h                     |    3 +
 include/ICameraSceneNode.h                    |    3 +
 include/IEventReceiver.h                      |    2 +-
 include/IGUIButton.h                          |    9 +
 include/IGUIComboBox.h                        |    6 +
 include/IGUIEditBox.h                         |   12 +
 include/IGUISpinBox.h                         |    1 +
 include/IGUIStaticText.h                      |    9 +-
 include/IParticleSystemSceneNode.h            |    5 +
 include/ISceneManager.h                       |    2 +-
 include/ITimer.h                              |    5 -
 include/IrrlichtDevice.h                      |   17 +
 include/irrMap.h                              |  189 +-
 include/irrlicht.h                            |    1 +
 include/quaternion.h                          |   14 +-
 include/triangle3d.h                          |   26 +-
 include/vector2d.h                            |    2 +-
 include/vector3d.h                            |   20 +
 media/bigfont.png                             |  Bin 21217 -> 21272 bytes
 source/Irrlicht/CAnimatedMeshMD2.cpp          |   92 +-
 source/Irrlicht/CAnimatedMeshSceneNode.cpp    |   18 +-
 source/Irrlicht/CBillboardSceneNode.cpp       |    2 +
 source/Irrlicht/CColladaFileLoader.cpp        |   50 +-
 source/Irrlicht/CColladaFileLoader.h          |    9 +-
 source/Irrlicht/CColladaMeshWriter.cpp        | 2004 +++++++++++++----
 source/Irrlicht/CColladaMeshWriter.h          |  115 +-
 source/Irrlicht/CD3D9Driver.cpp               |   29 +-
 .../CDummyTransformationSceneNode.cpp         |   19 +
 .../Irrlicht/CDummyTransformationSceneNode.h  |    4 +
 source/Irrlicht/CFileSystem.cpp               |   90 +-
 source/Irrlicht/CGUIButton.cpp                |   20 +-
 source/Irrlicht/CGUIButton.h                  |    6 +
 source/Irrlicht/CGUIComboBox.cpp              |   30 +-
 source/Irrlicht/CGUIComboBox.h                |    7 +
 source/Irrlicht/CGUIEditBox.cpp               |  178 +-
 source/Irrlicht/CGUIEditBox.h                 |   15 +
 source/Irrlicht/CGUIListBox.cpp               |    2 +-
 source/Irrlicht/CGUIModalScreen.cpp           |    9 +-
 source/Irrlicht/CGUIScrollBar.cpp             |    2 +-
 source/Irrlicht/CGUISkin.cpp                  |   77 +-
 source/Irrlicht/CGUISpinBox.cpp               |   11 +-
 source/Irrlicht/CGUISpinBox.h                 |    1 +
 source/Irrlicht/CGUIStaticText.cpp            |   97 +-
 source/Irrlicht/CGUIStaticText.h              |    7 +-
 source/Irrlicht/CGUITable.cpp                 |    2 +-
 source/Irrlicht/CGUITreeView.cpp              |    2 +-
 source/Irrlicht/CIrrDeviceStub.cpp            |   67 +-
 source/Irrlicht/CIrrDeviceStub.h              |   11 +
 source/Irrlicht/COctreeSceneNode.cpp          |   98 +-
 source/Irrlicht/CParticleSystemSceneNode.h    |    6 +-
 source/Irrlicht/CSceneCollisionManager.cpp    |    5 +-
 source/Irrlicht/CSceneManager.cpp             |    2 +-
 source/Irrlicht/CSceneManager.h               |    2 +-
 source/Irrlicht/CWaterSurfaceSceneNode.cpp    |   12 +-
 source/Irrlicht/CZipReader.cpp                |   14 +-
 source/Irrlicht/Irrlicht-gcc.cbp              |    7 +-
 source/Irrlicht/Irrlicht10.0.vcxproj          |    1 +
 source/Irrlicht/Irrlicht10.0.vcxproj.filters  |    3 +
 source/Irrlicht/Makefile                      |   28 +-
 source/Irrlicht/os.cpp                        |    4 +-
 source/Irrlicht/os.h                          |    2 +-
 tests/2dmaterial.cpp                          |  470 ++--
 tests/md2Animation.cpp                        |   85 +-
 tests/media/Burning's Video-md2Normals.png    |  Bin 0 -> 6405 bytes
 tests/screenshot.cpp                          |    2 +-
 tests/terrainSceneNode.cpp                    |   49 +-
 tests/testQuaternion.cpp                      |   43 +-
 tests/testUtils.h                             |    8 +-
 tests/triangle3d.cpp                          |  181 ++
 tools/FileToHeader/FileToHeader.layout        |    4 +-
 73 files changed, 3264 insertions(+), 1119 deletions(-)
 create mode 100644 tests/media/Burning's Video-md2Normals.png

diff --git a/changes.txt b/changes.txt
index 17ce35e0..34eaedae 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,27 @@
 Changes in 1.8 (??.??.2011)
 
+ - Add IGUIComboBox::setMaxSelectionRows and IGUIComboBox::getMaxSelectionRows
+
+ - Scenemanager switches from type ESNT_UNKNOWN to type ESNT_SCENE_MANAGER.
+
+ - Add getActiveFont to all elements which have setOverrideFont for cleaner code
+
+ - Add getOverrideFont to all elements which have setOverrideFont to have a consistent interface
+
+ - IGUIEditBox: added missing serialization for Border
+
+ - IGUIEditBox: remove bug that added spaces to the end of each line 
+
+ - IGUIEditBox: fix crash that happened when wordwrapping was enabled, spaces were entered beyond the border and then cursor-key was pressed.
+
+ - IGUIEditBox::setDrawBackground added.
+
+ - CGUISkin::draw3DSunkenPane no longer ignores fillBackGround in non-flat mode. Also borderlines are no longer drawn overlapping to avoid ugly corners.
+
+ - CDummyTransformationSceneNode::clone() added.
+
+ - IParticleSystemSceneNode::doParticleSystem now public to allow rendering outside scenegraph. 
+
  - Renamed IOSOperator::getOperationSystemVersion to getOperatingSystemVersion. Changed return type from wchar_t to core::stringc, as that's the internal representation the name is built on.
 
  - Added IGUITabControl::insertTab, IGUITabControl::removeTab, IGUITabControl::clear and IGUITabControl::getTabAt
@@ -12,7 +34,7 @@ Changes in 1.8 (??.??.2011)
 
  - Added ISceneManager::createSceneNodeAnimator to create animators by name
 
- - The Makefile now creates a symlink from the soname to the binary name during install. Binary compatibility is only confirmed between minor releases, so the only useful symlink is from libIrrlicht.so.1.8 to libIrrlicht.so.1.8.0; others should rightly fail.
+ - The Makefile now creates a symlink from the soname to the binary name during install. Binary compatibility is only confirmed between same minor releases.
 
  - Added SMF mesh loader, loads meshes from 3D World Studio. Originally written by Joseph Ellis
 
@@ -266,6 +288,27 @@ The following names can be queried for the given types:
 
 -----------------------------
 Changes in 1.7.3 (??.??.2011)
+
+ - editbox no longer moves text into next line when it fails wrapping creating senseless empty lines which mess up scrolling.
+
+ - Fix crash in editbox when scrolling up with empty first lines caused by textwrapping.
+
+ - triangle3d::isPointInside can now work with larger integers, old version failed already with values in the 3-digit range. It got also faster. (thx @ Eigen for report + testcase and REDDemon for patch proposal).
+
+ - Fix focus problem when removing an unfocused modal dialog reported by Reiko here: http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=44358
+
+ - Add integer template specialization for vector3d::getSphericalCoordinateAngles which rounds angles to nearest integer now.
+
+ - Recalculate FrameRect and ScrollPos in CGUIEditBox when AbsoluteRect gets changed (thx @ serengeor for report + testcase)
+ 
+ - Fix 'k' in bigfont.png (thx @ Scrappi for reporting)
+
+ - fix serialization for CBillboardSceneNode, it had missed 2 color (thx for finding + patch from pc0de)
+
+ - EMIE_MOUSE_WHEEL messages now handled correctly in several gui-element when wheel isn't just 1.0 or -1.0 (thx @ Reiko for reporting)
+
+ - Fix problems in Textwrapping in CGUIStaticText. Did use wrong size and did ignore last word of the text (thx @ Reiko for bugreport)
+ 
  - Fix crash in collada (.dae) loading
   
  - Fix memory-leaks in example 22 MaterialViewer
diff --git a/examples/16.Quake3MapShader/Quake3MapShader.cbp b/examples/16.Quake3MapShader/Quake3MapShader.cbp
index 62a6ce80..0ed9bcb8 100644
--- a/examples/16.Quake3MapShader/Quake3MapShader.cbp
+++ b/examples/16.Quake3MapShader/Quake3MapShader.cbp
@@ -24,8 +24,8 @@
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
-					<Add option="-W" />
 					<Add option="-g" />
+					<Add option="-W" />
 					<Add option="-D_IRR_STATIC_LIB_" />
 					<Add directory="../../lib/Linux" />
 				</Compiler>
@@ -33,7 +33,7 @@
 					<Add library="Xxf86vm" />
 					<Add library="Xcursor" />
 					<Add library="GL" />
-					<Add directory="../../lib/gcc" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/examples/23.SMeshHandling/SMeshHandling.cbp b/examples/23.SMeshHandling/SMeshHandling.cbp
index b8036570..ac304239 100644
--- a/examples/23.SMeshHandling/SMeshHandling.cbp
+++ b/examples/23.SMeshHandling/SMeshHandling.cbp
@@ -18,7 +18,9 @@
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Linker>
-					<Add library="Irrlicht" />
+					<Add library="Xxf86vm" />
+					<Add library="Xcursor" />
+					<Add library="GL" />
 					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
@@ -27,7 +29,7 @@
 			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
-			<Add option="../../lib/Win32-gcc/libIrrlicht.a" />
+			<Add library="Irrlicht" />
 		</Linker>
 		<Unit filename="main.cpp" />
 		<Extensions>
diff --git a/include/ESceneNodeTypes.h b/include/ESceneNodeTypes.h
index b84ce1a5..c9cfef3c 100644
--- a/include/ESceneNodeTypes.h
+++ b/include/ESceneNodeTypes.h
@@ -18,6 +18,9 @@ namespace scene
 	name clashes with external scene nodes.*/
 	enum ESCENE_NODE_TYPE
 	{
+		//! of type CSceneManager (note that ISceneManager is not(!) an ISceneNode)
+		ESNT_SCENE_MANAGER	= MAKE_IRR_ID('s','m','n','g'),
+
 		//! simple cube scene node
 		ESNT_CUBE           = MAKE_IRR_ID('c','u','b','e'),
 
diff --git a/include/ICameraSceneNode.h b/include/ICameraSceneNode.h
index 8f955345..7035f37e 100644
--- a/include/ICameraSceneNode.h
+++ b/include/ICameraSceneNode.h
@@ -76,6 +76,9 @@ namespace scene
 		/** If the camera's target and rotation are bound ( @see
 		bindTargetAndRotation() ) then calling this will also change
 		the camera's scene node rotation to match the target.
+		Note that setTarget uses the current absolute position 
+		internally, so if you changed setPosition since last rendering you must
+		call updateAbsolutePosition before using this function.
 		\param pos Look at target of the camera, in world co-ordinates. */
 		virtual void setTarget(const core::vector3df& pos) =0;
 
diff --git a/include/IEventReceiver.h b/include/IEventReceiver.h
index 26e5a8cf..1a19dff7 100644
--- a/include/IEventReceiver.h
+++ b/include/IEventReceiver.h
@@ -284,7 +284,7 @@ struct SEvent
 		//! Y position of mouse cursor
 		s32 Y;
 
-		//! mouse wheel delta, usually 1.0 or -1.0.
+		//! mouse wheel delta, often 1.0 or -1.0, but can have other values < 0.f or > 0.f;
 		/** Only valid if event was EMIE_MOUSE_WHEEL */
 		f32 Wheel;
 
diff --git a/include/IGUIButton.h b/include/IGUIButton.h
index 810049c0..9c44ec7d 100644
--- a/include/IGUIButton.h
+++ b/include/IGUIButton.h
@@ -65,6 +65,15 @@ namespace gui
 		\param font: New font to set. */
 		virtual void setOverrideFont(IGUIFont* font=0) = 0;
 
+		//! Gets the override font (if any)
+		/** \return The override font (may be 0) */
+		virtual IGUIFont* getOverrideFont(void) const = 0;
+
+		//! Get the font which is used right now for drawing
+		/** Currently this is the override font when one is set and the
+		font of the active skin otherwise */
+		virtual IGUIFont* getActiveFont() const = 0;
+
 		//! Sets an image which should be displayed on the button when it is in normal state.
 		/** \param image: Image to be displayed */
 		virtual void setImage(video::ITexture* image=0) = 0;
diff --git a/include/IGUIComboBox.h b/include/IGUIComboBox.h
index 3d818d98..b04f35d4 100644
--- a/include/IGUIComboBox.h
+++ b/include/IGUIComboBox.h
@@ -55,6 +55,12 @@ namespace gui
 		\param vertical: EGUIA_UPPERLEFT to align with top edge,
 		EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
 		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
+
+		//! Set the maximal number of rows for the selection listbox
+		virtual void setMaxSelectionRows(u32 max) = 0;
+
+		//! Get the maximimal number of rows for the selection listbox
+		virtual u32 getMaxSelectionRows() const = 0;
 	};
 
 
diff --git a/include/IGUIEditBox.h b/include/IGUIEditBox.h
index e3bba6eb..cdbf740a 100644
--- a/include/IGUIEditBox.h
+++ b/include/IGUIEditBox.h
@@ -28,6 +28,15 @@ namespace gui
 		\param font: New font to set. */
 		virtual void setOverrideFont(IGUIFont* font=0) = 0;
 
+		//! Gets the override font (if any)
+		/** \return The override font (may be 0) */
+		virtual IGUIFont* getOverrideFont() const = 0;
+
+		//! Get the font which is used right now for drawing
+		/** Currently this is the override font when one is set and the
+		font of the active skin otherwise */
+		virtual IGUIFont* getActiveFont() const = 0;
+
 		//! Sets another color for the text.
 		/** If set, the edit box does not use the EGDC_BUTTON_TEXT color defined
 		in the skin, but the set color instead. You don't need to call
@@ -51,6 +60,9 @@ namespace gui
 		/** \return true if the override color is enabled, false otherwise */
 		virtual bool isOverrideColorEnabled(void) const = 0;
 
+		//! Sets whether to draw the background
+		virtual void setDrawBackground(bool draw) = 0;
+
 		//! Turns the border on or off
 		/** \param border: true if you want the border to be drawn, false if not */
 		virtual void setDrawBorder(bool border) = 0;
diff --git a/include/IGUISpinBox.h b/include/IGUISpinBox.h
index dbbf4832..77cddd87 100644
--- a/include/IGUISpinBox.h
+++ b/include/IGUISpinBox.h
@@ -50,6 +50,7 @@ namespace gui
 		virtual void setStepSize(f32 step=1.f) = 0;
 
 		//! Sets the number of decimal places to display.
+		//! Note that this also rounds the range to the same number of decimal places.
 		/** \param places: The number of decimal places to display, use -1 to reset */
 		virtual void setDecimalPlaces(s32 places) = 0;
 
diff --git a/include/IGUIStaticText.h b/include/IGUIStaticText.h
index 221bfa21..03b21883 100644
--- a/include/IGUIStaticText.h
+++ b/include/IGUIStaticText.h
@@ -32,6 +32,11 @@ namespace gui
 		/** \return The override font (may be 0) */
 		virtual IGUIFont* getOverrideFont(void) const = 0;
 
+		//! Get the font which is used right now for drawing
+		/** Currently this is the override font when one is set and the
+		font of the active skin otherwise */
+		virtual IGUIFont* getActiveFont() const = 0;
+
 		//! Sets another color for the text.
 		/** If set, the static text does not use the EGDC_BUTTON_TEXT color defined
 		in the skin, but the set color instead. You don't need to call
@@ -91,10 +96,10 @@ namespace gui
 		/** If the text is broken, this returns the width of the widest line
 		\return The width of the text, or the widest broken line. */
 		virtual s32 getTextWidth(void) const = 0;
-		
+
 		//! Set whether the text in this label should be clipped if it goes outside bounds
 		virtual void setTextRestrainedInside(bool restrainedInside) = 0;
-		
+
 		//! Checks if the text in this label should be clipped if it goes outside bounds
 		virtual bool isTextRestrainedInside() const = 0;
 
diff --git a/include/IParticleSystemSceneNode.h b/include/IParticleSystemSceneNode.h
index f0693c4d..843dae14 100644
--- a/include/IParticleSystemSceneNode.h
+++ b/include/IParticleSystemSceneNode.h
@@ -67,6 +67,11 @@ public:
 	//! Remove all currently visible particles
 	virtual void clearParticles() = 0;
 
+	//! Do manually update the particles.
+ 	//! This should only be called when you want to render the node outside the scenegraph,
+ 	//! as the node will care about this otherwise automatically.
+	virtual void doParticleSystem(u32 time) = 0;
+
 	//! Gets the particle emitter, which creates the particles.
 	/** \return The particle emitter. Can be 0 if none is set. */
 	virtual IParticleEmitter* getEmitter() =0;
diff --git a/include/ISceneManager.h b/include/ISceneManager.h
index f4b700c3..13b2125a 100644
--- a/include/ISceneManager.h
+++ b/include/ISceneManager.h
@@ -90,7 +90,7 @@ namespace scene
 		//! Transparent effect scene nodes, drawn after Transparent nodes. They are sorted from back to front and drawn in that order.
 		ESNRP_TRANSPARENT_EFFECT =32,
 
-		//! Drawn after the transparent nodes, the time for drawing shadow volumes
+		//! Drawn after the solid nodes, before the transparent nodes, the time for drawing shadow volumes
 		ESNRP_SHADOW =64
 	};
 
diff --git a/include/ITimer.h b/include/ITimer.h
index aa32895f..b2d78d0f 100644
--- a/include/ITimer.h
+++ b/include/ITimer.h
@@ -14,10 +14,6 @@ namespace irr
 class ITimer : public virtual IReferenceCounted
 {
 public:
-
-	//! destructor
-	virtual ~ITimer() {}
-
 	//! Returns current real time in milliseconds of the system.
 	/** This value does not start with 0 when the application starts.
 	For example in one implementation the value returned could be the
@@ -105,4 +101,3 @@ public:
 } // end namespace irr
 
 #endif
-
diff --git a/include/IrrlichtDevice.h b/include/IrrlichtDevice.h
index f8ca14a6..e8b5ddb3 100644
--- a/include/IrrlichtDevice.h
+++ b/include/IrrlichtDevice.h
@@ -20,6 +20,7 @@ namespace irr
 {
 	class ILogger;
 	class IEventReceiver;
+	class IRandomizer;
 
 	namespace io {
 		class IFileSystem;
@@ -131,6 +132,22 @@ namespace irr
 		\return Pointer to the ITimer object. */
 		virtual ITimer* getTimer() = 0;
 
+		//! Provides access to the engine's currently set randomizer.
+		/** \return Pointer to the IRandomizer object. */
+		virtual IRandomizer* getRandomizer() const =0;
+
+		//! Sets a new randomizer.
+		/** \param r Pointer to the new IRandomizer object. This object is
+		grab()'ed by the engine and will be released upon the next setRandomizer
+		call or upon device destruction. */
+		virtual void setRandomizer(IRandomizer* r) =0;
+
+		//! Creates a new default randomizer.
+		/** The default randomizer provides the random sequence known from previous
+		Irrlicht versions and is the initial randomizer set on device creation.
+		\return Pointer to the default IRandomizer object. */
+		virtual IRandomizer* createDefaultRandomizer() const =0;
+
 		//! Sets the caption of the window.
 		/** \param text: New text of the window caption. */
 		virtual void setWindowCaption(const wchar_t* text) = 0;
diff --git a/include/irrMap.h b/include/irrMap.h
index d523c7ef..bb3a2df8 100644
--- a/include/irrMap.h
+++ b/include/irrMap.h
@@ -58,6 +58,12 @@ class map
 			return Value;
 		}
 
+		ValueTypeRB& getValue()
+		{
+			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+			return Value;
+		}
+
 		KeyTypeRB getKey() const
 		{
 			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
@@ -157,7 +163,7 @@ class map
 			return Cur==0;
 		}
 
-		Node* getNode()
+		Node* getNode() const
 		{
 			return Cur;
 		}
@@ -179,13 +185,12 @@ class map
 			dec();
 		}
 
-
-		Node* operator -> ()
+		Node* operator->()
 		{
 			return getNode();
 		}
 
-		Node& operator* ()
+		Node& operator*()
 		{
 			_IRR_DEBUG_BREAK_IF(atEnd()) // access violation
 
@@ -194,14 +199,14 @@ class map
 
 	private:
 
-		Node* getMin(Node* n)
+		Node* getMin(Node* n) const
 		{
 			while(n && n->getLeftChild())
 				n = n->getLeftChild();
 			return n;
 		}
 
-		Node* getMax(Node* n)
+		Node* getMax(Node* n) const
 		{
 			while(n && n->getRightChild())
 				n = n->getRightChild();
@@ -275,6 +280,153 @@ class map
 		Node* Cur;
 	}; // Iterator
 
+	//! Const Iterator
+	class ConstIterator
+	{
+	public:
+
+		ConstIterator() : Root(0), Cur(0) {}
+
+		// Constructor(Node*)
+		ConstIterator(const Node* root) : Root(root)
+		{
+			reset();
+		}
+
+		// Copy constructor
+		ConstIterator(const ConstIterator& src) : Root(src.Root), Cur(src.Cur) {}
+		ConstIterator(const Iterator& src) : Root(src.Root), Cur(src.Cur) {}
+
+		void reset(bool atLowest=true)
+		{
+			if (atLowest)
+				Cur = getMin(Root);
+			else
+				Cur = getMax(Root);
+		}
+
+		bool atEnd() const
+		{
+			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+			return Cur==0;
+		}
+
+		const Node* getNode() const
+		{
+			return Cur;
+		}
+
+		ConstIterator& operator=(const ConstIterator& src)
+		{
+			Root = src.Root;
+			Cur = src.Cur;
+			return (*this);
+		}
+
+		void operator++(int)
+		{
+			inc();
+		}
+
+		void operator--(int)
+		{
+			dec();
+		}
+
+		const Node* operator->()
+		{
+			return getNode();
+		}
+
+		const Node& operator*()
+		{
+			_IRR_DEBUG_BREAK_IF(atEnd()) // access violation
+
+			return *Cur;
+		}
+
+	private:
+
+		const Node* getMin(const Node* n) const
+		{
+			while(n && n->getLeftChild())
+				n = n->getLeftChild();
+			return n;
+		}
+
+		const Node* getMax(const Node* n) const
+		{
+			while(n && n->getRightChild())
+				n = n->getRightChild();
+			return n;
+		}
+
+		void inc()
+		{
+			// Already at end?
+			if (Cur==0)
+				return;
+
+			if (Cur->getRightChild())
+			{
+				// If current node has a right child, the next higher node is the
+				// node with lowest key beneath the right child.
+				Cur = getMin(Cur->getRightChild());
+			}
+			else if (Cur->isLeftChild())
+			{
+				// No right child? Well if current node is a left child then
+				// the next higher node is the parent
+				Cur = Cur->getParent();
+			}
+			else
+			{
+				// Current node neither is left child nor has a right child.
+				// Ie it is either right child or root
+				// The next higher node is the parent of the first non-right
+				// child (ie either a left child or the root) up in the
+				// hierarchy. Root's parent is 0.
+				while(Cur->isRightChild())
+					Cur = Cur->getParent();
+				Cur = Cur->getParent();
+			}
+		}
+
+		void dec()
+		{
+			// Already at end?
+			if (Cur==0)
+				return;
+
+			if (Cur->getLeftChild())
+			{
+				// If current node has a left child, the next lower node is the
+				// node with highest key beneath the left child.
+				Cur = getMax(Cur->getLeftChild());
+			}
+			else if (Cur->isRightChild())
+			{
+				// No left child? Well if current node is a right child then
+				// the next lower node is the parent
+				Cur = Cur->getParent();
+			}
+			else
+			{
+				// Current node neither is right child nor has a left child.
+				// Ie it is either left child or root
+				// The next higher node is the parent of the first non-left
+				// child (ie either a right child or the root) up in the
+				// hierarchy. Root's parent is 0.
+
+				while(Cur->isLeftChild())
+					Cur = Cur->getParent();
+				Cur = Cur->getParent();
+			}
+		}
+
+		const Node* Root;
+		const Node* Cur;
+	}; // ConstIterator
 
 
 	//! Parent First Iterator.
@@ -286,11 +438,7 @@ class map
 	{
 	public:
 
-
-	ParentFirstIterator() : Root(0), Cur(0)
-	{
-	}
-
+	ParentFirstIterator() : Root(0), Cur(0)	{}
 
 	explicit ParentFirstIterator(Node* root) : Root(root), Cur(0)
 	{
@@ -302,7 +450,6 @@ class map
 		Cur = Root;
 	}
 
-
 	bool atEnd() const
 	{
 		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
@@ -314,7 +461,6 @@ class map
 		return Cur;
 	}
 
-
 	ParentFirstIterator& operator=(const ParentFirstIterator& src)
 	{
 		Root = src.Root;
@@ -322,13 +468,11 @@ class map
 		return (*this);
 	}
 
-
 	void operator++(int)
 	{
 		inc();
 	}
 
-
 	Node* operator -> ()
 	{
 		return getNode();
@@ -795,27 +939,36 @@ class map
 	//------------------------------
 
 	//! Returns an iterator
-	Iterator getIterator()
+	Iterator getIterator() const
 	{
 		Iterator it(getRoot());
 		return it;
 	}
+
+	//! Returns a Constiterator
+	ConstIterator getConstIterator() const
+	{
+		Iterator it(getRoot());
+		return it;
+	}
+
 	//! Returns a ParentFirstIterator.
 	//! Traverses the tree from top to bottom. Typical usage is
 	//! when storing the tree structure, because when reading it
 	//! later (and inserting elements) the tree structure will
 	//! be the same.
-	ParentFirstIterator getParentFirstIterator()
+	ParentFirstIterator getParentFirstIterator() const
 	{
 		ParentFirstIterator it(getRoot());
 		return it;
 	}
+
 	//! Returns a ParentLastIterator to traverse the tree from
 	//! bottom to top.
 	//! Typical usage is when deleting all elements in the tree
 	//! because you must delete the children before you delete
 	//! their parent.
-	ParentLastIterator getParentLastIterator()
+	ParentLastIterator getParentLastIterator() const
 	{
 		ParentLastIterator it(getRoot());
 		return it;
diff --git a/include/irrlicht.h b/include/irrlicht.h
index feaca631..7b09e602 100644
--- a/include/irrlicht.h
+++ b/include/irrlicht.h
@@ -112,6 +112,7 @@
 #include "IMeshManipulator.h"
 #include "IMeshSceneNode.h"
 #include "IMeshWriter.h"
+#include "IColladaMeshWriter.h"
 #include "IMetaTriangleSelector.h"
 #include "IOSOperator.h"
 #include "IParticleSystemSceneNode.h" // also includes all emitters and attractors
diff --git a/include/quaternion.h b/include/quaternion.h
index e56b7329..ff5f970c 100644
--- a/include/quaternion.h
+++ b/include/quaternion.h
@@ -648,24 +648,20 @@ inline core::quaternion& quaternion::rotationFromTo(const vector3df& from, const
 	else if (d <= -1.0f) // exactly opposite
 	{
 		core::vector3df axis(1.0f, 0.f, 0.f);
-		axis = axis.crossProduct(core::vector3df(X,Y,Z));
+		axis = axis.crossProduct(v0);
 		if (axis.getLength()==0)
 		{
 			axis.set(0.f,1.f,0.f);
-			axis.crossProduct(core::vector3df(X,Y,Z));
+			axis.crossProduct(v0);
 		}
-		return this->fromAngleAxis(core::PI, axis);
+		// same as fromAngleAxis(core::PI, axis).normalize();
+		return set(axis.X, axis.Y, axis.Z, 0).normalize();
 	}
 
 	const f32 s = sqrtf( (1+d)*2 ); // optimize inv_sqrt
 	const f32 invs = 1.f / s;
 	const vector3df c = v0.crossProduct(v1)*invs;
-	X = c.X;
-	Y = c.Y;
-	Z = c.Z;
-	W = s * 0.5f;
-
-	return *this;
+	return set(c.X, c.Y, c.Z, s * 0.5f).normalize();
 }
 
 
diff --git a/include/triangle3d.h b/include/triangle3d.h
index 289ebd67..e80b53d2 100644
--- a/include/triangle3d.h
+++ b/include/triangle3d.h
@@ -81,21 +81,39 @@ namespace core
 			return d2 < d3 ? rbc : rca;
 		}
 
-		//! Check if a point is inside the triangle
+		//! Check if a point is inside the triangle (border-points count also as inside)
 		/** \param p Point to test. Assumes that this point is already
 		on the plane of the triangle.
 		\return True if the point is inside the triangle, otherwise false. */
 		bool isPointInside(const vector3d<T>& p) const
 		{
-			return (isOnSameSide(p, pointA, pointB, pointC) &&
-				isOnSameSide(p, pointB, pointA, pointC) &&
-				isOnSameSide(p, pointC, pointA, pointB));
+			const vector3d<T> a = pointC - pointA;
+			const vector3d<T> b = pointB - pointA;
+			const vector3d<T> c = p - pointA;
+			
+			const f64 dotAA = a.dotProduct( a);
+			const f64 dotAB = a.dotProduct( b);
+			const f64 dotAC = a.dotProduct( c);
+			const f64 dotBB = b.dotProduct( b);
+			const f64 dotBC = b.dotProduct( c);
+			 
+			// get coordinates in barycentric coordinate system
+			const f64 invDenom =  1/(dotAA * dotBB - dotAB * dotAB); 
+			const f64 u = (dotBB * dotAC - dotAB * dotBC) * invDenom;
+			const f64 v = (dotAA * dotBC - dotAB * dotAC ) * invDenom;
+		 
+			// We count border-points as inside to keep downward compatibility.
+			// That's why we use >= and <= instead of > and < as more commonly seen on the web.
+			return (u >= 0) && (v >= 0) && (u + v <= 1);
 		}
 
 		//! Check if a point is inside the triangle.
 		/** This method is an implementation of the example used in a
 		paper by Kasper Fauerby original written by Keidy from
 		Mr-Gamemaker.
+		This was once faster than an old isPointInside implementation, but the  
+		current isPointInside is usualy as fast, sometimes even faster. 
+		Border-points in isPointInsideFast are not defined, some are inside and some outside.
 		\param p Point to test. Assumes that this point is already
 		on the plane of the triangle.
 		\return True if point is inside the triangle, otherwise false. */
diff --git a/include/vector2d.h b/include/vector2d.h
index f0965833..8bd660c2 100644
--- a/include/vector2d.h
+++ b/include/vector2d.h
@@ -246,7 +246,7 @@ public:
 		if (tmp < 0.0)
 			tmp = -tmp;
 		if ( tmp > 1.0 ) //   avoid floating-point trouble
-			tmp = 1.0;			
+			tmp = 1.0;
 
 		return atan(sqrt(1 - tmp*tmp) / tmp) * RADTODEG64;
 	}
diff --git a/include/vector3d.h b/include/vector3d.h
index 800cac24..33b8345d 100644
--- a/include/vector3d.h
+++ b/include/vector3d.h
@@ -421,6 +421,26 @@ namespace core
 	template <>
 	inline vector3d<s32>& vector3d<s32>::operator /=(s32 val) {X/=val;Y/=val;Z/=val; return *this;}
 
+	template <>
+	inline vector3d<s32> vector3d<s32>::getSphericalCoordinateAngles()
+	{
+		vector3d<s32> angle;
+		const f64 length = X*X + Y*Y + Z*Z;
+
+		if (length)
+		{
+			if (X!=0)
+			{
+				angle.Y = round32((f32)(atan2((f64)Z,(f64)X) * RADTODEG64));
+			}
+			else if (Z<0)
+				angle.Y=180;
+
+			angle.X = round32((f32)(acos(Y * core::reciprocal_squareroot(length)) * RADTODEG64));
+		}
+		return angle;
+	}
+
 	//! Typedef for a f32 3d vector.
 	typedef vector3d<f32> vector3df;
 
diff --git a/media/bigfont.png b/media/bigfont.png
index 5104907165a8d512394961b6905db06ae4609fbe..ca8d948c773ebeb853e996b1699cc541344ef63e 100644
GIT binary patch
delta 18010
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
Yc<VOG3SAWn00000NkvXXu0mh|f(Ws<Hvj+t

delta 18053
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
SVe!KN0000<MNUMnLSTZ#F552v

diff --git a/source/Irrlicht/CAnimatedMeshMD2.cpp b/source/Irrlicht/CAnimatedMeshMD2.cpp
index 16d4b345..cb055dea 100644
--- a/source/Irrlicht/CAnimatedMeshMD2.cpp
+++ b/source/Irrlicht/CAnimatedMeshMD2.cpp
@@ -15,8 +15,7 @@ namespace scene
 {
 
 const s32 MD2_FRAME_SHIFT	= 2;
-const f32 MD2_FRAME_SHIFT_RECIPROCAL = 1.f / ( 1 << MD2_FRAME_SHIFT );
-
+const f32 MD2_FRAME_SHIFT_RECIPROCAL = 1.f / (1 << MD2_FRAME_SHIFT);
 
 const s32 Q2_VERTEX_NORMAL_TABLE_SIZE = 162;
 
@@ -194,27 +193,27 @@ struct SMD2AnimationType
 
 static const SMD2AnimationType MD2AnimationTypeList[21] =
 {
-    {   0,  39,  9 },   // STAND
-    {  40,  45, 10 },   // RUN
-    {  46,  53, 10 },   // ATTACK
-    {  54,  57,  7 },   // PAIN_A
-    {  58,  61,  7 },   // PAIN_B
-    {  62,  65,  7 },   // PAIN_C
-    {  66,  71,  7 },   // JUMP
-    {  72,  83,  7 },   // FLIP
-    {  84,  94,  7 },   // SALUTE
-    {  95, 111, 10 },   // FALLBACK
-    { 112, 122,  7 },   // WAVE
-    { 123, 134,  6 },   // POINT
-    { 135, 153, 10 },   // CROUCH_STAND
-    { 154, 159,  7 },   // CROUCH_WALK
-    { 160, 168, 10 },   // CROUCH_ATTACK
-    { 169, 172,  7 },   // CROUCH_PAIN
-    { 173, 177,  5 },   // CROUCH_DEATH
-    { 178, 183,  7 },   // DEATH_FALLBACK
-    { 184, 189,  7 },   // DEATH_FALLFORWARD
-    { 190, 197,  7 },   // DEATH_FALLBACKSLOW
-    { 198, 198,  5 },   // BOOM
+	{  0,  39,  9}, // STAND
+	{ 40,  45, 10}, // RUN
+	{ 46,  53, 10}, // ATTACK
+	{ 54,  57,  7}, // PAIN_A
+	{ 58,  61,  7}, // PAIN_B
+	{ 62,  65,  7}, // PAIN_C
+	{ 66,  71,  7}, // JUMP
+	{ 72,  83,  7}, // FLIP
+	{ 84,  94,  7}, // SALUTE
+	{ 95, 111, 10}, // FALLBACK
+	{112, 122,  7}, // WAVE
+	{123, 134,  6}, // POINT
+	{135, 153, 10}, // CROUCH_STAND
+	{154, 159,  7}, // CROUCH_WALK
+	{160, 168, 10}, // CROUCH_ATTACK
+	{169, 172,  7}, // CROUCH_PAIN
+	{173, 177,  5}, // CROUCH_DEATH
+	{178, 183,  7}, // DEATH_FALLBACK
+	{184, 189,  7}, // DEATH_FALLFORWARD
+	{190, 197,  7}, // DEATH_FALLBACKSLOW
+	{198, 198,  5}, // BOOM
 };
 
 
@@ -238,6 +237,7 @@ CAnimatedMeshMD2::~CAnimatedMeshMD2()
 		InterpolationBuffer->drop();
 }
 
+
 //! returns the amount of frames in milliseconds. If the amount is 1, it is a static (=non animated) mesh.
 u32 CAnimatedMeshMD2::getFrameCount() const
 {
@@ -294,7 +294,6 @@ void CAnimatedMeshMD2::updateInterpolationBuffer(s32 frame, s32 startFrameLoop,
 {
 	u32 firstFrame, secondFrame;
 	f32 div;
-	core::vector3df* NormalTable = (core::vector3df*)&Q2_VERTEX_NORMAL_TABLE;
 
 	// TA: resolve missing ipol in loop between end-start
 
@@ -311,10 +310,10 @@ void CAnimatedMeshMD2::updateInterpolationBuffer(s32 frame, s32 startFrameLoop,
 		u32 e = endFrameLoop >> MD2_FRAME_SHIFT;
 
 		firstFrame = frame >> MD2_FRAME_SHIFT;
-		secondFrame = core::if_c_a_else_b ( firstFrame + 1 > e, s, firstFrame + 1 );
+		secondFrame = core::if_c_a_else_b(firstFrame + 1 > e, s, firstFrame + 1);
 
-		firstFrame = core::s32_min ( FrameCount - 1, firstFrame );
-		secondFrame = core::s32_min ( FrameCount - 1, secondFrame );
+		firstFrame = core::s32_min(FrameCount - 1, firstFrame);
+		secondFrame = core::s32_min(FrameCount - 1, secondFrame);
 
 		//div = (frame % (1<<MD2_FRAME_SHIFT)) / (f32)(1<<MD2_FRAME_SHIFT);
 		frame &= (1<<MD2_FRAME_SHIFT) - 1;
@@ -322,24 +321,29 @@ void CAnimatedMeshMD2::updateInterpolationBuffer(s32 frame, s32 startFrameLoop,
 	}
 
 	video::S3DVertex* target = static_cast<video::S3DVertex*>(InterpolationBuffer->getVertices());
-	SMD2Vert*         first  = FrameList[firstFrame].pointer();
-	SMD2Vert*         second = FrameList[secondFrame].pointer();
+	SMD2Vert* first = FrameList[firstFrame].pointer();
+	SMD2Vert* second = FrameList[secondFrame].pointer();
 
 	// interpolate both frames
 	const u32 count = FrameList[firstFrame].size();
 	for (u32 i=0; i<count; ++i)
 	{
-		core::vector3df one, two;
-		one.X = f32(first->Pos.X) * FrameTransforms[firstFrame].scale.X + FrameTransforms[firstFrame].translate.X;
-		one.Y = f32(first->Pos.Y) * FrameTransforms[firstFrame].scale.Y + FrameTransforms[firstFrame].translate.Y;
-		one.Z = f32(first->Pos.Z) * FrameTransforms[firstFrame].scale.Z + FrameTransforms[firstFrame].translate.Z;
-		two.X = f32(second->Pos.X) * FrameTransforms[secondFrame].scale.X + FrameTransforms[secondFrame].translate.X;
-		two.Y = f32(second->Pos.Y) * FrameTransforms[secondFrame].scale.Y + FrameTransforms[secondFrame].translate.Y;
-		two.Z = f32(second->Pos.Z) * FrameTransforms[secondFrame].scale.Z + FrameTransforms[secondFrame].translate.Z;
-		target->Pos    = (two - one) * div + one;
-
-		target->Normal = (NormalTable[second->NormalIdx] - NormalTable[first->NormalIdx]) * div 
-			           +  NormalTable[first->NormalIdx];
+		const core::vector3df one = core::vector3df(f32(first->Pos.X) * FrameTransforms[firstFrame].scale.X + FrameTransforms[firstFrame].translate.X,
+				f32(first->Pos.Y) * FrameTransforms[firstFrame].scale.Y + FrameTransforms[firstFrame].translate.Y,
+				f32(first->Pos.Z) * FrameTransforms[firstFrame].scale.Z + FrameTransforms[firstFrame].translate.Z);
+		const core::vector3df two = core::vector3df(f32(second->Pos.X) * FrameTransforms[secondFrame].scale.X + FrameTransforms[secondFrame].translate.X,
+				f32(second->Pos.Y) * FrameTransforms[secondFrame].scale.Y + FrameTransforms[secondFrame].translate.Y,
+				f32(second->Pos.Z) * FrameTransforms[secondFrame].scale.Z + FrameTransforms[secondFrame].translate.Z);
+		target->Pos = two.getInterpolated(one, div);
+		const core::vector3df n1(
+				Q2_VERTEX_NORMAL_TABLE[first->NormalIdx][0],
+				Q2_VERTEX_NORMAL_TABLE[first->NormalIdx][2],
+				Q2_VERTEX_NORMAL_TABLE[first->NormalIdx][1]);
+		const core::vector3df n2(
+				Q2_VERTEX_NORMAL_TABLE[second->NormalIdx][0],
+				Q2_VERTEX_NORMAL_TABLE[second->NormalIdx][2],
+				Q2_VERTEX_NORMAL_TABLE[second->NormalIdx][1]);
+		target->Normal = n2.getInterpolated(n1, div);
 		++target;
 		++first;
 		++second;
@@ -381,7 +385,7 @@ const core::aabbox3d<f32>& CAnimatedMeshMD2::getBoundingBox() const
 
 
 //! set user axis aligned bounding box
-void CAnimatedMeshMD2::setBoundingBox( const core::aabbox3df& box)
+void CAnimatedMeshMD2::setBoundingBox(const core::aabbox3df& box)
 {
 	InterpolationBuffer->BoundingBox = box;
 }
@@ -396,7 +400,7 @@ E_ANIMATED_MESH_TYPE CAnimatedMeshMD2::getMeshType() const
 
 //! Returns frame loop data for a special MD2 animation type.
 void CAnimatedMeshMD2::getFrameLoop(EMD2_ANIMATION_TYPE l,
-									s32& outBegin, s32& outEnd, s32& outFPS) const
+				s32& outBegin, s32& outEnd, s32& outFPS) const
 {
 	if (l < 0 || l >= EMAT_COUNT)
 		return;
@@ -405,7 +409,7 @@ void CAnimatedMeshMD2::getFrameLoop(EMD2_ANIMATION_TYPE l,
 	outEnd = MD2AnimationTypeList[l].end << MD2_FRAME_SHIFT;
 
 	// correct to anim between last->first frame
-	outEnd += MD2_FRAME_SHIFT == 0 ? 1 : ( 1 << MD2_FRAME_SHIFT ) - 1;
+	outEnd += MD2_FRAME_SHIFT == 0 ? 1 : (1 << MD2_FRAME_SHIFT) - 1;
 	outFPS = MD2AnimationTypeList[l].fps << MD2_FRAME_SHIFT;
 }
 
@@ -420,7 +424,7 @@ bool CAnimatedMeshMD2::getFrameLoop(const c8* name,
 		{
 			outBegin = AnimationData[i].begin << MD2_FRAME_SHIFT;
 			outEnd = AnimationData[i].end << MD2_FRAME_SHIFT;
-			outEnd += MD2_FRAME_SHIFT == 0 ? 1 : ( 1 << MD2_FRAME_SHIFT ) - 1;
+			outEnd += MD2_FRAME_SHIFT == 0 ? 1 : (1 << MD2_FRAME_SHIFT) - 1;
 			outFPS = AnimationData[i].fps << MD2_FRAME_SHIFT;
 			return true;
 		}
diff --git a/source/Irrlicht/CAnimatedMeshSceneNode.cpp b/source/Irrlicht/CAnimatedMeshSceneNode.cpp
index f4a59ce9..30ab7c83 100644
--- a/source/Irrlicht/CAnimatedMeshSceneNode.cpp
+++ b/source/Irrlicht/CAnimatedMeshSceneNode.cpp
@@ -196,7 +196,7 @@ IMesh * CAnimatedMeshSceneNode::getMeshForCurrentFrame()
 	{
 #ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
 		return 0;
-#endif
+#else
 
 		// As multiple scene nodes may be sharing the same skinned mesh, we have to
 		// re-animate it every frame to ensure that this node gets the mesh that it needs.
@@ -230,6 +230,7 @@ IMesh * CAnimatedMeshSceneNode::getMeshForCurrentFrame()
 		}
 
 		return skinnedMesh;
+#endif
 	}
 }
 
@@ -579,7 +580,7 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName)
 #ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
 	os::Printer::log("Compiled without _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_", ELL_WARNING);
 	return 0;
-#endif
+#else
 
 	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
 	{
@@ -606,6 +607,7 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName)
 	}
 
 	return JointChildSceneNodes[number];
+#endif
 }
 
 
@@ -617,7 +619,7 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(u32 jointID)
 #ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
 	os::Printer::log("Compiled without _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_", ELL_WARNING);
 	return 0;
-#endif
+#else
 
 	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
 	{
@@ -634,6 +636,7 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(u32 jointID)
 	}
 
 	return JointChildSceneNodes[jointID];
+#endif
 }
 
 //! Gets joint count.
@@ -641,7 +644,7 @@ u32 CAnimatedMeshSceneNode::getJointCount() const
 {
 #ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
 	return 0;
-#endif
+#else
 
 	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
 		return 0;
@@ -649,6 +652,7 @@ u32 CAnimatedMeshSceneNode::getJointCount() const
 	ISkinnedMesh *skinnedMesh=(ISkinnedMesh*)Mesh;
 
 	return skinnedMesh->getJointCount();
+#endif
 }
 
 
@@ -949,7 +953,7 @@ void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions)
 {
 #ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
 	return;
-#endif
+#else
 	if (Mesh && Mesh->getMeshType() == EAMT_SKINNED )
 	{
 		checkJoints();
@@ -1021,6 +1025,7 @@ void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions)
 			}
 		}
 	}
+#endif
 }
 
 /*!
@@ -1029,7 +1034,7 @@ void CAnimatedMeshSceneNode::checkJoints()
 {
 #ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
 	return;
-#endif
+#else
 
 	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
 		return;
@@ -1047,6 +1052,7 @@ void CAnimatedMeshSceneNode::checkJoints()
 		JointsUsed=true;
 		JointMode=EJUOR_READ;
 	}
+#endif
 }
 
 /*!
diff --git a/source/Irrlicht/CBillboardSceneNode.cpp b/source/Irrlicht/CBillboardSceneNode.cpp
index 14cf0573..442486ea 100644
--- a/source/Irrlicht/CBillboardSceneNode.cpp
+++ b/source/Irrlicht/CBillboardSceneNode.cpp
@@ -181,6 +181,8 @@ void CBillboardSceneNode::deserializeAttributes(io::IAttributes* in, io::SAttrib
 	Size.Height = in->getAttributeAsFloat("Height");
 	vertices[1].Color = in->getAttributeAsColor ( "Shade_Top" );
 	vertices[0].Color = in->getAttributeAsColor ( "Shade_Down" );
+	vertices[2].Color = vertices[1].Color;
+	vertices[3].Color = vertices[0].Color;
 
 	setSize(Size);
 }
diff --git a/source/Irrlicht/CColladaFileLoader.cpp b/source/Irrlicht/CColladaFileLoader.cpp
index f23cd521..b096be11 100644
--- a/source/Irrlicht/CColladaFileLoader.cpp
+++ b/source/Irrlicht/CColladaFileLoader.cpp
@@ -1272,7 +1272,7 @@ void CColladaFileLoader::readTexture(io::IXMLReaderUTF8* reader)
 		if (input)
 		{
 			const core::stringc imageName = input->Source;
-			texture.Texture = getTextureFromImage(imageName);
+			texture.Texture = getTextureFromImage(imageName, NULL);
 		}
 	}
 }
@@ -1370,6 +1370,7 @@ void CColladaFileLoader::readEffect(io::IXMLReaderUTF8* reader, SColladaEffect *
 	{
 		Effects.push_back(SColladaEffect());
 		effect = &Effects.getLast();
+		effect->Parameters = new io::CAttributes();
 		effect->Id = readId(reader);
 		effect->Transparency = 1.f;
 		effect->Mat.Lighting=true;
@@ -1388,7 +1389,7 @@ void CColladaFileLoader::readEffect(io::IXMLReaderUTF8* reader, SColladaEffect *
 				readEffect(reader,effect);
 			else
 			if (newParamName == reader->getNodeName())
-				readParameter(reader);
+				readParameter(reader, effect->Parameters);
 			else
 			// these are the actual materials inside technique
 			if (constantNode == reader->getNodeName() ||
@@ -1538,10 +1539,10 @@ void CColladaFileLoader::readEffect(io::IXMLReaderUTF8* reader, SColladaEffect *
 		effect->Mat.MaterialType = irr::video::EMT_TRANSPARENT_VERTEX_ALPHA;
 		effect->Mat.ZWriteEnable = false;
 	}
-	effect->Mat.setFlag(video::EMF_TEXTURE_WRAP, !Parameters.getAttributeAsBool("wrap_s"));
-	effect->Mat.setFlag(video::EMF_BILINEAR_FILTER, Parameters.getAttributeAsBool("bilinear"));
-	effect->Mat.setFlag(video::EMF_TRILINEAR_FILTER, Parameters.getAttributeAsBool("trilinear"));
-	effect->Mat.setFlag(video::EMF_ANISOTROPIC_FILTER, Parameters.getAttributeAsBool("anisotropic"));
+	effect->Mat.setFlag(video::EMF_TEXTURE_WRAP, !effect->Parameters->getAttributeAsBool("wrap_s"));
+	effect->Mat.setFlag(video::EMF_BILINEAR_FILTER, effect->Parameters->getAttributeAsBool("bilinear"));
+	effect->Mat.setFlag(video::EMF_TRILINEAR_FILTER, effect->Parameters->getAttributeAsBool("trilinear"));
+	effect->Mat.setFlag(video::EMF_ANISOTROPIC_FILTER, effect->Parameters->getAttributeAsBool("anisotropic"));
 }
 
 
@@ -1569,7 +1570,7 @@ const SColladaMaterial* CColladaFileLoader::findMaterial(const core::stringc& ma
 			// found the effect, instantiate by copying into the material
 			Materials[mat].Mat = Effects[effect].Mat;
 			if (Effects[effect].Textures.size())
-				Materials[mat].Mat.setTexture(0, getTextureFromImage(Effects[effect].Textures[0]));
+				Materials[mat].Mat.setTexture(0, getTextureFromImage(Effects[effect].Textures[0], &(Effects[effect])));
 			Materials[mat].Transparency = Effects[effect].Transparency;
 			// and indicate the material is instantiated by removing the effect ref
 			Materials[mat].InstanceEffectId = "";
@@ -2494,7 +2495,7 @@ void CColladaFileLoader::readColladaInputs(io::IXMLReaderUTF8* reader, const cor
 	} // end while reader->read();
 }
 
-//! parses all collada parameters inside an element and stores them in Parameters
+//! parses all collada parameters inside an element and stores them in ColladaParameters
 void CColladaFileLoader::readColladaParameters(io::IXMLReaderUTF8* reader,
 		const core::stringc& parentName)
 {
@@ -2719,6 +2720,8 @@ void CColladaFileLoader::clearData()
 	Inputs.clear();
 
 	// clear all effects
+	for ( u32 i=0; i<Effects.size(); ++i )
+		Effects[i].Parameters->drop();
 	Effects.clear();
 
 	// clear all the materials to bind
@@ -2751,7 +2754,7 @@ core::stringc CColladaFileLoader::readId(io::IXMLReaderUTF8* reader)
 
 
 //! create an Irrlicht texture from the reference
-video::ITexture* CColladaFileLoader::getTextureFromImage(core::stringc uri)
+video::ITexture* CColladaFileLoader::getTextureFromImage(core::stringc uri, SColladaEffect * effect)
 {
 	#ifdef COLLADA_READER_DEBUG
 	os::Printer::log("COLLADA searching texture", uri);
@@ -2792,9 +2795,9 @@ video::ITexture* CColladaFileLoader::getTextureFromImage(core::stringc uri)
 				break;
 			}
 		}
-		if (Parameters.getAttributeType(uri.c_str())==io::EAT_STRING)
+		if (effect && effect->Parameters->getAttributeType(uri.c_str())==io::EAT_STRING)
 		{
-			uri = Parameters.getAttributeAsString(uri.c_str());
+			uri = effect->Parameters->getAttributeAsString(uri.c_str());
 #ifdef COLLADA_READER_DEBUG
 			os::Printer::log("COLLADA now searching texture", uri.c_str());
 #endif
@@ -2807,12 +2810,15 @@ video::ITexture* CColladaFileLoader::getTextureFromImage(core::stringc uri)
 
 
 //! read a parameter and value
-void CColladaFileLoader::readParameter(io::IXMLReaderUTF8* reader)
+void CColladaFileLoader::readParameter(io::IXMLReaderUTF8* reader, io::IAttributes* parameters)
 {
 	#ifdef COLLADA_READER_DEBUG
 	os::Printer::log("COLLADA reading parameter");
 	#endif
 
+	if ( !parameters )
+		return;
+
 	const core::stringc name = reader->getAttributeValue("sid");
 	if (!reader->isEmptyElement())
 	{
@@ -2823,7 +2829,7 @@ void CColladaFileLoader::readParameter(io::IXMLReaderUTF8* reader)
 				if (floatNodeName == reader->getNodeName())
 				{
 					const f32 f = readFloatNode(reader);
-					Parameters.addFloat(name.c_str(), f);
+					parameters->addFloat(name.c_str(), f);
 				}
 				else
 				if (float2NodeName == reader->getNodeName())
@@ -2837,14 +2843,14 @@ void CColladaFileLoader::readParameter(io::IXMLReaderUTF8* reader)
 				{
 					f32 f[3];
 					readFloatsInsideElement(reader, f, 3);
-					Parameters.addVector3d(name.c_str(), core::vector3df(f[0],f[1],f[2]));
+					parameters->addVector3d(name.c_str(), core::vector3df(f[0],f[1],f[2]));
 				}
 				else
 				if ((initFromName == reader->getNodeName()) ||
 					(sourceSectionName == reader->getNodeName()))
 				{
 					reader->read();
-					Parameters.addString(name.c_str(), reader->getNodeData());
+					parameters->addString(name.c_str(), reader->getNodeData());
 				}
 				else
 				if (wrapsName == reader->getNodeName())
@@ -2852,7 +2858,7 @@ void CColladaFileLoader::readParameter(io::IXMLReaderUTF8* reader)
 					reader->read();
 					const core::stringc val = reader->getNodeData();
 					if (val == "WRAP")
-						Parameters.addBool("wrap_s", true);
+						parameters->addBool("wrap_s", true);
 				}
 				else
 				if (wraptName == reader->getNodeName())
@@ -2860,7 +2866,7 @@ void CColladaFileLoader::readParameter(io::IXMLReaderUTF8* reader)
 					reader->read();
 					const core::stringc val = reader->getNodeData();
 					if (val == "WRAP")
-						Parameters.addBool("wrap_t", true);
+						parameters->addBool("wrap_t", true);
 				}
 				else
 				if (minfilterName == reader->getNodeName())
@@ -2868,10 +2874,10 @@ void CColladaFileLoader::readParameter(io::IXMLReaderUTF8* reader)
 					reader->read();
 					const core::stringc val = reader->getNodeData();
 					if (val == "LINEAR_MIPMAP_LINEAR")
-						Parameters.addBool("trilinear", true);
+						parameters->addBool("trilinear", true);
 					else
 					if (val == "LINEAR_MIPMAP_NEAREST")
-						Parameters.addBool("bilinear", true);
+						parameters->addBool("bilinear", true);
 				}
 				else
 				if (magfilterName == reader->getNodeName())
@@ -2880,14 +2886,14 @@ void CColladaFileLoader::readParameter(io::IXMLReaderUTF8* reader)
 					const core::stringc val = reader->getNodeData();
 					if (val != "LINEAR")
 					{
-						Parameters.addBool("bilinear", false);
-						Parameters.addBool("trilinear", false);
+						parameters->addBool("bilinear", false);
+						parameters->addBool("trilinear", false);
 					}
 				}
 				else
 				if (mipfilterName == reader->getNodeName())
 				{
-					Parameters.addBool("anisotropic", true);
+					parameters->addBool("anisotropic", true);
 				}
 			}
 			else
diff --git a/source/Irrlicht/CColladaFileLoader.h b/source/Irrlicht/CColladaFileLoader.h
index 944449d7..86dbeff9 100644
--- a/source/Irrlicht/CColladaFileLoader.h
+++ b/source/Irrlicht/CColladaFileLoader.h
@@ -135,6 +135,8 @@ struct SColladaEffect
 	f32 Transparency;
 	core::array<core::stringc> Textures;
 	video::SMaterial Mat;
+	// TODO: Parameters looks somewhat lazy workaround, I think we should really read all parameters correct.
+	io::IAttributes * Parameters;	
 
 	inline bool operator< (const SColladaEffect & other) const
 	{
@@ -298,7 +300,7 @@ private:
 	//! clears all loaded data
 	void clearData();
 
-	//! parses all collada parameters inside an element and stores them in Parameters
+	//! parses all collada parameters inside an element and stores them in ColladaParameters
 	void readColladaParameters(io::IXMLReaderUTF8* reader, const core::stringc& parentName);
 
 	//! returns a collada parameter or none if not found
@@ -332,10 +334,10 @@ private:
 	void readBindMaterialSection(io::IXMLReaderUTF8* reader, const core::stringc & id);
 
 	//! create an Irrlicht texture from the SColladaImage
-	video::ITexture* getTextureFromImage(core::stringc uri);
+	video::ITexture* getTextureFromImage(core::stringc uri, SColladaEffect * effect);
 
 	//! read a parameter and value
-	void readParameter(io::IXMLReaderUTF8* reader);
+	void readParameter(io::IXMLReaderUTF8* reader, io::IAttributes* parameters);
 
 	scene::ISceneManager* SceneManager;
 	io::IFileSystem* FileSystem;
@@ -360,7 +362,6 @@ private:
 	core::map<core::stringc,u32> MaterialsToBind;
 	//! Array of buffers for each material binding
 	core::array< core::array<irr::scene::IMeshBuffer*> > MeshesToBind;
-	io::CAttributes Parameters;
 
 	bool CreateInstances;
 };
diff --git a/source/Irrlicht/CColladaMeshWriter.cpp b/source/Irrlicht/CColladaMeshWriter.cpp
index 135cedd8..73bbfd15 100644
--- a/source/Irrlicht/CColladaMeshWriter.cpp
+++ b/source/Irrlicht/CColladaMeshWriter.cpp
@@ -2,6 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
+// TODO: second UV-coordinates currently ignored in textures
+
 #include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_COLLADA_WRITER_
@@ -13,14 +15,128 @@
 #include "IXMLWriter.h"
 #include "IMesh.h"
 #include "IAttributes.h"
+#include "IAnimatedMeshSceneNode.h"
+#include "IMeshSceneNode.h"
+#include "ITerrainSceneNode.h"
+#include "ILightSceneNode.h"
+#include "ISceneManager.h"
 
 namespace irr
 {
 namespace scene
 {
 
+//! Which lighting model should be used in the technique (FX) section when exporting effects (materials)
+E_COLLADA_TECHNIQUE_FX CColladaMeshWriterProperties::getTechniqueFx(const video::SMaterial& material) const
+{
+	return ECTF_BLINN;
+}
 
-CColladaMeshWriter::CColladaMeshWriter(video::IVideoDriver* driver,
+//! Which texture index should be used when writing the texture of the given sampler color.
+s32 CColladaMeshWriterProperties::getTextureIdx(const video::SMaterial & material, E_COLLADA_COLOR_SAMPLER cs) const
+{
+	// So far we just export in a way which is similar to how we import colladas.
+	// There might be better ways to do this, but I suppose it depends a lot for which target
+	// application we export, so in most cases it will have to be done in user-code anyway.
+	switch ( cs )
+	{
+		case ECCS_DIFFUSE:
+			return 2;
+		case ECCS_AMBIENT:
+			return 1;
+		case ECCS_EMISSIVE:
+			return 0;
+		case ECCS_SPECULAR:
+			return 3;
+		case ECCS_TRANSPARENT:
+			return -1;
+		case ECCS_REFLECTIVE:
+			return -1;
+	};
+	return -1;
+}
+
+E_COLLADA_IRR_COLOR CColladaMeshWriterProperties::getColorMapping(const video::SMaterial & material, E_COLLADA_COLOR_SAMPLER cs) const
+{
+	switch ( cs )
+	{
+		case ECCS_DIFFUSE:
+			return ECIC_DIFFUSE;
+		case ECCS_AMBIENT:
+			return ECIC_AMBIENT;
+		case ECCS_EMISSIVE:
+			return ECIC_EMISSIVE;
+		case ECCS_SPECULAR:
+			return ECIC_SPECULAR;
+		case ECCS_TRANSPARENT:
+			return ECIC_NONE;
+		case ECCS_REFLECTIVE:
+			return ECIC_CUSTOM;
+	};
+
+	return ECIC_NONE;
+}
+
+//! Return custom colors for certain color types requested by collada.
+video::SColor CColladaMeshWriterProperties::getCustomColor(const video::SMaterial & material, E_COLLADA_COLOR_SAMPLER cs) const
+{
+	return video::SColor(255, 0, 0, 0);
+}
+
+
+//! Return the settings for transparence
+E_COLLADA_TRANSPARENT_FX CColladaMeshWriterProperties::getTransparentFx(const video::SMaterial& material) const
+{
+	// TODO: figure out best default mapping
+	return ECOF_A_ONE;
+}
+
+//! Transparency value for the material.
+f32 CColladaMeshWriterProperties::getTransparency(const video::SMaterial& material) const
+{
+	// TODO: figure out best default mapping
+	return -1.f;
+}
+
+//! Reflectivity value for that material
+f32 CColladaMeshWriterProperties::getReflectivity(const video::SMaterial& material) const
+{
+	// TODO: figure out best default mapping
+	return 0.f;
+}
+
+//! Return index of refraction for that material
+f32 CColladaMeshWriterProperties::getIndexOfRefraction(const video::SMaterial& material) const
+{
+	return -1.f;
+}
+
+bool CColladaMeshWriterProperties::isExportable(const irr::scene::ISceneNode * node) const
+{
+	return node && node->isVisible();
+}
+
+IMesh* CColladaMeshWriterProperties::getMesh(irr::scene::ISceneNode * node)
+{
+	if ( !node )
+		return 0;
+	if ( node->getType() == ESNT_ANIMATED_MESH )
+		return static_cast<IAnimatedMeshSceneNode*>(node)->getMesh()->getMesh(0);
+	if (	node->getType() == ESNT_MESH
+		||	node->getType() == ESNT_CUBE
+		||	node->getType() == ESNT_SPHERE
+		||	node->getType() == ESNT_WATER_SURFACE
+		||	node->getType() == ESNT_Q3SHADER_SCENE_NODE
+		)
+		return static_cast<IMeshSceneNode*>(node)->getMesh();
+	if ( node->getType() == ESNT_TERRAIN )
+		return static_cast<ITerrainSceneNode*>(node)->getMesh();
+	return 0;
+}
+
+
+
+CColladaMeshWriter::CColladaMeshWriter(	ISceneManager * smgr, video::IVideoDriver* driver,
 					io::IFileSystem* fs)
 	: FileSystem(fs), VideoDriver(driver), Writer(0)
 {
@@ -34,6 +150,14 @@ CColladaMeshWriter::CColladaMeshWriter(video::IVideoDriver* driver,
 
 	if (FileSystem)
 		FileSystem->grab();
+
+	if ( smgr )
+		setAmbientLight( smgr->getAmbientLight() );
+
+	CColladaMeshWriterProperties * p = new CColladaMeshWriterProperties();
+	setDefaultProperties(p);
+	setProperties(p);
+	p->drop();
 }
 
 
@@ -53,6 +177,369 @@ EMESH_WRITER_TYPE CColladaMeshWriter::getType() const
 	return EMWT_COLLADA;
 }
 
+//! writes a scene starting with the given node
+bool CColladaMeshWriter::writeScene(io::IWriteFile* file, scene::ISceneNode* root)
+{
+	if (!file || !root)
+		return false;
+
+	Writer = FileSystem->createXMLWriter(file);
+
+	if (!Writer)
+	{
+		os::Printer::log("Could not write file", file->getFileName());
+		return false;
+	}
+
+	Directory = FileSystem->getFileDir(FileSystem->getAbsolutePath( file->getFileName() ));
+
+	// make names for all nodes with exportable meshes
+	Meshes.clear();
+	makeMeshNames(root);
+
+	os::Printer::log("Writing scene", file->getFileName());
+
+	// write COLLADA header
+
+	Writer->writeXMLHeader();
+
+	Writer->writeElement(L"COLLADA", false,
+		L"xmlns", L"http://www.collada.org/2005/11/COLLADASchema",
+		L"version", L"1.4.1");
+	Writer->writeLineBreak();
+
+	// write asset data
+	writeAsset();
+
+	// write all materials
+	Writer->writeElement(L"library_materials", false);
+	Writer->writeLineBreak();
+	writeNodeMaterials(root);
+	Writer->writeClosingTag(L"library_materials");
+	Writer->writeLineBreak();
+
+	LibraryImages.clear();
+	Writer->writeElement(L"library_effects", false);
+	Writer->writeLineBreak();
+	writeNodeEffects(root);
+	Writer->writeClosingTag(L"library_effects");
+	Writer->writeLineBreak();
+
+
+	// images
+	writeLibraryImages();
+
+	// lights
+	Writer->writeElement(L"library_lights", false);
+	Writer->writeLineBreak();
+
+	writeAmbientLightElement( getAmbientLight() );
+	writeNodeLights(root);
+
+	Writer->writeClosingTag(L"library_lights");
+	Writer->writeLineBreak();
+
+
+	// write meshes
+	Writer->writeElement(L"library_geometries", false);
+	Writer->writeLineBreak();
+	writeNodeGeometries(root);
+	Writer->writeClosingTag(L"library_geometries");
+	Writer->writeLineBreak();
+
+	// write scene
+	Writer->writeElement(L"library_visual_scenes", false);
+	Writer->writeLineBreak();
+	Writer->writeElement(L"visual_scene", false, L"id", L"default_scene");
+	Writer->writeLineBreak();
+
+		// ambient light
+		Writer->writeElement(L"node", false);
+		Writer->writeLineBreak();
+		Writer->writeElement(L"instance_light", true, L"url", L"#ambientlight");
+		Writer->writeLineBreak();
+
+			// scenegraph
+			writeSceneNode(root);
+
+		Writer->writeClosingTag(L"node");
+		Writer->writeLineBreak();
+
+	Writer->writeClosingTag(L"visual_scene");
+	Writer->writeLineBreak();
+	Writer->writeClosingTag(L"library_visual_scenes");
+	Writer->writeLineBreak();
+
+
+	// instance scene
+	Writer->writeElement(L"scene", false);
+	Writer->writeLineBreak();
+
+		Writer->writeElement(L"instance_visual_scene", true, L"url", L"#default_scene");
+		Writer->writeLineBreak();
+
+	Writer->writeClosingTag(L"scene");
+	Writer->writeLineBreak();
+
+
+	// close everything
+
+	Writer->writeClosingTag(L"COLLADA");
+	Writer->drop();
+
+	return true;
+}
+
+void CColladaMeshWriter::makeMeshNames(irr::scene::ISceneNode * node)
+{
+	if ( !node || !getProperties() || !getProperties()->isExportable(node) )
+		return;
+
+	IMesh* mesh = getProperties()->getMesh(node);
+	if ( mesh )
+	{
+		if ( !Meshes.find(mesh) )
+		{
+			ColladaMesh cm;
+			cm.Name = uniqueNameForMesh(mesh);
+			Meshes.insert(mesh, cm);
+		}
+	}
+
+	const core::list<ISceneNode*>& children = node->getChildren();
+	for ( core::list<ISceneNode*>::ConstIterator it = children.begin(); it != children.end(); ++it )
+	{
+		makeMeshNames(*it);
+	}
+}
+
+void CColladaMeshWriter::writeNodeMaterials(irr::scene::ISceneNode * node)
+{
+	if ( !node || !getProperties() || !getProperties()->isExportable(node) )
+		return;
+
+	IMesh* mesh = getProperties()->getMesh(node);
+	if ( mesh )
+	{
+		MeshNode * n = Meshes.find(mesh);
+		if ( n && !n->getValue().MaterialWritten )
+		{
+			writeMeshMaterials(n->getValue().Name, mesh);
+			n->getValue().MaterialWritten = true;
+		}
+	}
+
+	const core::list<ISceneNode*>& children = node->getChildren();
+	for ( core::list<ISceneNode*>::ConstIterator it = children.begin(); it != children.end(); ++it )
+	{
+		writeNodeMaterials( *it );
+	}
+}
+
+void CColladaMeshWriter::writeNodeEffects(irr::scene::ISceneNode * node)
+{
+	if ( !node || !getProperties() || !getProperties()->isExportable(node) )
+		return;
+
+	IMesh* mesh = getProperties()->getMesh(node);
+	if ( mesh )
+	{
+		MeshNode * n = Meshes.find(mesh);
+		if ( n  && !n->getValue().EffectWritten )
+		{
+			irr::core::stringw meshname(n->getValue().Name);
+			for (u32 i=0; i<node->getMaterialCount(); ++i)
+			{
+				core::stringw strMat = "mat";
+				strMat += meshname;
+				strMat += i;
+				strMat += L"-fx";
+
+				video::SMaterial & material = node->getMaterial(i);
+				writeMaterialEffect(meshname, strMat, material);
+			}
+			n->getValue().EffectWritten = true;
+		}
+	}
+
+	const core::list<ISceneNode*>& children = node->getChildren();
+	for ( core::list<ISceneNode*>::ConstIterator it = children.begin(); it != children.end(); ++it )
+	{
+		writeNodeEffects( *it );
+	}
+}
+
+void CColladaMeshWriter::writeNodeLights(irr::scene::ISceneNode * node)
+{
+	if ( !node )
+		return;
+
+	if ( node->getType() == ESNT_LIGHT )
+	{
+		ILightSceneNode * lightNode = static_cast<ILightSceneNode*>(node);
+		const video::SLight& lightData = lightNode->getLightData();
+
+		ColladaLight cLight;
+		cLight.Name = uniqueNameForLight(node);
+		LightNodes.insert(node, cLight);
+
+		Writer->writeElement(L"light", false, L"id", cLight.Name.c_str());
+		Writer->writeLineBreak();
+
+		Writer->writeElement(L"technique_common", false);
+		Writer->writeLineBreak();			
+
+		switch ( lightNode->getLightType() )
+		{
+			case video::ELT_POINT:
+				Writer->writeElement(L"point", false);
+				Writer->writeLineBreak();
+
+				writeColorElement(lightData.DiffuseColor, false);
+
+				Writer->writeElement(L"constant_attenuation ", false);
+				Writer->writeText( irr::core::stringw(lightData.Attenuation.X).c_str() );
+				Writer->writeClosingTag(L"constant_attenuation ");
+				Writer->writeLineBreak();
+				Writer->writeElement(L"linear_attenuation  ", false);
+				Writer->writeText( irr::core::stringw(lightData.Attenuation.Y).c_str() );
+				Writer->writeClosingTag(L"linear_attenuation  ");
+				Writer->writeLineBreak();
+				Writer->writeElement(L"quadratic_attenuation", false);
+				Writer->writeText( irr::core::stringw(lightData.Attenuation.Z).c_str() );
+				Writer->writeClosingTag(L"quadratic_attenuation");
+				Writer->writeLineBreak();
+
+				Writer->writeClosingTag(L"point");
+				Writer->writeLineBreak();
+				break;
+
+			case video::ELT_SPOT:
+				Writer->writeElement(L"spot", false);
+				Writer->writeLineBreak();
+
+				writeColorElement(lightData.DiffuseColor, false);
+
+				Writer->writeElement(L"constant_attenuation ", false);
+				Writer->writeText( irr::core::stringw(lightData.Attenuation.X).c_str() );
+				Writer->writeClosingTag(L"constant_attenuation ");
+				Writer->writeLineBreak();
+				Writer->writeElement(L"linear_attenuation  ", false);
+				Writer->writeText( irr::core::stringw(lightData.Attenuation.Y).c_str() );
+				Writer->writeClosingTag(L"linear_attenuation  ");
+				Writer->writeLineBreak();
+				Writer->writeElement(L"quadratic_attenuation", false);
+				Writer->writeText( irr::core::stringw(lightData.Attenuation.Z).c_str() );
+				Writer->writeClosingTag(L"quadratic_attenuation");
+				Writer->writeLineBreak();
+
+				Writer->writeElement(L"falloff_angle", false);
+				Writer->writeText( irr::core::stringw(lightData.OuterCone * core::RADTODEG).c_str() );
+				Writer->writeClosingTag(L"falloff_angle");
+				Writer->writeLineBreak();
+				Writer->writeElement(L"falloff_exponent", false);
+				Writer->writeText( irr::core::stringw(lightData.Falloff).c_str() );
+				Writer->writeClosingTag(L"falloff_exponent");
+				Writer->writeLineBreak();
+					
+				Writer->writeClosingTag(L"spot");
+				Writer->writeLineBreak();
+				break;
+
+			case video::ELT_DIRECTIONAL:
+				Writer->writeElement(L"directional", false);
+				Writer->writeLineBreak();
+
+				writeColorElement(lightData.DiffuseColor, false);
+
+				Writer->writeClosingTag(L"directional");
+				Writer->writeLineBreak();
+				break;
+		}
+
+		Writer->writeClosingTag(L"technique_common");
+		Writer->writeLineBreak();
+
+		Writer->writeClosingTag(L"light");
+		Writer->writeLineBreak();
+
+	}
+
+	const core::list<ISceneNode*>& children = node->getChildren();
+	for ( core::list<ISceneNode*>::ConstIterator it = children.begin(); it != children.end(); ++it )
+	{
+		writeNodeLights( *it );
+	}
+}
+
+void CColladaMeshWriter::writeNodeGeometries(irr::scene::ISceneNode * node)
+{
+	if ( !node || !getProperties() || !getProperties()->isExportable(node) )
+		return;
+
+	IMesh* mesh = getProperties()->getMesh(node);
+	if ( mesh )
+	{
+		MeshNode * n = Meshes.find(mesh);
+		if ( n && !n->getValue().GeometryWritten )
+		{
+			writeMeshGeometry(n->getValue().Name, mesh);
+			n->getValue().GeometryWritten = true;
+		}
+	}
+
+	const core::list<ISceneNode*>& children = node->getChildren();
+	for ( core::list<ISceneNode*>::ConstIterator it = children.begin(); it != children.end(); ++it )
+	{
+		writeNodeGeometries( *it );
+	}
+}
+
+void CColladaMeshWriter::writeSceneNode(irr::scene::ISceneNode * node )
+{
+	if ( !node || !getProperties() || !getProperties()->isExportable(node) )
+		return;
+
+	// Collada doesn't require to set the id, but some other tools have problems if none exists, so we just add it).
+	irr::core::stringw nameId(uniqueNameForNode(node));
+	Writer->writeElement(L"node", false, L"id", nameId.c_str());
+	Writer->writeLineBreak();
+
+	irr::core::vector3df rot(node->getRotation());
+	writeTranslateElement( node->getPosition() );
+	writeRotateElement( irr::core::vector3df(1.f, 0.f, 0.f), rot.X );
+	writeRotateElement( irr::core::vector3df(0.f, 1.f, 0.f), rot.Y );
+	writeRotateElement( irr::core::vector3df(0.f, 0.f, 1.f), rot.Z );
+	writeScaleElement( node->getScale() );
+
+	// instance geometry
+	IMesh* mesh = getProperties()->getMesh(node);
+	if ( mesh )
+	{
+		MeshNode * n = Meshes.find(mesh);
+		if ( n )
+			writeMeshInstanceGeometry(n->getValue().Name, mesh);
+	}
+
+	// instance light
+	if ( node->getType() == ESNT_LIGHT )
+	{
+		LightNode * n = LightNodes.find(node);
+		if ( n )
+			writeLightInstance(n->getValue().Name);
+	}
+
+	// TODO instance cameras
+
+	const core::list<ISceneNode*>& children = node->getChildren();
+	for ( core::list<ISceneNode*>::ConstIterator it = children.begin(); it != children.end(); ++it )
+	{
+		writeSceneNode( *it );
+	}
+
+	Writer->writeClosingTag(L"node");
+	Writer->writeLineBreak();
+}
 
 //! writes a mesh
 bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags)
@@ -68,6 +555,8 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		return false;
 	}
 
+	Directory = FileSystem->getFileDir(FileSystem->getAbsolutePath( file->getFileName() ));
+
 	os::Printer::log("Writing mesh", file->getFileName());
 
 	// write COLLADA header
@@ -79,8 +568,343 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		L"version", L"1.4.1");
 	Writer->writeLineBreak();
 
-	// write asset data 
+	// write asset data
+	writeAsset();
 
+	// write all materials
+
+	Writer->writeElement(L"library_materials", false);
+	Writer->writeLineBreak();
+
+	irr::core::stringw meshname(uniqueNameForMesh(mesh));
+	writeMeshMaterials(meshname, mesh);
+
+	Writer->writeClosingTag(L"library_materials");
+	Writer->writeLineBreak();
+
+	LibraryImages.clear();
+	Writer->writeElement(L"library_effects", false);
+	Writer->writeLineBreak();
+
+	writeMeshEffects(meshname, mesh);
+
+	Writer->writeClosingTag(L"library_effects");
+	Writer->writeLineBreak();
+
+	// images
+	writeLibraryImages();
+
+	// write mesh
+
+	Writer->writeElement(L"library_geometries", false);
+	Writer->writeLineBreak();
+
+	writeMeshGeometry(meshname, mesh);
+
+	Writer->writeClosingTag(L"library_geometries");
+	Writer->writeLineBreak();
+
+	// write scene_library
+	if ( getWriteDefaultScene() )
+	{
+		Writer->writeElement(L"library_visual_scenes", false);
+		Writer->writeLineBreak();
+
+		Writer->writeElement(L"visual_scene", false, L"id", L"default_scene");
+		Writer->writeLineBreak();
+
+			Writer->writeElement(L"node", false);
+			Writer->writeLineBreak();
+
+				writeMeshInstanceGeometry(meshname, mesh);
+
+			Writer->writeClosingTag(L"node");
+			Writer->writeLineBreak();
+
+		Writer->writeClosingTag(L"visual_scene");
+		Writer->writeLineBreak();
+
+		Writer->writeClosingTag(L"library_visual_scenes");
+		Writer->writeLineBreak();
+
+
+		// write scene
+		Writer->writeElement(L"scene", false);
+		Writer->writeLineBreak();
+
+			Writer->writeElement(L"instance_visual_scene", true, L"url", L"#default_scene");
+			Writer->writeLineBreak();
+
+		Writer->writeClosingTag(L"scene");
+		Writer->writeLineBreak();
+	}
+
+
+	// close everything
+
+	Writer->writeClosingTag(L"COLLADA");
+	Writer->drop();
+
+	return true;
+}
+
+void CColladaMeshWriter::writeMeshInstanceGeometry(const irr::core::stringw& meshname, scene::IMesh* mesh)
+{
+	//<instance_geometry url="#mesh">
+	core::stringw meshId(meshname);
+	Writer->writeElement(L"instance_geometry", false, L"url", toRef(meshId).c_str());
+	Writer->writeLineBreak();
+
+		Writer->writeElement(L"bind_material", false);
+		Writer->writeLineBreak();
+
+			Writer->writeElement(L"technique_common", false);
+			Writer->writeLineBreak();
+
+			// instance materials
+			// <instance_material symbol="leaf" target="#MidsummerLeaf01"/>
+			for (u32 i=0; i<mesh->getMeshBufferCount(); ++i)
+			{
+				core::stringw strMat = "mat";
+				strMat += meshname;
+				strMat += i;
+				core::stringw strMatInst(L"#");
+				strMatInst += strMat;
+				Writer->writeElement(L"instance_material", false, L"symbol", strMat.c_str(), L"target", strMatInst.c_str());
+				Writer->writeLineBreak();
+
+					// <bind_vertex_input semantic="mesh-TexCoord0" input_semantic="TEXCOORD" input_set="0"/>
+					core::stringw meshTexCoordId(meshname);
+					meshTexCoordId += L"-TexCoord0";	// TODO: need to handle second UV-set
+					Writer->writeElement(L"bind_vertex_input", true, L"semantic", meshTexCoordId.c_str(), L"input_semantic", L"TEXCOORD", L"input_set", L"0" );
+					Writer->writeLineBreak();
+
+				Writer->writeClosingTag(L"instance_material");
+				Writer->writeLineBreak();
+			}
+
+			Writer->writeClosingTag(L"technique_common");
+			Writer->writeLineBreak();
+
+		Writer->writeClosingTag(L"bind_material");
+		Writer->writeLineBreak();
+
+	Writer->writeClosingTag(L"instance_geometry");
+	Writer->writeLineBreak();
+}
+
+void CColladaMeshWriter::writeLightInstance(const irr::core::stringw& lightName)
+{
+	Writer->writeElement(L"instance_light", true, L"url", toRef(lightName).c_str());
+	Writer->writeLineBreak();
+}
+
+bool CColladaMeshWriter::hasSecondTextureCoordinates(video::E_VERTEX_TYPE type) const
+{
+	return type == video::EVT_2TCOORDS;
+}
+
+irr::core::stringw CColladaMeshWriter::toString(const irr::core::vector3df& vec) const
+{
+	c8 tmpbuf[255];
+	snprintf(tmpbuf, 255, "%f %f %f", vec.X, vec.Y, vec.Z);
+	core::stringw str  = tmpbuf;
+
+	return str;
+}
+
+irr::core::stringw CColladaMeshWriter::uvToString(const irr::core::vector2df& vec) const
+{
+	// change handedness
+	return toString( core::vector2df(vec.X, 1.f-vec.Y) );
+}
+
+irr::core::stringw CColladaMeshWriter::toString(const irr::core::vector2df& vec) const
+{
+	c8 tmpbuf[255];
+	snprintf(tmpbuf, 255, "%f %f", vec.X, vec.Y);
+	core::stringw str  = tmpbuf;
+
+	return str;
+}
+
+irr::core::stringw CColladaMeshWriter::toString(const irr::video::SColorf& colorf, bool writeAlpha) const
+{
+	c8 tmpbuf[255];
+	if ( writeAlpha )
+		snprintf(tmpbuf, 255, "%f %f %f %f", colorf.getRed(), colorf.getGreen(), colorf.getBlue(), colorf.getAlpha());
+	else
+		snprintf(tmpbuf, 255, "%f %f %f", colorf.getRed(), colorf.getGreen(), colorf.getBlue());
+	core::stringw str = tmpbuf;
+
+	return str;
+}
+
+irr::core::stringw CColladaMeshWriter::toString(const irr::video::ECOLOR_FORMAT format) const
+{
+	switch ( format )
+	{
+		case video::ECF_A1R5G5B5:	return irr::core::stringw(L"A1R5G5B5");
+		case video::ECF_R5G6B5:		return irr::core::stringw(L"R5G6B5");
+		case video::ECF_R8G8B8:		return irr::core::stringw(L"R8G8B8");
+		case video::ECF_A8R8G8B8:	return irr::core::stringw(L"A8R8G8B8");
+		default:					return irr::core::stringw(L"");
+	}
+}
+
+irr::core::stringw CColladaMeshWriter::toString(const irr::video::E_TEXTURE_CLAMP clamp) const
+{
+	switch ( clamp )
+	{
+		case video::ETC_REPEAT:
+			return core::stringw(L"WRAP");
+		case video::ETC_CLAMP:
+		case video::ETC_CLAMP_TO_EDGE:
+			return core::stringw(L"CLAMP");
+		case video::ETC_CLAMP_TO_BORDER:
+			return core::stringw(L"BORDER");
+		case video::ETC_MIRROR:
+		case video::ETC_MIRROR_CLAMP:
+		case video::ETC_MIRROR_CLAMP_TO_EDGE:
+		case video::ETC_MIRROR_CLAMP_TO_BORDER:
+			return core::stringw(L"MIRROR");
+	}
+	return core::stringw(L"NONE");
+}
+
+irr::core::stringw CColladaMeshWriter::toString(const irr::scene::E_COLLADA_TRANSPARENT_FX transparent) const
+{
+	if ( transparent & ECOF_RGB_ZERO )
+		return core::stringw(L"RGB_ZERO");
+	else
+		return core::stringw(L"A_ONE");
+}
+
+irr::core::stringw CColladaMeshWriter::toRef(const irr::core::stringw& source) const
+{
+	irr::core::stringw ref(L"#");
+	ref += source;
+	return ref;
+}
+
+irr::core::stringw CColladaMeshWriter::uniqueNameForMesh(const scene::IMesh* mesh) const
+{
+	irr::core::stringw name(L"mesh");
+	name += irr::core::stringw((long)mesh);
+	return name;
+}
+
+irr::core::stringw CColladaMeshWriter::uniqueNameForLight(const scene::ISceneNode* lightNode) const
+{
+	irr::core::stringw name(L"light");	// (prefix, because xs::ID can't start with a number)
+	name += irr::core::stringw((long)lightNode);
+	return name;
+}
+
+irr::core::stringw CColladaMeshWriter::uniqueNameForNode(const scene::ISceneNode* node) const
+{
+	irr::core::stringw name(L"node");	// (prefix, because xs::ID can't start with a number)
+	name += irr::core::stringw((long)node);
+	if ( node )
+		name += irr::core::stringw(node->getName());
+	return name;
+}
+
+irr::core::stringw CColladaMeshWriter::minTexfilterToString(bool bilinear, bool trilinear) const
+{
+	if ( trilinear )
+		return core::stringw(L"LINEAR_MIPMAP_LINEAR");
+	else if ( bilinear )
+		return core::stringw(L"LINEAR_MIPMAP_NEAREST");
+
+	return core::stringw(L"NONE");
+}
+
+inline irr::core::stringw CColladaMeshWriter::magTexfilterToString(bool bilinear, bool trilinear) const
+{
+	if ( bilinear || trilinear )
+		return core::stringw(L"LINEAR");
+
+	return core::stringw(L"NONE");
+}
+
+bool CColladaMeshWriter::isXmlNameStartChar(wchar_t c) const
+{
+	return		(c >= 'A' && c <= 'Z')
+			||	c == L'_'
+			||	(c >= 'a' && c <= 'z')
+			||	(c >= 0xC0 && c <= 0xD6)
+			||	(c >= 0xD8 && c <= 0xF6)
+			||	(c >= 0xF8 && c <= 0x2FF)
+			||  (c >= 0x370 && c <= 0x37D)
+			||  (c >= 0x37F && c <= 0x1FFF)
+			||  (c >= 0x200C && c <= 0x200D)
+			||  (c >= 0x2070 && c <= 0x218F)
+			||  (c >= 0x2C00 && c <= 0x2FEF)
+			||  (c >= 0x3001 && c <= 0xD7FF)
+			||  (c >= 0xF900 && c <= 0xFDCF)
+			||  (c >= 0xFDF0 && c <= 0xFFFD)
+			||  (c >= 0x10000 && c <= 0xEFFFF);
+}
+
+bool CColladaMeshWriter::isXmlNameChar(wchar_t c) const
+{
+	return isXmlNameStartChar(c)
+		||	c == L'-'
+		||	c == L'.'
+		||	(c >= '0' && c <= '9')
+		||	c == 0xB7
+		||	(c >= 0x0300 && c <= 0x036F)
+		||	(c >= 0x203F && c <= 0x2040);
+}
+
+// Restrict the characters to a set of allowed characters in xs::NCName.
+irr::core::stringw CColladaMeshWriter::pathToNCName(const irr::io::path& path) const
+{
+	irr::core::stringw result(L"_NCNAME_");	// ensure id starts with a valid char and reduce chance of name-conflicts
+	if ( path.empty() )
+		return result;
+
+	result.append( irr::core::stringw(path) );
+
+	// We replace all characters not allowed by a replacement char
+	const wchar_t REPLACMENT = L'-';
+	for ( irr::u32 i=1; i < result.size(); ++i )
+	{
+		if ( result[i] == L':' || !isXmlNameChar(result[i]) )
+		{
+			result[i] = REPLACMENT;
+		}
+	}
+	return result;
+}
+
+irr::core::stringw CColladaMeshWriter::pathToURI(const irr::io::path& path) const
+{
+	irr::core::stringw result;
+
+	// is this a relative path?
+	if ( path.size() > 1
+		&& path[0] != _IRR_TEXT('/')
+		&& path[0] != _IRR_TEXT('\\')
+		&& path[1] != _IRR_TEXT(':') )
+	{
+		// not already starting with "./" ?
+		if (	path[0] != _IRR_TEXT('.')
+			||	path[1] != _IRR_TEXT('/') )
+		{
+			result.append(L"./");
+		}
+	}
+	result.append(path);
+
+	// TODO: make correct URI (without whitespaces)
+
+	return result;
+}
+
+void CColladaMeshWriter::writeAsset()
+{
 	Writer->writeElement(L"asset", false);
 	Writer->writeLineBreak();
 
@@ -111,16 +935,15 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 
 	Writer->writeClosingTag(L"asset");
 	Writer->writeLineBreak();
+}
 
-	// write all materials
-
-	Writer->writeElement(L"library_materials", false);
-	Writer->writeLineBreak();
-
+void CColladaMeshWriter::writeMeshMaterials(const irr::core::stringw& meshname, scene::IMesh* mesh)
+{
 	u32 i;
 	for (i=0; i<mesh->getMeshBufferCount(); ++i)
 	{
 		core::stringw strMat = "mat";
+		strMat += meshname;
 		strMat += i;
 
 		Writer->writeElement(L"material", false,
@@ -136,93 +959,157 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		Writer->writeClosingTag(L"material");
 		Writer->writeLineBreak();
 	}
+}
 
-	Writer->writeClosingTag(L"library_materials");
+void CColladaMeshWriter::writeMaterialEffect(const irr::core::stringw& meshname, const irr::core::stringw& materialname, const video::SMaterial & material)
+{
+	Writer->writeElement(L"effect", false,
+		L"id", materialname.c_str(),
+		L"name", materialname.c_str());
+	Writer->writeLineBreak();
+	Writer->writeElement(L"profile_COMMON", false);
 	Writer->writeLineBreak();
 
-	Writer->writeElement(L"library_effects", false);
+	int numTextures = 0;
+	if ( getWriteTextures() )
+	{
+		// write texture surfaces and samplers and buffer all used imagess
+		for ( int t=0; t<4; ++t )
+		{
+			const video::SMaterialLayer& layer  = material.TextureLayer[t];
+			if ( !layer.Texture )
+				break;
+			++numTextures;
+
+			if ( LibraryImages.linear_search(layer.Texture) < 0 )
+					LibraryImages.push_back( layer.Texture );
+
+			irr::core::stringw texName("tex");
+			texName += irr::core::stringw(t);
+
+			// write texture surface
+			//<newparam sid="tex0-surface">
+			irr::core::stringw texSurface(texName);
+			texSurface += L"-surface";
+			Writer->writeElement(L"newparam", false, L"sid", texSurface.c_str());
+			Writer->writeLineBreak();
+			//  <surface type="2D">
+				Writer->writeElement(L"surface", false, L"type", L"2D");
+				Writer->writeLineBreak();
+
+		//          <init_from>internal_texturename</init_from>
+					Writer->writeElement(L"init_from", false);
+					irr::io::path p(FileSystem->getRelativeFilename(layer.Texture->getName().getPath(), Directory));
+					Writer->writeText(pathToNCName(p).c_str());
+					Writer->writeClosingTag(L"init_from");
+					Writer->writeLineBreak();
+
+		//          <format>A8R8G8B8</format>
+					Writer->writeElement(L"format", false);
+					video::ECOLOR_FORMAT format = layer.Texture->getColorFormat();
+					Writer->writeText(toString(format).c_str());
+					Writer->writeClosingTag(L"format");
+					Writer->writeLineBreak();
+		//      </surface>
+				Writer->writeClosingTag(L"surface");
+				Writer->writeLineBreak();
+		//  </newparam>
+			Writer->writeClosingTag(L"newparam");
+			Writer->writeLineBreak();
+
+			// write texture sampler
+		//  <newparam sid="tex0-sampler">
+			irr::core::stringw texSampler(texName);
+			texSampler += L"-sampler";
+			Writer->writeElement(L"newparam", false, L"sid", texSampler.c_str());
+			Writer->writeLineBreak();
+		//      <sampler2D>
+				Writer->writeElement(L"sampler2D", false);
+				Writer->writeLineBreak();
+
+		//          <source>tex0-surface</source>
+					Writer->writeElement(L"source", false);
+					Writer->writeText(texSurface.c_str());
+					Writer->writeClosingTag(L"source");
+					Writer->writeLineBreak();
+
+		//			<wrap_s>WRAP</wrap_s>
+					Writer->writeElement(L"wrap_s", false);
+					Writer->writeText(toString((video::E_TEXTURE_CLAMP)layer.TextureWrapU).c_str());
+					Writer->writeClosingTag(L"wrap_s");
+					Writer->writeLineBreak();
+
+		//			<wrap_t>WRAP</wrap_t>
+					Writer->writeElement(L"wrap_t", false);
+					Writer->writeText(toString((video::E_TEXTURE_CLAMP)layer.TextureWrapV).c_str());
+					Writer->writeClosingTag(L"wrap_t");
+					Writer->writeLineBreak();
+
+		//			<minfilter>LINEAR_MIPMAP_LINEAR</minfilter>
+					Writer->writeElement(L"minfilter", false);
+					Writer->writeText(minTexfilterToString(layer.BilinearFilter, layer.TrilinearFilter).c_str());
+					Writer->writeClosingTag(L"minfilter");
+					Writer->writeLineBreak();
+
+		//			<magfilter>LINEAR</magfilter>
+					Writer->writeElement(L"magfilter", false);
+					Writer->writeText(magTexfilterToString(layer.BilinearFilter, layer.TrilinearFilter).c_str());
+					Writer->writeClosingTag(L"magfilter");
+					Writer->writeLineBreak();
+
+					// TBD - actually not sure how anisotropic should be written, so for now it writes in a way
+					// that works with the way the loader reads it again.
+					if ( layer.AnisotropicFilter )
+					{
+		//			<mipfilter>LINEAR_MIPMAP_LINEAR</mipfilter>
+						Writer->writeElement(L"mipfilter", false);
+						Writer->writeText(L"LINEAR_MIPMAP_LINEAR");
+						Writer->writeClosingTag(L"mipfilter");
+						Writer->writeLineBreak();
+					}
+
+		//     </sampler2D>
+				Writer->writeClosingTag(L"sampler2D");
+				Writer->writeLineBreak();
+		//  </newparam>
+			Writer->writeClosingTag(L"newparam");
+			Writer->writeLineBreak();
+		}
+	}
+
+	Writer->writeElement(L"technique", false, L"sid", L"common");
 	Writer->writeLineBreak();
 
-	for (i=0; i<mesh->getMeshBufferCount(); ++i)
+	E_COLLADA_TECHNIQUE_FX techFx = getProperties() ? getProperties()->getTechniqueFx(material) : ECTF_BLINN;
+	writeFxElement(meshname, material, techFx);
+
+	Writer->writeClosingTag(L"technique");
+	Writer->writeLineBreak();
+	Writer->writeClosingTag(L"profile_COMMON");
+	Writer->writeLineBreak();
+	Writer->writeClosingTag(L"effect");
+	Writer->writeLineBreak();
+}
+
+void CColladaMeshWriter::writeMeshEffects(const irr::core::stringw& meshname, scene::IMesh* mesh)
+{
+	for (u32 i=0; i<mesh->getMeshBufferCount(); ++i)
 	{
 		core::stringw strMat = "mat";
+		strMat += meshname;
 		strMat += i;
 		strMat += L"-fx";
 
-		Writer->writeElement(L"effect", false,
-			L"id", strMat.c_str(),
-			L"name", strMat.c_str());
-		Writer->writeLineBreak();
-		Writer->writeElement(L"profile_COMMON", false);
-		Writer->writeLineBreak();
-		Writer->writeElement(L"technique", false, L"sid", L"common");
-		Writer->writeLineBreak();
-		Writer->writeElement(L"blinn", false);
-		Writer->writeLineBreak();
-
-		// write all interesting material parameters as parameter
-
-		io::IAttributes* attributes = VideoDriver->createAttributesFromMaterial(
-			mesh->getMeshBuffer(i)->getMaterial());
-
-		// attributes must be written in fixed order
-		core::stringc str;
-		s32 attridx = attributes->findAttribute("Emissive");
-		if ( attridx >= 0 )
-		{
-			writeColorAttribute(L"emission", attributes, attridx);
-		}
-		attridx = attributes->findAttribute("Ambient");
-		if ( attridx >= 0 )
-		{
-			writeColorAttribute(L"ambient", attributes, attridx);
-		}
-		attridx = attributes->findAttribute("Diffuse");
-		if ( attridx >= 0 )
-		{
-			writeColorAttribute(L"diffuse", attributes, attridx);
-		}
-		attridx = attributes->findAttribute("Specular");
-		if ( attridx >= 0 )
-		{
-			writeColorAttribute(L"specular", attributes, attridx);
-		}
-		attridx = attributes->findAttribute("Shininess");
-		if ( attridx >= 0 )
-		{
-			Writer->writeElement(L"shininess", false);
-			Writer->writeLineBreak();
-			Writer->writeElement(L"float", false);
-
-			Writer->writeText(core::stringw(attributes->getAttributeAsString(attridx).c_str()).c_str());
-
-			Writer->writeClosingTag(L"float");
-			Writer->writeLineBreak();
-			Writer->writeClosingTag(L"shininess");
-			Writer->writeLineBreak();
-		}
-
-		attributes->drop();
-
-		Writer->writeClosingTag(L"blinn");
-		Writer->writeLineBreak();
-		Writer->writeClosingTag(L"technique");
-		Writer->writeLineBreak();
-		Writer->writeClosingTag(L"profile_COMMON");
-		Writer->writeLineBreak();
-		Writer->writeClosingTag(L"effect");
-		Writer->writeLineBreak();
+		video::SMaterial & material = mesh->getMeshBuffer(i)->getMaterial();
+		writeMaterialEffect(meshname, strMat, material);
 	}
+}
 
-	Writer->writeClosingTag(L"library_effects");
-	Writer->writeLineBreak();
+void CColladaMeshWriter::writeMeshGeometry(const irr::core::stringw& meshname, scene::IMesh* mesh)
+{
+	core::stringw meshId(meshname);
 
-	// write mesh
-
-	Writer->writeElement(L"library_geometries", false);
-	Writer->writeLineBreak();
-
-	Writer->writeElement(L"geometry", false, L"id", L"mesh", L"name", L"mesh");
+	Writer->writeElement(L"geometry", false, L"id", meshId.c_str(), L"name", meshId.c_str());
 	Writer->writeLineBreak();
 	Writer->writeElement(L"mesh");
 	Writer->writeLineBreak();
@@ -237,7 +1124,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 	u32 totalVertexCount = 0;
 	u32 totalTCoords2Count = 0;
 	bool needsTangents = false; // TODO: tangents not supported here yet
-
+	u32 i=0;
 	for (i=0; i<mesh->getMeshBufferCount(); ++i)
 	{
 		totalVertexCount += mesh->getMeshBuffer(i)->getVertexCount();
@@ -252,271 +1139,16 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 	SComponentGlobalStartPos* globalIndices = new SComponentGlobalStartPos[mesh->getMeshBufferCount()];
 
 	// write positions
-
-	Writer->writeElement(L"source", false, L"id", L"mesh-Pos");
+	core::stringw meshPosId(meshId);
+	meshPosId += L"-Pos";
+	Writer->writeElement(L"source", false, L"id", meshPosId.c_str());
 	Writer->writeLineBreak();
 
-	core::stringw vertexCountStr(totalVertexCount*3);
-	Writer->writeElement(L"float_array", false, L"id", L"mesh-Pos-array",
-				L"count", vertexCountStr.c_str());
-	Writer->writeLineBreak();
-
-	for (i=0; i<mesh->getMeshBufferCount(); ++i)
-	{
-		scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
-		video::E_VERTEX_TYPE vtxType = buffer->getVertexType();
-		u32 vertexCount = buffer->getVertexCount();
-
-		globalIndices[i].PosStartIndex = 0;
-
-		if (i!=0)
-			globalIndices[i].PosStartIndex = globalIndices[i-1].PosLastIndex + 1;
-
-		globalIndices[i].PosLastIndex = globalIndices[i].PosStartIndex + vertexCount - 1;
-
-		switch(vtxType)
-		{
-		case video::EVT_STANDARD:
-			{
-				video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices();
-				for (u32 j=0; j<vertexCount; ++j)
-				{
-					Writer->writeText(toString(vtx[j].Pos).c_str());
-					Writer->writeLineBreak();
-				}
-			}
-			break;
-		case video::EVT_2TCOORDS:
-			{
-				video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
-				for (u32 j=0; j<vertexCount; ++j)
-				{
-					Writer->writeText(toString(vtx[j].Pos).c_str());
-					Writer->writeLineBreak();
-				}
-			}
-			break;
-		case video::EVT_TANGENTS:
-			{
-				video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices();
-				for (u32 j=0; j<vertexCount; ++j)
-				{
-					Writer->writeText(toString(vtx[j].Pos).c_str());
-					Writer->writeLineBreak();
-				}
-			}
-			break;
-		}
-	}
-
-	Writer->writeClosingTag(L"float_array");
-	Writer->writeLineBreak();
-
-	Writer->writeElement(L"technique_common", false);
-	Writer->writeLineBreak();
-
-	vertexCountStr = core::stringw(totalVertexCount);
-
-		Writer->writeElement(L"accessor", false, L"source", L"#mesh-Pos-array",
-					L"count", vertexCountStr.c_str(), L"stride", L"3");
-		Writer->writeLineBreak();
-
-			Writer->writeElement(L"param", true, L"name", L"X", L"type", L"float");
-			Writer->writeLineBreak();
-			Writer->writeElement(L"param", true, L"name", L"Y", L"type", L"float");
-			Writer->writeLineBreak();
-			Writer->writeElement(L"param", true, L"name", L"Z", L"type", L"float");
-			Writer->writeLineBreak();
-
-			Writer->writeClosingTag(L"accessor");
-			Writer->writeLineBreak();
-
-	Writer->writeClosingTag(L"technique_common");
-	Writer->writeLineBreak();
-
-	Writer->writeClosingTag(L"source");
-	Writer->writeLineBreak();
-
-	// write texture coordinates
-
-	Writer->writeElement(L"source", false, L"id", L"mesh-TexCoord0");
-	Writer->writeLineBreak();
-
-	vertexCountStr = core::stringw(totalVertexCount*2);
-	Writer->writeElement(L"float_array", false, L"id", L"mesh-TexCoord0-array",
-				L"count", vertexCountStr.c_str());
-	Writer->writeLineBreak();
-
-	for (i=0; i<mesh->getMeshBufferCount(); ++i)
-	{
-		scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
-		video::E_VERTEX_TYPE vtxType = buffer->getVertexType();
-		u32 vertexCount = buffer->getVertexCount();
-
-		globalIndices[i].TCoord0StartIndex = 0;
-
-		if (i!=0)
-			globalIndices[i].TCoord0StartIndex = globalIndices[i-1].TCoord0LastIndex + 1;
-
-		globalIndices[i].TCoord0LastIndex = globalIndices[i].TCoord0StartIndex + vertexCount - 1;
-
-		switch(vtxType)
-		{
-		case video::EVT_STANDARD:
-			{
-				video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices();
-				for (u32 j=0; j<vertexCount; ++j)
-				{
-					Writer->writeText(toString(vtx[j].TCoords).c_str());
-					Writer->writeLineBreak();
-				}
-			}
-			break;
-		case video::EVT_2TCOORDS:
-			{
-				video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
-				for (u32 j=0; j<vertexCount; ++j)
-				{
-					Writer->writeText(toString(vtx[j].TCoords).c_str());
-					Writer->writeLineBreak();
-				}
-			}
-			break;
-		case video::EVT_TANGENTS:
-			{
-				video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices();
-				for (u32 j=0; j<vertexCount; ++j)
-				{
-					Writer->writeText(toString(vtx[j].TCoords).c_str());
-					Writer->writeLineBreak();
-				}
-			}
-			break;
-		}
-	}
-
-	Writer->writeClosingTag(L"float_array");
-	Writer->writeLineBreak();
-
-	Writer->writeElement(L"technique_common", false);
-	Writer->writeLineBreak();
-
-	vertexCountStr = core::stringw(totalVertexCount);
-
-		Writer->writeElement(L"accessor", false, L"source", L"#mesh-TexCoord0-array",
-					L"count", vertexCountStr.c_str(), L"stride", L"2");
-		Writer->writeLineBreak();
-
-			Writer->writeElement(L"param", true, L"name", L"U", L"type", L"float");
-			Writer->writeLineBreak();
-			Writer->writeElement(L"param", true, L"name", L"V", L"type", L"float");
-			Writer->writeLineBreak();
-
-		Writer->writeClosingTag(L"accessor");
-		Writer->writeLineBreak();
-
-	Writer->writeClosingTag(L"technique_common");
-	Writer->writeLineBreak();
-
-	Writer->writeClosingTag(L"source");
-	Writer->writeLineBreak();
-
-	// write normals
-
-	Writer->writeElement(L"source", false, L"id", L"mesh-Normal");
-	Writer->writeLineBreak();
-
-	vertexCountStr = core::stringw(totalVertexCount*3);
-	Writer->writeElement(L"float_array", false, L"id", L"mesh-Normal-array",
-				L"count", vertexCountStr.c_str());
-	Writer->writeLineBreak();
-
-	for (i=0; i<mesh->getMeshBufferCount(); ++i)
-	{
-		scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
-		video::E_VERTEX_TYPE vtxType = buffer->getVertexType();
-		u32 vertexCount = buffer->getVertexCount();
-
-		globalIndices[i].NormalStartIndex = 0;
-
-		if (i!=0)
-			globalIndices[i].NormalStartIndex = globalIndices[i-1].NormalLastIndex + 1;
-
-		globalIndices[i].NormalLastIndex = globalIndices[i].NormalStartIndex + vertexCount - 1;
-
-		switch(vtxType)
-		{
-		case video::EVT_STANDARD:
-			{
-				video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices();
-				for (u32 j=0; j<vertexCount; ++j)
-				{
-					Writer->writeText(toString(vtx[j].Normal).c_str());
-					Writer->writeLineBreak();
-				}
-			}
-			break;
-		case video::EVT_2TCOORDS:
-			{
-				video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
-				for (u32 j=0; j<vertexCount; ++j)
-				{
-					Writer->writeText(toString(vtx[j].Normal).c_str());
-					Writer->writeLineBreak();
-				}
-			}
-			break;
-		case video::EVT_TANGENTS:
-			{
-				video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices();
-				for (u32 j=0; j<vertexCount; ++j)
-				{
-					Writer->writeText(toString(vtx[j].Normal).c_str());
-					Writer->writeLineBreak();
-				}
-			}
-			break;
-		}
-	}
-
-	Writer->writeClosingTag(L"float_array");
-	Writer->writeLineBreak();
-
-	Writer->writeElement(L"technique_common", false);
-	Writer->writeLineBreak();
-
-	vertexCountStr = core::stringw(totalVertexCount);
-
-		Writer->writeElement(L"accessor", false, L"source", L"#mesh-Normal-array",
-								L"count", vertexCountStr.c_str(), L"stride", L"3");
-		Writer->writeLineBreak();
-
-			Writer->writeElement(L"param", true, L"name", L"X", L"type", L"float");
-			Writer->writeLineBreak();
-			Writer->writeElement(L"param", true, L"name", L"Y", L"type", L"float");
-			Writer->writeLineBreak();
-			Writer->writeElement(L"param", true, L"name", L"Z", L"type", L"float");
-			Writer->writeLineBreak();
-
-		Writer->writeClosingTag(L"accessor");
-		Writer->writeLineBreak();
-
-	Writer->writeClosingTag(L"technique_common");
-	Writer->writeLineBreak();
-
-	Writer->writeClosingTag(L"source");
-	Writer->writeLineBreak();
-
-	// write second set of texture coordinates
-
-	if (totalTCoords2Count)
-	{
-		Writer->writeElement(L"source", false, L"id", L"mesh-TexCoord1");
-		Writer->writeLineBreak();
-
-		vertexCountStr = core::stringw(totalTCoords2Count*2);
-		Writer->writeElement(L"float_array", false, L"id", L"mesh-TexCoord1-array",
-								L"count", vertexCountStr.c_str());
+		core::stringw vertexCountStr(totalVertexCount*3);
+		core::stringw meshPosArrayId(meshPosId);
+		meshPosArrayId += L"-array";
+		Writer->writeElement(L"float_array", false, L"id", meshPosArrayId.c_str(),
+					L"count", vertexCountStr.c_str());
 		Writer->writeLineBreak();
 
 		for (i=0; i<mesh->getMeshBufferCount(); ++i)
@@ -525,31 +1157,46 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 			video::E_VERTEX_TYPE vtxType = buffer->getVertexType();
 			u32 vertexCount = buffer->getVertexCount();
 
-			if (hasSecondTextureCoordinates(vtxType))
+			globalIndices[i].PosStartIndex = 0;
+
+			if (i!=0)
+				globalIndices[i].PosStartIndex = globalIndices[i-1].PosLastIndex + 1;
+
+			globalIndices[i].PosLastIndex = globalIndices[i].PosStartIndex + vertexCount - 1;
+
+			switch(vtxType)
 			{
-				globalIndices[i].TCoord1StartIndex = 0;
-
-				if (i!=0 && globalIndices[i-1].TCoord1LastIndex != -1)
-					globalIndices[i].TCoord1StartIndex = globalIndices[i-1].TCoord1LastIndex + 1;
-
-				globalIndices[i].TCoord1LastIndex = globalIndices[i].TCoord1StartIndex + vertexCount - 1;
-
-				switch(vtxType)
+			case video::EVT_STANDARD:
 				{
-				case video::EVT_2TCOORDS:
+					video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices();
+					for (u32 j=0; j<vertexCount; ++j)
 					{
-						video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
-						for (u32 j=0; j<vertexCount; ++j)
-						{
-							Writer->writeText(toString(vtx[j].TCoords2).c_str());
-							Writer->writeLineBreak();
-						}
+						Writer->writeText(toString(vtx[j].Pos).c_str());
+						Writer->writeLineBreak();
 					}
-					break;
-				default:
-					break;
 				}
-			} // end this buffer has 2 texture coordinates
+				break;
+			case video::EVT_2TCOORDS:
+				{
+					video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
+					for (u32 j=0; j<vertexCount; ++j)
+					{
+						Writer->writeText(toString(vtx[j].Pos).c_str());
+						Writer->writeLineBreak();
+					}
+				}
+				break;
+			case video::EVT_TANGENTS:
+				{
+					video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices();
+					for (u32 j=0; j<vertexCount; ++j)
+					{
+						Writer->writeText(toString(vtx[j].Pos).c_str());
+						Writer->writeLineBreak();
+					}
+				}
+				break;
+			}
 		}
 
 		Writer->writeClosingTag(L"float_array");
@@ -558,10 +1205,100 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		Writer->writeElement(L"technique_common", false);
 		Writer->writeLineBreak();
 
-		vertexCountStr = core::stringw(totalTCoords2Count);
+		vertexCountStr = core::stringw(totalVertexCount);
 
-			Writer->writeElement(L"accessor", false, L"source", L"#mesh-TexCoord1-array",
-									L"count", vertexCountStr.c_str(), L"stride", L"2");
+			Writer->writeElement(L"accessor", false, L"source", toRef(meshPosArrayId).c_str(),
+						L"count", vertexCountStr.c_str(), L"stride", L"3");
+			Writer->writeLineBreak();
+
+				Writer->writeElement(L"param", true, L"name", L"X", L"type", L"float");
+				Writer->writeLineBreak();
+				Writer->writeElement(L"param", true, L"name", L"Y", L"type", L"float");
+				Writer->writeLineBreak();
+				Writer->writeElement(L"param", true, L"name", L"Z", L"type", L"float");
+				Writer->writeLineBreak();
+
+				Writer->writeClosingTag(L"accessor");
+				Writer->writeLineBreak();
+
+		Writer->writeClosingTag(L"technique_common");
+		Writer->writeLineBreak();
+
+	Writer->writeClosingTag(L"source");
+	Writer->writeLineBreak();
+
+	// write texture coordinates
+
+	core::stringw meshTexCoord0Id(meshId);
+	meshTexCoord0Id += L"-TexCoord0";
+	Writer->writeElement(L"source", false, L"id", meshTexCoord0Id.c_str());
+	Writer->writeLineBreak();
+
+		vertexCountStr = core::stringw(totalVertexCount*2);
+		core::stringw meshTexCoordArrayId(meshTexCoord0Id);
+		meshTexCoordArrayId += L"-array";
+		Writer->writeElement(L"float_array", false, L"id", meshTexCoordArrayId.c_str(),
+					L"count", vertexCountStr.c_str());
+		Writer->writeLineBreak();
+
+		for (i=0; i<mesh->getMeshBufferCount(); ++i)
+		{
+			scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
+			video::E_VERTEX_TYPE vtxType = buffer->getVertexType();
+			u32 vertexCount = buffer->getVertexCount();
+
+			globalIndices[i].TCoord0StartIndex = 0;
+
+			if (i!=0)
+				globalIndices[i].TCoord0StartIndex = globalIndices[i-1].TCoord0LastIndex + 1;
+
+			globalIndices[i].TCoord0LastIndex = globalIndices[i].TCoord0StartIndex + vertexCount - 1;
+
+			switch(vtxType)
+			{
+			case video::EVT_STANDARD:
+				{
+					video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices();
+					for (u32 j=0; j<vertexCount; ++j)
+					{
+						Writer->writeText(uvToString(vtx[j].TCoords).c_str());
+						Writer->writeLineBreak();
+					}
+				}
+				break;
+			case video::EVT_2TCOORDS:
+				{
+					video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
+					for (u32 j=0; j<vertexCount; ++j)
+					{
+						Writer->writeText(uvToString(vtx[j].TCoords).c_str());
+						Writer->writeLineBreak();
+					}
+				}
+				break;
+			case video::EVT_TANGENTS:
+				{
+					video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices();
+					for (u32 j=0; j<vertexCount; ++j)
+					{
+						Writer->writeText(uvToString(vtx[j].TCoords).c_str());
+						Writer->writeLineBreak();
+					}
+				}
+				break;
+			}
+		}
+
+		Writer->writeClosingTag(L"float_array");
+		Writer->writeLineBreak();
+
+		Writer->writeElement(L"technique_common", false);
+		Writer->writeLineBreak();
+
+		vertexCountStr = core::stringw(totalVertexCount);
+
+			Writer->writeElement(L"accessor", false, L"source", toRef(meshTexCoordArrayId).c_str(),
+						L"count", vertexCountStr.c_str(), L"stride", L"2");
 			Writer->writeLineBreak();
 
 				Writer->writeElement(L"param", true, L"name", L"U", L"type", L"float");
@@ -575,6 +1312,169 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		Writer->writeClosingTag(L"technique_common");
 		Writer->writeLineBreak();
 
+	Writer->writeClosingTag(L"source");
+	Writer->writeLineBreak();
+
+	// write normals
+	core::stringw meshNormalId(meshId);
+	meshNormalId += L"-Normal";
+	Writer->writeElement(L"source", false, L"id", meshNormalId.c_str());
+	Writer->writeLineBreak();
+
+		vertexCountStr = core::stringw(totalVertexCount*3);
+		core::stringw meshNormalArrayId(meshNormalId);
+		meshNormalArrayId += L"-array";
+		Writer->writeElement(L"float_array", false, L"id", meshNormalArrayId.c_str(),
+					L"count", vertexCountStr.c_str());
+		Writer->writeLineBreak();
+
+		for (i=0; i<mesh->getMeshBufferCount(); ++i)
+		{
+			scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
+			video::E_VERTEX_TYPE vtxType = buffer->getVertexType();
+			u32 vertexCount = buffer->getVertexCount();
+
+			globalIndices[i].NormalStartIndex = 0;
+
+			if (i!=0)
+				globalIndices[i].NormalStartIndex = globalIndices[i-1].NormalLastIndex + 1;
+
+			globalIndices[i].NormalLastIndex = globalIndices[i].NormalStartIndex + vertexCount - 1;
+
+			switch(vtxType)
+			{
+			case video::EVT_STANDARD:
+				{
+					video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices();
+					for (u32 j=0; j<vertexCount; ++j)
+					{
+						Writer->writeText(toString(vtx[j].Normal).c_str());
+						Writer->writeLineBreak();
+					}
+				}
+				break;
+			case video::EVT_2TCOORDS:
+				{
+					video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
+					for (u32 j=0; j<vertexCount; ++j)
+					{
+						Writer->writeText(toString(vtx[j].Normal).c_str());
+						Writer->writeLineBreak();
+					}
+				}
+				break;
+			case video::EVT_TANGENTS:
+				{
+					video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices();
+					for (u32 j=0; j<vertexCount; ++j)
+					{
+						Writer->writeText(toString(vtx[j].Normal).c_str());
+						Writer->writeLineBreak();
+					}
+				}
+				break;
+			}
+		}
+
+		Writer->writeClosingTag(L"float_array");
+		Writer->writeLineBreak();
+
+		Writer->writeElement(L"technique_common", false);
+		Writer->writeLineBreak();
+
+		vertexCountStr = core::stringw(totalVertexCount);
+
+		Writer->writeElement(L"accessor", false, L"source", toRef(meshNormalArrayId).c_str(),
+									L"count", vertexCountStr.c_str(), L"stride", L"3");
+			Writer->writeLineBreak();
+
+				Writer->writeElement(L"param", true, L"name", L"X", L"type", L"float");
+				Writer->writeLineBreak();
+				Writer->writeElement(L"param", true, L"name", L"Y", L"type", L"float");
+				Writer->writeLineBreak();
+				Writer->writeElement(L"param", true, L"name", L"Z", L"type", L"float");
+				Writer->writeLineBreak();
+
+			Writer->writeClosingTag(L"accessor");
+			Writer->writeLineBreak();
+
+		Writer->writeClosingTag(L"technique_common");
+		Writer->writeLineBreak();
+
+	Writer->writeClosingTag(L"source");
+	Writer->writeLineBreak();
+
+	// write second set of texture coordinates
+	core::stringw meshTexCoord1Id(meshId);
+	meshTexCoord1Id += L"-TexCoord1";
+	if (totalTCoords2Count)
+	{
+		Writer->writeElement(L"source", false, L"id", meshTexCoord1Id.c_str());
+		Writer->writeLineBreak();
+
+			vertexCountStr = core::stringw(totalTCoords2Count*2);
+			core::stringw meshTexCoord1ArrayId(meshTexCoord1Id);
+			meshTexCoord1ArrayId += L"-array";
+			Writer->writeElement(L"float_array", false, L"id", meshTexCoord1ArrayId.c_str(),
+									L"count", vertexCountStr.c_str());
+			Writer->writeLineBreak();
+
+			for (i=0; i<mesh->getMeshBufferCount(); ++i)
+			{
+				scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
+				video::E_VERTEX_TYPE vtxType = buffer->getVertexType();
+				u32 vertexCount = buffer->getVertexCount();
+
+				if (hasSecondTextureCoordinates(vtxType))
+				{
+					globalIndices[i].TCoord1StartIndex = 0;
+
+					if (i!=0 && globalIndices[i-1].TCoord1LastIndex != -1)
+						globalIndices[i].TCoord1StartIndex = globalIndices[i-1].TCoord1LastIndex + 1;
+
+					globalIndices[i].TCoord1LastIndex = globalIndices[i].TCoord1StartIndex + vertexCount - 1;
+
+					switch(vtxType)
+					{
+					case video::EVT_2TCOORDS:
+						{
+							video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
+							for (u32 j=0; j<vertexCount; ++j)
+							{
+								Writer->writeText(toString(vtx[j].TCoords2).c_str());
+								Writer->writeLineBreak();
+							}
+						}
+						break;
+					default:
+						break;
+					}
+				} // end this buffer has 2 texture coordinates
+			}
+
+			Writer->writeClosingTag(L"float_array");
+			Writer->writeLineBreak();
+
+			Writer->writeElement(L"technique_common", false);
+			Writer->writeLineBreak();
+
+			vertexCountStr = core::stringw(totalTCoords2Count);
+
+				Writer->writeElement(L"accessor", false, L"source", toRef(meshTexCoord1ArrayId).c_str(),
+										L"count", vertexCountStr.c_str(), L"stride", L"2");
+				Writer->writeLineBreak();
+
+					Writer->writeElement(L"param", true, L"name", L"U", L"type", L"float");
+					Writer->writeLineBreak();
+					Writer->writeElement(L"param", true, L"name", L"V", L"type", L"float");
+					Writer->writeLineBreak();
+
+				Writer->writeClosingTag(L"accessor");
+				Writer->writeLineBreak();
+
+			Writer->writeClosingTag(L"technique_common");
+			Writer->writeLineBreak();
+
 		Writer->writeClosingTag(L"source");
 		Writer->writeLineBreak();
 	}
@@ -584,12 +1484,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 	// TODO
 
 	// write vertices
-
-	Writer->writeElement(L"vertices", false, L"id", L"mesh-Vtx");
+	core::stringw meshVtxId(meshId);
+	meshVtxId += L"-Vtx";
+	Writer->writeElement(L"vertices", false, L"id", meshVtxId.c_str());
 	Writer->writeLineBreak();
 
-	Writer->writeElement(L"input", true, L"semantic", L"POSITION", L"source", L"#mesh-Pos");
-	Writer->writeLineBreak();
+		Writer->writeElement(L"input", true, L"semantic", L"POSITION", L"source", toRef(meshPosId).c_str());
+		Writer->writeLineBreak();
 
 	Writer->writeClosingTag(L"vertices");
 	Writer->writeLineBreak();
@@ -603,23 +1504,24 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		const u32 polyCount = buffer->getIndexCount() / 3;
 		core::stringw strPolyCount(polyCount);
 		core::stringw strMat = "mat";
+		strMat += meshname;
 		strMat += i;
 
 		Writer->writeElement(L"triangles", false, L"count", strPolyCount.c_str(),
 								L"material", strMat.c_str());
 		Writer->writeLineBreak();
 
-		Writer->writeElement(L"input", true, L"semantic", L"VERTEX", L"source", L"#mesh-Vtx", L"offset", L"0");
+		Writer->writeElement(L"input", true, L"semantic", L"VERTEX", L"source", toRef(meshVtxId).c_str(), L"offset", L"0");
 		Writer->writeLineBreak();
-		Writer->writeElement(L"input", true, L"semantic", L"TEXCOORD", L"source", L"#mesh-TexCoord0", L"offset", L"1");
+		Writer->writeElement(L"input", true, L"semantic", L"TEXCOORD", L"source", toRef(meshTexCoord0Id).c_str(), L"offset", L"1", L"set", L"0");
 		Writer->writeLineBreak();
-		Writer->writeElement(L"input", true, L"semantic", L"NORMAL", L"source", L"#mesh-Normal", L"offset", L"2");
+		Writer->writeElement(L"input", true, L"semantic", L"NORMAL", L"source", toRef(meshNormalId).c_str(), L"offset", L"2");
 		Writer->writeLineBreak();
 
 		bool has2ndTexCoords = hasSecondTextureCoordinates(buffer->getVertexType());
 		if (has2ndTexCoords)
 		{
-			Writer->writeElement(L"input", true, L"semantic", L"TEXCOORD", L"source", L"#mesh-TexCoord1", L"idx", L"3");
+			Writer->writeElement(L"input", true, L"semantic", L"TEXCOORD", L"source", toRef(meshTexCoord1Id).c_str(), L"idx", L"3");
 			Writer->writeLineBreak();
 		}
 
@@ -685,72 +1587,324 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 	}
 
 	// close mesh and geometry
-
+	delete [] globalIndices;
 	Writer->writeClosingTag(L"mesh");
 	Writer->writeLineBreak();
 	Writer->writeClosingTag(L"geometry");
 	Writer->writeLineBreak();
-
-	Writer->writeClosingTag(L"library_geometries");
-	Writer->writeLineBreak();
-
-	// close everything
-
-	Writer->writeClosingTag(L"COLLADA");
-	Writer->drop();
-
-	delete [] globalIndices;
-
-	return true;
 }
 
-
-bool CColladaMeshWriter::hasSecondTextureCoordinates(video::E_VERTEX_TYPE type) const
+void CColladaMeshWriter::writeLibraryImages()
 {
-	return type == video::EVT_2TCOORDS;
+	if ( getWriteTextures() && !LibraryImages.empty() )
+	{
+		Writer->writeElement(L"library_images", false);
+		Writer->writeLineBreak();
+
+		for ( irr::u32 i=0; i<LibraryImages.size(); ++i )
+		{
+			irr::io::path p(FileSystem->getRelativeFilename(LibraryImages[i]->getName().getPath(), Directory));
+			//<image name="rose01">
+			irr::core::stringw ncname(pathToNCName(p));
+			Writer->writeElement(L"image", false, L"id", ncname.c_str(), L"name", ncname.c_str());
+			Writer->writeLineBreak();
+			//  <init_from>../flowers/rose01.jpg</init_from>
+				Writer->writeElement(L"init_from", false);
+				Writer->writeText(pathToURI(p).c_str());
+				Writer->writeClosingTag(L"init_from");
+				Writer->writeLineBreak();
+	 		//  </image>
+			Writer->writeClosingTag(L"image");
+			Writer->writeLineBreak();
+		}
+
+		Writer->writeClosingTag(L"library_images");
+		Writer->writeLineBreak();
+	}
 }
 
-irr::core::stringw CColladaMeshWriter::toString(const irr::core::vector3df& vec) const
+void CColladaMeshWriter::writeColorElement(const video::SColorf & col, bool writeAlpha)
 {
-	c8 tmpbuf[255];
-	snprintf(tmpbuf, 255, "%f %f %f", vec.X, vec.Y, vec.Z);
-	core::stringw str  = tmpbuf;
-
-	return str;
-}
-
-irr::core::stringw CColladaMeshWriter::toString(const irr::core::vector2df& vec) const
-{
-	c8 tmpbuf[255];
-	snprintf(tmpbuf, 255, "%f %f", vec.X, vec.Y);
-	core::stringw str  = tmpbuf;
-
-	return str;
-}
-
-inline irr::core::stringw CColladaMeshWriter::toString(const irr::video::SColorf& colorf) const
-{
-	c8 tmpbuf[255];
-	snprintf(tmpbuf, 255, "%f %f %f %f", colorf.getRed(), colorf.getGreen(), colorf.getBlue(), colorf.getAlpha());
-	core::stringw str = tmpbuf;
-
-	return str;
-}
-
-void CColladaMeshWriter::writeColorAttribute(wchar_t * parentTag, io::IAttributes* attributes, s32 attridx)
-{
-	Writer->writeElement(parentTag, false);
-	Writer->writeLineBreak();
-
 	Writer->writeElement(L"color", false);
 
-	irr::core::stringw str( toString(attributes->getAttributeAsColorf(attridx)) );
+	irr::core::stringw str( toString(col, writeAlpha) );
 	Writer->writeText(str.c_str());
 
 	Writer->writeClosingTag(L"color");
 	Writer->writeLineBreak();
+}
 
-	Writer->writeClosingTag(parentTag);
+void CColladaMeshWriter::writeColorElement(const video::SColor & col, bool writeAlpha)
+{
+	writeColorElement( video::SColorf(col), writeAlpha );
+}
+
+void CColladaMeshWriter::writeAmbientLightElement(const video::SColorf & col)
+{
+	Writer->writeElement(L"light", false, L"id", L"ambientlight");
+	Writer->writeLineBreak();
+
+		Writer->writeElement(L"technique_common", false);
+		Writer->writeLineBreak();			
+
+			Writer->writeElement(L"ambient", false);
+			Writer->writeLineBreak();
+					
+				writeColorElement(col, false);
+
+			Writer->writeClosingTag(L"ambient");
+			Writer->writeLineBreak();
+
+		Writer->writeClosingTag(L"technique_common");
+		Writer->writeLineBreak();
+
+	Writer->writeClosingTag(L"light");
+	Writer->writeLineBreak();
+}
+
+s32 CColladaMeshWriter::getCheckedTextureIdx(const video::SMaterial & material, E_COLLADA_COLOR_SAMPLER cs)
+{
+	if (	!getWriteTextures()
+		||	!getProperties() )
+		return -1;
+
+	s32 idx = getProperties()->getTextureIdx(material, cs);
+	if ( idx >= 0 && !material.TextureLayer[idx].Texture )
+		return -1;
+
+	return idx;
+}
+
+video::SColor CColladaMeshWriter::getColorMapping(const video::SMaterial & material, E_COLLADA_COLOR_SAMPLER cs, E_COLLADA_IRR_COLOR colType)
+{
+	switch ( colType )
+	{
+		case ECIC_NONE:
+			return video::SColor(255, 0, 0, 0);
+
+		case ECIC_CUSTOM:
+			return getProperties()->getCustomColor(material, cs);
+
+		case ECIC_DIFFUSE:
+			return material.DiffuseColor;
+
+		case ECIC_AMBIENT:
+			return material.AmbientColor;
+
+		case ECIC_EMISSIVE:
+			return material.EmissiveColor;
+
+		case ECIC_SPECULAR:
+			return material.SpecularColor;
+	}
+	return video::SColor(255, 0, 0, 0);
+}
+
+void CColladaMeshWriter::writeTextureSampler(const irr::core::stringw& meshname, s32 textureIdx)
+{
+	irr::core::stringw sampler(L"tex");
+	sampler += irr::core::stringw(textureIdx);
+	sampler += L"-sampler";
+
+	// <texture texture="sampler" texcoord="texCoord"/>
+	core::stringw meshTexCoordId(meshname);
+	meshTexCoordId += L"-TexCoord0";	// TODO: need to handle second UV-set
+	Writer->writeElement(L"texture", true, L"texture", sampler.c_str(), L"texcoord", meshTexCoordId.c_str() );
+	Writer->writeLineBreak();
+}
+
+void CColladaMeshWriter::writeFxElement(const irr::core::stringw& meshname, const video::SMaterial & material, E_COLLADA_TECHNIQUE_FX techFx)
+{
+	core::stringw fxLabel;
+	bool writeEmission = true;
+	bool writeAmbient = true;
+	bool writeDiffuse = true;
+	bool writeSpecular = true;
+	bool writeShininess = true;
+	bool writeReflective = true;
+	bool writeReflectivity = true;
+	bool writeTransparent = true;
+	bool writeTransparency = true;
+	bool writeIndexOfRefraction = true;
+	switch ( techFx )
+	{
+		case ECTF_BLINN:
+			fxLabel = L"blinn";
+			break;
+		case ECTF_PHONG:
+			fxLabel = L"phong";
+			break;
+		case ECTF_LAMBERT:
+			fxLabel = L"lambert";
+			writeSpecular = false;
+			writeShininess = false;
+			break;
+		case ECTF_CONSTANT:
+			fxLabel = L"constant";
+			writeAmbient = false;
+			writeDiffuse = false;
+			writeSpecular = false;
+			writeShininess = false;
+			break;
+	}
+
+	Writer->writeElement(fxLabel.c_str(), false);
+	Writer->writeLineBreak();
+
+	// write all interesting material parameters
+	// attributes must be written in fixed order
+	if ( getProperties() )
+	{
+		if ( writeEmission )
+		{
+			writeColorFx(meshname, material, L"emission", ECCS_EMISSIVE);
+		}
+
+		if ( writeAmbient )
+		{
+			writeColorFx(meshname, material, L"ambient", ECCS_AMBIENT);
+		}
+
+		if ( writeDiffuse )
+		{
+			writeColorFx(meshname, material, L"diffuse", ECCS_DIFFUSE);
+		}
+
+		if ( writeSpecular )
+		{
+			writeColorFx(meshname, material, L"specular", ECCS_SPECULAR);
+		}
+
+		if ( writeShininess )
+		{
+			Writer->writeElement(L"shininess", false);
+			Writer->writeLineBreak();
+			writeFloatElement(material.Shininess);
+			Writer->writeClosingTag(L"shininess");
+			Writer->writeLineBreak();
+		}
+
+		if ( writeReflective )
+		{
+			writeColorFx(meshname, material, L"reflective", ECCS_REFLECTIVE);
+		}
+
+		if ( writeReflectivity )
+		{
+			f32 t = getProperties()->getReflectivity(material);
+			if ( t >= 0.f )
+			{
+				// <transparency>  <float>1.000000</float> </transparency>
+				Writer->writeElement(L"reflectivity", false);
+				Writer->writeLineBreak();
+				writeFloatElement(t);
+				Writer->writeClosingTag(L"reflectivity");
+				Writer->writeLineBreak();
+			}
+		}
+
+		if ( writeTransparent )
+		{
+			E_COLLADA_TRANSPARENT_FX transparentFx = getProperties()->getTransparentFx(material);
+			writeColorFx(meshname, material, L"transparent", ECCS_TRANSPARENT, L"opaque", toString(transparentFx).c_str());
+		}
+
+		if ( writeTransparency  )
+		{
+			f32 t = getProperties()->getTransparency(material);
+			if ( t >= 0.f )
+			{
+				// <transparency>  <float>1.000000</float> </transparency>
+				Writer->writeElement(L"transparency", false);
+				Writer->writeLineBreak();
+				writeFloatElement(t);
+				Writer->writeClosingTag(L"transparency");
+				Writer->writeLineBreak();
+			}
+		}
+
+		if ( writeIndexOfRefraction )
+		{
+			f32 t = getProperties()->getIndexOfRefraction(material);
+			if ( t >= 0.f )
+			{
+				Writer->writeElement(L"index_of_refraction", false);
+				Writer->writeLineBreak();
+				writeFloatElement(t);
+				Writer->writeClosingTag(L"index_of_refraction");
+				Writer->writeLineBreak();
+			}
+		}
+	}
+
+
+	Writer->writeClosingTag(fxLabel.c_str());
+	Writer->writeLineBreak();
+}
+
+void CColladaMeshWriter::writeColorFx(const irr::core::stringw& meshname, const video::SMaterial & material, const wchar_t * colorname, E_COLLADA_COLOR_SAMPLER cs, const wchar_t* attr1Name, const wchar_t* attr1Value)
+{
+	irr::s32 idx = getCheckedTextureIdx(material, cs);
+	E_COLLADA_IRR_COLOR colType = idx < 0 ? getProperties()->getColorMapping(material, cs) : ECIC_NONE;
+	if ( idx >= 0 || colType != ECIC_NONE )
+	{
+		Writer->writeElement(colorname, false, attr1Name, attr1Value);
+		Writer->writeLineBreak();
+		if ( idx >= 0 )
+			writeTextureSampler( meshname, idx);
+		else
+			writeColorElement(getColorMapping(material, cs, colType));
+		Writer->writeClosingTag(colorname);
+		Writer->writeLineBreak();
+	}
+}
+
+void CColladaMeshWriter::writeFloatElement(irr::f32 value)
+{
+	Writer->writeElement(L"float", false);
+	Writer->writeText(core::stringw(value).c_str());
+	Writer->writeClosingTag(L"float");
+	Writer->writeLineBreak();
+}
+
+void CColladaMeshWriter::writeRotateElement(const irr::core::vector3df& axis, irr::f32 angle)
+{
+	Writer->writeElement(L"rotate", false);
+	irr::core::stringw txt(axis.X);
+	txt += L" ";
+	txt += irr::core::stringw(axis.Y);
+	txt += L" ";
+	txt += irr::core::stringw(axis.Z);
+	txt += L" ";
+	txt += irr::core::stringw(angle);
+	Writer->writeText(txt.c_str());
+	Writer->writeClosingTag(L"rotate");
+	Writer->writeLineBreak();
+}
+
+void CColladaMeshWriter::writeScaleElement(const irr::core::vector3df& scale)
+{
+	Writer->writeElement(L"scale", false);
+	irr::core::stringw txt(scale.X);
+	txt += L" ";
+	txt += irr::core::stringw(scale.Y);
+	txt += L" ";
+	txt += irr::core::stringw(scale.Z);
+	Writer->writeText(txt.c_str());
+	Writer->writeClosingTag(L"scale");
+	Writer->writeLineBreak();
+}
+
+void CColladaMeshWriter::writeTranslateElement(const irr::core::vector3df& translate)
+{
+	Writer->writeElement(L"translate", false);
+	irr::core::stringw txt(translate.X);
+	txt += L" ";
+	txt += irr::core::stringw(translate.Y);
+	txt += L" ";
+	txt += irr::core::stringw(translate.Z);
+	Writer->writeText(txt.c_str());
+	Writer->writeClosingTag(L"translate");
 	Writer->writeLineBreak();
 }
 
diff --git a/source/Irrlicht/CColladaMeshWriter.h b/source/Irrlicht/CColladaMeshWriter.h
index fe7619a1..698d75be 100644
--- a/source/Irrlicht/CColladaMeshWriter.h
+++ b/source/Irrlicht/CColladaMeshWriter.h
@@ -5,8 +5,9 @@
 #ifndef __IRR_C_COLLADA_MESH_WRITER_H_INCLUDED__
 #define __IRR_C_COLLADA_MESH_WRITER_H_INCLUDED__
 
-#include "IMeshWriter.h"
+#include "IColladaMeshWriter.h"
 #include "S3DVertex.h"
+#include "irrMap.h"
 #include "IVideoDriver.h"
 
 namespace irr
@@ -19,19 +20,59 @@ namespace io
 namespace scene
 {
 
+	//! Callback interface for properties which can be used to influence collada writing
+	// (Implementer note: keep namespace labels here to make it easier for users copying this one)
+	class CColladaMeshWriterProperties  : public virtual IColladaMeshWriterProperties
+	{
+	public:
+		//! Which lighting model should be used in the technique (FX) section when exporting effects (materials)
+		virtual irr::scene::E_COLLADA_TECHNIQUE_FX getTechniqueFx(const irr::video::SMaterial& material) const;
+
+		//! Which texture index should be used when writing the texture of the given sampler color.
+		virtual irr::s32 getTextureIdx(const irr::video::SMaterial & material, irr::scene::E_COLLADA_COLOR_SAMPLER cs) const;
+
+		//! Return which color from Irrlicht should be used for the color requested by collada
+		virtual irr::scene::E_COLLADA_IRR_COLOR getColorMapping(const irr::video::SMaterial & material, irr::scene::E_COLLADA_COLOR_SAMPLER cs) const;
+
+		//! Return custom colors for certain color types requested by collada. 
+		virtual irr::video::SColor getCustomColor(const irr::video::SMaterial & material, irr::scene::E_COLLADA_COLOR_SAMPLER cs) const;
+
+		//! Return the settings for transparence
+		virtual irr::scene::E_COLLADA_TRANSPARENT_FX getTransparentFx(const irr::video::SMaterial& material) const;
+
+		//! Transparency value for that material. 
+		virtual irr::f32 getTransparency(const irr::video::SMaterial& material) const;
+
+		//! Reflectivity value for that material
+		virtual irr::f32 getReflectivity(const irr::video::SMaterial& material) const;
+
+		//! Return index of refraction for that material
+		virtual irr::f32 getIndexOfRefraction(const irr::video::SMaterial& material) const;
+
+		//! Should node be used in scene export? By default all visible nodes are exported.
+		virtual bool isExportable(const irr::scene::ISceneNode * node) const;
+
+		//! Return the mesh for the given nod. If it has no mesh or shouldn't export it's mesh return 0.
+		virtual irr::scene::IMesh* getMesh(irr::scene::ISceneNode * node);
+	};
+
+
 //! class to write meshes, implementing a COLLADA (.dae, .xml) writer
 /** This writer implementation has been originally developed for irrEdit and then
 merged out to the Irrlicht Engine */
-class CColladaMeshWriter : public IMeshWriter
+class CColladaMeshWriter : public IColladaMeshWriter
 {
 public:
 
-	CColladaMeshWriter(video::IVideoDriver* driver, io::IFileSystem* fs);
+	CColladaMeshWriter(ISceneManager * smgr, video::IVideoDriver* driver, io::IFileSystem* fs);
 	virtual ~CColladaMeshWriter();
 
 	//! Returns the type of the mesh writer
 	virtual EMESH_WRITER_TYPE getType() const;
 
+	//! writes a scene starting with the given node
+	virtual bool writeScene(io::IWriteFile* file, scene::ISceneNode* root);
+
 	//! writes a mesh
 	virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE);
 
@@ -40,9 +81,48 @@ protected:
 
 	bool hasSecondTextureCoordinates(video::E_VERTEX_TYPE type) const;
 	inline irr::core::stringw toString(const irr::core::vector3df& vec) const;
+	inline irr::core::stringw uvToString(const irr::core::vector2df& vec) const;
 	inline irr::core::stringw toString(const irr::core::vector2df& vec) const;
-	inline irr::core::stringw toString(const irr::video::SColorf& colorf) const;
-	inline void writeColorAttribute(wchar_t * parentTag, io::IAttributes* attributes, s32 attridx);
+	inline irr::core::stringw toString(const irr::video::SColorf& colorf, bool writeAlpha=true) const;
+	inline irr::core::stringw toString(const irr::video::ECOLOR_FORMAT format) const;
+	inline irr::core::stringw toString(const irr::video::E_TEXTURE_CLAMP clamp) const;
+	inline irr::core::stringw toString(const irr::scene::E_COLLADA_TRANSPARENT_FX opaque) const;
+	inline irr::core::stringw toRef(const irr::core::stringw& source) const;
+	irr::core::stringw uniqueNameForMesh(const scene::IMesh* mesh) const;
+	irr::core::stringw uniqueNameForLight(const scene::ISceneNode* lightNode) const;
+	irr::core::stringw uniqueNameForNode(const scene::ISceneNode* node) const;
+	irr::core::stringw minTexfilterToString(bool bilinear, bool trilinear) const;
+	irr::core::stringw magTexfilterToString(bool bilinear, bool trilinear) const;
+	irr::core::stringw pathToNCName(const irr::io::path& path) const;
+	irr::core::stringw pathToURI(const irr::io::path& path) const;
+	inline bool isXmlNameStartChar(wchar_t c) const;
+	inline bool isXmlNameChar(wchar_t c) const;
+	s32 getCheckedTextureIdx(const video::SMaterial & material, E_COLLADA_COLOR_SAMPLER cs);
+	video::SColor getColorMapping(const video::SMaterial & material, E_COLLADA_COLOR_SAMPLER cs, E_COLLADA_IRR_COLOR colType);
+	void writeAsset();
+	void makeMeshNames(irr::scene::ISceneNode * node);
+	void writeNodeMaterials(irr::scene::ISceneNode * node);
+	void writeNodeEffects(irr::scene::ISceneNode * node);
+	void writeNodeLights(irr::scene::ISceneNode * node);
+	void writeNodeGeometries(irr::scene::ISceneNode * node);
+	void writeSceneNode(irr::scene::ISceneNode * node);
+	void writeMeshMaterials(const irr::core::stringw& meshname, scene::IMesh* mesh);
+	void writeMeshEffects(const irr::core::stringw& meshname, scene::IMesh* mesh);
+	void writeMaterialEffect(const irr::core::stringw& meshname, const irr::core::stringw& materialname, const video::SMaterial & material);
+	void writeMeshGeometry(const irr::core::stringw& meshname, scene::IMesh* mesh);
+	void writeMeshInstanceGeometry(const irr::core::stringw& meshname, scene::IMesh* mesh);
+	void writeLightInstance(const irr::core::stringw& lightName);
+	void writeLibraryImages();
+	void writeColorFx(const irr::core::stringw& meshname, const video::SMaterial & material, const wchar_t * colorname, E_COLLADA_COLOR_SAMPLER cs, const wchar_t* attr1Name=0, const wchar_t* attr1Value=0);
+	void writeAmbientLightElement(const video::SColorf & col);
+	void writeColorElement(const video::SColor & col, bool writeAlpha=true);
+	void writeColorElement(const video::SColorf & col, bool writeAlpha=true);
+	void writeTextureSampler(const irr::core::stringw& meshname, s32 textureIdx);
+	void writeFxElement(const irr::core::stringw& meshname, const video::SMaterial & material, E_COLLADA_TECHNIQUE_FX techFx);
+	void writeFloatElement(irr::f32 value);
+	void writeRotateElement(const irr::core::vector3df& axis, irr::f32 angle);
+	void writeScaleElement(const irr::core::vector3df& scale);
+	void writeTranslateElement(const irr::core::vector3df& translate);
 
 	struct SComponentGlobalStartPos
 	{
@@ -68,6 +148,30 @@ protected:
 	io::IFileSystem* FileSystem;
 	video::IVideoDriver* VideoDriver;
 	io::IXMLWriter* Writer;
+	core::array<video::ITexture*> LibraryImages;
+	io::path Directory;
+
+	struct ColladaMesh
+	{
+		ColladaMesh() : MaterialWritten(false), EffectWritten(false), GeometryWritten(false)
+		{
+		}
+
+		irr::core::stringw Name;
+		bool MaterialWritten;
+		bool EffectWritten;
+		bool GeometryWritten;
+	};
+	typedef core::map<IMesh*, ColladaMesh>::Node MeshNode;
+	core::map<IMesh*, ColladaMesh> Meshes;
+
+	struct ColladaLight
+	{
+		ColladaLight()	{}
+		irr::core::stringw Name;
+	};
+	typedef core::map<ISceneNode*, ColladaLight>::Node LightNode;
+	core::map<ISceneNode*, ColladaLight> LightNodes;
 };
 
 
@@ -76,3 +180,4 @@ protected:
 
 #endif
 
+
diff --git a/source/Irrlicht/CD3D9Driver.cpp b/source/Irrlicht/CD3D9Driver.cpp
index 788a3b6b..abdc2ad1 100644
--- a/source/Irrlicht/CD3D9Driver.cpp
+++ b/source/Irrlicht/CD3D9Driver.cpp
@@ -1053,7 +1053,7 @@ bool CD3D9Driver::updateVertexHardwareBuffer(SHWBufferLink_d3d9 *hwBuffer)
 		}
 
 		DWORD flags = D3DUSAGE_WRITEONLY; // SIO2: Default to D3DUSAGE_WRITEONLY
-		if(hwBuffer->Mapped_Vertex != scene::EHM_STATIC)
+		if (hwBuffer->Mapped_Vertex != scene::EHM_STATIC)
 			flags |= D3DUSAGE_DYNAMIC;
 
 		if (FAILED(pID3DDevice->CreateVertexBuffer(bufSize, flags, FVF, D3DPOOL_DEFAULT, &hwBuffer->vertexBuffer, NULL)))
@@ -1061,7 +1061,7 @@ bool CD3D9Driver::updateVertexHardwareBuffer(SHWBufferLink_d3d9 *hwBuffer)
 		hwBuffer->vertexBufferSize = bufSize;
 
 		flags = 0; // SIO2: Reset flags before Lock
-		if(hwBuffer->Mapped_Vertex != scene::EHM_STATIC)
+		if (hwBuffer->Mapped_Vertex != scene::EHM_STATIC)
 			flags = D3DLOCK_DISCARD;
 
 		void* lockedBuffer = 0;
@@ -1187,7 +1187,9 @@ bool CD3D9Driver::updateHardwareBuffer(SHWBufferLink *hwBuffer)
 //! Create hardware buffer from meshbuffer
 CD3D9Driver::SHWBufferLink *CD3D9Driver::createHardwareBuffer(const scene::IMeshBuffer* mb)
 {
-	if (!mb || (mb->getHardwareMappingHint_Index()==scene::EHM_NEVER && mb->getHardwareMappingHint_Vertex()==scene::EHM_NEVER))
+	// Looks like d3d does not support only partial buffering, so refuse
+	// in any case of NEVER
+	if (!mb || (mb->getHardwareMappingHint_Index()==scene::EHM_NEVER || mb->getHardwareMappingHint_Vertex()==scene::EHM_NEVER))
 		return 0;
 
 	SHWBufferLink_d3d9 *hwBuffer=new SHWBufferLink_d3d9(mb);
@@ -1252,12 +1254,20 @@ void CD3D9Driver::drawHardwareBuffer(SHWBufferLink *_HWBuffer)
 	const scene::IMeshBuffer* mb = HWBuffer->MeshBuffer;
 	const E_VERTEX_TYPE vType = mb->getVertexType();
 	const u32 stride = getVertexPitchFromType(vType);
+	const void* vPtr = mb->getVertices();
+	const void* iPtr = mb->getIndices();
 	if (HWBuffer->vertexBuffer)
+	{
 		pID3DDevice->SetStreamSource(0, HWBuffer->vertexBuffer, 0, stride);
+		vPtr=0;
+	}
 	if (HWBuffer->indexBuffer)
+	{
 		pID3DDevice->SetIndices(HWBuffer->indexBuffer);
+		iPtr=0;
+	}
 
-	drawVertexPrimitiveList(0, mb->getVertexCount(), 0, mb->getIndexCount()/3, mb->getVertexType(), scene::EPT_TRIANGLES, mb->getIndexType());
+	drawVertexPrimitiveList(vPtr, mb->getVertexCount(), iPtr, mb->getIndexCount()/3, mb->getVertexType(), scene::EPT_TRIANGLES, mb->getIndexType());
 
 	if (HWBuffer->vertexBuffer)
 		pID3DDevice->SetStreamSource(0, 0, 0, 0);
@@ -2563,9 +2573,15 @@ void CD3D9Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChan
 
 			pID3DDevice->SetRenderState(D3DRS_STENCILENABLE, FALSE);
 		}
-		pID3DDevice->SetTransform(D3DTS_WORLD, &UnitMatrixD3D9);
-
 		core::matrix4 m;
+// this fixes some problems with pixel exact rendering, but also breaks nice texturing
+// moreover, it would have to be tested in each call, as the texture flag can change each time
+//		if (!texture)
+//			m.setTranslation(core::vector3df(0.5f,0.5f,0));
+		pID3DDevice->SetTransform(D3DTS_WORLD, (D3DMATRIX*)((void*)m.pointer()));
+
+		// adjust the view such that pixel center aligns with texels
+		// Otherwise, subpixel artifacts will occur
 		m.setTranslation(core::vector3df(-0.5f,-0.5f,0));
 		pID3DDevice->SetTransform(D3DTS_VIEW, (D3DMATRIX*)((void*)m.pointer()));
 
@@ -2574,6 +2590,7 @@ void CD3D9Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChan
 		m.setTranslation(core::vector3df(-1,1,0));
 		pID3DDevice->SetTransform(D3DTS_PROJECTION, (D3DMATRIX*)((void*)m.pointer()));
 
+		// 2d elements are clipped in software
 		pID3DDevice->SetRenderState(D3DRS_CLIPPING, FALSE);
 
 		Transformation3DChanged = false;
diff --git a/source/Irrlicht/CDummyTransformationSceneNode.cpp b/source/Irrlicht/CDummyTransformationSceneNode.cpp
index d279a783..ddc0d7fb 100644
--- a/source/Irrlicht/CDummyTransformationSceneNode.cpp
+++ b/source/Irrlicht/CDummyTransformationSceneNode.cpp
@@ -44,6 +44,25 @@ core::matrix4 CDummyTransformationSceneNode::getRelativeTransformation() const
 	return RelativeTransformationMatrix;
 }
 
+//! Creates a clone of this scene node and its children.
+ISceneNode* CDummyTransformationSceneNode::clone(ISceneNode* newParent, ISceneManager* newManager)
+{
+	if (!newParent)
+		newParent = Parent;
+	if (!newManager)
+		newManager = SceneManager;
+
+	CDummyTransformationSceneNode* nb = new CDummyTransformationSceneNode(newParent,
+		newManager, ID);
+
+	nb->cloneMembers(this, newManager);
+	nb->RelativeTransformationMatrix = RelativeTransformationMatrix;
+	nb->Box = Box;
+
+	if ( newParent )
+		nb->drop();
+	return nb;
+}
 
 } // end namespace scene
 } // end namespace irr
diff --git a/source/Irrlicht/CDummyTransformationSceneNode.h b/source/Irrlicht/CDummyTransformationSceneNode.h
index 94650bc5..607fcd51 100644
--- a/source/Irrlicht/CDummyTransformationSceneNode.h
+++ b/source/Irrlicht/CDummyTransformationSceneNode.h
@@ -36,6 +36,10 @@ namespace scene
 		//! Returns type of the scene node
 		virtual ESCENE_NODE_TYPE getType() const { return ESNT_DUMMY_TRANSFORMATION; }
 
+		//! Creates a clone of this scene node and its children.
+		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0);
+
+
 	private:
 
 		core::matrix4 RelativeTransformationMatrix;
diff --git a/source/Irrlicht/CFileSystem.cpp b/source/Irrlicht/CFileSystem.cpp
index 8bdb8a0b..afa4e564 100644
--- a/source/Irrlicht/CFileSystem.cpp
+++ b/source/Irrlicht/CFileSystem.cpp
@@ -700,36 +700,66 @@ io::path& CFileSystem::flattenFilename(io::path& directory, const io::path& root
 //! Get the relative filename, relative to the given directory
 path CFileSystem::getRelativeFilename(const path& filename, const path& directory) const
 {
-		io::path path1, file, ext;
-		core::splitFilename(getAbsolutePath(filename), &path1, &file, &ext);
-		io::path path2(getAbsolutePath(directory));
-		core::list<io::path> list1, list2;
-		path1.split(list1, _IRR_TEXT("/\\"), 2);
-		path2.split(list2, _IRR_TEXT("/\\"), 2);
-		u32 i=0;
-		core::list<io::path>::ConstIterator it1,it2;
-		it1=list1.begin();
-		it2=list2.begin();
-		for (; i<list1.size() && i<list2.size() && (*it1==*it2); ++i)
-		{
-			++it1;
-			++it2;
-		}
-		path1=_IRR_TEXT("");
-		for (; i<list2.size(); ++i)
-			path1 += _IRR_TEXT("../");
-		while (it1 != list1.end())
-		{
-			path1 += *it1++;
-			path1 += _IRR_TEXT('/');
-		}
-		path1 += file;
-		if (ext.size())
-		{
-			path1 += _IRR_TEXT('.');
-			path1 += ext;
-		}
-		return path1;
+	if ( filename.empty() || directory.empty() )
+		return filename;
+
+	io::path path1, file, ext;
+	core::splitFilename(getAbsolutePath(filename), &path1, &file, &ext);
+	io::path path2(getAbsolutePath(directory));
+	core::list<io::path> list1, list2;
+	path1.split(list1, _IRR_TEXT("/\\"), 2);
+	path2.split(list2, _IRR_TEXT("/\\"), 2);
+	u32 i=0;
+	core::list<io::path>::ConstIterator it1,it2;
+	it1=list1.begin();
+	it2=list2.begin();
+
+	#if defined (_IRR_WINDOWS_API_)
+	fschar_t partition1 = 0, partition2 = 0;
+	io::path prefix1, prefix2;
+	if ( it1 != list1.end() )
+		prefix1 = *it1;
+	if ( it2 != list2.end() )
+		prefix2 = *it2;
+	if ( prefix1.size() > 1 && prefix1[1] == _IRR_TEXT(':') )
+		partition1 = core::locale_lower(prefix1[0]);
+	if ( prefix2.size() > 1 && prefix2[1] == _IRR_TEXT(':') )
+		partition2 = core::locale_lower(prefix2[0]);
+
+	// must have the same prefix or we can't resolve it to a relative filename
+	if ( partition1 != partition2 )
+	{
+		return filename;
+	}
+	#endif
+
+
+	for (; i<list1.size() && i<list2.size() 
+#if defined (_IRR_WINDOWS_API_)
+		&& (io::path(*it1).make_lower()==io::path(*it2).make_lower())
+#else
+		&& (*it1==*it2)
+#endif
+		; ++i)
+	{
+		++it1;
+		++it2;
+	}
+	path1=_IRR_TEXT("");
+	for (; i<list2.size(); ++i)
+		path1 += _IRR_TEXT("../");
+	while (it1 != list1.end())
+	{
+		path1 += *it1++;
+		path1 += _IRR_TEXT('/');
+	}
+	path1 += file;
+	if (ext.size())
+	{
+		path1 += _IRR_TEXT('.');
+		path1 += ext;
+	}
+	return path1;
 }
 
 
diff --git a/source/Irrlicht/CGUIButton.cpp b/source/Irrlicht/CGUIButton.cpp
index 55d04efe..546f305f 100644
--- a/source/Irrlicht/CGUIButton.cpp
+++ b/source/Irrlicht/CGUIButton.cpp
@@ -287,9 +287,7 @@ void CGUIButton::draw()
 
 	if (Text.size())
 	{
-		IGUIFont* font = OverrideFont;
-		if (!OverrideFont)
-			font = skin->getFont(EGDF_BUTTON);
+		IGUIFont* font = getActiveFont();
 
 		core::rect<s32> rect = AbsoluteRect;
 		if (Pressed)
@@ -320,6 +318,22 @@ void CGUIButton::setOverrideFont(IGUIFont* font)
 		OverrideFont->grab();
 }
 
+//! Gets the override font (if any)
+IGUIFont * CGUIButton::getOverrideFont() const
+{
+	return OverrideFont;
+}
+
+//! Get the font which is used right now for drawing
+IGUIFont* CGUIButton::getActiveFont() const
+{
+	if ( OverrideFont )
+		return OverrideFont;
+	IGUISkin* skin = Environment->getSkin();
+	if (skin)
+		return skin->getFont();
+	return 0;
+}
 
 //! Sets an image which should be displayed on the button when it is in normal state.
 void CGUIButton::setImage(video::ITexture* image)
diff --git a/source/Irrlicht/CGUIButton.h b/source/Irrlicht/CGUIButton.h
index c3a3336e..23a84250 100644
--- a/source/Irrlicht/CGUIButton.h
+++ b/source/Irrlicht/CGUIButton.h
@@ -37,6 +37,12 @@ namespace gui
 		//! sets another skin independent font. if this is set to zero, the button uses the font of the skin.
 		virtual void setOverrideFont(IGUIFont* font=0);
 
+		//! Gets the override font (if any)
+		virtual IGUIFont* getOverrideFont() const;
+
+		//! Get the font which is used right now for drawing
+		virtual IGUIFont* getActiveFont() const;
+
 		//! Sets an image which should be displayed on the button when it is in normal state.
 		virtual void setImage(video::ITexture* image=0);
 
diff --git a/source/Irrlicht/CGUIComboBox.cpp b/source/Irrlicht/CGUIComboBox.cpp
index 3ab01eca..50470e25 100644
--- a/source/Irrlicht/CGUIComboBox.cpp
+++ b/source/Irrlicht/CGUIComboBox.cpp
@@ -24,7 +24,7 @@ CGUIComboBox::CGUIComboBox(IGUIEnvironment* environment, IGUIElement* parent,
 	s32 id, core::rect<s32> rectangle)
 	: IGUIComboBox(environment, parent, id, rectangle),
 	ListButton(0), SelectedText(0), ListBox(0), LastFocus(0),
-	Selected(-1), HAlign(EGUIA_UPPERLEFT), VAlign(EGUIA_CENTER), HasFocus(false)
+	Selected(-1), HAlign(EGUIA_UPPERLEFT), VAlign(EGUIA_CENTER), MaxSelectionRows(5), HasFocus(false)
 {
 	#ifdef _DEBUG
 	setDebugName("CGUIComboBox");
@@ -81,6 +81,26 @@ void CGUIComboBox::setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT ve
 }
 
 
+//! Set the maximal number of rows for the selection listbox
+void CGUIComboBox::setMaxSelectionRows(u32 max)
+{
+	MaxSelectionRows = max;
+
+	// force recalculation of open listbox
+	if (ListBox)
+	{
+		openCloseMenu();
+		openCloseMenu();
+	}
+}
+
+//! Get the maximimal number of rows for the selection listbox
+u32 CGUIComboBox::getMaxSelectionRows() const
+{
+	return MaxSelectionRows;
+}
+
+
 //! Returns amount of items in box
 u32 CGUIComboBox::getItemCount() const
 {
@@ -408,10 +428,10 @@ void CGUIComboBox::openCloseMenu()
 			Parent->bringToFront(this);
 
 		IGUISkin* skin = Environment->getSkin();
-		s32 h = Items.size();
+		u32 h = Items.size();
 
-		if (h > 5)
-			h = 5;
+		if (h > getMaxSelectionRows())
+			h = getMaxSelectionRows();
 		if (h == 0)
 			h = 1;
 
@@ -450,6 +470,7 @@ void CGUIComboBox::serializeAttributes(io::IAttributes* out, io::SAttributeReadW
 
 	out->addEnum ("HTextAlign", HAlign, GUIAlignmentNames);
 	out->addEnum ("VTextAlign", VAlign, GUIAlignmentNames);
+	out->addInt("MaxSelectionRows", (s32)MaxSelectionRows );
 
 	out->addInt	("Selected",	Selected );
 	out->addInt	("ItemCount",	Items.size());
@@ -470,6 +491,7 @@ void CGUIComboBox::deserializeAttributes(io::IAttributes* in, io::SAttributeRead
 
 	setTextAlignment( (EGUI_ALIGNMENT) in->getAttributeAsEnumeration("HTextAlign", GUIAlignmentNames),
                       (EGUI_ALIGNMENT) in->getAttributeAsEnumeration("VTextAlign", GUIAlignmentNames));
+	setMaxSelectionRows( (u32)(in->getAttributeAsInt("MaxSelectionRows")) );
 
 	// clear the list
 	clear();
diff --git a/source/Irrlicht/CGUIComboBox.h b/source/Irrlicht/CGUIComboBox.h
index 1c656d8d..77e8a0ff 100644
--- a/source/Irrlicht/CGUIComboBox.h
+++ b/source/Irrlicht/CGUIComboBox.h
@@ -62,6 +62,12 @@ namespace gui
 		//! sets the text alignment of the text part
 		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical);
 
+		//! Set the maximal number of rows for the selection listbox
+		virtual void setMaxSelectionRows(u32 max);
+
+		//! Get the maximimal number of rows for the selection listbox
+		virtual u32 getMaxSelectionRows() const;
+
 		//! called if an event happened.
 		virtual bool OnEvent(const SEvent& event);
 
@@ -97,6 +103,7 @@ namespace gui
 
 		s32 Selected;
 		EGUI_ALIGNMENT HAlign, VAlign;
+		u32 MaxSelectionRows;
 		bool HasFocus;
 	};
 
diff --git a/source/Irrlicht/CGUIEditBox.cpp b/source/Irrlicht/CGUIEditBox.cpp
index 756100c3..9c8eea7c 100644
--- a/source/Irrlicht/CGUIEditBox.cpp
+++ b/source/Irrlicht/CGUIEditBox.cpp
@@ -32,7 +32,7 @@ CGUIEditBox::CGUIEditBox(const wchar_t* text, bool border,
 		IGUIEnvironment* environment, IGUIElement* parent, s32 id,
 		const core::rect<s32>& rectangle)
 	: IGUIEditBox(environment, parent, id, rectangle), MouseMarking(false),
-	Border(border), OverrideColorEnabled(false), MarkBegin(0), MarkEnd(0),
+	Border(border), Background(true), OverrideColorEnabled(false), MarkBegin(0), MarkEnd(0),
 	OverrideColor(video::SColor(101,255,255,255)), OverrideFont(0), LastBreakFont(0),
 	Operator(0), BlinkStartTime(0), CursorPos(0), HScrollPos(0), VScrollPos(0), Max(0),
 	WordWrap(false), MultiLine(false), AutoScroll(true), PasswordBox(false),
@@ -55,17 +55,7 @@ CGUIEditBox::CGUIEditBox(const wchar_t* text, bool border,
 	setTabStop(true);
 	setTabOrder(-1);
 
-	IGUISkin *skin = 0;
-	if (Environment)
-		skin = Environment->getSkin();
-	if (Border && skin)
-	{
-		FrameRect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
-		FrameRect.UpperLeftCorner.Y += skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
-		FrameRect.LowerRightCorner.X -= skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
-		FrameRect.LowerRightCorner.Y -= skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
-	}
-
+	calculateFrameRect();
 	breakText();
 
 	calculateScrollPos();
@@ -100,6 +90,22 @@ void CGUIEditBox::setOverrideFont(IGUIFont* font)
 	breakText();
 }
 
+//! Gets the override font (if any)
+IGUIFont * CGUIEditBox::getOverrideFont() const
+{
+	return OverrideFont;
+}
+
+//! Get the font which is used right now for drawing
+IGUIFont* CGUIEditBox::getActiveFont() const
+{
+	if ( OverrideFont )
+		return OverrideFont;
+	IGUISkin* skin = Environment->getSkin();
+	if (skin)
+		return skin->getFont();
+	return 0;
+}
 
 //! Sets another color for the text.
 void CGUIEditBox::setOverrideColor(video::SColor color)
@@ -121,6 +127,11 @@ void CGUIEditBox::setDrawBorder(bool border)
 	Border = border;
 }
 
+//! Sets whether to draw the background
+void CGUIEditBox::setDrawBackground(bool draw)
+{
+	Background = draw;
+}
 
 //! Sets if the text should use the overide color or the color in the gui skin.
 void CGUIEditBox::enableOverrideColor(bool enable)
@@ -148,7 +159,9 @@ void CGUIEditBox::updateAbsolutePosition()
 	IGUIElement::updateAbsolutePosition();
 	if ( oldAbsoluteRect != AbsoluteRect )
 	{
+		calculateFrameRect();
         breakText();
+        calculateScrollPos();
 	}
 }
 
@@ -507,7 +520,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
 			{
 				s32 cp = CursorPos - BrokenTextPositions[lineNo];
 				if ((s32)BrokenText[lineNo-1].size() < cp)
-					CursorPos = BrokenTextPositions[lineNo-1] + (s32)BrokenText[lineNo-1].size()-1;
+					CursorPos = BrokenTextPositions[lineNo-1] + core::max_((u32)1, BrokenText[lineNo-1].size())-1;
 				else
 					CursorPos = BrokenTextPositions[lineNo-1] + cp;
 			}
@@ -538,7 +551,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
 			{
 				s32 cp = CursorPos - BrokenTextPositions[lineNo];
 				if ((s32)BrokenText[lineNo+1].size() < cp)
-					CursorPos = BrokenTextPositions[lineNo+1] + BrokenText[lineNo+1].size()-1;
+					CursorPos = BrokenTextPositions[lineNo+1] + core::max_((u32)1, BrokenText[lineNo+1].size())-1;
 				else
 					CursorPos = BrokenTextPositions[lineNo+1] + cp;
 			}
@@ -702,31 +715,29 @@ void CGUIEditBox::draw()
 	if (!skin)
 		return;
 
-	FrameRect = AbsoluteRect;
+	EGUI_DEFAULT_COLOR bgCol = EGDC_GRAY_EDITABLE;
+	if ( isEnabled() )
+		bgCol = focus ? EGDC_FOCUSED_EDITABLE : EGDC_EDITABLE;
 
-	// draw the border
+	if (!Border && Background)
+	{
+		skin->draw2DRectangle(this, skin->getColor(bgCol), AbsoluteRect, &AbsoluteClippingRect);
+	}
 
 	if (Border)
 	{
-		EGUI_DEFAULT_COLOR col = EGDC_GRAY_EDITABLE;
-		if ( isEnabled() )
-			col = focus ? EGDC_FOCUSED_EDITABLE : EGDC_EDITABLE;
-		skin->draw3DSunkenPane(this, skin->getColor(col),
-			false, true, FrameRect, &AbsoluteClippingRect);
+		// draw the border
+		skin->draw3DSunkenPane(this, skin->getColor(bgCol), false, Background, AbsoluteRect, &AbsoluteClippingRect);
 
-		FrameRect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
-		FrameRect.UpperLeftCorner.Y += skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
-		FrameRect.LowerRightCorner.X -= skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
-		FrameRect.LowerRightCorner.Y -= skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
+		calculateFrameRect();
 	}
+
 	core::rect<s32> localClipRect = FrameRect;
 	localClipRect.clipAgainst(AbsoluteClippingRect);
 
 	// draw the text
 
-	IGUIFont* font = OverrideFont;
-	if (!OverrideFont)
-		font = skin->getFont();
+	IGUIFont* font = getActiveFont();
 
 	s32 cursorLine = 0;
 	s32 charcursorpos = 0;
@@ -1024,10 +1035,7 @@ bool CGUIEditBox::processMouse(const SEvent& event)
 
 s32 CGUIEditBox::getCursorPos(s32 x, s32 y)
 {
-	IGUIFont* font = OverrideFont;
-	IGUISkin* skin = Environment->getSkin();
-	if (!OverrideFont)
-		font = skin->getFont();
+	IGUIFont* font = getActiveFont();
 
 	const u32 lineCount = (WordWrap || MultiLine) ? BrokenText.size() : 1;
 
@@ -1056,7 +1064,10 @@ s32 CGUIEditBox::getCursorPos(s32 x, s32 y)
 	if (x < CurrentTextRect.UpperLeftCorner.X)
 		x = CurrentTextRect.UpperLeftCorner.X;
 
-	s32 idx = txtLine ? font->getCharacterFromPos(txtLine->c_str(), x - CurrentTextRect.UpperLeftCorner.X) : -1;
+	if ( !txtLine )
+		return 0;
+
+	s32 idx = font->getCharacterFromPos(txtLine->c_str(), x - CurrentTextRect.UpperLeftCorner.X);
 
 	// click was on or left of the line
 	if (idx != -1)
@@ -1070,18 +1081,13 @@ s32 CGUIEditBox::getCursorPos(s32 x, s32 y)
 //! Breaks the single text line.
 void CGUIEditBox::breakText()
 {
-	IGUISkin* skin = Environment->getSkin();
-
-	if ((!WordWrap && !MultiLine) || !skin)
+	if ((!WordWrap && !MultiLine))
 		return;
 
 	BrokenText.clear(); // need to reallocate :/
 	BrokenTextPositions.set_used(0);
 
-	IGUIFont* font = OverrideFont;
-	if (!OverrideFont)
-		font = skin->getFont();
-
+	IGUIFont* font = getActiveFont();
 	if (!font)
 		return;
 
@@ -1104,7 +1110,7 @@ void CGUIEditBox::breakText()
 		if (c == L'\r') // Mac or Windows breaks
 		{
 			lineBreak = true;
-			c = ' ';
+			c = 0;
 			if (Text[i+1] == L'\n') // Windows breaks
 			{
 				Text.erase(i+1);
@@ -1114,7 +1120,7 @@ void CGUIEditBox::breakText()
 		else if (c == L'\n') // Unix breaks
 		{
 			lineBreak = true;
-			c = ' ';
+			c = 0;
 		}
 
 		// don't break if we're not a multi-line edit box
@@ -1123,35 +1129,35 @@ void CGUIEditBox::breakText()
 
 		if (c == L' ' || c == 0 || i == (size-1))
 		{
-			if (word.size())
+			// here comes the next whitespace, look if
+			// we can break the last word to the next line
+			// We also break whitespace, otherwise cursor would vanish beside the right border.
+			s32 whitelgth = font->getDimension(whitespace.c_str()).Width;
+			s32 worldlgth = font->getDimension(word.c_str()).Width;
+
+			if (WordWrap && length + worldlgth + whitelgth > elWidth && line.size() > 0)
 			{
-				// here comes the next whitespace, look if
-				// we can break the last word to the next line.
-				s32 whitelgth = font->getDimension(whitespace.c_str()).Width;
-				s32 worldlgth = font->getDimension(word.c_str()).Width;
-
-				if (WordWrap && length + worldlgth + whitelgth > elWidth)
-				{
-					// break to next line
-					length = worldlgth;
-					BrokenText.push_back(line);
-					BrokenTextPositions.push_back(lastLineStart);
-					lastLineStart = i - (s32)word.size();
-					line = word;
-				}
-				else
-				{
-					// add word to line
-					line += whitespace;
-					line += word;
-					length += whitelgth + worldlgth;
-				}
-
-				word = L"";
-				whitespace = L"";
+				// break to next line
+				length = worldlgth;
+				BrokenText.push_back(line);
+				BrokenTextPositions.push_back(lastLineStart);
+				lastLineStart = i - (s32)word.size();
+				line = word;
+			}
+			else
+			{
+				// add word to line
+				line += whitespace;
+				line += word;
+				length += whitelgth + worldlgth;
 			}
 
-			whitespace += c;
+			word = L"";
+			whitespace = L"";
+
+
+			if ( c )
+				whitespace += c;
 
 			// compute line break
 			if (lineBreak)
@@ -1183,17 +1189,15 @@ void CGUIEditBox::breakText()
 
 void CGUIEditBox::setTextRect(s32 line)
 {
-	core::dimension2du d;
-
-	IGUISkin* skin = Environment->getSkin();
-	if (!skin)
+	if ( line < 0 )
 		return;
 
-	IGUIFont* font = OverrideFont ? OverrideFont : skin->getFont();
-
+	IGUIFont* font = getActiveFont();
 	if (!font)
 		return;
 
+	core::dimension2du d;
+
 	// get text dimension
 	const u32 lineCount = (WordWrap || MultiLine) ? BrokenText.size() : 1;
 	if (WordWrap || MultiLine)
@@ -1321,16 +1325,15 @@ void CGUIEditBox::calculateScrollPos()
 
 	// calculate horizontal scroll position
 	s32 cursLine = getLineFromPos(CursorPos);
+	if ( cursLine < 0 )
+		return;
 	setTextRect(cursLine);
 
 	// don't do horizontal scrolling when wordwrap is enabled.
 	if (!WordWrap)
 	{
 		// get cursor position
-		IGUISkin* skin = Environment->getSkin();
-		if (!skin)
-			return;
-		IGUIFont* font = OverrideFont ? OverrideFont : skin->getFont();
+		IGUIFont* font = getActiveFont();
 		if (!font)
 			return;
 
@@ -1364,6 +1367,21 @@ void CGUIEditBox::calculateScrollPos()
 	// todo: adjust scrollbar
 }
 
+void CGUIEditBox::calculateFrameRect()
+{
+	FrameRect = AbsoluteRect;
+	IGUISkin *skin = 0;
+	if (Environment)
+		skin = Environment->getSkin();
+	if (Border && skin)
+	{
+		FrameRect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
+		FrameRect.UpperLeftCorner.Y += skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
+		FrameRect.LowerRightCorner.X -= skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
+		FrameRect.LowerRightCorner.Y -= skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
+	}
+}
+
 //! set text markers
 void CGUIEditBox::setTextMarkers(s32 begin, s32 end)
 {
@@ -1395,6 +1413,8 @@ void CGUIEditBox::serializeAttributes(io::IAttributes* out, io::SAttributeReadWr
 {
 	// IGUIEditBox::serializeAttributes(out,options);
 
+	out->addBool  ("Border", 			  Border);
+	out->addBool  ("Background", 		  Background);
 	out->addBool  ("OverrideColorEnabled",OverrideColorEnabled );
 	out->addColor ("OverrideColor",       OverrideColor);
 	// out->addFont("OverrideFont",OverrideFont);
@@ -1418,6 +1438,8 @@ void CGUIEditBox::deserializeAttributes(io::IAttributes* in, io::SAttributeReadW
 {
 	IGUIEditBox::deserializeAttributes(in,options);
 
+	setDrawBorder( in->getAttributeAsBool("Border") );
+	setDrawBackground( in->getAttributeAsBool("Background") );
 	setOverrideColor(in->getAttributeAsColor("OverrideColor"));
 	enableOverrideColor(in->getAttributeAsBool("OverrideColorEnabled"));
 	setMax(in->getAttributeAsInt("MaxChars"));
diff --git a/source/Irrlicht/CGUIEditBox.h b/source/Irrlicht/CGUIEditBox.h
index 39ae7498..88fb0f28 100644
--- a/source/Irrlicht/CGUIEditBox.h
+++ b/source/Irrlicht/CGUIEditBox.h
@@ -30,6 +30,15 @@ namespace gui
 		//! Sets another skin independent font.
 		virtual void setOverrideFont(IGUIFont* font=0);
 
+		//! Gets the override font (if any)
+		/** \return The override font (may be 0) */
+		virtual IGUIFont* getOverrideFont() const;
+
+		//! Get the font which is used right now for drawing
+		/** Currently this is the override font when one is set and the
+		font of the active skin otherwise */
+		virtual IGUIFont* getActiveFont() const;
+
 		//! Sets another color for the text.
 		virtual void setOverrideColor(video::SColor color);
 
@@ -44,6 +53,9 @@ namespace gui
 		/** \return true if the override color is enabled, false otherwise */
 		virtual bool isOverrideColorEnabled(void) const;
 
+		//! Sets whether to draw the background
+		virtual void setDrawBackground(bool draw);
+
 		//! Turns the border on or off
 		virtual void setDrawBorder(bool border);
 
@@ -124,6 +136,8 @@ namespace gui
 		void inputChar(wchar_t c);
 		//! calculates the current scroll position
 		void calculateScrollPos();
+		//! calculated the FrameRect
+		void calculateFrameRect();
 		//! send some gui event to parent
 		void sendGuiEvent(EGUI_EVENT_TYPE type);
 		//! set text markers
@@ -135,6 +149,7 @@ namespace gui
 
 		bool MouseMarking;
 		bool Border;
+		bool Background;
 		bool OverrideColorEnabled;
 		s32 MarkBegin;
 		s32 MarkEnd;
diff --git a/source/Irrlicht/CGUIListBox.cpp b/source/Irrlicht/CGUIListBox.cpp
index bb7c25ec..c300233b 100644
--- a/source/Irrlicht/CGUIListBox.cpp
+++ b/source/Irrlicht/CGUIListBox.cpp
@@ -405,7 +405,7 @@ bool CGUIListBox::OnEvent(const SEvent& event)
 				switch(event.MouseInput.Event)
 				{
 				case EMIE_MOUSE_WHEEL:
-					ScrollBar->setPos(ScrollBar->getPos() + (s32)event.MouseInput.Wheel*-ItemHeight/2);
+					ScrollBar->setPos(ScrollBar->getPos() + (event.MouseInput.Wheel < 0 ? -1 : 1)*-ItemHeight/2);
 					return true;
 
 				case EMIE_LMOUSE_PRESSED_DOWN:
diff --git a/source/Irrlicht/CGUIModalScreen.cpp b/source/Irrlicht/CGUIModalScreen.cpp
index 895471ed..ca352277 100644
--- a/source/Irrlicht/CGUIModalScreen.cpp
+++ b/source/Irrlicht/CGUIModalScreen.cpp
@@ -33,7 +33,7 @@ bool CGUIModalScreen::canTakeFocus(IGUIElement* target) const
 {
     return (target && ((const IGUIElement*)target == this // this element can take it
                         || isMyChild(target)    // own children also
-                        || (target->getType() == EGUIET_MODAL_SCREEN )// other modals also fine
+                        || (target->getType() == EGUIET_MODAL_SCREEN )	// other modals also fine (is now on top or explicitely requested)
                         || (target->getParent() && target->getParent()->getType() == EGUIET_MODAL_SCREEN )))   // children of other modals will do
             ;
 }
@@ -86,6 +86,13 @@ bool CGUIModalScreen::OnEvent(const SEvent& event)
 		switch(event.GUIEvent.EventType)
 		{
 		case EGET_ELEMENT_FOCUSED:
+			if ( event.GUIEvent.Caller == this && isMyChild(event.GUIEvent.Element) )
+			{
+				Environment->removeFocus(0);	// can't setFocus otherwise at it still has focus here
+				Environment->setFocus(event.GUIEvent.Element);
+				MouseDownTime = os::Timer::getTime();
+				return true;
+			}			
 			if ( !canTakeFocus(event.GUIEvent.Caller))
 			{
 				if ( !Children.empty() )
diff --git a/source/Irrlicht/CGUIScrollBar.cpp b/source/Irrlicht/CGUIScrollBar.cpp
index 628ac7e8..4629144d 100644
--- a/source/Irrlicht/CGUIScrollBar.cpp
+++ b/source/Irrlicht/CGUIScrollBar.cpp
@@ -146,7 +146,7 @@ bool CGUIScrollBar::OnEvent(const SEvent& event)
 					// thanks to tommi by tommi for another bugfix
 					// everybody needs a little thanking. hallo niko!;-)
 					setPos(	getPos() +
-							( (s32)event.MouseInput.Wheel * SmallStep * (Horizontal ? 1 : -1 ) )
+							( (event.MouseInput.Wheel < 0 ? -1 : 1) * SmallStep * (Horizontal ? 1 : -1 ) )
 							);
 
 					SEvent newEvent;
diff --git a/source/Irrlicht/CGUISkin.cpp b/source/Irrlicht/CGUISkin.cpp
index db827eea..8f595176 100644
--- a/source/Irrlicht/CGUISkin.cpp
+++ b/source/Irrlicht/CGUISkin.cpp
@@ -47,9 +47,9 @@ CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver)
 		Colors[EGDC_ICON]               = video::SColor(200,255,255,255);
 		Colors[EGDC_ICON_HIGH_LIGHT]    = video::SColor(200,8,36,107);
 		Colors[EGDC_GRAY_WINDOW_SYMBOL] = video::SColor(240,100,100,100);
-		Colors[EGDC_EDITABLE] 			= video::SColor(101,255,255,255);
-		Colors[EGDC_GRAY_EDITABLE]		= video::SColor(101,200,200,200);
-		Colors[EGDC_FOCUSED_EDITABLE]	= video::SColor(101,230,230,255);
+		Colors[EGDC_EDITABLE] 			= video::SColor(255,255,255,255);
+		Colors[EGDC_GRAY_EDITABLE]		= video::SColor(255,120,120,120);
+		Colors[EGDC_FOCUSED_EDITABLE]	= video::SColor(255,240,240,255);
 
 
 		Sizes[EGDS_SCROLLBAR_SIZE] = 14;
@@ -414,49 +414,74 @@ void CGUISkin::draw3DSunkenPane(IGUIElement* element, video::SColor bgcolor,
 
 	core::rect<s32> rect = r;
 
+	if (fillBackGround)
+		Driver->draw2DRectangle(bgcolor, rect, clip);
+
 	if (flat)
 	{
 		// draw flat sunken pane
-		if (fillBackGround)
-			Driver->draw2DRectangle(bgcolor, rect, clip);
 
 		rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
-		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);	// top
 
+		++rect.UpperLeftCorner.Y;
 		rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
 		rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
-		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);	// left
 
 		rect = r;
+		++rect.UpperLeftCorner.Y;
 		rect.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
-		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);	// right
 
 		rect = r;
+		++rect.UpperLeftCorner.X;
 		rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
-		rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
-		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);
+		--rect.LowerRightCorner.X;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);	// bottom
 	}
 	else
 	{
 		// draw deep sunken pane
-		if (fillBackGround)
-			Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);
-
-		rect.LowerRightCorner.X -= 1;
-		rect.LowerRightCorner.Y -= 1;
-		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);
-
-		rect.UpperLeftCorner.X += 1;
-		rect.UpperLeftCorner.Y += 1;
-		Driver->draw2DRectangle(getColor(EGDC_3D_LIGHT), rect, clip);
-
-		rect.LowerRightCorner.X -= 1;
-		rect.LowerRightCorner.Y -= 1;
+		rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);	// top
+		++rect.UpperLeftCorner.X;
+		++rect.UpperLeftCorner.Y;
+		--rect.LowerRightCorner.X;
+		++rect.LowerRightCorner.Y;
 		Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), rect, clip);
 
-		rect.UpperLeftCorner.X += 1;
-		rect.UpperLeftCorner.Y += 1;
-		Driver->draw2DRectangle(bgcolor, rect, clip);
+		rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
+		rect.UpperLeftCorner.Y = r.UpperLeftCorner.Y+1;
+		rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
+		rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);	// left
+		++rect.UpperLeftCorner.X;
+		++rect.UpperLeftCorner.Y;
+		++rect.LowerRightCorner.X;
+		--rect.LowerRightCorner.Y;
+		Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), rect, clip);
+
+		rect = r;
+		rect.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
+		++rect.UpperLeftCorner.Y;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);	// right
+		--rect.UpperLeftCorner.X;
+		++rect.UpperLeftCorner.Y;
+		--rect.LowerRightCorner.X;
+		--rect.LowerRightCorner.Y;
+		Driver->draw2DRectangle(getColor(EGDC_3D_LIGHT), rect, clip);
+
+		rect = r;
+		++rect.UpperLeftCorner.X;
+		rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
+		--rect.LowerRightCorner.X;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);	// bottom
+		++rect.UpperLeftCorner.X;
+		--rect.UpperLeftCorner.Y;
+		--rect.LowerRightCorner.X;
+		--rect.LowerRightCorner.Y;
+		Driver->draw2DRectangle(getColor(EGDC_3D_LIGHT), rect, clip);
 	}
 }
 
diff --git a/source/Irrlicht/CGUISpinBox.cpp b/source/Irrlicht/CGUISpinBox.cpp
index 83b63c98..4042391b 100644
--- a/source/Irrlicht/CGUISpinBox.cpp
+++ b/source/Irrlicht/CGUISpinBox.cpp
@@ -133,6 +133,14 @@ void CGUISpinBox::setRange(f32 min, f32 max)
 		core::swap(min, max);
 	RangeMin = min;
 	RangeMax = max;
+
+	// we have to round the range - otherwise we can get into an infinte setValue/verifyValueRange cycle.
+	wchar_t str[100];
+	swprintf(str, 99, FormatString.c_str(), RangeMin);
+	RangeMin = core::fast_atof(core::stringc(str).c_str());
+	swprintf(str, 99, FormatString.c_str(), RangeMax);
+	RangeMax = core::fast_atof(core::stringc(str).c_str());
+
 	verifyValueRange();
 }
 
@@ -173,6 +181,7 @@ void CGUISpinBox::setDecimalPlaces(s32 places)
 		FormatString += places;
 		FormatString += "f";
 	}
+	setRange( RangeMin, RangeMax );
 	setValue(getValue());
 }
 
@@ -189,7 +198,7 @@ bool CGUISpinBox::OnEvent(const SEvent& event)
 			{
 			case EMIE_MOUSE_WHEEL:
 				{
-					f32 val = getValue() + (StepSize * event.MouseInput.Wheel);
+					f32 val = getValue() + (StepSize * (event.MouseInput.Wheel < 0 ? -1.f : 1.f));
 					setValue(val);
 					changeEvent = true;
 				}
diff --git a/source/Irrlicht/CGUISpinBox.h b/source/Irrlicht/CGUISpinBox.h
index 50d98ecd..cf20aa10 100644
--- a/source/Irrlicht/CGUISpinBox.h
+++ b/source/Irrlicht/CGUISpinBox.h
@@ -72,6 +72,7 @@ namespace gui
 		virtual const wchar_t* getText() const;
 
 		//! Sets the number of decimal places to display.
+		//! Note that this also rounds the range to the same number of decimal places.
 		/** \param places: The number of decimal places to display, use -1 to reset */
 		virtual void setDecimalPlaces(s32 places);
 
diff --git a/source/Irrlicht/CGUIStaticText.cpp b/source/Irrlicht/CGUIStaticText.cpp
index 4ae7b6a3..42445ecd 100644
--- a/source/Irrlicht/CGUIStaticText.cpp
+++ b/source/Irrlicht/CGUIStaticText.cpp
@@ -82,9 +82,7 @@ void CGUIStaticText::draw()
 	// draw the text
 	if (Text.size())
 	{
-		IGUIFont* font = OverrideFont;
-		if (!OverrideFont)
-			font = skin->getFont();
+		IGUIFont* font = getActiveFont();
 
 		if (font)
 		{
@@ -162,12 +160,22 @@ void CGUIStaticText::setOverrideFont(IGUIFont* font)
 	breakText();
 }
 
-
+//! Gets the override font (if any)
 IGUIFont * CGUIStaticText::getOverrideFont() const
 {
 	return OverrideFont;
 }
 
+//! Get the font which is used right now for drawing
+IGUIFont* CGUIStaticText::getActiveFont() const
+{
+	if ( OverrideFont )
+		return OverrideFont;
+	IGUISkin* skin = Environment->getSkin();
+	if (skin)
+		return skin->getFont();
+	return 0;
+}
 
 //! Sets another color for the text.
 void CGUIStaticText::setOverrideColor(video::SColor color)
@@ -204,7 +212,7 @@ void CGUIStaticText::setTextRestrainedInside(bool restrainTextInside)
 {
 	RestrainTextInside = restrainTextInside;
 }
- 
+
 
 bool CGUIStaticText::isTextRestrainedInside() const
 {
@@ -275,36 +283,34 @@ bool CGUIStaticText::isRightToLeft() const
 //! Breaks the single text line.
 void CGUIStaticText::breakText()
 {
-	IGUISkin* skin = Environment->getSkin();
-
-	if (!WordWrap || !skin)
+	if (!WordWrap)
 		return;
 
 	BrokenText.clear();
 
-	IGUIFont* font = OverrideFont;
-	if (!OverrideFont)
-		font = skin->getFont();
-
+	IGUISkin* skin = Environment->getSkin();
+	IGUIFont* font = getActiveFont();
 	if (!font)
 		return;
 
 	LastBreakFont = font;
 
+	core::stringw line;
+	core::stringw word;
+	core::stringw whitespace;
+	s32 size = Text.size();
+	s32 length = 0;
+	s32 elWidth = RelativeRect.getWidth();
+	if (Border)
+		elWidth -= 2*skin->getSize(EGDS_TEXT_DISTANCE_X);
+	wchar_t c;
+
 	// We have to deal with right-to-left and left-to-right differently
 	// However, most parts of the following code is the same, it's just
 	// some order and boundaries which change.
 	if (!RightToLeft)
 	{
 		// regular (left-to-right)
-		core::stringw line;
-		core::stringw word;
-		core::stringw whitespace;
-		s32 size = Text.size();
-		s32 length = 0;
-		s32 elWidth = RelativeRect.getWidth() - 6;
-		wchar_t c;
-
 		for (s32 i=0; i<size; ++i)
 		{
 			c = Text[i];
@@ -326,7 +332,14 @@ void CGUIStaticText::breakText()
 				c = '\0';
 			}
 
-			if (c==L' ' || c==0 || i==(size-1))
+			bool isWhitespace = (c == L' ' || c == 0);
+			if ( !isWhitespace )
+			{
+				// part of a word
+				word += c;
+			}
+
+			if ( isWhitespace || i == (size-1))
 			{
 				if (word.size())
 				{
@@ -334,7 +347,7 @@ void CGUIStaticText::breakText()
 					// we must break the last word to the next line.
 					const s32 whitelgth = font->getDimension(whitespace.c_str()).Width;
 					const s32 wordlgth = font->getDimension(word.c_str()).Width;
-					
+
 					if (wordlgth > elWidth)
 					{
 						// This word is too long to fit in the available space, look for
@@ -347,7 +360,7 @@ void CGUIStaticText::breakText()
 							core::stringw second = word.subString(where, word.size() - where);
 							BrokenText.push_back(line + first + L"-");
 							const s32 secondLength = font->getDimension(second.c_str()).Width;
-							
+
 							length = secondLength;
 							line = second;
 						}
@@ -380,7 +393,10 @@ void CGUIStaticText::breakText()
 					whitespace = L"";
 				}
 
-				whitespace += c;
+				if ( isWhitespace )
+				{
+					whitespace += c;
+				}
 
 				// compute line break
 				if (lineBreak)
@@ -394,11 +410,6 @@ void CGUIStaticText::breakText()
 					length = 0;
 				}
 			}
-			else
-			{
-				// yippee this is a word..
-				word += c;
-			}
 		}
 
 		line += whitespace;
@@ -408,14 +419,6 @@ void CGUIStaticText::breakText()
 	else
 	{
 		// right-to-left
-		core::stringw line;
-		core::stringw word;
-		core::stringw whitespace;
-		s32 size = Text.size();
-		s32 length = 0;
-		s32 elWidth = RelativeRect.getWidth() - 6;
-		wchar_t c;
-
 		for (s32 i=size; i>=0; --i)
 		{
 			c = Text[i];
@@ -512,15 +515,7 @@ void CGUIStaticText::updateAbsolutePosition()
 //! Returns the height of the text in pixels when it is drawn.
 s32 CGUIStaticText::getTextHeight() const
 {
-	IGUISkin* skin = Environment->getSkin();
-
-	if (!skin)
-		return 0;
-
-	IGUIFont* font = OverrideFont;
-	if (!OverrideFont)
-		font = skin->getFont();
-
+	IGUIFont* font = getActiveFont();
 	if (!font)
 		return 0;
 
@@ -535,15 +530,7 @@ s32 CGUIStaticText::getTextHeight() const
 
 s32 CGUIStaticText::getTextWidth() const
 {
-	IGUIFont * font = OverrideFont;
-
-	if(!OverrideFont)
-	{
-		IGUISkin * skin = Environment->getSkin();
-		if(skin)
-			font = skin->getFont();
-	}
-
+	IGUIFont * font = getActiveFont();
 	if(!font)
 		return 0;
 
diff --git a/source/Irrlicht/CGUIStaticText.h b/source/Irrlicht/CGUIStaticText.h
index 077dec6a..7cd50e93 100644
--- a/source/Irrlicht/CGUIStaticText.h
+++ b/source/Irrlicht/CGUIStaticText.h
@@ -34,7 +34,10 @@ namespace gui
 		virtual void setOverrideFont(IGUIFont* font=0);
 
 		//! Gets the override font (if any)
-		virtual IGUIFont * getOverrideFont() const;
+		virtual IGUIFont* getOverrideFont() const;
+
+		//! Get the font which is used right now for drawing
+		virtual IGUIFont* getActiveFont() const;
 
 		//! Sets another color for the text.
 		virtual void setOverrideColor(video::SColor color);
@@ -63,7 +66,7 @@ namespace gui
 
 		//! Set whether the text in this label should be clipped if it goes outside bounds
 		virtual void setTextRestrainedInside(bool restrainedInside);
-		
+
 		//! Checks if the text in this label should be clipped if it goes outside bounds
 		virtual bool isTextRestrainedInside() const;
 
diff --git a/source/Irrlicht/CGUITable.cpp b/source/Irrlicht/CGUITable.cpp
index a1718d17..3c416a76 100644
--- a/source/Irrlicht/CGUITable.cpp
+++ b/source/Irrlicht/CGUITable.cpp
@@ -583,7 +583,7 @@ bool CGUITable::OnEvent(const SEvent &event)
 				switch(event.MouseInput.Event)
 				{
 				case EMIE_MOUSE_WHEEL:
-					VerticalScrollBar->setPos(VerticalScrollBar->getPos() + (s32)event.MouseInput.Wheel*-10);
+					VerticalScrollBar->setPos(VerticalScrollBar->getPos() + (event.MouseInput.Wheel < 0 ? -1 : 1)*-10);
 					return true;
 
 				case EMIE_LMOUSE_PRESSED_DOWN:
diff --git a/source/Irrlicht/CGUITreeView.cpp b/source/Irrlicht/CGUITreeView.cpp
index ef609e81..b5b8a838 100644
--- a/source/Irrlicht/CGUITreeView.cpp
+++ b/source/Irrlicht/CGUITreeView.cpp
@@ -625,7 +625,7 @@ bool CGUITreeView::OnEvent( const SEvent &event )
 				{
 				case EMIE_MOUSE_WHEEL:
 					if ( ScrollBarV )
-						ScrollBarV->setPos( ScrollBarV->getPos() + (s32)event.MouseInput.Wheel * -10 );
+						ScrollBarV->setPos( ScrollBarV->getPos() + (event.MouseInput.Wheel < 0 ? -1 : 1) * -10 );
 					return true;
 					break;
 
diff --git a/source/Irrlicht/CIrrDeviceStub.cpp b/source/Irrlicht/CIrrDeviceStub.cpp
index f074ae21..d2274696 100644
--- a/source/Irrlicht/CIrrDeviceStub.cpp
+++ b/source/Irrlicht/CIrrDeviceStub.cpp
@@ -12,6 +12,7 @@
 #include "CTimer.h"
 #include "CLogger.h"
 #include "irrString.h"
+#include "IRandomizer.h"
 
 namespace irr
 {
@@ -19,7 +20,7 @@ namespace irr
 CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params)
 : IrrlichtDevice(), VideoDriver(0), GUIEnvironment(0), SceneManager(0),
 	Timer(0), CursorControl(0), UserReceiver(params.EventReceiver), Logger(0), Operator(0),
-	FileSystem(0), InputReceivingSceneManager(0), CreationParams(params),
+	Randomizer(0), FileSystem(0), InputReceivingSceneManager(0), CreationParams(params),
 	Close(false)
 {
 	Timer = new CTimer(params.UsePerformanceTimer);
@@ -34,9 +35,10 @@ CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params)
 		Logger = new CLogger(UserReceiver);
 		os::Printer::Logger = Logger;
 	}
-	Logger->setLogLevel( CreationParams.LoggingLevel );
+	Logger->setLogLevel(CreationParams.LoggingLevel);
 
 	os::Printer::Logger = Logger;
+	Randomizer = createDefaultRandomizer();
 
 	FileSystem = io::createFileSystem();
 	core::stringc s = "Irrlicht Engine version ";
@@ -69,9 +71,13 @@ CIrrDeviceStub::~CIrrDeviceStub()
 	if (Operator)
 		Operator->drop();
 
+	if (Randomizer)
+		Randomizer->drop();
+
 	CursorControl = 0;
 
-	Timer->drop();
+	if (Timer)
+		Timer->drop();
 
 	if (Logger->drop())
 		os::Printer::Logger = 0;
@@ -256,6 +262,61 @@ IOSOperator* CIrrDeviceStub::getOSOperator()
 }
 
 
+//! Provides access to the engine's currently set randomizer.
+IRandomizer* CIrrDeviceStub::getRandomizer() const
+{
+	return Randomizer;
+}
+
+//! Sets a new randomizer.
+void CIrrDeviceStub::setRandomizer(IRandomizer* r)
+{
+	if (r!=Randomizer)
+	{
+		if (Randomizer)
+			Randomizer->drop();
+		Randomizer=r;
+		if (Randomizer)
+			Randomizer->grab();
+	}
+}
+
+namespace
+{
+	struct SDefaultRandomizer : public IRandomizer
+	{
+		virtual void reset(s32 value=0x0f0f0f0f)
+		{
+			os::Randomizer::reset(value);
+		}
+
+		virtual s32 rand() const
+		{
+			return os::Randomizer::rand();
+		}
+
+		virtual f32 frand() const
+		{
+			return os::Randomizer::frand();
+		}
+
+		virtual s32 randMax() const
+		{
+			return os::Randomizer::randMax();
+		}
+	};
+}
+
+//! Creates a new default randomizer.
+IRandomizer* CIrrDeviceStub::createDefaultRandomizer() const
+{
+	IRandomizer* r = new SDefaultRandomizer();
+	if (r)
+		r->reset();
+	return r;
+}
+
+
 //! Sets the input receiving scene manager.
 void CIrrDeviceStub::setInputReceivingSceneManager(scene::ISceneManager* sceneManager)
 {
diff --git a/source/Irrlicht/CIrrDeviceStub.h b/source/Irrlicht/CIrrDeviceStub.h
index 7814ccc6..c4da62c5 100644
--- a/source/Irrlicht/CIrrDeviceStub.h
+++ b/source/Irrlicht/CIrrDeviceStub.h
@@ -15,6 +15,7 @@ namespace irr
 	// lots of prototypes:
 	class ILogger;
 	class CLogger;
+	class IRandomizer;
 
 	namespace gui
 	{
@@ -97,6 +98,15 @@ namespace irr
 		//! Returns a pointer to the logger.
 		virtual ILogger* getLogger();
 
+		//! Provides access to the engine's currently set randomizer.
+		virtual IRandomizer* getRandomizer() const;
+
+		//! Sets a new randomizer.
+		virtual void setRandomizer(IRandomizer* r);
+
+		//! Creates a new default randomizer.
+		virtual IRandomizer* createDefaultRandomizer() const;
+
 		//! Returns the operation system opertator object.
 		virtual IOSOperator* getOSOperator();
 
@@ -148,6 +158,7 @@ namespace irr
 		IEventReceiver* UserReceiver;
 		CLogger* Logger;
 		IOSOperator* Operator;
+		IRandomizer* Randomizer;
 		io::IFileSystem* FileSystem;
 		scene::ISceneManager* InputReceivingSceneManager;
 
diff --git a/source/Irrlicht/COctreeSceneNode.cpp b/source/Irrlicht/COctreeSceneNode.cpp
index 940c16ae..30072465 100644
--- a/source/Irrlicht/COctreeSceneNode.cpp
+++ b/source/Irrlicht/COctreeSceneNode.cpp
@@ -289,6 +289,8 @@ const core::aabbox3d<f32>& COctreeSceneNode::getBoundingBox() const
 
 
 //! creates the tree
+/* This method has a lot of duplication and overhead. Moreover, the tangents mesh conversion does not really work. I think we need a a proper mesh implementation for octrees, which handle all vertex types internally. Converting all structures to just one vertex type is always problematic.
+Thanks to Auria for fixing major parts of this method. */
 bool COctreeSceneNode::createTree(IMesh* mesh)
 {
 	if (!mesh)
@@ -301,7 +303,7 @@ bool COctreeSceneNode::createTree(IMesh* mesh)
 
 	Mesh = mesh;
 
-	u32 beginTime = os::Timer::getRealTime();
+	const u32 beginTime = os::Timer::getRealTime();
 
 	u32 nodeCount = 0;
 	u32 polyCount = 0;
@@ -311,12 +313,28 @@ bool COctreeSceneNode::createTree(IMesh* mesh)
 
 	if (mesh->getMeshBufferCount())
 	{
-		VertexType = mesh->getMeshBuffer(0)->getVertexType();
+		// check for "larger" buffer types
+		VertexType = video::EVT_STANDARD;
+		u32 meshReserve = 0;
+		for (i=0; i<mesh->getMeshBufferCount(); ++i)
+		{
+			const IMeshBuffer* b = mesh->getMeshBuffer(i);
+			if (b->getVertexCount() && b->getIndexCount())
+			{
+				++meshReserve;
+				if (b->getVertexType() == video::EVT_2TCOORDS)
+					VertexType = video::EVT_2TCOORDS;
+				else if (b->getVertexType() == video::EVT_TANGENTS)
+					VertexType = video::EVT_TANGENTS;
+			}
+		}
+		Materials.reallocate(Materials.size()+meshReserve);
 
 		switch(VertexType)
 		{
 		case video::EVT_STANDARD:
 			{
+				StdMeshes.reallocate(StdMeshes.size() + meshReserve);
 				for (i=0; i<mesh->getMeshBufferCount(); ++i)
 				{
 					IMeshBuffer* b = mesh->getMeshBuffer(i);
@@ -331,8 +349,21 @@ bool COctreeSceneNode::createTree(IMesh* mesh)
 
 						u32 v;
 						nchunk.Vertices.reallocate(b->getVertexCount());
-						for (v=0; v<b->getVertexCount(); ++v)
-							nchunk.Vertices.push_back(((video::S3DVertex*)b->getVertices())[v]);
+						switch (b->getVertexType())
+						{
+						case video::EVT_STANDARD:
+							for (v=0; v<b->getVertexCount(); ++v)
+								nchunk.Vertices.push_back(((video::S3DVertex*)b->getVertices())[v]);
+							break;
+						case video::EVT_2TCOORDS:
+							for (v=0; v<b->getVertexCount(); ++v)
+								nchunk.Vertices.push_back(((video::S3DVertex2TCoords*)b->getVertices())[v]);
+							break;
+						case video::EVT_TANGENTS:
+							for (v=0; v<b->getVertexCount(); ++v)
+								nchunk.Vertices.push_back(((video::S3DVertexTangents*)b->getVertices())[v]);
+							break;
+						}
 
 						polyCount += b->getIndexCount();
 
@@ -348,22 +379,11 @@ bool COctreeSceneNode::createTree(IMesh* mesh)
 			break;
 		case video::EVT_2TCOORDS:
 			{
-				IMeshBuffer* b;
-				u32 meshReserve = 0;
-				for ( i=0; i < mesh->getMeshBufferCount(); ++i)
-				{
-					b = mesh->getMeshBuffer(i);
-					if (b->getVertexCount() && b->getIndexCount())
-					{
-						meshReserve += 1;
-					}
-
-				}
-				LightMapMeshes.reallocate ( LightMapMeshes.size() + meshReserve );
+				LightMapMeshes.reallocate(LightMapMeshes.size() + meshReserve);
 
 				for ( i=0; i < mesh->getMeshBufferCount(); ++i)
 				{
-					b = mesh->getMeshBuffer(i);
+					IMeshBuffer* b = mesh->getMeshBuffer(i);
 
 					if (b->getVertexCount() && b->getIndexCount())
 					{
@@ -382,8 +402,21 @@ bool COctreeSceneNode::createTree(IMesh* mesh)
 
 						u32 v;
 						nchunk.Vertices.reallocate(b->getVertexCount());
-						for (v=0; v<b->getVertexCount(); ++v)
-							nchunk.Vertices.push_back(((video::S3DVertex2TCoords*)b->getVertices())[v]);
+						switch (b->getVertexType())
+						{
+						case video::EVT_STANDARD:
+							for (v=0; v<b->getVertexCount(); ++v)
+								nchunk.Vertices.push_back(((video::S3DVertex*)b->getVertices())[v]);
+							break;
+						case video::EVT_2TCOORDS:
+							for (v=0; v<b->getVertexCount(); ++v)
+								nchunk.Vertices.push_back(((video::S3DVertex2TCoords*)b->getVertices())[v]);
+							break;
+						case video::EVT_TANGENTS:
+							for (v=0; v<b->getVertexCount(); ++v)
+								nchunk.Vertices.push_back(((video::S3DVertexTangents*)b->getVertices())[v]);
+							break;
+						}
 
 						polyCount += b->getIndexCount();
 						nchunk.Indices.reallocate(b->getIndexCount());
@@ -398,6 +431,8 @@ bool COctreeSceneNode::createTree(IMesh* mesh)
 			break;
 		case video::EVT_TANGENTS:
 			{
+				TangentsMeshes.reallocate(TangentsMeshes.size() + meshReserve);
+
 				for (u32 i=0; i<mesh->getMeshBufferCount(); ++i)
 				{
 					IMeshBuffer* b = mesh->getMeshBuffer(i);
@@ -411,8 +446,27 @@ bool COctreeSceneNode::createTree(IMesh* mesh)
 
 						u32 v;
 						nchunk.Vertices.reallocate(b->getVertexCount());
-						for (v=0; v<b->getVertexCount(); ++v)
-							nchunk.Vertices.push_back(((video::S3DVertexTangents*)b->getVertices())[v]);
+						switch (b->getVertexType())
+						{
+						case video::EVT_STANDARD:
+							for (v=0; v<b->getVertexCount(); ++v)
+							{
+								const video::S3DVertex& tmpV = ((video::S3DVertex*)b->getVertices())[v];
+								nchunk.Vertices.push_back(video::S3DVertexTangents(tmpV.Pos, tmpV.Color, tmpV.TCoords));
+							}
+							break;
+						case video::EVT_2TCOORDS:
+							for (v=0; v<b->getVertexCount(); ++v)
+							{
+								const video::S3DVertex2TCoords& tmpV = ((video::S3DVertex2TCoords*)b->getVertices())[v];
+								nchunk.Vertices.push_back(video::S3DVertexTangents(tmpV.Pos, tmpV.Color, tmpV.TCoords));
+							}
+							break;
+						case video::EVT_TANGENTS:
+							for (v=0; v<b->getVertexCount(); ++v)
+								nchunk.Vertices.push_back(((video::S3DVertexTangents*)b->getVertices())[v]);
+							break;
+						}
 
 						polyCount += b->getIndexCount();
 						nchunk.Indices.reallocate(b->getIndexCount());
@@ -428,7 +482,7 @@ bool COctreeSceneNode::createTree(IMesh* mesh)
 		}
 	}
 
-	u32 endTime = os::Timer::getRealTime();
+	const u32 endTime = os::Timer::getRealTime();
 	c8 tmp[255];
 	sprintf(tmp, "Needed %ums to create Octree SceneNode.(%u nodes, %u polys)",
 		endTime - beginTime, nodeCount, polyCount/3);
diff --git a/source/Irrlicht/CParticleSystemSceneNode.h b/source/Irrlicht/CParticleSystemSceneNode.h
index 74f0bfc7..ffecefd3 100644
--- a/source/Irrlicht/CParticleSystemSceneNode.h
+++ b/source/Irrlicht/CParticleSystemSceneNode.h
@@ -193,6 +193,11 @@ public:
 	//! Remove all currently visible particles
 	virtual void clearParticles();
 
+	//! Do manually update the particles.
+ 	//! This should only be called when you want to render the node outside the scenegraph,
+ 	//! as the node will care about this otherwise automatically.
+	virtual void doParticleSystem(u32 time);
+
 	//! Writes attributes of the scene node.
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const;
 
@@ -204,7 +209,6 @@ public:
 
 private:
 
-	void doParticleSystem(u32 time);
 	void reallocateBuffers();
 
 	core::list<IParticleAffector*> AffectorList;
diff --git a/source/Irrlicht/CSceneCollisionManager.cpp b/source/Irrlicht/CSceneCollisionManager.cpp
index 98c080f2..a5825174 100644
--- a/source/Irrlicht/CSceneCollisionManager.cpp
+++ b/source/Irrlicht/CSceneCollisionManager.cpp
@@ -358,6 +358,9 @@ bool CSceneCollisionManager::getCollisionPoint(const core::line3d<f32>& ray,
 	}
 
 	s32 totalcnt = selector->getTriangleCount();
+	if ( totalcnt <= 0 )
+		return false;
+
 	Triangles.set_used(totalcnt);
 
 	s32 cnt = 0;
@@ -889,7 +892,7 @@ core::position2d<s32> CSceneCollisionManager::getScreenCoordinatesFrom3DPosition
 	if (useViewPort)
 		dim.set(Driver->getViewPort().getWidth(), Driver->getViewPort().getHeight());
 	else
-		dim=(Driver->getScreenSize());
+		dim=(Driver->getCurrentRenderTargetSize());
 
 	dim.Width /= 2;
 	dim.Height /= 2;
diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp
index a2adb1e0..aedc5f5b 100644
--- a/source/Irrlicht/CSceneManager.cpp
+++ b/source/Irrlicht/CSceneManager.cpp
@@ -2475,7 +2475,7 @@ IMeshWriter* CSceneManager::createMeshWriter(EMESH_WRITER_TYPE type)
 #endif
 	case EMWT_COLLADA:
 #ifdef _IRR_COMPILE_WITH_COLLADA_WRITER_
-		return new CColladaMeshWriter(Driver, FileSystem);
+		return new CColladaMeshWriter(this, Driver, FileSystem);
 #else
 		return 0;
 #endif
diff --git a/source/Irrlicht/CSceneManager.h b/source/Irrlicht/CSceneManager.h
index 7d34ada8..ea939886 100644
--- a/source/Irrlicht/CSceneManager.h
+++ b/source/Irrlicht/CSceneManager.h
@@ -433,7 +433,7 @@ namespace scene
 		virtual ISceneManager* createNewSceneManager(bool cloneContent);
 
 		//! Returns type of the scene node
-		virtual ESCENE_NODE_TYPE getType() const { return ESNT_UNKNOWN; }
+		virtual ESCENE_NODE_TYPE getType() const { return ESNT_SCENE_MANAGER; }
 
 		//! Returns the default scene node factory which can create all built in scene nodes
 		virtual ISceneNodeFactory* getDefaultSceneNodeFactory();
diff --git a/source/Irrlicht/CWaterSurfaceSceneNode.cpp b/source/Irrlicht/CWaterSurfaceSceneNode.cpp
index c20a3fb9..99d23945 100644
--- a/source/Irrlicht/CWaterSurfaceSceneNode.cpp
+++ b/source/Irrlicht/CWaterSurfaceSceneNode.cpp
@@ -28,14 +28,7 @@ CWaterSurfaceSceneNode::CWaterSurfaceSceneNode(f32 waveHeight, f32 waveSpeed, f3
 	setDebugName("CWaterSurfaceSceneNode");
 	#endif
 
-	// create copy of the mesh
-	if (mesh)
-	{
-		// Mesh is set in CMeshSceneNode constructor, now it is moved to OriginalMesh
-		IMesh* clone = SceneManager->getMeshManipulator()->createMeshCopy(mesh);
-		OriginalMesh = Mesh;
-		Mesh = clone;
-	}
+	setMesh(mesh);
 }
 
 
@@ -71,6 +64,7 @@ void CWaterSurfaceSceneNode::OnAnimate(u32 timeMs)
 					OriginalMesh->getMeshBuffer(b)->getPosition(i),
 					time);
 		}// end for all mesh buffers
+		Mesh->setDirty(scene::EBT_VERTEX);
 
 		SceneManager->getMeshManipulator()->recalculateNormals(Mesh);
 	}
@@ -88,6 +82,8 @@ void CWaterSurfaceSceneNode::setMesh(IMesh* mesh)
 	IMesh* clone = SceneManager->getMeshManipulator()->createMeshCopy(mesh);
 	OriginalMesh = mesh;
 	Mesh = clone;
+	Mesh->setHardwareMappingHint(scene::EHM_STATIC, scene::EBT_INDEX);
+//	Mesh->setHardwareMappingHint(scene::EHM_STREAM, scene::EBT_VERTEX);
 }
 
 
diff --git a/source/Irrlicht/CZipReader.cpp b/source/Irrlicht/CZipReader.cpp
index 676edf51..2e096648 100644
--- a/source/Irrlicht/CZipReader.cpp
+++ b/source/Irrlicht/CZipReader.cpp
@@ -104,7 +104,7 @@ IFileArchive* CArchiveLoaderZIP::createArchive(io::IReadFile* file, bool ignoreC
 		file->read(&sig, 2);
 
 #ifdef __BIG_ENDIAN__
-		os::Byteswap::byteswap(sig);
+		sig = os::Byteswap::byteswap(sig);
 #endif
 
 		file->seek(0);
@@ -126,7 +126,7 @@ bool CArchiveLoaderZIP::isALoadableFileFormat(io::IReadFile* file) const
 
 	file->read( &header.Sig, 4 );
 #ifdef __BIG_ENDIAN__
-	os::Byteswap::byteswap(header.Sig);
+	header.Sig = os::Byteswap::byteswap(header.Sig);
 #endif
 
 	return header.Sig == 0x04034b50 || // ZIP
@@ -192,8 +192,8 @@ bool CZipReader::scanGZipHeader()
 	{
 
 #ifdef __BIG_ENDIAN__
-		os::Byteswap::byteswap(header.sig);
-		os::Byteswap::byteswap(header.time);
+		header.sig = os::Byteswap::byteswap(header.sig);
+		header.time = os::Byteswap::byteswap(header.time);
 #endif
 
 		// check header value
@@ -209,7 +209,7 @@ bool CZipReader::scanGZipHeader()
 			File->read(&dataLen, 2);
 
 #ifdef __BIG_ENDIAN__
-			os::Byteswap::byteswap(dataLen);
+			dataLen = os::Byteswap::byteswap(dataLen);
 #endif
 
 			// skip it
@@ -274,8 +274,8 @@ bool CZipReader::scanGZipHeader()
 		File->read(&entry.header.DataDescriptor.UncompressedSize, 4);
 
 #ifdef __BIG_ENDIAN__
-		os::Byteswap::byteswap(entry.header.DataDescriptor.CRC32);
-		os::Byteswap::byteswap(entry.header.DataDescriptor.UncompressedSize);
+		entry.header.DataDescriptor.CRC32 = os::Byteswap::byteswap(entry.header.DataDescriptor.CRC32);
+		entry.header.DataDescriptor.UncompressedSize = os::Byteswap::byteswap(entry.header.DataDescriptor.UncompressedSize);
 #endif
 
 		// now we've filled all the fields, this is just a standard deflate block
diff --git a/source/Irrlicht/Irrlicht-gcc.cbp b/source/Irrlicht/Irrlicht-gcc.cbp
index 30dad9ae..6e4056e7 100644
--- a/source/Irrlicht/Irrlicht-gcc.cbp
+++ b/source/Irrlicht/Irrlicht-gcc.cbp
@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Win32 - Debug - dll">
 				<Option platforms="Windows;" />
-				<Option output="../../lib/Win32-gcc/Irrlicht" prefix_auto="1" extension_auto="1" />
+				<Option output="../../lib/Win32-gcc/libIrrlicht" prefix_auto="1" extension_auto="1" />
 				<Option object_output="../obj/win32-gcc-debug-dll" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -52,7 +52,7 @@
 			</Target>
 			<Target title="Win32 - Release - accurate math - dll">
 				<Option platforms="Windows;" />
-				<Option output="../../lib/Win32-gcc/Irrlicht" prefix_auto="1" extension_auto="1" />
+				<Option output="../../lib/Win32-gcc/libIrrlicht" prefix_auto="1" extension_auto="1" />
 				<Option object_output="../obj/win32-gcc-release-dll" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -94,7 +94,7 @@
 			</Target>
 			<Target title="Win32 - Release - fast math - dll">
 				<Option platforms="Windows;" />
-				<Option output="../../lib/Win32-gcc/Irrlicht" prefix_auto="1" extension_auto="1" />
+				<Option output="../../lib/Win32-gcc/libIrrlicht" prefix_auto="1" extension_auto="1" />
 				<Option object_output="../obj/win32-gcc-release-fast-dll" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -455,6 +455,7 @@
 		<Unit filename="../../include/IBillboardTextSceneNode.h" />
 		<Unit filename="../../include/IBoneSceneNode.h" />
 		<Unit filename="../../include/ICameraSceneNode.h" />
+		<Unit filename="../../include/IColladaMeshWriter.h" />
 		<Unit filename="../../include/ICursorControl.h" />
 		<Unit filename="../../include/IDummyTransformationSceneNode.h" />
 		<Unit filename="../../include/IDynamicMeshBuffer.h" />
diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj b/source/Irrlicht/Irrlicht10.0.vcxproj
index aed1bad6..bbc2205b 100644
--- a/source/Irrlicht/Irrlicht10.0.vcxproj
+++ b/source/Irrlicht/Irrlicht10.0.vcxproj
@@ -827,6 +827,7 @@
     <ClInclude Include="..\..\include\IEventReceiver.h" />
     <ClInclude Include="..\..\include\ILogger.h" />
     <ClInclude Include="..\..\include\IOSOperator.h" />
+    <ClInclude Include="..\..\include\IRandomizer.h" />
     <ClInclude Include="..\..\include\IReferenceCounted.h" />
     <ClInclude Include="..\..\include\IrrCompileConfig.h" />
     <ClInclude Include="..\..\include\irrlicht.h" />
diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj.filters b/source/Irrlicht/Irrlicht10.0.vcxproj.filters
index 0a8f6e05..b95eca19 100644
--- a/source/Irrlicht/Irrlicht10.0.vcxproj.filters
+++ b/source/Irrlicht/Irrlicht10.0.vcxproj.filters
@@ -1339,6 +1339,9 @@
     <ClInclude Include="..\..\include\EDriverFeatures.h">
       <Filter>include\video</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\IRandomizer.h">
+      <Filter>include</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\changes.txt">
diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile
index e4dab7c2..d75b838d 100644
--- a/source/Irrlicht/Makefile
+++ b/source/Irrlicht/Makefile
@@ -1,9 +1,7 @@
 VERSION_MAJOR = 1
 VERSION_MINOR = 8
 VERSION_RELEASE = 0-SVN
-VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
-COMPATIBILITY_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
-# Irrlicht Engine 1.7.0-SVN
+# Irrlicht Engine 1.8.0-SVN
 # Makefile for Linux
 #
 # To use, just run:
@@ -18,6 +16,10 @@ COMPATIBILITY_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
 # make sharedlib
 # make install
 #
+# If you want to compile in release mode run:
+#
+# make NDEBUG=1
+#
 # For cross-compilation for Win32 under Linux, just use the win32 targets. You have to set
 # at least CXX, CC, and AR to the proper binaries.
 #
@@ -105,15 +107,19 @@ sharedlib_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm
 sharedlib_win32 staticlib_win32: CPPFLAGS += -DIRR_COMPILE_WITH_DX9_DEV_PACK -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
 staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
 
+VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
+SHARED_FULLNAME = $(SHARED_LIB).$(VERSION)
+SONAME = $(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR)
+
 ####################
 # All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux
 all linux: staticlib
 
 # Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux
 sharedlib: $(LINKOBJ)
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SONAME) -o $(SHARED_FULLNAME) $^ $(LDFLAGS)
 	mkdir -p $(LIB_PATH)
-	cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
+	cp $(SHARED_FULLNAME) $(LIB_PATH)
 
 # Builds Irrlicht as static lib (libIrrlicht.a)
 $(STATIC_LIB): $(LINKOBJ)
@@ -135,17 +141,17 @@ staticlib_win32: $(STATIC_LIB)
 
 # Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/MacOSX
 sharedlib_osx: $(LINKOBJ)
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -dynamiclib -Wl,-install_name,$(SHARED_LIB).$(COMPATIBILITY_VERSION) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
-	cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $(SHARED_FULLNAME) $^ $(LDFLAGS)
+	cp $(SHARED_FULLNAME) $(LIB_PATH)
 
 # Installs Irrlicht if it was created as shared lib
 install install_osx:
 	$(RM) -r $(INSTALL_DIR)/../include/irrlicht
 	mkdir -p $(INSTALL_DIR)/../include/irrlicht
 	cp ../../include/*.h $(INSTALL_DIR)/../include/irrlicht/
-	cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)
-	cd $(INSTALL_DIR) && ln -s -f $(SHARED_LIB).$(VERSION) $(COMPATIBILITY_VERSION)
-
+	cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR)
+	cd $(INSTALL_DIR) && ln -s -f $(SHARED_FULLNAME) $(SONAME)
+	cd $(INSTALL_DIR) && ln -s -f $(SONAME) $(SHARED_LIB)
 #	ldconfig -n $(INSTALL_DIR)
 
 TAGS:
@@ -180,7 +186,7 @@ help:
 
 # Cleans all temporary files and compilation results.
 clean:
-	$(RM) $(LINKOBJ) $(SHARED_LIB).$(VERSION) $(STATIC_LIB) $(LINKOBJ:.o=.d)
+	$(RM) $(LINKOBJ) $(SHARED_FULLNAME) $(STATIC_LIB) $(LINKOBJ:.o=.d)
 
 .PHONY: all sharedlib staticlib sharedlib_win32 staticlib_win32 help install clean
 
diff --git a/source/Irrlicht/os.cpp b/source/Irrlicht/os.cpp
index ed347779..18e15cd9 100644
--- a/source/Irrlicht/os.cpp
+++ b/source/Irrlicht/os.cpp
@@ -222,9 +222,9 @@ namespace os
 	}
 
 	//! resets the randomizer
-	void Randomizer::reset()
+	void Randomizer::reset(s32 value)
 	{
-		seed = 0x0f0f0f0f;
+		seed = value;
 	}
 
 
diff --git a/source/Irrlicht/os.h b/source/Irrlicht/os.h
index 79a0ce01..fa7fb797 100644
--- a/source/Irrlicht/os.h
+++ b/source/Irrlicht/os.h
@@ -51,7 +51,7 @@ namespace os
 	public:
 
 		//! resets the randomizer
-		static void reset();
+		static void reset(s32 value=0x0f0f0f0f);
 
 		//! generates a pseudo random number in the range 0..randMax()
 		static s32 rand();
diff --git a/tests/2dmaterial.cpp b/tests/2dmaterial.cpp
index eac04cd3..d51351cc 100644
--- a/tests/2dmaterial.cpp
+++ b/tests/2dmaterial.cpp
@@ -9,23 +9,23 @@ namespace
 // based on code and media from SuperTuxKart
 class ScalableFont : public gui::IGUIFontBitmap
 {
-    float m_scale;
-    struct TextureInfo
-    {
-        irr::core::stringc m_file_name;
-        bool m_has_alpha;
-        float m_scale;
-        
-        TextureInfo()
-        {
-            m_has_alpha = false;
-            m_scale = 1.0f;
-        }
-    };
-    
-    std::map<int /* texture file ID */, TextureInfo> m_texture_files;
-    
-    void lazyLoadTexture(int texID)
+	float m_scale;
+	struct TextureInfo
+	{
+		irr::core::stringc m_file_name;
+		bool m_has_alpha;
+		float m_scale;
+		
+		TextureInfo()
+		{
+			m_has_alpha = false;
+			m_scale = 1.0f;
+		}
+	};
+	
+	std::map<int /* texture file ID */, TextureInfo> m_texture_files;
+	
+	void lazyLoadTexture(int texID)
 	{
 		const bool mipmap = Driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
 		Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, true);
@@ -33,7 +33,7 @@ class ScalableFont : public gui::IGUIFontBitmap
 		SpriteBank->setTexture(texID, Driver->getTexture( m_texture_files[texID].m_file_name ));
 		// set previous mip-map+filter state
 		Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, mipmap);
-	    
+		
 		// couldn't load texture, abort.
 		if (!SpriteBank->getTexture(texID))
 		{
@@ -48,7 +48,7 @@ class ScalableFont : public gui::IGUIFontBitmap
 			}
 		}
 	}
-    void doReadXmlFile(io::IXMLReader* xml)
+	void doReadXmlFile(io::IXMLReader* xml)
 	{
 		while (xml->read())
 		{
@@ -70,29 +70,29 @@ class ScalableFont : public gui::IGUIFontBitmap
 					core::stringc filename = xml->getAttributeValue(L"filename");
 					core::stringc fn = filename;
 					u32 i = (u32)xml->getAttributeValueAsInt(L"index");
-	                
+					
 					float scale=1.0f;
-					if(xml->getAttributeValue(L"scale"))
+					if (xml->getAttributeValue(L"scale"))
 						scale = xml->getAttributeValueAsFloat(L"scale");
 						//std::cout  << "scale = " << scale << std::endl;
-	                    
+						
 					core::stringw alpha = xml->getAttributeValue(L"hasAlpha");
-	                
+					
 					//std::cout << "---- Adding font texture " << fn.c_str() << "; alpha=" << alpha.c_str() << std::endl;
-	                
-	                
+					
+					
 					// make sure the sprite bank has enough textures in it
 					while (i+1 > SpriteBank->getTextureCount())
 					{
 						SpriteBank->addTexture(NULL);
 					}
-	            
+				
 					TextureInfo info;
 					info.m_file_name   = fn;
 					info.m_has_alpha   = (alpha == core::stringw("true"));
-					info.m_scale       = scale;
-	                
-					m_texture_files[i] = info;                
+					info.m_scale = scale;
+					
+					m_texture_files[i] = info;				
 				}
 				else if (core::stringw(L"c") == xml->getNodeName())
 				{
@@ -101,16 +101,16 @@ class ScalableFont : public gui::IGUIFontBitmap
 					gui::SGUISpriteFrame f;
 					gui::SGUISprite s;
 					core::rect<s32> rectangle;
-	                
-					a.underhang     = xml->getAttributeValueAsInt(L"u");
-					a.overhang      = xml->getAttributeValueAsInt(L"o");
-					a.spriteno      = SpriteBank->getSprites().size();
-					s32 texno       = xml->getAttributeValueAsInt(L"i");
-	                
+					
+					a.underhang = xml->getAttributeValueAsInt(L"u");
+					a.overhang = xml->getAttributeValueAsInt(L"o");
+					a.spriteno = SpriteBank->getSprites().size();
+					s32 texno = xml->getAttributeValueAsInt(L"i");
+					
 					// parse rectangle
 					core::stringc rectstr   = xml->getAttributeValue(L"r");
-					wchar_t ch      = xml->getAttributeValue(L"c")[0];
-	                
+					wchar_t ch = xml->getAttributeValue(L"c")[0];
+					
 					const c8 *c = rectstr.c_str();
 					s32 val;
 					val = 0;
@@ -122,7 +122,7 @@ class ScalableFont : public gui::IGUIFontBitmap
 					}
 					rectangle.UpperLeftCorner.X = val;
 					while (*c == L' ' || *c == L',') c++;
-	                
+					
 					val = 0;
 					while (*c >= '0' && *c <= '9')
 					{
@@ -132,7 +132,7 @@ class ScalableFont : public gui::IGUIFontBitmap
 					}
 					rectangle.UpperLeftCorner.Y = val;
 					while (*c == L' ' || *c == L',') c++;
-	                
+					
 					val = 0;
 					while (*c >= '0' && *c <= '9')
 					{
@@ -142,7 +142,7 @@ class ScalableFont : public gui::IGUIFontBitmap
 					}
 					rectangle.LowerRightCorner.X = val;
 					while (*c == L' ' || *c == L',') c++;
-	                
+					
 					val = 0;
 					while (*c >= '0' && *c <= '9')
 					{
@@ -151,24 +151,24 @@ class ScalableFont : public gui::IGUIFontBitmap
 						c++;
 					}
 					rectangle.LowerRightCorner.Y = val;
-	                
+					
 					CharacterMap[ch] = Areas.size();
-	                
+					
 					// make frame
 					f.rectNumber = SpriteBank->getPositions().size();
 					f.textureNumber = texno;
-	                
+					
 					// add frame to sprite
 					s.Frames.push_back(f);
 					s.frameTime = 0;
-	                
+					
 					// add rectangle to sprite bank
 					SpriteBank->getPositions().push_back(rectangle);
 					a.width = rectangle.getWidth();
-	                
+					
 					// add sprite to sprite bank
 					SpriteBank->getSprites().push_back(s);
-	                
+					
 					// add character to font
 					Areas.push_back(a);
 				}
@@ -178,13 +178,13 @@ class ScalableFont : public gui::IGUIFontBitmap
 
 public:
 
-    bool m_black_border;
-    
-    ScalableFont* m_fallback_font;
-    float         m_fallback_font_scale;
-    int           m_fallback_kerning_width;
-    
-    //! constructor
+	bool m_black_border;
+	
+	ScalableFont* m_fallback_font;
+	float m_fallback_font_scale;
+	int m_fallback_kerning_width;
+	
+	//! constructor
 	ScalableFont(gui::IGUIEnvironment *env, const io::path& filename)
 	: Driver(0), SpriteBank(0), Environment(env), WrongCharacter(0),
 		MaxHeight(0), GlobalKerningWidth(0), GlobalKerningHeight(0)
@@ -192,12 +192,12 @@ public:
 	#ifdef _DEBUG
 		setDebugName("ScalableFont");
 	#endif
-	    
-		m_fallback_font          = NULL;
+		
+		m_fallback_font = NULL;
 		m_fallback_kerning_width = 0;
-		m_fallback_font_scale    = 1.0f;
-		m_scale                  = 0.37f;
-		m_black_border           = false;    
+		m_fallback_font_scale = 1.0f;
+		m_scale = 0.37f;
+		m_black_border = false;
 
 		if (Environment)
 		{
@@ -213,7 +213,7 @@ public:
 			Driver->grab();
 
 		setInvisibleCharacters ( L" " );
-	    
+		
 		io::IXMLReader* reader = env->getFileSystem()->createXMLReader(filename.c_str());
 		if (reader)
 		{
@@ -223,21 +223,23 @@ public:
 		assert(Areas.size() > 0);
 	}
 
-    //! destructor
-    virtual ~ScalableFont()
+	//! destructor
+	virtual ~ScalableFont()
 	{
-		if (Driver)     Driver->drop();
-		if (SpriteBank) SpriteBank->drop();
+		if (Driver)
+			Driver->drop();
+		if (SpriteBank)
+			SpriteBank->drop();
 	}
 
-    //! loads a font from an XML file
-    bool load(io::IXMLReader* xml)
+	//! loads a font from an XML file
+	bool load(io::IXMLReader* xml)
 	{
 		if (!SpriteBank)
 			return false;
 
 		doReadXmlFile(xml);
-	    
+		
 		// set bad character
 		WrongCharacter = getAreaIDFromCharacter(L' ', NULL);
 
@@ -246,32 +248,33 @@ public:
 		for(wchar_t c='0'; c<='9'; c++)
 		{
 			SFontArea a = getAreaFromCharacter(c, NULL);
-			if(a.overhang  > m_max_digit_area.overhang ) m_max_digit_area.overhang  = a.overhang;
-			if(a.underhang > m_max_digit_area.underhang) m_max_digit_area.underhang = a.underhang;
-			if(a.width     > m_max_digit_area.width    ) m_max_digit_area.width     = a.width;
+			if (a.overhang > m_max_digit_area.overhang ) m_max_digit_area.overhang  = a.overhang;
+			if (a.underhang > m_max_digit_area.underhang) m_max_digit_area.underhang = a.underhang;
+			if (a.width > m_max_digit_area.width) m_max_digit_area.width = a.width;
 		}
-		m_max_digit_area.overhang = 0;m_max_digit_area.underhang=0;
+		m_max_digit_area.overhang = 0;
+		m_max_digit_area.underhang=0;
 		return true;
 	}
-    //! draws an text and clips it to the specified rectangle if wanted
-    virtual void draw(const core::stringw& text, const core::rect<s32>& position,
-            video::SColor color, bool hcenter=false,
-            bool vcenter=false, const core::rect<s32>* clip=0)
+	//! draws an text and clips it to the specified rectangle if wanted
+	virtual void draw(const core::stringw& text, const core::rect<s32>& position,
+			video::SColor color, bool hcenter=false,
+			bool vcenter=false, const core::rect<s32>* clip=0)
 	{
 		if (!Driver) return;
-	    
+		
 		core::position2d<s32> offset = position.UpperLeftCorner;
 		core::dimension2d<s32> text_dimension;
 
 		// When we use the "tab" hack, disable right-alignment, it messes up everything
-		bool has_tab = (text.findFirst(L'\t') != -1);
+//		bool has_tab = (text.findFirst(L'\t') != -1);
 		// ---- collect character locations
 		const unsigned int text_size = text.size();
-		core::array<s32>               indices(text_size);
+		core::array<s32> indices(text_size);
 		core::array<core::position2di> offsets(text_size);
-		core::array<bool>              fallback;
+		core::array<bool> fallback;
 		fallback.set_used(text_size);
-	    
+		
 		for (u32 i = 0; i<text_size; i++)
 		{
 			wchar_t c = text[i];
@@ -282,11 +285,12 @@ public:
 				offset.X = position.UpperLeftCorner.X + position.getWidth()/2;
 				continue;
 			}
-	        
-			if (c == L'\r' ||          // Windows breaks
-				c == L'\n'    )        // Unix breaks
+			
+			if (c == L'\r' ||	// Windows breaks
+				c == L'\n')	// Unix breaks
 			{
-				if(c==L'\r' && text[i+1]==L'\n') c = text[++i];
+				if (c==L'\r' && text[i+1]==L'\n')
+					c = text[++i];
 				offset.Y += (int)(MaxHeight*m_scale);
 				offset.X  = position.UpperLeftCorner.X;
 				if (hcenter)
@@ -296,23 +300,23 @@ public:
 
 			bool use_fallback_font = false;
 			const SFontArea &area  = getAreaFromCharacter(c, &use_fallback_font);
-			fallback[i]            = use_fallback_font;
-			offset.X              += area.underhang;
+			fallback[i] = use_fallback_font;
+			offset.X += area.underhang;
 			offsets.push_back(offset);
 			// Invisible character. add something to the array anyway so that 
 			// indices from the various arrays remain in sync
-			indices.push_back( Invisible.findFirst(c) < 0  ? area.spriteno
-														   : -1            );
+			indices.push_back((Invisible.findFirst(c) < 0) ? (int)area.spriteno
+						: -1);
 			offset.X += getCharWidth(area, fallback[i]);
 		}   // for i<text_size
 
 		// ---- do the actual rendering
-		const int indiceAmount                    = indices.size();
-		core::array< gui::SGUISprite >& sprites        = SpriteBank->getSprites();
-		core::array< core::rect<s32> >& positions = SpriteBank->getPositions();    
+		const int indiceAmount = indices.size();
+		core::array< gui::SGUISprite >& sprites = SpriteBank->getSprites();
+		core::array< core::rect<s32> >& positions = SpriteBank->getPositions();	
 		core::array< gui::SGUISprite >* fallback_sprites;
 		core::array< core::rect<s32> >* fallback_positions;
-		if(m_fallback_font!=NULL)
+		if (m_fallback_font!=NULL)
 		{
 			fallback_sprites   = &m_fallback_font->SpriteBank->getSprites();
 			fallback_positions = &m_fallback_font->SpriteBank->getPositions();
@@ -324,50 +328,51 @@ public:
 		}
 
 		video::IVideoDriver* driver = Environment->getVideoDriver();
-		const int spriteAmount      = sprites.size();
+		const int spriteAmount = sprites.size();
 		for (int n=0; n<indiceAmount; n++)
 		{
 			const int spriteID = indices[n];
-			if (!fallback[n] && (spriteID < 0 || spriteID >= spriteAmount)) continue;
-			if (indices[n] == -1) continue;
-	        
+			if (!fallback[n] && (spriteID < 0 || spriteID >= spriteAmount))
+				continue;
+			if (indices[n] == -1)
+				continue;
+			
 			//assert(sprites[spriteID].Frames.size() > 0);
-	        
+			
 			const int texID = (fallback[n] ?
-							   (*fallback_sprites)[spriteID].Frames[0].textureNumber :
-							   sprites[spriteID].Frames[0].textureNumber);
-	        
+					(*fallback_sprites)[spriteID].Frames[0].textureNumber :
+					sprites[spriteID].Frames[0].textureNumber);
+			
 			core::rect<s32> source = (fallback[n] ?
-									  (*fallback_positions)[(*fallback_sprites)[spriteID].Frames[0].rectNumber] :
-									  positions[sprites[spriteID].Frames[0].rectNumber]);
-	        
+						(*fallback_positions)[(*fallback_sprites)[spriteID].Frames[0].rectNumber] :
+						positions[sprites[spriteID].Frames[0].rectNumber]);
+			
 			const TextureInfo& info = (fallback[n] ?
-									   (*(m_fallback_font->m_texture_files.find(texID))).second :
-									   (*(m_texture_files.find(texID))).second
-									   );
+						(*(m_fallback_font->m_texture_files.find(texID))).second :
+						(*(m_texture_files.find(texID))).second);
 			float char_scale = info.m_scale;
 
 			core::dimension2d<s32> size = source.getSize();
-	        
+			
 			float scale = (fallback[n] ? m_scale*m_fallback_font_scale : m_scale);
 			size.Width  = (int)(size.Width  * scale * char_scale);
 			size.Height = (int)(size.Height * scale * char_scale);
-	        
+			
 			// align vertically if character is smaller
 			int y_shift = (size.Height < MaxHeight*m_scale ? (int)((MaxHeight*m_scale - size.Height)/2.0f) : 0);
-	        
+			
 			core::rect<s32> dest(offsets[n] + core::position2di(0, y_shift), size);
-	        
+			
 			video::SColor colors[] = {color, color, color, color};
-	                
+					
 			video::ITexture* texture = (fallback[n] ?
 										m_fallback_font->SpriteBank->getTexture(texID) :
 										SpriteBank->getTexture(texID) );
-	        
+			
 			if (texture == NULL)
 			{
 				// perform lazy loading
-	            
+				
 				if (fallback[n])
 				{
 					m_fallback_font->lazyLoadTexture(texID);
@@ -378,19 +383,19 @@ public:
 					lazyLoadTexture(texID);
 					texture = SpriteBank->getTexture(texID);
 				}
-	            
+				
 				if (texture == NULL)
 				{
 					continue; // no such character
 				}
 			}
-	        
+			
 			if (m_black_border)
 			{
 				// draw black border
 				video::SColor black(color.getAlpha(),0,0,0);
 				video::SColor black_colors[] = {black, black, black, black};
-	            
+				
 				for (int x_delta=-2; x_delta<=2; x_delta++)
 				{
 					for (int y_delta=-2; y_delta<=2; y_delta++)
@@ -401,10 +406,10 @@ public:
 											source,
 											clip,
 											black_colors, true);
-					}            
+					}			
 				}
 			}
-	        
+			
 			if (fallback[n])
 			{
 				// draw text over
@@ -424,23 +429,23 @@ public:
 									source,
 									clip,
 									colors, true);
-	            
+				
 			}
 		}
 	}
 
-    //! returns the dimension of a text
-    virtual core::dimension2d<u32> getDimension(const wchar_t* text) const
+	//! returns the dimension of a text
+	virtual core::dimension2d<u32> getDimension(const wchar_t* text) const
 	{
 		assert(Areas.size() > 0);
-	    
+		
 		core::dimension2d<u32> dim(0, 0);
 		core::dimension2d<u32> thisLine(0, (int)(MaxHeight*m_scale));
 
 		for (const wchar_t* p = text; *p; ++p)
 		{
-			if (*p == L'\r'  ||      // Windows breaks
-				*p == L'\n'      )   // Unix breaks
+			if (*p == L'\r' || // Windows breaks
+				*p == L'\n') // Unix breaks
 			{
 				if (*p==L'\r' && p[1] == L'\n') // Windows breaks
 					++p;
@@ -453,26 +458,26 @@ public:
 
 			bool fallback = false;
 			const SFontArea &area = getAreaFromCharacter(*p, &fallback);
-	            
+				
 			thisLine.Width += area.underhang;
-	        
+			
 			thisLine.Width += getCharWidth(area, fallback);
 		}
 
 		dim.Height += thisLine.Height;
 		if (dim.Width < thisLine.Width) dim.Width = thisLine.Width;
 
-	   // std::cout << "ScalableFont::getDimension returns : " << dim.Width << ", " << dim.Height << " --> ";
+		// std::cout << "ScalableFont::getDimension returns : " << dim.Width << ", " << dim.Height << " --> ";
 
 		dim.Width  = (int)(dim.Width + 0.9f); // round up
 		dim.Height = (int)(dim.Height + 0.9f);
 
 		//std::cout << dim.Width << ", " << dim.Height << std::endl;
-	    
+		
 		return dim;
 	}
-    //! Calculates the index of the character in the text which is on a specific position.
-    virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const
+	//! Calculates the index of the character in the text which is on a specific position.
+	virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const
 	{
 		s32 x = 0;
 		s32 idx = 0;
@@ -491,20 +496,20 @@ public:
 
 		return -1;
 	}
-    //! Returns the type of this font
-    virtual gui::EGUI_FONT_TYPE getType() const { return gui::EGFT_BITMAP; }
+	//! Returns the type of this font
+	virtual gui::EGUI_FONT_TYPE getType() const { return gui::EGFT_BITMAP; }
 
-    //! set an Pixel Offset on Drawing ( scale position on width )
-    virtual void setKerningWidth (s32 kerning)
+	//! set an Pixel Offset on Drawing ( scale position on width )
+	virtual void setKerningWidth (s32 kerning)
 	{
 		GlobalKerningWidth = kerning;
 	}
-    virtual void setKerningHeight (s32 kerning)
+	virtual void setKerningHeight (s32 kerning)
 	{
 		GlobalKerningHeight = kerning;
 	}
-    //! set an Pixel Offset on Drawing ( scale position on width )
-    virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const
+	//! set an Pixel Offset on Drawing ( scale position on width )
+	virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const
 	{
 		s32 ret = GlobalKerningWidth;
 
@@ -520,67 +525,69 @@ public:
 
 		return ret;
 	}
-    virtual s32 getKerningHeight() const
+	virtual s32 getKerningHeight() const
 	{
 		return GlobalKerningHeight;
 	}
 
-    //! gets the sprite bank
-    virtual gui::IGUISpriteBank* getSpriteBank() const
+	//! gets the sprite bank
+	virtual gui::IGUISpriteBank* getSpriteBank() const
 	{
 		return SpriteBank;
 	}
 
-    //! returns the sprite number from a given character
-    virtual u32 getSpriteNoFromChar(const wchar_t *c) const
+	//! returns the sprite number from a given character
+	virtual u32 getSpriteNoFromChar(const wchar_t *c) const
 	{
 		return Areas[getAreaIDFromCharacter(*c, NULL)].spriteno;
 	}
 
-    virtual void setInvisibleCharacters( const wchar_t *s )
+	virtual void setInvisibleCharacters( const wchar_t *s )
 	{
 		Invisible = s;
 	}
 
 private:
 
-    struct SFontArea
-    {
-        SFontArea() : underhang(0), overhang(0), width(0), spriteno(0) {}
-        s32             underhang;
-        s32             overhang;
-        s32             width;
-        u32             spriteno;
-    };
-    
-    int getCharWidth(const SFontArea& area, const bool fallback) const
+	struct SFontArea
 	{
-		core::array< gui::SGUISprite >& sprites = SpriteBank->getSprites();        
+		SFontArea() : underhang(0), overhang(0), width(0), spriteno(0) {}
+		s32 underhang;
+		s32 overhang;
+		s32 width;
+		u32 spriteno;
+	};
+	
+	int getCharWidth(const SFontArea& area, const bool fallback) const
+	{
+		core::array< gui::SGUISprite >& sprites = SpriteBank->getSprites();		
 		core::array< gui::SGUISprite >* fallback_sprites = (m_fallback_font != NULL ?
-													   &m_fallback_font->SpriteBank->getSprites() :
-													   NULL);
-	    
+													&m_fallback_font->SpriteBank->getSprites() :
+													NULL);
+		
 		const int texID = (fallback ?
-						   (*fallback_sprites)[area.spriteno].Frames[0].textureNumber :
-						   sprites[area.spriteno].Frames[0].textureNumber);
-	    
+				(*fallback_sprites)[area.spriteno].Frames[0].textureNumber :
+				sprites[area.spriteno].Frames[0].textureNumber);
+		
 		const TextureInfo& info = (fallback ?
-								   (*(m_fallback_font->m_texture_files.find(texID))).second :
-									(*(m_texture_files.find(texID))).second
-								   );
+					(*(m_fallback_font->m_texture_files.find(texID))).second :
+					(*(m_texture_files.find(texID))).second);
 		const float char_scale = info.m_scale;
-	    
+		
 		//std::cout << "area.spriteno=" << area.spriteno << ", char_scale=" << char_scale << std::endl;
-	    
-		if (fallback) return (int)(((area.width + area.overhang)*m_fallback_font_scale + m_fallback_kerning_width) * m_scale * char_scale);
-		else          return (int)((area.width + area.overhang + GlobalKerningWidth) * m_scale * char_scale);
+		
+		if (fallback)
+			return (int)(((area.width + area.overhang)*m_fallback_font_scale + m_fallback_kerning_width) * m_scale * char_scale);
+		else
+			return (int)((area.width + area.overhang + GlobalKerningWidth) * m_scale * char_scale);
 	}
 	s32 getAreaIDFromCharacter(const wchar_t c, bool* fallback_font) const
 	{
 		std::map<wchar_t, s32>::const_iterator n = CharacterMap.find(c);
 		if (n != CharacterMap.end())
 		{
-			if (fallback_font != NULL) *fallback_font = false;
+			if (fallback_font != NULL)
+				*fallback_font = false;
 			return (*n).second;
 		}
 		else if (m_fallback_font != NULL && fallback_font != NULL)
@@ -591,19 +598,20 @@ private:
 		else
 		{
 			// std::cout << "The font does not have this character : <" << (int)c << ">" << std::endl;
-			if (fallback_font != NULL) *fallback_font = false;
+			if (fallback_font != NULL)
+				*fallback_font = false;
 			return WrongCharacter;
 		}
 	}
-    const SFontArea &getAreaFromCharacter(const wchar_t c, bool* fallback_font) const
+	const SFontArea &getAreaFromCharacter(const wchar_t c, bool* fallback_font) const
 	{
 		const int area_id = getAreaIDFromCharacter(c, fallback_font);
-	    const bool use_fallback_font = (fallback_font && *fallback_font);
-	    
+		const bool use_fallback_font = (fallback_font && *fallback_font);
+		
 		// Note: fallback_font can be NULL
 		return ( use_fallback_font ? m_fallback_font->Areas[area_id] : Areas[area_id]);
 	}   // getAreaFromCharacter
-    void setMaxHeight()
+	void setMaxHeight()
 	{
 		// FIXME: should consider per-texture scaling
 		MaxHeight = 0;
@@ -618,18 +626,18 @@ private:
 				MaxHeight = t;
 		}
 	}
-    core::array<SFontArea>      Areas;
-    /** The maximum values of all digits, used in monospace_digits. */
-    mutable SFontArea           m_max_digit_area;
-    std::map<wchar_t, s32>      CharacterMap;
-    video::IVideoDriver*        Driver;
-    gui::IGUISpriteBank*         SpriteBank;
-    gui::IGUIEnvironment*        Environment;
-    u32             WrongCharacter;
-    s32             MaxHeight;
-    s32             GlobalKerningWidth, GlobalKerningHeight;
+	core::array<SFontArea>	Areas;
+	/** The maximum values of all digits, used in monospace_digits. */
+	mutable SFontArea	m_max_digit_area;
+	std::map<wchar_t, s32>	CharacterMap;
+	video::IVideoDriver*	Driver;
+	gui::IGUISpriteBank*	SpriteBank;
+	gui::IGUIEnvironment*	Environment;
+	u32			WrongCharacter;
+	s32			MaxHeight;
+	s32			GlobalKerningWidth, GlobalKerningHeight;
 
-    core::stringw Invisible;
+	core::stringw Invisible;
 };
 }
 
@@ -655,12 +663,12 @@ static bool draw2DImage4c(video::E_DRIVER_TYPE type)
 
 	logTestString("Testing driver %ls\n", driver->getName());
 
-    driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS,true);
-    driver->setTextureCreationFlag(video::ETCF_OPTIMIZED_FOR_QUALITY,true);
+	driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS,true);
+	driver->setTextureCreationFlag(video::ETCF_OPTIMIZED_FOR_QUALITY,true);
 
 	video::ITexture* images = driver->getTexture("../media/2ddemo.png");
 	driver->makeColorKeyTexture(images, core::position2d<s32>(0,0));
-    
+	
 	core::rect<s32> imp1(349,15,385,78);
 	core::rect<s32> imp2(387,15,423,78);
 
@@ -668,54 +676,54 @@ static bool draw2DImage4c(video::E_DRIVER_TYPE type)
 	io::path cwd = device->getFileSystem()->getWorkingDirectory();
 	device->getFileSystem()->changeWorkingDirectoryTo("media");
 
-    ScalableFont* font = new ScalableFont(device->getGUIEnvironment(), "title_font.xml");
-    font->m_fallback_font_scale = 4.0f; 
-    font->m_fallback_kerning_width = 15;
-    font->setKerningWidth(-18);
-    font->m_black_border = true;
+	ScalableFont* font = new ScalableFont(device->getGUIEnvironment(), "title_font.xml");
+	font->m_fallback_font_scale = 4.0f; 
+	font->m_fallback_kerning_width = 15;
+	font->setKerningWidth(-18);
+	font->m_black_border = true;
 
 	/*
-     Prepare a nicely filtering 2d render mode for special cases.
-     */
-    driver->getMaterial2D().UseMipMaps = true;
+	Prepare a nicely filtering 2d render mode for special cases.
+	*/
+	driver->getMaterial2D().UseMipMaps = true;
 	driver->getMaterial2D().TextureLayer[0].BilinearFilter = true;
-    
+	
 	{
 		driver->beginScene(true, true, video::SColor(255,120,102,136));
-        
-        driver->enableMaterial2D();
+		
+		driver->enableMaterial2D();
 
 		// draw fire & dragons background world
 		driver->draw2DImage(images, core::position2di(),
-                            core::rect<s32>(0,0,342,224), 0,
-                            video::SColor(255,255,255,255), true);
-        
+							core::rect<s32>(0,0,342,224), 0,
+							video::SColor(255,255,255,255), true);
+		
 		// draw flying imp
 		driver->draw2DImage(images, core::position2d<s32>(114,75),
-                            imp1, 0, video::SColor(255,255,255,255), true);
-        
+							imp1, 0, video::SColor(255,255,255,255), true);
+		
 		// draw second flying imp
 		driver->draw2DImage(images, core::position2d<s32>(220,55),
-                            imp2, 0, video::SColor(255,255,255,255), true);
-        
+							imp2, 0, video::SColor(255,255,255,255), true);
+		
 		driver->draw2DImage(images, core::rect<s32>(10,10,108,48),
-                            core::rect<s32>(354,87,442,118));
+							core::rect<s32>(354,87,442,118));
 
 		video::SColor colors[] = {0xff00ffff, 0xff00ffff, 0xffffff00, 0xffffff00};
 		driver->draw2DImage(images, core::recti(10,50,108,88),
 			core::recti(354,87,442,118), 0, colors, true);
 
-        font->draw( L"WXYZsSdDrRjJbB", core::rect<s32>(30,20,300,300),
-                   video::SColor(255,255,255,255) );
-        
+		font->draw( L"WXYZsSdDrRjJbB", core::rect<s32>(30,20,300,300),
+				video::SColor(255,255,255,255) );
+		
 		driver->enableMaterial2D(false);
-        
+		
 		driver->draw2DImage(images, core::recti(10,90,108,128),
 			core::recti(354,87,442,118), 0, colors, true);
 
-        font->draw( L"WXYZsSdDrRjJbB", core::rect<s32>(30,60,300,400),
-                   video::SColor(255,255,255,255) );
-        
+		font->draw( L"WXYZsSdDrRjJbB", core::rect<s32>(30,60,300,400),
+				video::SColor(255,255,255,255) );
+		
 		driver->endScene();
 	}
 	font->drop();
@@ -727,7 +735,7 @@ static bool draw2DImage4c(video::E_DRIVER_TYPE type)
 	device->closeDevice();
 	device->run();
 	device->drop();
-    return result;
+	return result;
 }
 
 // This test renders a 3d scene and a gui on top of it. The GUI is
@@ -821,7 +829,7 @@ static bool addBlend2d(video::E_DRIVER_TYPE type)
 	device->closeDevice();
 	device->run();
 	device->drop();
-    return result;
+	return result;
 } 
 
 // This test renders 4 times the same image. Two via IGUIImage, two via draw2DImage
@@ -833,8 +841,8 @@ static bool moreFilterTests(video::E_DRIVER_TYPE type)
 	if (!device)
 		return true;
 
-    video::IVideoDriver* driver = device->getVideoDriver();
-    gui::IGUIEnvironment* gui = device->getGUIEnvironment();
+	video::IVideoDriver* driver = device->getVideoDriver();
+	gui::IGUIEnvironment* gui = device->getGUIEnvironment();
 
 	if (!driver->queryFeature(video::EVDF_BILINEAR_FILTER))
 	{
@@ -848,41 +856,41 @@ static bool moreFilterTests(video::E_DRIVER_TYPE type)
 
 	driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
 	video::ITexture* tex = driver->getTexture("../media/irrlichtlogo.jpg");
-    gui::IGUIImage* image = gui->addImage(core::recti(0,0,64,64));
-    image->setScaleImage(true);
-    image->setImage(tex);
-    image->setUseAlphaChannel(true);
+	gui::IGUIImage* image = gui->addImage(core::recti(0,0,64,64));
+	image->setScaleImage(true);
+	image->setImage(tex);
+	image->setUseAlphaChannel(true);
 	driver->getMaterial2D().TextureLayer[0].BilinearFilter=true;
 	driver->getMaterial2D().TextureLayer[0].TrilinearFilter=true;
 
-    {
-        driver->beginScene(true, true, irr::video::SColor(255,255,255,255));
+	{
+		driver->beginScene(true, true, irr::video::SColor(255,255,255,255));
 
 		// all three logos should be with filtering
-        driver->enableMaterial2D();
+		driver->enableMaterial2D();
 
-        driver->getMaterial2D().setTexture(0, 0);
-        driver->draw2DImage(tex, irr::core::rect<irr::s32>(64, 64, 128, 128), irr::core::rect<irr::s32>(0, 0, 88, 31));
+		driver->getMaterial2D().setTexture(0, 0);
+		driver->draw2DImage(tex, irr::core::rect<irr::s32>(64, 64, 128, 128), irr::core::rect<irr::s32>(0, 0, 88, 31));
 
 		driver->getMaterial2D().setTexture(0, tex);
-        driver->draw2DImage(tex, irr::core::rect<irr::s32>(64, 0, 128, 64), irr::core::rect<irr::s32>(0, 0, 88, 31));
+		driver->draw2DImage(tex, irr::core::rect<irr::s32>(64, 0, 128, 64), irr::core::rect<irr::s32>(0, 0, 88, 31));
 
-        gui->drawAll();
+		gui->drawAll();
 
 		// the next gui image should be without filter
-        driver->enableMaterial2D(false);
+		driver->enableMaterial2D(false);
 		image->setRelativePosition(core::recti(0,64,64,128));
-        gui->drawAll();
+		gui->drawAll();
 
 		driver->endScene();
-    }
+	}
 
 	bool result = takeScreenshotAndCompareAgainstReference(driver, "-2dmatFilter.png");
 
 	device->closeDevice();
 	device->run();
 	device->drop();
-    return result;
+	return result;
 } 
 
 bool twodmaterial()
diff --git a/tests/md2Animation.cpp b/tests/md2Animation.cpp
index 3f858bac..3fac32bc 100644
--- a/tests/md2Animation.cpp
+++ b/tests/md2Animation.cpp
@@ -5,49 +5,43 @@
 
 using namespace irr;
 using namespace core;
-using namespace scene;
-using namespace video;
-using namespace io;
-using namespace gui;
 
+namespace
+{
 // Tests MD2 animations.
 /** At the moment, this just verifies that the last frame of the animation produces the expected bitmap. */
-bool md2Animation(void)
+bool testLastFrame()
 {
 	// Use EDT_BURNINGSVIDEO since it is not dependent on (e.g.) OpenGL driver versions.
-	IrrlichtDevice *device = createDevice( EDT_BURNINGSVIDEO, dimension2d<u32>(160, 120), 32);
-	assert(device);
+	IrrlichtDevice *device = createDevice(video::EDT_BURNINGSVIDEO, dimension2d<u32>(160, 120), 32);
 	if (!device)
 		return false;
 
-	IVideoDriver* driver = device->getVideoDriver();
-	ISceneManager * smgr = device->getSceneManager();
+	video::IVideoDriver* driver = device->getVideoDriver();
+	scene::ISceneManager * smgr = device->getSceneManager();
 
-	IAnimatedMesh* mesh = smgr->getMesh("../media/sydney.md2");
-	IAnimatedMeshSceneNode* node;
-	assert(mesh);
+	scene::IAnimatedMesh* mesh = smgr->getMesh("../media/sydney.md2");
 
 	bool result = (mesh != 0);
-	if(mesh)
+	if (mesh)
 	{
-		node = smgr->addAnimatedMeshSceneNode(mesh);
-		assert(node);
+		scene::IAnimatedMeshSceneNode* node = smgr->addAnimatedMeshSceneNode(mesh);
 
-		if(node)
+		if (node)
 		{
 			node->setPosition(vector3df(20, 0, 30));
-			node->setMaterialFlag(EMF_LIGHTING, false);
+			node->setMaterialFlag(video::EMF_LIGHTING, false);
 			node->setMaterialTexture(0, driver->getTexture("../media/sydney.bmp"));
 			node->setLoopMode(false);
 
 			(void)smgr->addCameraSceneNode();
 
 			// Just jump to the last frame since that's all we're interested in.
-			node->setMD2Animation(EMAT_DEATH_FALLBACK);
+			node->setMD2Animation(scene::EMAT_DEATH_FALLBACK);
 			node->setCurrentFrame((f32)(node->getEndFrame()));
 			node->setAnimationSpeed(0);
 			device->run();
-			driver->beginScene(true, true, SColor(255, 255, 255, 0));
+			driver->beginScene(true, true, video::SColor(255, 255, 255, 0));
 			smgr->drawAll();
 			driver->endScene();
 			if (mesh->getBoundingBox() != mesh->getMesh(node->getEndFrame())->getBoundingBox())
@@ -79,3 +73,56 @@ bool md2Animation(void)
 	return result;
 }
 
+// Tests MD2 normals.
+bool testNormals()
+{
+	// Use EDT_BURNINGSVIDEO since it is not dependent on (e.g.) OpenGL driver versions.
+	IrrlichtDevice *device = createDevice(video::EDT_BURNINGSVIDEO, dimension2d<u32>(160, 120), 32);
+	if (!device)
+		return false;
+
+	video::IVideoDriver* driver = device->getVideoDriver();
+	scene::ISceneManager * smgr = device->getSceneManager();
+
+	scene::IAnimatedMesh* mesh = smgr->getMesh("../media/sydney.md2");
+
+	bool result = (mesh != 0);
+	if (mesh)
+	{
+		scene::IAnimatedMeshSceneNode* node = smgr->addAnimatedMeshSceneNode(mesh);
+		if (node)
+		{
+			node->setPosition(vector3df(20, 0, 30));
+			node->setMaterialFlag(video::EMF_LIGHTING, false);
+			node->setDebugDataVisible(scene::EDS_NORMALS);
+			node->setMaterialTexture(0, driver->getTexture("../media/sydney.bmp"));
+			node->setLoopMode(false);
+
+			(void)smgr->addCameraSceneNode();
+
+			node->setMD2Animation(scene::EMAT_STAND);
+			node->setAnimationSpeed(0);
+			device->run();
+			driver->beginScene(true, true, video::SColor(255, 255, 255, 0));
+			smgr->drawAll();
+			driver->endScene();
+		}
+	}
+
+	result &= takeScreenshotAndCompareAgainstReference(driver, "-md2Normals.png");
+	device->closeDevice();
+	device->run();
+	device->drop();
+
+	return result;
+}
+
+}
+
+// test md2 features
+bool md2Animation(void)
+{
+	bool result = testLastFrame();
+	result &= testNormals();
+	return result;
+}
diff --git a/tests/media/Burning's Video-md2Normals.png b/tests/media/Burning's Video-md2Normals.png
new file mode 100644
index 0000000000000000000000000000000000000000..709b97e9eb7baadcc108fe5e8e9866530634a35e
GIT binary patch
literal 6405
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
TLgF7>00000NkvXXu0mjf^a^TA

literal 0
HcmV?d00001

diff --git a/tests/screenshot.cpp b/tests/screenshot.cpp
index 6c701f15..d8f7b40c 100644
--- a/tests/screenshot.cpp
+++ b/tests/screenshot.cpp
@@ -41,7 +41,7 @@ bool testShots(video::E_DRIVER_TYPE type)
 	smgr->drawAll();
 	driver->endScene();
 
-	for (u32 i=0; i<video::ECF_UNKNOWN; ++i)
+	for (s32 i=0; i<video::ECF_UNKNOWN; ++i)
 	{
 		video::IImage* img = driver->createScreenShot((video::ECOLOR_FORMAT)i);
 		logTestString("Color Format %d %ssupported\n", i, (img && img->getColorFormat() == i)?"":"un");
diff --git a/tests/terrainSceneNode.cpp b/tests/terrainSceneNode.cpp
index 1056c4b3..181dc68d 100644
--- a/tests/terrainSceneNode.cpp
+++ b/tests/terrainSceneNode.cpp
@@ -10,41 +10,41 @@ namespace
 // test camera changes with terrain scene node recalculation
 bool terrainRecalc(void)
 {
-    IrrlichtDevice *device =
-        createDevice(video::EDT_BURNINGSVIDEO, dimension2du(160, 120), 32);
+	IrrlichtDevice *device =
+		createDevice(video::EDT_BURNINGSVIDEO, dimension2du(160, 120), 32);
 
 	if (!device)
 		return true;
 
-    video::IVideoDriver* driver = device->getVideoDriver();
-    scene::ISceneManager* smgr = device->getSceneManager();
+	video::IVideoDriver* driver = device->getVideoDriver();
+	scene::ISceneManager* smgr = device->getSceneManager();
 
-    scene::ITerrainSceneNode* terrain = smgr->addTerrainSceneNode(
-        "../media/terrain-heightmap.bmp");
-    terrain->setScale(core::vector3df(40.f, .1f, 40.f));
+	scene::ITerrainSceneNode* terrain = smgr->addTerrainSceneNode(
+		"../media/terrain-heightmap.bmp");
+	terrain->setScale(core::vector3df(40.f, .1f, 40.f));
 
-    terrain->setMaterialFlag(video::EMF_LIGHTING, false);
-    terrain->setMaterialTexture(0, driver->getTexture("../media/terrain-texture.jpg"));
-    terrain->setDebugDataVisible(scene::EDS_FULL);
+	terrain->setMaterialFlag(video::EMF_LIGHTING, false);
+	terrain->setMaterialTexture(0, driver->getTexture("../media/terrain-texture.jpg"));
+	terrain->setDebugDataVisible(scene::EDS_FULL);
 
-    scene::ICameraSceneNode* camera = smgr->addCameraSceneNode();
+	scene::ICameraSceneNode* camera = smgr->addCameraSceneNode();
 
-    const core::vector3df center(terrain->getBoundingBox().getCenter());
-    camera->setTarget(center);
+	const core::vector3df center(terrain->getBoundingBox().getCenter());
+	camera->setTarget(center);
 
-    // yes, Y is intentionally being set to X here
-    const core::vector3df above (center.X, center.X, center.Z);
-    camera->setPosition (above);
+	// yes, Y is intentionally being set to X here
+	const core::vector3df above (center.X, center.X, center.Z);
+	camera->setPosition (above);
 	camera->setUpVector(vector3df(1.f, 0.f, 0.f));
-    camera->setFarValue(above.Y);
+	camera->setFarValue(above.Y);
 
-    device->run();
-    smgr->drawAll();
+	device->run();
+	smgr->drawAll();
 
 
 	// This shouldn't cause a recalc
 	camera->setUpVector(vector3df(1.f, 0.f, .01f).normalize());
-    device->run();
+	device->run();
 	driver->beginScene(true, true, video::SColor(255,100,101,140));
 	smgr->drawAll();
 	driver->endScene();
@@ -58,7 +58,7 @@ bool terrainRecalc(void)
 
 	// This is big enough to cause a recalc
 	camera->setUpVector(vector3df(1.f, 0.f, .1f).normalize());
-    device->run();
+	device->run();
 	driver->beginScene(true, true, video::SColor(255,100,101,140));
 	smgr->drawAll();
 	driver->endScene();
@@ -72,7 +72,7 @@ bool terrainRecalc(void)
 	device->closeDevice();
 	device->run();
 	device->drop();
-    return result;
+	return result;
 }
 
 bool terrainGaps()
@@ -114,7 +114,7 @@ bool terrainGaps()
 	device->closeDevice();
 	device->run();
 	device->drop();
-    return true;
+	return result;
 }
 
 }
@@ -124,4 +124,5 @@ bool terrainSceneNode()
 	bool result = terrainRecalc();
 	result &= terrainGaps();
 	return result;
-}
\ No newline at end of file
+}
+
diff --git a/tests/testQuaternion.cpp b/tests/testQuaternion.cpp
index 6e3cd47b..f6d976ce 100644
--- a/tests/testQuaternion.cpp
+++ b/tests/testQuaternion.cpp
@@ -32,7 +32,7 @@ inline bool compareQ(const core::vector3df& v, const core::vector3df& turn=core:
 	return true;
 }
 
-core::vector3df vals[] = {
+const core::vector3df vals[] = {
 	core::vector3df(0.f, 0.f, 0.f),
 	core::vector3df(0.f, 0.f, 24.04f),
 	core::vector3df(0.f, 0.f, 71.f),
@@ -100,39 +100,52 @@ bool testEulerConversion()
 bool testRotationFromTo()
 {
 	bool result = true;
-	core::quaternion q1;
-	core::matrix4 mat;
-	core::quaternion q4(mat);
+	core::quaternion q;
 
-	q4.rotationFromTo(core::vector3df(1.f,0.f,0.f), core::vector3df(1.f,0.f,0.f));
-	if (q4 != q1)
+	q.rotationFromTo(core::vector3df(1.f,0.f,0.f), core::vector3df(1.f,0.f,0.f));
+	if (q != core::quaternion())
 	{
 		logTestString("Quaternion rotationFromTo method did not yield identity.\n");
 		result = false;
 	}
 
-	q1.set(0.f,0.f,core::PI);
-	core::quaternion q2(0.f,core::PI,0.f);
-	q4.rotationFromTo(core::vector3df(1.f,0.f,0.f), core::vector3df(-1.f,0.f,0.f));
-	if ((q4 != q1)&&(q4 != q2))
+	core::vector3df from(1.f,0.f,0.f);
+	q.rotationFromTo(from, core::vector3df(-1.f,0.f,0.f));
+	from=q*from;
+	if (from != core::vector3df(-1.f,0.f,0.f))
 	{
 		logTestString("Quaternion rotationFromTo method did not yield x flip.\n");
 		result = false;
 	}
-	q4.rotationFromTo(core::vector3df(10.f,20.f,30.f), core::vector3df(-10.f,-20.f,-30.f));
-	if ((q4 != q1)&&(q4 != q2))
+
+	from.set(1.f,2.f,3.f);
+	q.rotationFromTo(from, core::vector3df(-1.f,-2.f,-3.f));
+	from=q*from;
+	if (from != core::vector3df(-1.f,-2.f,-3.f))
 	{
 		logTestString("Quaternion rotationFromTo method did not yield x flip for non-axis.\n");
 		result = false;
 	}
 
-	q1.set(0.f,0.f,core::PI/2);
-	q4.rotationFromTo(core::vector3df(1.f,0.f,0.f), core::vector3df(0.f,1.f,0.f));
-	if (!q4.equals(q1))
+	from.set(1.f,0.f,0.f);
+	q.rotationFromTo(from, core::vector3df(0.f,1.f,0.f));
+	from=q*from;
+	if (from != core::vector3df(0.f,1.f,0.f))
 	{
 		logTestString("Quaternion rotationFromTo method did not yield 90 degree rotation.\n");
 		result = false;
 	}
+
+	for (u32 i=1; i<sizeof(vals)/sizeof(vals[0])-1; ++i)
+	{
+		from.set(vals[i]).normalize();
+		core::vector3df to(vals[i+1]);
+		to.normalize();
+		q.rotationFromTo(from, to);
+		from = q*from;
+		result &= (from.equals(to, 0.00012f));
+	}
+
 	return result;
 }
 
diff --git a/tests/testUtils.h b/tests/testUtils.h
index 973d47e8..272d1b28 100644
--- a/tests/testUtils.h
+++ b/tests/testUtils.h
@@ -5,14 +5,14 @@
 #include "irrlicht.h"
 #include <assert.h>
 
-#define TestWithAllDrivers(X, ...) \
+#define TestWithAllDrivers(X) \
 	logTestString("Running test " #X "\n"); \
 	for (u32 i=1; i<video::EDT_COUNT; ++i) \
-	result &= X(video::E_DRIVER_TYPE(i), ##__VA_ARGS__)
-#define TestWithAllHWDrivers(X, ...) \
+	result &= X(video::E_DRIVER_TYPE(i))
+#define TestWithAllHWDrivers(X) \
 	logTestString("Running test " #X "\n"); \
 	for (u32 i=video::EDT_DIRECT3D8; i<video::EDT_COUNT; ++i) \
-	result &= X(video::E_DRIVER_TYPE(i), ##__VA_ARGS__)
+	result &= X(video::E_DRIVER_TYPE(i))
 
 //! Compare two files
 /** \param fileName1 The first file for comparison.
diff --git a/tests/triangle3d.cpp b/tests/triangle3d.cpp
index c1cafc61..f13694d0 100644
--- a/tests/triangle3d.cpp
+++ b/tests/triangle3d.cpp
@@ -59,6 +59,164 @@ static bool testGetIntersectionWithLine(core::triangle3d<T>& triangle, const cor
 	return allExpected;
 }
 
+// modifying the same triangle in diverse ways get some more test-cases automatically
+template<class T>
+static bool stageModifications(int stage, triangle3d<T>& triangle)
+{
+	switch ( stage )
+	{
+		case 0:
+			return true;
+		case 1:
+			swap(triangle.pointB, triangle.pointC);
+			return true;
+		case 2:
+			swap(triangle.pointA, triangle.pointC);
+			return true;
+		case 3:
+			triangle.pointA.Z += 1000;
+			triangle.pointB.Z += 1000;
+			triangle.pointC.Z += 1000;
+			return true;
+		case 4:
+			swap(triangle.pointA.Y, triangle.pointA.Z);
+			swap(triangle.pointB.Y, triangle.pointB.Z);
+			swap(triangle.pointC.Y, triangle.pointC.Z);
+			return true;
+	}
+	return false;
+}
+
+template<class T>
+static void stageModifications(int stage, vector3d<T>& point)
+{
+	switch ( stage )
+	{
+		case 3:
+			point.Z += 1000;
+			break;
+		case 4:
+			swap(point.Y, point.Z);
+			break;
+	}
+}
+
+template<class T>
+static bool isPointInside(triangle3d<T> triangleOrig)
+{
+	bool allExpected=true;
+	
+	array< vector3d<T> > pointsInside;
+	pointsInside.push_back( vector3d<T>(0,0,0) );
+	pointsInside.push_back( (triangleOrig.pointA + triangleOrig.pointB + triangleOrig.pointC) / 3 );
+	pointsInside.push_back( (triangleOrig.pointA + triangleOrig.pointB)/2 + vector3d<T>(0,1,0) );
+	pointsInside.push_back( (triangleOrig.pointA + triangleOrig.pointC)/2 + vector3d<T>(1,0,0) );
+	pointsInside.push_back( (triangleOrig.pointB + triangleOrig.pointC)/2 - vector3d<T>(1,0,0) );
+	
+	for (u32 stage=0; ; ++stage)
+	{
+		triangle3d<T> triangle = triangleOrig;
+		if ( !stageModifications(stage, triangle) )
+			break;
+		
+		for ( u32 i=0; i < pointsInside.size(); ++i )
+		{
+			vector3d<T> point = pointsInside[i];
+			stageModifications(stage, point);
+			
+			allExpected &= triangle.isPointInside( point );
+			if ( !allExpected )
+			{
+				logTestString("triangle3d::isPointInside pointsInside test failed in stage %d point %d\n", stage, i);
+				return false;
+			}
+			
+			allExpected &= triangle.isPointInsideFast( point );
+			if ( !allExpected )
+			{
+				logTestString("triangle3d::isPointInsideFast pointsInside test failed in stage %d point %d\n", stage, i);
+				return false;
+			}
+		}
+	}
+	
+	array< vector3d<T> > pointsOutside;
+	pointsOutside.push_back( triangleOrig.pointA - vector3d<T>(1,0,0) );
+	pointsOutside.push_back( triangleOrig.pointA - vector3d<T>(0,1,0) );
+	pointsOutside.push_back( triangleOrig.pointB + vector3d<T>(1,0,0) );
+	pointsOutside.push_back( triangleOrig.pointB - vector3d<T>(0,1,0) );
+	pointsOutside.push_back( triangleOrig.pointC - vector3d<T>(1,0,0) );
+	pointsOutside.push_back( triangleOrig.pointC + vector3d<T>(1,0,0) );
+	pointsOutside.push_back( triangleOrig.pointC + vector3d<T>(0,1,0) );
+	pointsOutside.push_back( (triangleOrig.pointA + triangleOrig.pointB)/2 - vector3d<T>(0,1,0) );
+	pointsOutside.push_back( (triangleOrig.pointA + triangleOrig.pointC)/2 - vector3d<T>(1,0,0) );
+	pointsOutside.push_back( (triangleOrig.pointB + triangleOrig.pointC)/2 + vector3d<T>(1,0,0) );
+	
+	for (u32 stage=0; ; ++stage)
+	{
+		triangle3d<T> triangle = triangleOrig;
+		if ( !stageModifications(stage, triangle) )
+			break;
+		
+		for ( u32 i=0; i < pointsOutside.size(); ++i )
+		{
+			vector3d<T> point = pointsOutside[i];
+			stageModifications(stage, point);
+			
+			allExpected &= !triangle.isPointInside( point );
+			if ( !allExpected )
+			{
+				logTestString("triangle3d::isPointInside pointsOutside test failed in stage %d point %d\n", stage, i);
+				return false;
+			}
+			
+			allExpected &= !triangle.isPointInsideFast( point );
+			if ( !allExpected )
+			{
+				logTestString("triangle3d::isPointInsideFast pointsOutside test failed in stage %d point %d\n", stage, i);
+				return false;
+			}
+		}
+	}
+	
+	array< vector3d<T> > pointsBorder;
+	pointsBorder.push_back( triangleOrig.pointA );
+	pointsBorder.push_back( triangleOrig.pointB );
+	pointsBorder.push_back( triangleOrig.pointC );
+	pointsBorder.push_back( (triangleOrig.pointA + triangleOrig.pointB)/2 );
+	pointsBorder.push_back( (triangleOrig.pointA + triangleOrig.pointC)/2 );
+	pointsBorder.push_back( (triangleOrig.pointB + triangleOrig.pointC)/2 );
+	
+	for (u32 stage=0; ; ++stage)
+	{
+		triangle3d<T> triangle = triangleOrig;
+		if ( !stageModifications(stage, triangle) )
+			break;
+		
+		for ( u32 i=0; i < pointsBorder.size(); ++i )
+		{
+			vector3d<T> point = pointsBorder[i];
+			stageModifications(stage, point);
+
+			allExpected &= triangle.isPointInside( point );
+			if ( !allExpected )
+			{
+				logTestString("triangle3d::isPointInside pointsBorder test failed in stage %d point %d\n", stage, i);
+				return false;
+			}
+			
+			/*	results for isPointInsideFast are mixed for border cases, but I guess that's fine.
+			if ( triangle.isPointInsideFast( point ) )
+				logTestString("+ triangle3d::isPointInsideFast pointsBorder stage %d point %d is INSIDE\n", stage, i);
+			else 
+				logTestString("- triangle3d::isPointInsideFast pointsBorder stage %d point %d is NOT inside\n", stage, i);
+			*/
+		}
+	}
+
+	return allExpected;
+}
+
 
 // Test the functionality of triangle3d<T>
 /** Validation is done with asserts() against expected results. */
@@ -89,6 +247,29 @@ bool testTriangle3d(void)
 		allExpected &= testGetIntersectionWithLine(triangle, ray);
 	}
 
+	bool testEigen = triangle3di(vector3di(250, 0, 0), vector3di(0, 0, 500), vector3di(500, 0, 500)).isPointInside(vector3di(300,0,300));
+	if ( !testEigen )	// test from Eigen from here: http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=44372&p=254331#p254331
+		logTestString("Test isPointInside fails with integers\n");
+	allExpected &= testEigen;
+	
+	logTestString("Test isPointInside with f32\n");
+	{
+		triangle3d<f32> t(vector3d<f32>(-1000,-1000,0), vector3d<f32>(1000,-1000,0), vector3d<f32>(0,1000,0));	
+		allExpected &= isPointInside(t);
+	}
+	
+	logTestString("Test isPointInside with f64\n");
+	{
+		triangle3d<f64> t(vector3d<f64>(-1000,-1000,0), vector3d<f64>(1000,-1000,0), vector3d<f64>(0,1000,0));	
+		allExpected &= isPointInside(t);
+	}
+	
+	logTestString("Test isPointInside with s32\n");
+	{
+		triangle3d<s32> t(vector3d<s32>(-1000,-1000,0), vector3d<s32>(1000,-1000,0), vector3d<s32>(0,1000,0));	
+		allExpected &= isPointInside(t);
+	}
+	
 	if(allExpected)
 		logTestString("\nAll tests passed\n");
 	else
diff --git a/tools/FileToHeader/FileToHeader.layout b/tools/FileToHeader/FileToHeader.layout
index 59193d00..97e1eeed 100644
--- a/tools/FileToHeader/FileToHeader.layout
+++ b/tools/FileToHeader/FileToHeader.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="All" />
-	<File name="main.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1821" topLine="63" />
+	<File name="main.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor1 position="363" topLine="6" />
 	</File>
 </CodeBlocks_layout_file>