Explorar o código

Some fixes for build with MinGW

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@40 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
DarkGuru %!s(int64=17) %!d(string=hai) anos
pai
achega
522ce03d00
Modificáronse 2 ficheiros con 14 adicións e 14 borrados
  1. 0 13
      tools/assimp_view/Display.cpp
  2. 14 1
      tools/assimp_view/Display.h

+ 0 - 13
tools/assimp_view/Display.cpp

@@ -1057,19 +1057,6 @@ type clamp(intype in)
 //-------------------------------------------------------------------------------
 int CDisplay::HandleTreeViewPopup(WPARAM wParam,LPARAM lParam)
 {
-	// helper class
-	struct Info
-	{
-		Info(	D3DXVECTOR4* p1,
-				AssetHelper::MeshHelper* p2,
-				const char* p3)
-				: pclrColor(p1),pMesh(p2),szShaderParam(p3) {}
-
-		D3DXVECTOR4* pclrColor;
-		AssetHelper::MeshHelper* pMesh;
-		const char* szShaderParam;
-	};
-
 	// get the current selected material
 	std::vector<Info> apclrOut;
 	const char* szMatKey;

+ 14 - 1
tools/assimp_view/Display.h

@@ -57,7 +57,20 @@ class CDisplay
 	{
 private:
 
-	// default constructor
+	// helper class
+	struct Info
+	{
+		Info(	D3DXVECTOR4* p1,
+				AssetHelper::MeshHelper* p2,
+				const char* p3)
+				: pclrColor(p1),pMesh(p2),szShaderParam(p3) {}
+
+		D3DXVECTOR4* pclrColor;
+		AssetHelper::MeshHelper* pMesh;
+		const char* szShaderParam;
+	};
+
+// default constructor
 	CDisplay() 
 		:	m_iViewMode(VIEWMODE_FULL), 
 			m_pcCurrentTexture(NULL),