Some minor fixes of typos and formatting issues.
kimkulling
parent
292e454d86
commit
60d803f490
|
|
@ -3,7 +3,7 @@
|
|||
Open Asset Import Library (assimp)
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
Copyright (c) 2006-2015, assimp team
|
||||
Copyright (c) 2006-2018, assimp team
|
||||
|
||||
All rights reserved.
|
||||
|
||||
|
|
@ -40,6 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
*/
|
||||
|
||||
#include "assimp_view.h"
|
||||
|
||||
#include <tuple>
|
||||
|
||||
using namespace AssimpView;
|
||||
|
|
|
|||
|
|
@ -96,8 +96,9 @@ D3DXVECTOR4 g_aclNormalColors[14] =
|
|||
void GetNodeCount(aiNode* pcNode, unsigned int* piCnt)
|
||||
{
|
||||
*piCnt = *piCnt+1;
|
||||
for (unsigned int i = 0; i < pcNode->mNumChildren;++i)
|
||||
GetNodeCount(pcNode->mChildren[i],piCnt);
|
||||
for (unsigned int i = 0; i < pcNode->mNumChildren; ++i) {
|
||||
GetNodeCount(pcNode->mChildren[i], piCnt);
|
||||
}
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------------
|
||||
|
|
@ -1042,16 +1043,23 @@ int CDisplay::OnSetupTextureView(TextureInfo* pcNew)
|
|||
switch (pcNew->eOp)
|
||||
{
|
||||
case aiTextureOp_Add:
|
||||
szOp = "add";break;
|
||||
szOp = "add";
|
||||
break;
|
||||
case aiTextureOp_Subtract:
|
||||
szOp = "sub";break;
|
||||
szOp = "sub";
|
||||
break;
|
||||
case aiTextureOp_Divide:
|
||||
szOp = "div";break;
|
||||
szOp = "div";
|
||||
break;
|
||||
case aiTextureOp_SignedAdd:
|
||||
szOp = "addsign";break;
|
||||
szOp = "addsign";
|
||||
break;
|
||||
case aiTextureOp_SmoothAdd:
|
||||
szOp = "addsmooth";break;
|
||||
default: szOp = "mul";
|
||||
szOp = "addsmooth";
|
||||
break;
|
||||
default:
|
||||
szOp = "mul";
|
||||
break;
|
||||
};
|
||||
SetWindowText(GetDlgItem(g_hDlg,IDC_ELOAD),szOp);
|
||||
|
||||
|
|
|
|||
|
|
@ -80,8 +80,7 @@ void SaveHistory();
|
|||
// File associations are registered in HKCU\Software\Classes. They might
|
||||
// be overwritten by global file associations.
|
||||
//-------------------------------------------------------------------------------
|
||||
void MakeFileAssociations()
|
||||
{
|
||||
void MakeFileAssociations() {
|
||||
char szTemp2[MAX_PATH];
|
||||
char szTemp[MAX_PATH + 10];
|
||||
|
||||
|
|
@ -1399,7 +1398,7 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg,
|
|||
|
||||
g_hDlg = hwndDlg;
|
||||
|
||||
// load the state of the usr interface
|
||||
// load the state of the user interface
|
||||
InitUI();
|
||||
|
||||
// load the file history
|
||||
|
|
@ -1643,11 +1642,6 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg,
|
|||
xPos = xPos2 = sPoint.x;
|
||||
yPos = yPos2 = sPoint.y;
|
||||
|
||||
/* xPos -= 10;
|
||||
yPos -= 10;
|
||||
xPos2 = xPos-3;
|
||||
yPos2 = yPos-5;*/
|
||||
|
||||
RECT sRect;
|
||||
GetWindowRect(GetDlgItem(g_hDlg,IDC_RT),&sRect);
|
||||
sRect.right -= sRect.left;
|
||||
|
|
@ -1830,7 +1824,6 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg,
|
|||
return TRUE;
|
||||
|
||||
case WM_COMMAND:
|
||||
|
||||
HMENU hMenu = GetMenu(g_hDlg);
|
||||
if (ID_VIEWER_QUIT == LOWORD(wParam))
|
||||
{
|
||||
|
|
@ -2361,7 +2354,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
|
|||
HINSTANCE hPrevInstance,
|
||||
LPTSTR lpCmdLine,
|
||||
int nCmdShow)
|
||||
{
|
||||
{
|
||||
UNREFERENCED_PARAMETER(hPrevInstance);
|
||||
UNREFERENCED_PARAMETER(lpCmdLine);
|
||||
|
||||
|
|
@ -2371,10 +2364,9 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
|
|||
// load windows common controls library to get XP style
|
||||
InitCommonControls();
|
||||
|
||||
// intiailize the IDirect3D9 interface
|
||||
// initialize the IDirect3D9 interface
|
||||
g_hInstance = hInstance;
|
||||
if (0 == InitD3D())
|
||||
{
|
||||
if (0 == InitD3D()) {
|
||||
MessageBox(NULL,"Failed to initialize Direct3D 9",
|
||||
"ASSIMP ModelViewer",MB_OK);
|
||||
return -6;
|
||||
|
|
@ -2395,8 +2387,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
|
|||
Assimp::DefaultLogger::Debugging | Assimp::DefaultLogger::Info |
|
||||
Assimp::DefaultLogger::Err | Assimp::DefaultLogger::Warn);
|
||||
|
||||
if (NULL == hDlg)
|
||||
{
|
||||
if (NULL == hDlg) {
|
||||
MessageBox(NULL,"Failed to create dialog from resource",
|
||||
"ASSIMP ModelViewer",MB_OK);
|
||||
return -5;
|
||||
|
|
@ -2410,12 +2401,12 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
|
|||
UpdateWindow( hDlg );
|
||||
|
||||
// create the D3D device object
|
||||
if (0 == CreateDevice(g_sOptions.bMultiSample,false,true))
|
||||
{
|
||||
if (0 == CreateDevice(g_sOptions.bMultiSample,false,true)) {
|
||||
MessageBox(NULL,"Failed to initialize Direct3D 9 (2)",
|
||||
"ASSIMP ModelViewer",MB_OK);
|
||||
return -4;
|
||||
}
|
||||
|
||||
CLogDisplay::Instance().AddEntry("[OK] Here we go!");
|
||||
|
||||
// create the log window
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ float g_fLoadTime = 0.0f;
|
|||
|
||||
//-------------------------------------------------------------------------------
|
||||
// Entry point for the loader thread
|
||||
// The laoder thread loads the asset while the progress dialog displays the
|
||||
// The loader thread loads the asset while the progress dialog displays the
|
||||
// smart progress bar
|
||||
//-------------------------------------------------------------------------------
|
||||
DWORD WINAPI LoadThreadProc(LPVOID lpParameter)
|
||||
|
|
@ -200,9 +200,9 @@ DWORD WINAPI LoadThreadProc(LPVOID lpParameter)
|
|||
// load the current asset
|
||||
// THe path to the asset is specified in the global path variable
|
||||
//-------------------------------------------------------------------------------
|
||||
int LoadAsset(void)
|
||||
int LoadAsset()
|
||||
{
|
||||
// set the world and world rotation matrices to the identuty
|
||||
// set the world and world rotation matrices to the identity
|
||||
g_mWorldRotate = aiMatrix4x4();
|
||||
g_mWorld = aiMatrix4x4();
|
||||
|
||||
|
|
@ -1130,8 +1130,6 @@ int GetProjectionMatrix (aiMatrix4x4& p_mOut)
|
|||
return 1;
|
||||
}
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------------
|
||||
//-------------------------------------------------------------------------------
|
||||
aiVector3D GetCameraMatrix (aiMatrix4x4& p_mOut)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,13 +15,11 @@
|
|||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// German (Germany) resources
|
||||
// Deutsch (Deutschland) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
|
|
@ -32,6 +30,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
|
|||
// remains consistent on all systems.
|
||||
IDI_ASSIMP_VIEW ICON "../shared/assimp_tools_icon.ico"
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Dialog
|
||||
|
|
@ -49,104 +48,63 @@ BEGIN
|
|||
LTEXT "http://assimp.sourceforge.net http://www.zfx.info",IDC_STATIC,31,101,127,22
|
||||
DEFPUSHBUTTON "Love this library",IDOK,186,110,84,14
|
||||
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,148,283,1
|
||||
CONTROL 130,IDC_STATIC,"Static",SS_BITMAP,0,129,514,20
|
||||
CONTROL IDB_BITMAP1,IDC_STATIC,"Static",SS_BITMAP,0,129,514,20
|
||||
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,10,281,1
|
||||
END
|
||||
|
||||
#define X_GROUP1 7
|
||||
#define W_GROUP1 6+160+6
|
||||
#define X_GROUP2 X_GROUP1+W_GROUP1+7
|
||||
#define W_GROUP2 6+150+8
|
||||
#define X_GROUP3 X_GROUP2+W_GROUP2+7
|
||||
#define W_GROUP3 6+60+35+8
|
||||
|
||||
#define W X_GROUP3+W_GROUP3+47
|
||||
#define H 450
|
||||
|
||||
#define Y_PANEL H-12-82-7-7-14-4
|
||||
#define Y_GROUPS Y_PANEL+14+7
|
||||
|
||||
#define TREE_W 143
|
||||
#define COMBO_W 100
|
||||
|
||||
IDD_DIALOGMAIN DIALOGEX 0, 0, W+TREE_W, H
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
IDD_DIALOGMAIN DIALOGEX 0, 0, 656, 450
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_ACCEPTFILES | WS_EX_WINDOWEDGE
|
||||
CAPTION "Open Asset Import Library - Model Viewer "
|
||||
MENU IDR_MENU1
|
||||
FONT 8, "Microsoft Sans Serif", 400, 0, 0x0
|
||||
BEGIN
|
||||
|
||||
CONTROL "",IDC_RT,"Static",SS_OWNERDRAW,0,0,W,Y_PANEL
|
||||
CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS|TVS_HASLINES|TVS_SHOWSELALWAYS|WS_BORDER|WS_HSCROLL|WS_TABSTOP, W,0,TREE_W,H
|
||||
|
||||
#define Y Y_PANEL+4
|
||||
CONTROL "<<",IDC_BLUBB,"Button",BS_AUTOCHECKBOX|BS_PUSHLIKE|WS_TABSTOP, W-7-35,Y,35,14
|
||||
COMBOBOX IDC_COMBO1, W-7-35-4-100,Y,100,14, CBS_DROPDOWN|WS_VSCROLL|WS_TABSTOP
|
||||
PUSHBUTTON "Play",IDC_PLAY, W-7-35-4-100-35-4,Y,35,14
|
||||
CONTROL "",IDC_SLIDERANIM,"msctls_trackbar32",TBS_AUTOTICKS|TBS_BOTH|TBS_NOTICKS|WS_TABSTOP, 0,Y,W-7-35-4-100-35-4,15
|
||||
|
||||
#undef Y
|
||||
#define Y Y_GROUPS+12
|
||||
#define X X_GROUP1+6
|
||||
|
||||
GROUPBOX "Display",IDC_STATIC, X_GROUP1,Y_GROUPS,W_GROUP1,12+82+7
|
||||
|
||||
CONTROL "Multisampling [M]",IDC_TOGGLEMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X,Y,80,10
|
||||
CONTROL "Wireframe [W]",IDC_TOGGLEWIRE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X,Y+12,80,10
|
||||
CONTROL "No materials [D]",IDC_TOGGLEMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X,Y+24,80,10
|
||||
CONTROL "Display normals [N]",IDC_TOGGLENORMALS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X,Y+36,80,10
|
||||
CONTROL "Low quality [P]",IDC_LOWQUALITY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X,Y+48,80,10
|
||||
CONTROL "No specular [S]",IDC_NOSPECULAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X,Y+60,80,10
|
||||
CONTROL "Show skeleton [K]",IDC_SHOWSKELETON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X,Y+72,80,10
|
||||
|
||||
CONTROL "AutoRotate [A]",IDC_AUTOROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X+80,Y,80,10
|
||||
CONTROL "Zoom/Rotate [Z]",IDC_ZOOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X+80,Y+12,80,10
|
||||
CONTROL "Rotate lights [R]",IDC_LIGHTROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X+80,Y+24,80,10
|
||||
CONTROL "Two lights [L]",IDC_3LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X+80,Y+36,80,10
|
||||
CONTROL "Backface culling [C]",IDC_BFCULL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X+80,Y+48,80,10
|
||||
CONTROL "No transparency [T]",IDC_NOAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, X+80,Y+60,80,10
|
||||
|
||||
#undef X
|
||||
#define X X_GROUP2+6
|
||||
|
||||
GROUPBOX "Statistics",IDC_STATIC, X_GROUP2,Y_GROUPS,W_GROUP2,12+36+8+7
|
||||
|
||||
LTEXT "Vertices:",IDC_NUMVERTS, X,Y,35,8
|
||||
LTEXT "Nodes:",IDC_NUMNODES, X,Y+12,35,8
|
||||
LTEXT "Shaders:",IDC_NUMSHADERS, X,Y+24,35,8
|
||||
LTEXT "Time:",IDC_LOADTIME, X,Y+36,35,8
|
||||
|
||||
EDITTEXT IDC_EVERT, X+35,Y,35,8, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | ES_RIGHT
|
||||
EDITTEXT IDC_ENODEWND, X+35,Y+12,35,8, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | ES_RIGHT
|
||||
EDITTEXT IDC_ESHADER, X+35,Y+24,35,8, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | ES_RIGHT
|
||||
EDITTEXT IDC_ELOAD, X+35,Y+36,35,8, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | ES_RIGHT
|
||||
|
||||
LTEXT "Faces:",IDC_NUMFACES, X+80,Y,35,8
|
||||
LTEXT "Materials:",IDC_NUMMATS, X+80,Y+12,35,8
|
||||
LTEXT "Meshes:",IDC_NUMMESHES, X+80,Y+24,35,8
|
||||
LTEXT "FPS:",IDC_FPS, X+80,Y+36,35,8
|
||||
|
||||
EDITTEXT IDC_EFACE, X+115,Y,35,8, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | ES_RIGHT
|
||||
EDITTEXT IDC_EMAT, X+115,Y+12,35,8, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | ES_RIGHT
|
||||
EDITTEXT IDC_EMESH, X+115,Y+24,35,8, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | ES_RIGHT
|
||||
EDITTEXT IDC_EFPS, X+115,Y+36,35,8, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | ES_RIGHT
|
||||
|
||||
EDITTEXT IDC_VIEWMATRIX, X,Y+48+7,72,44, ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_VISIBLE
|
||||
|
||||
#undef X
|
||||
#define X X_GROUP3+6
|
||||
|
||||
GROUPBOX "Colors",IDC_STATIC, X_GROUP3,Y_GROUPS,W_GROUP3,12+54+14+7
|
||||
|
||||
LTEXT "Primary:",IDC_STATIC, X,Y+3,48,8
|
||||
LTEXT "Secondary:",IDC_STATIC, X,Y+3+18,54,8
|
||||
LTEXT "Ambient:",IDC_STATIC, X,Y+3+36,54,8
|
||||
|
||||
CONTROL "Button1",IDC_LCOLOR1,"Button",BS_OWNERDRAW | WS_TABSTOP, X+60,Y,35,14
|
||||
CONTROL "Button1",IDC_LCOLOR2,"Button",BS_OWNERDRAW | WS_TABSTOP, X+60,Y+18,35,14
|
||||
CONTROL "Button1",IDC_LCOLOR3,"Button",BS_OWNERDRAW | WS_TABSTOP, X+60,Y+36,35,14
|
||||
PUSHBUTTON "Reset",IDC_LRESET, X+60,Y+54,35,14
|
||||
CONTROL "",IDC_RT,"Static",SS_OWNERDRAW,0,0,513,324
|
||||
CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,513,0,143,450
|
||||
CONTROL "<<",IDC_BLUBB,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,471,328,35,14
|
||||
COMBOBOX IDC_COMBO1,367,328,100,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
|
||||
PUSHBUTTON "Play",IDC_PLAY,328,328,35,14
|
||||
CONTROL "",IDC_SLIDERANIM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,0,328,328,15
|
||||
GROUPBOX "Display",IDC_STATIC,7,345,172,101
|
||||
CONTROL "Multisampling [M]",IDC_TOGGLEMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,357,80,10
|
||||
CONTROL "Wireframe [W]",IDC_TOGGLEWIRE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,369,80,10
|
||||
CONTROL "No materials [D]",IDC_TOGGLEMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,381,80,10
|
||||
CONTROL "Display normals [N]",IDC_TOGGLENORMALS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,393,80,10
|
||||
CONTROL "Low quality [P]",IDC_LOWQUALITY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,405,80,10
|
||||
CONTROL "No specular [S]",IDC_NOSPECULAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,417,80,10
|
||||
CONTROL "Show skeleton [K]",IDC_SHOWSKELETON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,429,80,10
|
||||
CONTROL "AutoRotate [A]",IDC_AUTOROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,357,80,10
|
||||
CONTROL "Zoom/Rotate [Z]",IDC_ZOOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,369,80,10
|
||||
CONTROL "Rotate lights [R]",IDC_LIGHTROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,381,80,10
|
||||
CONTROL "Two lights [L]",IDC_3LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,393,80,10
|
||||
CONTROL "Backface culling [C]",IDC_BFCULL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,405,80,10
|
||||
CONTROL "No transparency [T]",IDC_NOAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,417,80,10
|
||||
GROUPBOX "Statistics",IDC_STATIC,186,345,164,63
|
||||
LTEXT "Vertices:",IDC_NUMVERTS,192,357,35,8
|
||||
LTEXT "Nodes:",IDC_NUMNODES,192,369,35,8
|
||||
LTEXT "Shaders:",IDC_NUMSHADERS,192,381,35,8
|
||||
LTEXT "Time:",IDC_LOADTIME,192,393,35,8
|
||||
EDITTEXT IDC_EVERT,227,357,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
|
||||
EDITTEXT IDC_ENODEWND,227,369,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
|
||||
EDITTEXT IDC_ESHADER,227,381,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
|
||||
EDITTEXT IDC_ELOAD,227,393,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
|
||||
LTEXT "Faces:",IDC_NUMFACES,272,357,35,8
|
||||
LTEXT "Materials:",IDC_NUMMATS,272,369,35,8
|
||||
LTEXT "Meshes:",IDC_NUMMESHES,272,381,35,8
|
||||
LTEXT "FPS:",IDC_FPS,272,393,35,8
|
||||
EDITTEXT IDC_EFACE,307,357,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
|
||||
EDITTEXT IDC_EMAT,307,369,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
|
||||
EDITTEXT IDC_EMESH,307,381,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
|
||||
EDITTEXT IDC_EFPS,307,393,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
|
||||
EDITTEXT IDC_VIEWMATRIX,192,412,72,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE | NOT WS_BORDER
|
||||
GROUPBOX "Colors",IDC_STATIC,357,345,109,87
|
||||
LTEXT "Primary:",IDC_STATIC,363,360,48,8
|
||||
LTEXT "Secondary:",IDC_STATIC,363,378,54,8
|
||||
LTEXT "Ambient:",IDC_STATIC,363,396,54,8
|
||||
CONTROL "Button1",IDC_LCOLOR1,"Button",BS_OWNERDRAW | WS_TABSTOP,423,357,35,14
|
||||
CONTROL "Button1",IDC_LCOLOR2,"Button",BS_OWNERDRAW | WS_TABSTOP,423,375,35,14
|
||||
CONTROL "Button1",IDC_LCOLOR3,"Button",BS_OWNERDRAW | WS_TABSTOP,423,393,35,14
|
||||
PUSHBUTTON "Reset",IDC_LRESET,423,411,35,14
|
||||
END
|
||||
|
||||
IDD_LOADDIALOG DIALOGEX 0, 0, 143, 60
|
||||
|
|
@ -279,7 +237,6 @@ BEGIN
|
|||
IDD_DIALOGMAIN, DIALOG
|
||||
BEGIN
|
||||
RIGHTMARGIN, 623
|
||||
BOTTOMMARGIN, 484
|
||||
END
|
||||
|
||||
IDD_LOADDIALOG, DIALOG
|
||||
|
|
@ -321,17 +278,28 @@ END
|
|||
//
|
||||
|
||||
IDB_BITMAP1 BITMAP "banner.bmp"
|
||||
|
||||
IDB_BANIM BITMAP "base_anim.bmp"
|
||||
|
||||
IDB_BDISPLAY BITMAP "base_display.bmp"
|
||||
|
||||
IDB_BINTER BITMAP "base_inter.bmp"
|
||||
|
||||
IDB_BRENDERING BITMAP "base_rendering.bmp"
|
||||
|
||||
IDB_BSTATS BITMAP "base_stats.bmp"
|
||||
|
||||
IDB_BTX BITMAP "tx.bmp"
|
||||
|
||||
IDB_BFX BITMAP "fx.bmp"
|
||||
|
||||
IDB_BNODE BITMAP "n.bmp"
|
||||
|
||||
IDB_BROOT BITMAP "root.bmp"
|
||||
|
||||
IDB_BTXI BITMAP "txi.bmp"
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Menu
|
||||
|
|
@ -473,14 +441,17 @@ END
|
|||
|
||||
IDR_TEXT1 TEXT "text1.bin"
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// RCDATA
|
||||
//
|
||||
|
||||
IDR_HUD RCDATA "HUD.png"
|
||||
|
||||
IDR_HUDMASK RCDATA "HUDMask.png"
|
||||
#endif // German (Germany) resources
|
||||
|
||||
#endif // Deutsch (Deutschland) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue