Further work on the IRR, AC, LWS loaders. Further work on the - still unfinished - OptimizeGraph step. SceneCombiner works now properly in all cases I tested yet.

Added missing 'typename' in Colladaparser.h
First implementation of spherical and cylindrical mapping, already in use for IRR and LWO models. For the latter the coordinate system is not yet correct.
Moved vec2d to a separate header and added operators similar to vec3.
Added plane and ray helper classes. Just the data is wrapped, no operators required for the moment.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@249 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

include/aiTypes.h

@@ -49,6 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // include math helper classes 
 #include "aiVector3D.h"
+#include "aiVector2D.h"
 #include "aiMatrix3x3.h"
 #include "aiMatrix4x4.h"
 
@@ -66,22 +67,6 @@ const size_t MAXLEN = 1024;
 
 #include "./Compiler/pushpack1.h"
 
-// ---------------------------------------------------------------------------
-/** Represents a two-dimensional vector. 
-*/
-struct aiVector2D
-{
-#ifdef __cplusplus
-	aiVector2D () : x(0.0f), y(0.0f) {}
-	aiVector2D (float _x, float _y) : x(_x), y(_y) {}
-	aiVector2D (const aiVector2D& o) : x(o.x), y(o.y) {}
-	
-#endif // !__cplusplus
-
-	//! X and y coordinates
-	float x, y;
-} PACK_STRUCT;
-
 
 // ---------------------------------------------------------------------------
 /** Represents a plane in a three-dimensional, euclidean space
@@ -94,13 +79,32 @@ struct aiPlane
 		: a(_a), b(_b), c(_c), d(_d) {}
 
 	aiPlane (const aiPlane& o) : a(o.a), b(o.b), c(o.c), d(o.d) {}
-	
+
 #endif // !__cplusplus
 
 	//! Plane equation
 	float a,b,c,d;
 } PACK_STRUCT;
 
+
+// ---------------------------------------------------------------------------
+/** Represents a ray
+*/
+struct aiRay
+{
+#ifdef __cplusplus
+	aiRay () {}
+	aiRay (const aiVector3D& _pos, const aiVector3D& _dir)
+		: pos(_pos), dir(_dir) {}
+
+	aiRay (const aiRay& o) : pos (o.pos), dir (o.dir) {}
+
+#endif // !__cplusplus
+
+	//! Position and direction of the ray
+	aiVector3D pos, dir;
+} PACK_STRUCT;
+
 // aiVector3D type moved to separate header due to size of operators
 // aiQuaternion type moved to separate header due to size of operators
 // aiMatrix4x4 type moved to separate header due to size of operators