ase/ask loader is quite stable now, loads most models correctly
added pretransformvertices postprocess step bugfixes in the 3ds material system. transparency is now displayed correctly Node view in the viewer display the local transformation matrix now Fixed wrong directory name. "unused" renamed to "extra" ---> all is WIP ... git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@50 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
@@ -139,6 +139,7 @@ int CDisplay::ClearDisplayList(void)
|
||||
{
|
||||
// clear the combo box
|
||||
TreeView_DeleteAllItems(GetDlgItem(g_hDlg,IDC_TREE1));
|
||||
this->Reset();
|
||||
return 1;
|
||||
}
|
||||
//-------------------------------------------------------------------------------
|
||||
@@ -756,8 +757,31 @@ int CDisplay::OnRender()
|
||||
return 1;
|
||||
}
|
||||
//-------------------------------------------------------------------------------
|
||||
void UpdateColorFieldsInUI()
|
||||
{
|
||||
InvalidateRect(GetDlgItem(g_hDlg,IDC_LCOLOR1),NULL,TRUE);
|
||||
InvalidateRect(GetDlgItem(g_hDlg,IDC_LCOLOR2),NULL,TRUE);
|
||||
InvalidateRect(GetDlgItem(g_hDlg,IDC_LCOLOR3),NULL,TRUE);
|
||||
|
||||
UpdateWindow(GetDlgItem(g_hDlg,IDC_LCOLOR1));
|
||||
UpdateWindow(GetDlgItem(g_hDlg,IDC_LCOLOR2));
|
||||
UpdateWindow(GetDlgItem(g_hDlg,IDC_LCOLOR3));
|
||||
}
|
||||
//-------------------------------------------------------------------------------
|
||||
int CDisplay::FillDefaultStatistics(void)
|
||||
{
|
||||
if (!g_pcAsset)
|
||||
{
|
||||
// clear all stats edit controls
|
||||
SetDlgItemText(g_hDlg,IDC_EVERT,"0");
|
||||
SetDlgItemText(g_hDlg,IDC_EFACE,"0");
|
||||
SetDlgItemText(g_hDlg,IDC_EMAT,"0");
|
||||
SetDlgItemText(g_hDlg,IDC_ENODE,"0");
|
||||
SetDlgItemText(g_hDlg,IDC_ESHADER,"0");
|
||||
SetDlgItemText(g_hDlg,IDC_ETEX,"0");
|
||||
return 1;
|
||||
}
|
||||
|
||||
// get the number of vertices/faces in the model
|
||||
unsigned int iNumVert = 0;
|
||||
unsigned int iNumFaces = 0;
|
||||
@@ -791,6 +815,7 @@ int CDisplay::FillDefaultStatistics(void)
|
||||
sprintf(szOut,"%.5f",(float)g_fLoadTime);
|
||||
SetDlgItemText(g_hDlg,IDC_ELOAD,szOut);
|
||||
|
||||
UpdateColorFieldsInUI();
|
||||
UpdateWindow(g_hDlg);
|
||||
return 1;
|
||||
}
|
||||
@@ -807,19 +832,24 @@ int CDisplay::Reset(void)
|
||||
return this->OnSetupNormalView();
|
||||
}
|
||||
//-------------------------------------------------------------------------------
|
||||
void UpdateColorFieldsInUI()
|
||||
void ShowNormalUIComponents()
|
||||
{
|
||||
InvalidateRect(GetDlgItem(g_hDlg,IDC_LCOLOR1),NULL,TRUE);
|
||||
InvalidateRect(GetDlgItem(g_hDlg,IDC_LCOLOR2),NULL,TRUE);
|
||||
InvalidateRect(GetDlgItem(g_hDlg,IDC_LCOLOR3),NULL,TRUE);
|
||||
|
||||
UpdateWindow(GetDlgItem(g_hDlg,IDC_LCOLOR1));
|
||||
UpdateWindow(GetDlgItem(g_hDlg,IDC_LCOLOR2));
|
||||
UpdateWindow(GetDlgItem(g_hDlg,IDC_LCOLOR3));
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_NUMNODES),SW_SHOW);
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_ENODEWND),SW_SHOW);
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_NUMSHADERS),SW_SHOW);
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_LOADTIME),SW_SHOW);
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_ESHADER),SW_SHOW);
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_ELOAD),SW_SHOW);
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_VIEWMATRIX),SW_HIDE);
|
||||
}
|
||||
//-------------------------------------------------------------------------------
|
||||
int CDisplay::OnSetupNormalView()
|
||||
{
|
||||
if (VIEWMODE_NODE == this->m_iViewMode)
|
||||
{
|
||||
ShowNormalUIComponents();
|
||||
}
|
||||
|
||||
// now ... change the meaning of the statistics fields back
|
||||
SetWindowText(GetDlgItem(g_hDlg,IDC_NUMVERTS),"Verts:");
|
||||
SetWindowText(GetDlgItem(g_hDlg,IDC_NUMNODES),"Nodes:");
|
||||
@@ -848,6 +878,41 @@ int CDisplay::OnSetupNodeView(NodeInfo* pcNew)
|
||||
ai_assert(NULL != pcNew);
|
||||
|
||||
if (this->m_pcCurrentNode == pcNew)return 2;
|
||||
|
||||
// now ... change the meaning of the statistics fields back
|
||||
SetWindowText(GetDlgItem(g_hDlg,IDC_NUMVERTS),"Verts:");
|
||||
SetWindowText(GetDlgItem(g_hDlg,IDC_NUMFACES),"Faces:");
|
||||
SetWindowText(GetDlgItem(g_hDlg,IDC_NUMMATS),"Mats:");
|
||||
SetWindowText(GetDlgItem(g_hDlg,IDC_NUMMESHES),"Mesh:");
|
||||
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_NUMNODES),SW_HIDE);
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_ENODEWND),SW_HIDE);
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_NUMSHADERS),SW_HIDE);
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_LOADTIME),SW_HIDE);
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_ESHADER),SW_HIDE);
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_ELOAD),SW_HIDE);
|
||||
ShowWindow(GetDlgItem(g_hDlg,IDC_VIEWMATRIX),SW_SHOW);
|
||||
|
||||
char szTemp[1024];
|
||||
sprintf(szTemp,
|
||||
"%.2f %.2f %.2f\r\n"
|
||||
"%.2f %.2f %.2f\r\n"
|
||||
"%.2f %.2f %.2f\r\n"
|
||||
"%.2f %.2f %.2f\r\n",
|
||||
pcNew->psNode->mTransformation.a1,
|
||||
pcNew->psNode->mTransformation.b1,
|
||||
pcNew->psNode->mTransformation.c1,
|
||||
pcNew->psNode->mTransformation.a2,
|
||||
pcNew->psNode->mTransformation.b2,
|
||||
pcNew->psNode->mTransformation.c2,
|
||||
pcNew->psNode->mTransformation.a3,
|
||||
pcNew->psNode->mTransformation.b3,
|
||||
pcNew->psNode->mTransformation.c3,
|
||||
pcNew->psNode->mTransformation.a4,
|
||||
pcNew->psNode->mTransformation.b4,
|
||||
pcNew->psNode->mTransformation.c4);
|
||||
SetWindowText(GetDlgItem(g_hDlg,IDC_VIEWMATRIX),szTemp);
|
||||
|
||||
|
||||
this->m_pcCurrentNode = pcNew;
|
||||
this->SetViewMode(VIEWMODE_NODE);
|
||||
@@ -861,6 +926,11 @@ int CDisplay::OnSetupMaterialView(MaterialInfo* pcNew)
|
||||
|
||||
if (this->m_pcCurrentMaterial == pcNew)return 2;
|
||||
|
||||
if (VIEWMODE_NODE == this->m_iViewMode)
|
||||
{
|
||||
ShowNormalUIComponents();
|
||||
}
|
||||
|
||||
this->m_pcCurrentMaterial = pcNew;
|
||||
this->SetViewMode(VIEWMODE_MATERIAL);
|
||||
|
||||
@@ -876,6 +946,12 @@ int CDisplay::OnSetupTextureView(TextureInfo* pcNew)
|
||||
ai_assert(NULL != pcNew);
|
||||
|
||||
if (this->m_pcCurrentTexture == pcNew)return 2;
|
||||
|
||||
if (VIEWMODE_NODE == this->m_iViewMode)
|
||||
{
|
||||
ShowNormalUIComponents();
|
||||
}
|
||||
|
||||
if ((AI_TEXTYPE_OPACITY | 0x40000000) == pcNew->iType)
|
||||
{
|
||||
// for opacity textures display a warn message
|
||||
|
||||
@@ -1329,6 +1329,10 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg,
|
||||
b = (unsigned char)(CDisplay::Instance().GetFirstCheckerColor()->z * 255.0f);
|
||||
szText = "B0";
|
||||
}
|
||||
else if (!g_pcAsset)
|
||||
{
|
||||
r = g = b = 150;szText = "-";
|
||||
}
|
||||
else
|
||||
{
|
||||
r = (unsigned char)((g_avLightColors[0] >> 16) & 0xFF);
|
||||
@@ -1358,6 +1362,10 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg,
|
||||
b = (unsigned char)(CDisplay::Instance().GetSecondCheckerColor()->z * 255.0f);
|
||||
szText = "B1";
|
||||
}
|
||||
else if (!g_pcAsset)
|
||||
{
|
||||
r = g = b = 150;szText = "-";
|
||||
}
|
||||
else
|
||||
{
|
||||
r = (unsigned char)((g_avLightColors[1] >> 16) & 0xFF);
|
||||
@@ -1383,6 +1391,10 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg,
|
||||
r = g = b = 0;
|
||||
szText = "-";
|
||||
}
|
||||
else if (!g_pcAsset)
|
||||
{
|
||||
r = g = b = 150;szText = "-";
|
||||
}
|
||||
else
|
||||
{
|
||||
r = (unsigned char)((g_avLightColors[2] >> 16) & 0xFF);
|
||||
|
||||
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#include "GenVertexNormalsProcess.h"
|
||||
#include "JoinVerticesProcess.h"
|
||||
#include "CalcTangentsProcess.h"
|
||||
#include "unused/MakeVerboseFormat.h"
|
||||
#include "extra/MakeVerboseFormat.h"
|
||||
|
||||
namespace AssimpView {
|
||||
|
||||
|
||||
Binary file not shown.
@@ -268,14 +268,6 @@ int DeleteAsset(void)
|
||||
delete g_pcAsset;
|
||||
g_pcAsset = NULL;
|
||||
|
||||
// clear all stats edit controls
|
||||
SetDlgItemText(g_hDlg,IDC_EVERT,"0");
|
||||
SetDlgItemText(g_hDlg,IDC_EFACE,"0");
|
||||
SetDlgItemText(g_hDlg,IDC_EMAT,"0");
|
||||
SetDlgItemText(g_hDlg,IDC_ENODE,"0");
|
||||
SetDlgItemText(g_hDlg,IDC_ESHADER,"0");
|
||||
SetDlgItemText(g_hDlg,IDC_ETEX,"0");
|
||||
|
||||
// reset the caption of the viewer window
|
||||
SetWindowText(g_hDlg,AI_VIEW_CAPTION_BASE);
|
||||
|
||||
@@ -284,6 +276,7 @@ int DeleteAsset(void)
|
||||
CDisplay::Instance().ClearDisplayList();
|
||||
|
||||
CMaterialManager::Instance().Reset();
|
||||
UpdateWindow(g_hDlg);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -67,16 +67,16 @@ BEGIN
|
||||
CONTROL "Toggle Wireframe",IDC_TOGGLEWIRE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,473,183,73,10
|
||||
CONTROL "Disable Materials",IDC_TOGGLEMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,473,193,69,10
|
||||
LTEXT "Verts:",IDC_NUMVERTS,475,14,47,8
|
||||
LTEXT "Faces:\t",IDC_NUMFACES,475,26,45,8
|
||||
LTEXT "Faces:\t",IDC_NUMFACES,539,14,27,8
|
||||
LTEXT "Mats:",IDC_NUMMATS,540,26,26,8
|
||||
LTEXT "FPS:",IDC_FPS,540,51,21,8
|
||||
CONTROL "Display Normals",IDC_TOGGLENORMALS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,473,203,66,10
|
||||
CONTROL "Toggle AutoRotate",IDC_AUTOROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,473,257,74,10
|
||||
CONTROL 130,IDC_STATIC,"Static",SS_BITMAP,0,360,600,25
|
||||
EDITTEXT IDC_EVERT,504,11,32,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
EDITTEXT IDC_EFACE,504,24,32,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
EDITTEXT IDC_EMAT,564,24,27,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
EDITTEXT IDC_EFPS,564,50,27,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
EDITTEXT IDC_EFACE,562,11,29,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
EDITTEXT IDC_EMAT,562,24,29,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
EDITTEXT IDC_EFPS,562,50,29,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
CONTROL "Rotate light sources",IDC_LIGHTROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,473,276,74,10
|
||||
CONTROL "2 directional lights",IDC_3LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,473,213,73,10
|
||||
LTEXT "Time:",IDC_LOADTIME,475,51,46,8
|
||||
@@ -113,16 +113,17 @@ BEGIN
|
||||
CONTROL 149,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,583,161,10,9
|
||||
CONTROL 149,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,584,245,10,9
|
||||
CONTROL 149,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,584,287,10,9
|
||||
LTEXT "Nodes:",IDC_NUMNODES,540,13,24,8
|
||||
EDITTEXT IDC_ENODEWND,564,11,27,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
LTEXT "Nodes:",IDC_NUMNODES,476,26,24,8
|
||||
EDITTEXT IDC_ENODEWND,504,24,32,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,470,74,123,88
|
||||
LTEXT "Mesh:",IDC_NUMMESHES,540,39,20,8
|
||||
EDITTEXT IDC_EMESH,564,37,27,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
EDITTEXT IDC_EMESH,562,37,29,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDVERT,567,170,1,75
|
||||
CONTROL "Button1",IDC_LCOLOR1,"Button",BS_OWNERDRAW | WS_TABSTOP,570,174,21,17
|
||||
CONTROL "Button1",IDC_LCOLOR2,"Button",BS_OWNERDRAW | WS_TABSTOP,570,194,21,17
|
||||
CONTROL "Button1",IDC_LCOLOR3,"Button",BS_OWNERDRAW | WS_TABSTOP,570,214,21,17
|
||||
PUSHBUTTON "R",IDC_LRESET,576,232,15,11,BS_BOTTOM
|
||||
EDITTEXT IDC_VIEWMATRIX,475,24,61,38,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE
|
||||
END
|
||||
|
||||
IDD_LOADDIALOG DIALOGEX 0, 0, 278, 99
|
||||
|
||||
@@ -97,6 +97,8 @@
|
||||
#define IDC_LCOLOR3 1044
|
||||
#define IDC_LRESET 1046
|
||||
#define IDC_NUMMESHES 1047
|
||||
#define IDC_VIEWMAT 1048
|
||||
#define IDC_VIEWMATRIX 1048
|
||||
#define ID_VIEWER_OPEN 32771
|
||||
#define ID_VIEWER_CLOSETHIS 32772
|
||||
#define ID_VIEWER_CLOSEASSET 32773
|
||||
@@ -158,7 +160,7 @@
|
||||
#define _APS_NO_MFC 1
|
||||
#define _APS_NEXT_RESOURCE_VALUE 158
|
||||
#define _APS_NEXT_COMMAND_VALUE 32823
|
||||
#define _APS_NEXT_CONTROL_VALUE 1048
|
||||
#define _APS_NEXT_CONTROL_VALUE 1049
|
||||
#define _APS_NEXT_SYMED_VALUE 110
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user