- rework AssimpView GUI.

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

tools/assimp_view/assimp_view.rc

@@ -53,71 +53,70 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,10,281,1
 END
 
-IDD_DIALOGMAIN DIALOGEX 0, 0, 615, 484
+IDD_DIALOGMAIN DIALOGEX 0, 0, 709, 485
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES | WS_EX_WINDOWEDGE
-CAPTION "Open Asset Import Library - ModelViewer "
+CAPTION "Open Asset Import Library - Model Viewer "
 MENU IDR_MENU1
 FONT 8, "Microsoft Sans Serif", 400, 0, 0x0
 BEGIN
-    CONTROL         "Multisampling",IDC_TOGGLEMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,394,56,12
-    CONTROL         "Wireframe",IDC_TOGGLEWIRE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,404,57,12
-    CONTROL         "No materials",IDC_TOGGLEMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,415,64,12
-    LTEXT           "Verts:",IDC_NUMVERTS,220,400,31,9
-    LTEXT           "Faces:\t",IDC_NUMFACES,295,400,26,9
-    LTEXT           "Mats:",IDC_NUMMATS,295,413,23,9
-    LTEXT           "FPS:",IDC_FPS,295,442,23,9
-    CONTROL         "Display normals",IDC_TOGGLENORMALS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,425,62,12
-    CONTROL         "Toggle AutoRotate",IDC_AUTOROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,394,87,12
-    EDITTEXT        IDC_EVERT,253,396,37,14,ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_EFACE,322,396,34,14,ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_EMAT,322,411,34,14,ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_EFPS,322,441,34,14,ES_AUTOHSCROLL | ES_READONLY
-    CONTROL         "Rotate light sources",IDC_LIGHTROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,416,87,12
-    CONTROL         "Two lights",IDC_3LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,427,56,12
-    LTEXT           "Time:",IDC_LOADTIME,220,442,34,9
-    EDITTEXT        IDC_ELOAD,253,441,37,14,ES_AUTOHSCROLL | ES_READONLY
-    CONTROL         "Zoom/Rotate",IDC_ZOOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,405,68,12
-    CONTROL         "Low quality",IDC_LOWQUALITY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,435,48,12
-    CONTROL         "No specular ",IDC_NOSPECULAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,446,50,12
-    LTEXT           "Shd:",IDC_NUMSHADERS,221,430,27,9
-    EDITTEXT        IDC_ESHADER,253,426,37,14,ES_AUTOHSCROLL | ES_READONLY
-    LTEXT           "[M]",IDC_STATIC,84,394,13,9
-    LTEXT           "[W]",IDC_STATIC,84,404,13,9
-    LTEXT           "[D]",IDC_STATIC,84,470,13,9
-    LTEXT           "[N]",IDC_STATIC,84,415,13,9
-    LTEXT           "[L]",IDC_STATIC,194,428,13,9
-    LTEXT           "[P]",IDC_STATIC,84,425,13,9
-    LTEXT           "[S]",IDC_STATIC,84,437,13,9
-    LTEXT           "[A]",IDC_STATIC,194,395,13,9
-    LTEXT           "[Z]",IDC_STATIC,194,406,13,9
-    LTEXT           "[R]",IDC_STATIC,194,417,13,9
-    COMBOBOX        IDC_COMBO1,317,373,112,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Nodes:",IDC_NUMNODES,221,413,28,9
-    EDITTEXT        IDC_ENODEWND,253,411,37,14,ES_AUTOHSCROLL | ES_READONLY
-    CONTROL         "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,474,0,141,484
-    LTEXT           "Mesh:",IDC_NUMMESHES,295,428,23,9
-    EDITTEXT        IDC_EMESH,322,426,34,14,ES_AUTOHSCROLL | ES_READONLY
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDVERT,100,392,1,87
-    CONTROL         "Button1",IDC_LCOLOR1,"Button",BS_OWNERDRAW | WS_TABSTOP,408,396,59,20
-    CONTROL         "Button1",IDC_LCOLOR2,"Button",BS_OWNERDRAW | WS_TABSTOP,408,419,59,20
-    CONTROL         "Button1",IDC_LCOLOR3,"Button",BS_OWNERDRAW | WS_TABSTOP,408,442,59,20
-    PUSHBUTTON      "Reset",IDC_LRESET,434,464,33,13,BS_BOTTOM
-    EDITTEXT        IDC_VIEWMATRIX,220,411,71,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE
-    CONTROL         "Show skeleton",IDC_SHOWSKELETON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,457,58,12
-    LTEXT           "[K]",IDC_STATIC,84,447,13,9
-    CONTROL         "<<",IDC_BLUBB,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,431,372,36,14
-    LTEXT           "[C]",IDC_STATIC,84,459,13,9
-    CONTROL         "",IDC_SLIDERANIM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,0,371,290,16
-    PUSHBUTTON      "Play",IDC_PLAY,291,372,25,14
-    CONTROL         "Backface culling",IDC_BFCULL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,468,65,12
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDVERT,209,392,1,70
-    CONTROL         "",IDC_RT,"Static",SS_OWNERDRAW,0,0,471,366
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,390,471,1
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDVERT,472,0,1,484
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDVERT,365,392,1,70
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,1,367,471,1
-    CONTROL         "No transparency",IDC_NOAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,439,68,12
+    CONTROL         "Multisampling",IDC_TOGGLEMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,402,56,12
+    CONTROL         "Wireframe",IDC_TOGGLEWIRE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,412,57,12
+    CONTROL         "No materials",IDC_TOGGLEMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,423,64,12
+    LTEXT           "Vertices",IDC_NUMVERTS,234,404,31,9
+    LTEXT           "Faces",IDC_NUMFACES,318,405,26,9
+    LTEXT           "Materials",IDC_NUMMATS,318,420,27,9
+    LTEXT           "Fps",IDC_FPS,318,449,30,9
+    CONTROL         "Display normals",IDC_TOGGLENORMALS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,433,62,12
+    CONTROL         "Toggle AutoRotate",IDC_AUTOROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,402,80,12
+    EDITTEXT        IDC_EVERT,268,402,37,14,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_EFACE,350,402,34,14,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_EMAT,350,417,34,14,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_EFPS,350,446,34,14,ES_AUTOHSCROLL | ES_READONLY
+    CONTROL         "Rotate light sources",IDC_LIGHTROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,424,80,12
+    CONTROL         "Two lights",IDC_3LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,435,56,12
+    LTEXT           "Load time",IDC_LOADTIME,234,449,34,9
+    EDITTEXT        IDC_ELOAD,268,447,37,14,ES_AUTOHSCROLL | ES_READONLY
+    CONTROL         "Zoom/Rotate",IDC_ZOOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,413,68,12
+    CONTROL         "Low quality",IDC_LOWQUALITY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,443,48,12
+    CONTROL         "No specular ",IDC_NOSPECULAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,454,50,12
+    LTEXT           "Shaders",IDC_NUMSHADERS,234,435,27,9
+    EDITTEXT        IDC_ESHADER,268,432,37,14,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "[M]",IDC_STATIC,84,404,13,9
+    LTEXT           "[W]",IDC_STATIC,84,414,13,9
+    LTEXT           "[C]",IDC_STATIC,198,448,13,9
+    LTEXT           "[D]",IDC_STATIC,84,425,13,9
+    LTEXT           "[L]",IDC_STATIC,198,436,13,9
+    LTEXT           "[N]",IDC_STATIC,84,435,13,9
+    LTEXT           "[P]",IDC_STATIC,84,447,13,9
+    LTEXT           "[A]",IDC_STATIC,198,402,13,9
+    LTEXT           "[Z]",IDC_STATIC,198,413,13,9
+    LTEXT           "[R]",IDC_STATIC,198,424,13,9
+    COMBOBOX        IDC_COMBO1,408,369,112,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Nodes",IDC_NUMNODES,234,420,28,9
+    EDITTEXT        IDC_ENODEWND,268,417,37,14,ES_AUTOHSCROLL | ES_READONLY
+    CONTROL         "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,565,0,143,484
+    LTEXT           "Meshes",IDC_NUMMESHES,318,434,27,9
+    EDITTEXT        IDC_EMESH,350,431,34,14,ES_AUTOHSCROLL | ES_READONLY
+    CONTROL         "Button1",IDC_LCOLOR1,"Button",BS_OWNERDRAW | WS_TABSTOP,462,402,36,20
+    CONTROL         "Button1",IDC_LCOLOR2,"Button",BS_OWNERDRAW | WS_TABSTOP,462,426,36,20
+    CONTROL         "Button1",IDC_LCOLOR3,"Button",BS_OWNERDRAW | WS_TABSTOP,462,450,36,20
+    PUSHBUTTON      "Reset",IDC_LRESET,504,402,33,13,BS_BOTTOM
+    EDITTEXT        IDC_VIEWMATRIX,480,426,71,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE
+    CONTROL         "Show skeleton",IDC_SHOWSKELETON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,484,58,12
+    LTEXT           "[S]",IDC_STATIC,84,457,13,9
+    CONTROL         "<<",IDC_BLUBB,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,528,366,36,24
+    CONTROL         "",IDC_SLIDERANIM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,0,366,382,16
+    PUSHBUTTON      "Play",IDC_PLAY,382,368,25,14
+    CONTROL         "Backface culling",IDC_BFCULL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,446,65,12
+    CONTROL         "",IDC_RT,"Static",SS_OWNERDRAW,0,0,566,363
+    CONTROL         "No transparency",IDC_NOAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,457,68,12
+    GROUPBOX        "Statistics",IDC_STATIC,228,390,162,84
+    GROUPBOX        "Display",IDC_STATIC,6,390,216,84
+    GROUPBOX        "Colors",IDC_STATIC,396,390,150,85
+    LTEXT           "Primary light",IDC_STATIC,402,408,48,8
+    LTEXT           "Secondary light",IDC_STATIC,402,432,54,8
+    LTEXT           "Ambient light",IDC_STATIC,402,456,54,8
 END
 
 IDD_LOADDIALOG DIALOGEX 0, 0, 143, 60
@@ -247,6 +246,12 @@ BEGIN
         BOTTOMMARGIN, 138
     END
 
+    IDD_DIALOGMAIN, DIALOG
+    BEGIN
+        RIGHTMARGIN, 623
+        BOTTOMMARGIN, 484
+    END
+
     IDD_LOADDIALOG, DIALOG
     BEGIN
         LEFTMARGIN, 7

tools/assimp_view/resource.h

@@ -109,6 +109,7 @@
 #define IDC_SHOWSKELETON                1054
 #define IDC_BFCULL                      1055
 #define IDC_EDITSM                      1056
+#define IDC_TAB1                        1058
 #define ID_VIEWER_OPEN                  32771
 #define ID_VIEWER_CLOSETHIS             32772
 #define ID_VIEWER_CLOSEASSET            32773
@@ -226,7 +227,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        160
 #define _APS_NEXT_COMMAND_VALUE         32878
-#define _APS_NEXT_CONTROL_VALUE         1057
+#define _APS_NEXT_CONTROL_VALUE         1059
 #define _APS_NEXT_SYMED_VALUE           110
 #endif
 #endif