Browse Source

Fixed class attribute initialization order.

Marcel Metz 13 years ago
parent
commit
846a8959f8

+ 6 - 5
tools/assimp_view/AssetHelper.h

@@ -139,19 +139,20 @@ class AssetHelper
 					: 
 					: 
 					piVB				(NULL),
 					piVB				(NULL),
 					piIB				(NULL),
 					piIB				(NULL),
-					piEffect			(NULL),
 					piVBNormals			(NULL),
 					piVBNormals			(NULL),
+					piEffect			(NULL),
+					bSharedFX           (false),
 					piDiffuseTexture	(NULL),
 					piDiffuseTexture	(NULL),
 					piSpecularTexture	(NULL),
 					piSpecularTexture	(NULL),
 					piAmbientTexture	(NULL),
 					piAmbientTexture	(NULL),
-					piNormalTexture		(NULL),
 					piEmissiveTexture	(NULL),
 					piEmissiveTexture	(NULL),
+					piNormalTexture		(NULL),
 					piOpacityTexture	(NULL),
 					piOpacityTexture	(NULL),
 					piShininessTexture	(NULL),
 					piShininessTexture	(NULL),
 					piLightmapTexture	(NULL),
 					piLightmapTexture	(NULL),
-					pvOriginalNormals	(NULL),
-					bSharedFX(false),
-					twosided (false){}
+					twosided            (false),
+					pvOriginalNormals	(NULL)
+                {}
 
 
 				~MeshHelper ()
 				~MeshHelper ()
 					{
 					{

+ 3 - 3
tools/assimp_view/Background.h

@@ -47,10 +47,10 @@ class CBackgroundPainter
 	{
 	{
 	CBackgroundPainter()
 	CBackgroundPainter()
 		: 
 		: 
-		pcTexture(NULL),
 		clrColor(D3DCOLOR_ARGB(0xFF,100,100,100)),
 		clrColor(D3DCOLOR_ARGB(0xFF,100,100,100)),
-		eMode(SIMPLE_COLOR),
-		piSkyBoxEffect(NULL)
+		pcTexture(NULL),
+		piSkyBoxEffect(NULL),
+		eMode(SIMPLE_COLOR)
 		{}
 		{}
 
 
 public:
 public:

+ 1 - 1
tools/assimp_view/Camera.h

@@ -55,8 +55,8 @@ class Camera
 			:
 			:
 
 
 			vPos(0.0f,0.0f,-10.0f),
 			vPos(0.0f,0.0f,-10.0f),
-			vLookAt(0.0f,0.0f,1.0f),
 			vUp(0.0f,1.0f,0.0f),
 			vUp(0.0f,1.0f,0.0f),
+			vLookAt(0.0f,0.0f,1.0f),
 			vRight(0.0f,1.0f,0.0f)
 			vRight(0.0f,1.0f,0.0f)
 			{
 			{
 
 

+ 3 - 3
tools/assimp_view/RenderOptions.h

@@ -60,16 +60,16 @@ class RenderOptions
 			bSuperSample	(false),
 			bSuperSample	(false),
 			bRenderMats		(true),
 			bRenderMats		(true),
 			bRenderNormals	(false),
 			bRenderNormals	(false),
-			eDrawMode		(NORMAL),
 			b3Lights		(false),
 			b3Lights		(false),
 			bLightRotate	(false),
 			bLightRotate	(false),
 			bRotate			(true),
 			bRotate			(true),
 			bLowQuality		(false),
 			bLowQuality		(false),
 			bNoSpecular		(false),
 			bNoSpecular		(false),
 			bStereoView		(false),
 			bStereoView		(false),
+			bNoAlphaBlending(false),
+			eDrawMode		(NORMAL),
 			bCulling		(false),
 			bCulling		(false),
-			bSkeleton		(false),
-			bNoAlphaBlending(false)
+			bSkeleton		(false)
 			
 			
 			{}
 			{}