v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixes for build with MinGW 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@40 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
DarkGuru 2008-05-25 13:49:34 +00:00
parent 7e9d0cc834
commit 522ce03d00
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/assimp_view/Display.cpp
View File

@ -1057,19 +1057,6 @@ type clamp(intype in)
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
int CDisplay::HandleTreeViewPopup(WPARAM wParam,LPARAM lParam) 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 // get the current selected material
std::vector<Info> apclrOut; std::vector<Info> apclrOut;
const char* szMatKey; const char* szMatKey;

15
tools/assimp_view/Display.h
View File

@ -57,7 +57,20 @@ class CDisplay
{ {
private: 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() CDisplay()
: m_iViewMode(VIEWMODE_FULL), : m_iViewMode(VIEWMODE_FULL),
m_pcCurrentTexture(NULL), m_pcCurrentTexture(NULL),