Vima19 Texture Lib 08/04/20
@@ -207,6 +207,20 @@ | ||
207 | 207 | { |
208 | 208 | |
209 | 209 | // Vima 20/3/20 |
210 | + | |
211 | + case ID_TEST_GENERAL: | |
212 | + { | |
213 | + if (App->CL_Vm_ImGui->Show_Image == 1) | |
214 | + { | |
215 | + App->CL_Vm_ImGui->Show_Image = 0; | |
216 | + } | |
217 | + else | |
218 | + { | |
219 | + App->CL_Vm_ImGui->Show_Image = 1; | |
220 | + } | |
221 | + return 1; | |
222 | + } | |
223 | + | |
210 | 224 | case ID_IMPORT_GENESIS3D: |
211 | 225 | { |
212 | 226 | App->CL_Importer->Genesis3D_Loader(); |
@@ -311,23 +325,6 @@ | ||
311 | 325 | } |
312 | 326 | |
313 | 327 | // ----------------------------------------------------- |
314 | - // ----------------------------------------------------- | |
315 | - case ID_TEST_GENERAL: | |
316 | - { | |
317 | - App->CL_Vm_TopBar->Start_TopBar(); | |
318 | - //if (App->Cl_FileView_V2->OpenObjects == 1) | |
319 | - //{ | |
320 | - // //App->Cl_FileView_V2->OpenObjects = 0; | |
321 | - // App->Cl_FileView_V2->SelectObject = 1; | |
322 | - //} | |
323 | - //else | |
324 | - //{ | |
325 | - // App->Cl_FileView_V2->OpenObjects = 1; | |
326 | - // App->Cl_FileView_V2->SelectObject = 1; | |
327 | - //} | |
328 | - return 1; | |
329 | - } | |
330 | - | |
331 | 328 | //------------------------- Menu Camera |
332 | 329 | case ID_CAMERA_FOLLOWOBJECT: |
333 | 330 | { |
@@ -11,6 +11,7 @@ | ||
11 | 11 | Show_Rotation = 0; |
12 | 12 | Show_Position = 0; |
13 | 13 | Show_Scale = 0; |
14 | + Show_Image = 0; | |
14 | 15 | |
15 | 16 | Model_XTranslate = 2; |
16 | 17 | Model_YTranslate = 2; |
@@ -72,6 +73,13 @@ | ||
72 | 73 | { |
73 | 74 | ImGui_Scale(); |
74 | 75 | } |
76 | + | |
77 | + if (Show_Image == 1) | |
78 | + { | |
79 | + ImGui_Image(); | |
80 | + } | |
81 | + | |
82 | + | |
75 | 83 | } |
76 | 84 | |
77 | 85 | // ************************************************************************* |
@@ -113,7 +121,7 @@ | ||
113 | 121 | } |
114 | 122 | else |
115 | 123 | { |
116 | - | |
124 | + | |
117 | 125 | ImGui::Text(" X Y Z"); |
118 | 126 | |
119 | 127 | if (ImGui::Button("X+", ImVec2(70, 0))) |
@@ -481,4 +489,36 @@ | ||
481 | 489 | } |
482 | 490 | ImGui::End(); |
483 | 491 | } |
484 | -} | |
\ No newline at end of file | ||
492 | +} | |
493 | + | |
494 | + | |
495 | +// ************************************************************************* | |
496 | +// * ImGui_Image Terry Bernie * | |
497 | +// ************************************************************************* | |
498 | +void VM_ImGui::ImGui_Image(void) | |
499 | +{ | |
500 | + //ImGui::SetNextWindowPos(ImVec2(10, 10), ImGuiCond_FirstUseEver); | |
501 | + | |
502 | + if (!ImGui::Begin("Image", &Show_Image, ImGuiWindowFlags_NoSavedSettings)) | |
503 | + { | |
504 | + ImGui::End(); | |
505 | + } | |
506 | + else | |
507 | + { | |
508 | + if (App->CL_Vm_Textures->g_Texture[0] == NULL) | |
509 | + { | |
510 | + | |
511 | + } | |
512 | + else | |
513 | + { | |
514 | + | |
515 | + /*int MatIndex = App->CL_Vm_Model->MatIndex_Data[0]; | |
516 | + glBindTexture(GL_TEXTURE_2D, App->CL_Vm_Textures->g_Texture[MatIndex]); | |
517 | + | |
518 | + ImGui::Text("pointer = %p", App->CL_Vm_Textures->g_Texture[MatIndex]); | |
519 | + ImGui::Text("size = %d x %d", 256, 256); | |
520 | + ImGui::Image((void*)(intptr_t)App->CL_Vm_Textures->g_Texture[MatIndex], ImVec2(256.0f, 256.0f)); | |
521 | + ImGui::End();*/ | |
522 | + } | |
523 | + } | |
524 | +} |
@@ -12,6 +12,7 @@ | ||
12 | 12 | void ImGui_Rotation(void); |
13 | 13 | void ImGui_Position(void); |
14 | 14 | void ImGui_Scale(void); |
15 | + void ImGui_Image(void); | |
15 | 16 | |
16 | 17 | bool StartPos; |
17 | 18 |
@@ -21,6 +22,7 @@ | ||
21 | 22 | bool Show_Rotation; |
22 | 23 | bool Show_Position; |
23 | 24 | bool Show_Scale; |
25 | + bool Show_Image; | |
24 | 26 | |
25 | 27 | float Model_XTranslate; |
26 | 28 | float Model_YTranslate; |
@@ -29,7 +29,7 @@ | ||
29 | 29 | VM_TextLib::VM_TextLib() |
30 | 30 | { |
31 | 31 | Entry = nullptr; |
32 | - pData = nullptr; | |
32 | + p_Data = nullptr; | |
33 | 33 | } |
34 | 34 | |
35 | 35 | VM_TextLib::~VM_TextLib() |
@@ -62,6 +62,8 @@ | ||
62 | 62 | { |
63 | 63 | case WM_INITDIALOG: |
64 | 64 | { |
65 | + SendDlgItemMessage(hDlg, IDC_TEXTURELIST, WM_SETFONT, (WPARAM)App->Font_CB15, MAKELPARAM(TRUE, 0)); | |
66 | + | |
65 | 67 | App->CL_Vm_TextLib->Entry = new BitmapEntry; |
66 | 68 | |
67 | 69 | SetWindowLong(GetDlgItem(hDlg, IDC_PREVIEW), GWL_WNDPROC, (LONG)TextureLibPreviewWnd); |
@@ -74,10 +76,10 @@ | ||
74 | 76 | |
75 | 77 | App->CL_Vm_TextLib->LoadFile(hDlg); |
76 | 78 | |
77 | - /*strcpy(buf1, szTitle); | |
79 | + strcpy(buf1, App->Version); | |
78 | 80 | strcat(buf1, " "); |
79 | - strcat(buf1, C_TetureLib->pData->TXLFileName); | |
80 | - SetWindowText(hDlg, buf1);*/ | |
81 | + strcat(buf1, App->CL_Vm_TextLib->p_Data->TXLFileName); | |
82 | + SetWindowText(hDlg, buf1); | |
81 | 83 | |
82 | 84 | Font = CreateFont(-24, 0, 0, 0, 0, 0, 0, 0, 0, OUT_TT_ONLY_PRECIS, 0, 0, 0, "Arial Black"); |
83 | 85 | Font1 = CreateFont(-20, 0, 0, 0, 0, 0, 0, 0, 0, OUT_TT_ONLY_PRECIS, 0, 0, 0, "Arial Black"); |
@@ -86,8 +88,7 @@ | ||
86 | 88 | SendDlgItemMessage(hDlg, IDC_TEXTURE, WM_SETFONT, (WPARAM)Font, MAKELPARAM(TRUE, 0)); |
87 | 89 | SendDlgItemMessage(hDlg, IDC_ALPHA, WM_SETFONT, (WPARAM)Font, MAKELPARAM(TRUE, 0)); |
88 | 90 | SendDlgItemMessage(hDlg, IDC_GEINFO, WM_SETFONT, (WPARAM)Font1, MAKELPARAM(TRUE, 0)); |
89 | - // SendDlgItemMessage(hDlg,IDC_CTRLKEY, WM_SETFONT, (WPARAM)Font2, MAKELPARAM(TRUE, 0)); | |
90 | - SendDlgItemMessage(hDlg, IDC_TEXTURELIST, WM_SETFONT, (WPARAM)Font2, MAKELPARAM(TRUE, 0)); | |
91 | + | |
91 | 92 | |
92 | 93 | } |
93 | 94 |
@@ -103,7 +104,7 @@ | ||
103 | 104 | if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) |
104 | 105 | { |
105 | 106 | |
106 | - if (App->CL_Vm_TextLib->pData->Dirty) | |
107 | + if (App->CL_Vm_TextLib->p_Data->Dirty) | |
107 | 108 | { |
108 | 109 | int Result; |
109 | 110 |
@@ -117,8 +118,8 @@ | ||
117 | 118 | |
118 | 119 | if (Result == IDYES) |
119 | 120 | { |
120 | - if (App->CL_Vm_TextLib->pData->FileNameIsValid) | |
121 | - App->CL_Vm_TextLib->Save(App->CL_Vm_TextLib->pData->TXLFileName); | |
121 | + if (App->CL_Vm_TextLib->p_Data->FileNameIsValid) | |
122 | + App->CL_Vm_TextLib->Save(App->CL_Vm_TextLib->p_Data->TXLFileName); | |
122 | 123 | else |
123 | 124 | App->CL_Vm_TextLib->Save(NULL); |
124 | 125 | } |
@@ -145,7 +146,7 @@ | ||
145 | 146 | }*/ |
146 | 147 | |
147 | 148 | App->CL_Vm_TextLib->AddTexture(NULL, App->CL_Vm_TextLib->Txt_FileName); |
148 | - App->CL_Vm_TextLib->pData->Dirty = 1; // it as changed reqest save | |
149 | + App->CL_Vm_TextLib->p_Data->Dirty = 1; // it as changed reqest save | |
149 | 150 | return TRUE; |
150 | 151 | } |
151 | 152 | //--------------------------------- Save ---------------------- |
@@ -152,7 +153,7 @@ | ||
152 | 153 | if (LOWORD(wParam) == IDC_SAVE) |
153 | 154 | { |
154 | 155 | |
155 | - App->CL_Vm_TextLib->Save(App->CL_Vm_TextLib->pData->TXLFileName); | |
156 | + App->CL_Vm_TextLib->Save(App->CL_Vm_TextLib->p_Data->TXLFileName); | |
156 | 157 | return TRUE; |
157 | 158 | } |
158 | 159 | //--------------------------------- Rename ---------------------- |
@@ -505,7 +506,6 @@ | ||
505 | 506 | return FALSE; |
506 | 507 | |
507 | 508 | SelectObject(MemDC, Bmp); |
508 | - | |
509 | 509 | SourceWidth = SourceRect->right - SourceRect->left; |
510 | 510 | SourceHeight = SourceRect->bottom - SourceRect->top; |
511 | 511 | DestWidth = DestRect->right - DestRect->left; |
@@ -522,6 +522,7 @@ | ||
522 | 522 | SourceWidth, |
523 | 523 | SourceHeight, |
524 | 524 | SRCCOPY); |
525 | + | |
525 | 526 | if (Alpha) |
526 | 527 | { |
527 | 528 | SelectObject(MemDC, Alpha); |
@@ -777,9 +778,9 @@ | ||
777 | 778 | geVFile_Finder * Finder = NULL; |
778 | 779 | geVFile_Finder * FinderCount = NULL; |
779 | 780 | |
780 | - pData = new TPack_WindowData; | |
781 | - pData->hwnd = ChDlg; | |
782 | - pData->BitmapCount = 0; | |
781 | + p_Data = new TPack_WindowData; | |
782 | + p_Data->hwnd = ChDlg; | |
783 | + p_Data->BitmapCount = 0; | |
783 | 784 | |
784 | 785 | int TextureCount = 0; |
785 | 786 |
@@ -829,13 +830,13 @@ | ||
829 | 830 | } |
830 | 831 | |
831 | 832 | } |
832 | - strcpy(pData->TXLFileName, Txt_FileName); | |
833 | - pData->FileNameIsValid = TRUE; | |
834 | - pData->Dirty = FALSE; | |
833 | + strcpy(p_Data->TXLFileName, Txt_FileName); | |
834 | + p_Data->FileNameIsValid = TRUE; | |
835 | + p_Data->Dirty = FALSE; | |
835 | 836 | geVFile_Close(VFS); |
836 | 837 | |
837 | - SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_SETCURSEL, (WPARAM)0, (LPARAM)0); | |
838 | - | |
838 | + SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_SETCURSEL, (WPARAM)0, (LPARAM)0); | |
839 | + App->CL_Vm_TextLib->SelectBitmap(); | |
839 | 840 | return 1; |
840 | 841 | } |
841 | 842 |
@@ -905,7 +906,7 @@ | ||
905 | 906 | // goto fail; |
906 | 907 | // } |
907 | 908 | // NewBitmapList = geRam_Realloc(pData->Bitmaps, sizeof(*NewBitmapList) * (pData->BitmapCount + 1)); |
908 | - NewBitmapList[pData->BitmapCount] = new BitmapEntry; | |
909 | + NewBitmapList[p_Data->BitmapCount] = new BitmapEntry; | |
909 | 910 | if (!NewBitmapList) |
910 | 911 | { |
911 | 912 | NonFatalError("Memory allocation error processing %s", Path); |
@@ -912,14 +913,14 @@ | ||
912 | 913 | return TRUE; |
913 | 914 | } |
914 | 915 | |
915 | - NewBitmapList[pData->BitmapCount]->Name = Name; | |
916 | - NewBitmapList[pData->BitmapCount]->Bitmap = Bitmap; | |
917 | - NewBitmapList[pData->BitmapCount]->WinBitmap = NULL; | |
918 | - NewBitmapList[pData->BitmapCount]->WinABitmap = NULL; | |
919 | - NewBitmapList[pData->BitmapCount]->Flags = 0; | |
920 | - pData->BitmapCount++; | |
916 | + NewBitmapList[p_Data->BitmapCount]->Name = Name; | |
917 | + NewBitmapList[p_Data->BitmapCount]->Bitmap = Bitmap; | |
918 | + NewBitmapList[p_Data->BitmapCount]->WinBitmap = NULL; | |
919 | + NewBitmapList[p_Data->BitmapCount]->WinABitmap = NULL; | |
920 | + NewBitmapList[p_Data->BitmapCount]->Flags = 0; | |
921 | + p_Data->BitmapCount++; | |
921 | 922 | |
922 | - SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_ADDSTRING, (WPARAM)0, (LPARAM)Name); | |
923 | + SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_ADDSTRING, (WPARAM)0, (LPARAM)Name); | |
923 | 924 | |
924 | 925 | return TRUE; |
925 | 926 |
@@ -936,7 +937,7 @@ | ||
936 | 937 | |
937 | 938 | int location = 0; |
938 | 939 | |
939 | - Index = SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0); | |
940 | + Index = SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0); | |
940 | 941 | if (Index == LB_ERR) |
941 | 942 | { |
942 | 943 | // Entry = NULL; |
@@ -943,9 +944,9 @@ | ||
943 | 944 | } |
944 | 945 | else |
945 | 946 | { |
946 | - SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_GETTEXT, (WPARAM)Index, (LPARAM)&TextureName[0]); | |
947 | + SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_GETTEXT, (WPARAM)Index, (LPARAM)&TextureName[0]); | |
947 | 948 | |
948 | - location = FindBitmap(pData, TextureName); | |
949 | + location = FindBitmap(p_Data, TextureName); | |
949 | 950 | |
950 | 951 | // assert(Entry); |
951 | 952 | if (!NewBitmapList[location]->WinBitmap) |
@@ -955,7 +956,7 @@ | ||
955 | 956 | HBITMAP ahbm; |
956 | 957 | HDC hDC; |
957 | 958 | |
958 | - PreviewWnd = GetDlgItem(pData->hwnd, IDC_PREVIEW); | |
959 | + PreviewWnd = GetDlgItem(p_Data->hwnd, IDC_PREVIEW); | |
959 | 960 | hDC = GetDC(PreviewWnd); |
960 | 961 | hbm = CreateHBitmapFromgeBitmap(NewBitmapList[location]->Bitmap, hDC); |
961 | 962 | NewBitmapList[location]->WinBitmap = hbm; |
@@ -975,7 +976,7 @@ | ||
975 | 976 | } |
976 | 977 | } |
977 | 978 | |
978 | - InvalidateRect(GetDlgItem(pData->hwnd, IDC_PREVIEW), NULL, TRUE); | |
979 | + InvalidateRect(GetDlgItem(p_Data->hwnd, IDC_PREVIEW), NULL, TRUE); | |
979 | 980 | |
980 | 981 | Entry = NewBitmapList[location]; |
981 | 982 | UpDateGeList(location); |
@@ -987,11 +988,11 @@ | ||
987 | 988 | // ************************************************************************* |
988 | 989 | // * FindBitmap 06/06/08 * |
989 | 990 | // ************************************************************************* |
990 | -int VM_TextLib::FindBitmap(TPack_WindowData *pData, const char *Name) | |
991 | +int VM_TextLib::FindBitmap(TPack_WindowData *p_Data, const char *Name) | |
991 | 992 | { |
992 | 993 | int i; |
993 | 994 | |
994 | - for (i = 0; i < pData->BitmapCount; i++) | |
995 | + for (i = 0; i < p_Data->BitmapCount; i++) | |
995 | 996 | { |
996 | 997 | |
997 | 998 | if (!strcmp(Name, NewBitmapList[i]->Name)) |
@@ -1104,22 +1105,22 @@ | ||
1104 | 1105 | |
1105 | 1106 | char buff[256]; |
1106 | 1107 | strcpy(buff, "no info"); |
1107 | - SendDlgItemMessage(pData->hwnd, IDC_GEINFO, LB_RESETCONTENT, (WPARAM)0, (LPARAM)0); | |
1108 | + SendDlgItemMessage(p_Data->hwnd, IDC_GEINFO, LB_RESETCONTENT, (WPARAM)0, (LPARAM)0); | |
1108 | 1109 | |
1109 | 1110 | sprintf(buff, "%s %s", "Texture Name :-", NewBitmapList[Location]->Name); |
1110 | - SendDlgItemMessage(pData->hwnd, IDC_GEINFO, LB_ADDSTRING, (WPARAM)0, (LPARAM)buff); | |
1111 | + SendDlgItemMessage(p_Data->hwnd, IDC_GEINFO, LB_ADDSTRING, (WPARAM)0, (LPARAM)buff); | |
1111 | 1112 | |
1112 | 1113 | sprintf(buff, "%s %i", "Index :-", Location); |
1113 | - SendDlgItemMessage(pData->hwnd, IDC_GEINFO, LB_ADDSTRING, (WPARAM)0, (LPARAM)buff); | |
1114 | + SendDlgItemMessage(p_Data->hwnd, IDC_GEINFO, LB_ADDSTRING, (WPARAM)0, (LPARAM)buff); | |
1114 | 1115 | |
1115 | 1116 | sprintf(buff, "%s %s", "Bitmap :-", "Valid"); |
1116 | - SendDlgItemMessage(pData->hwnd, IDC_GEINFO, LB_ADDSTRING, (WPARAM)0, (LPARAM)buff); | |
1117 | + SendDlgItemMessage(p_Data->hwnd, IDC_GEINFO, LB_ADDSTRING, (WPARAM)0, (LPARAM)buff); | |
1117 | 1118 | |
1118 | 1119 | sprintf(buff, "%s %d", "Width :-", geBitmap_Width(NewBitmapList[Location]->Bitmap)); |
1119 | - SendDlgItemMessage(pData->hwnd, IDC_GEINFO, LB_ADDSTRING, (WPARAM)0, (LPARAM)buff); | |
1120 | + SendDlgItemMessage(p_Data->hwnd, IDC_GEINFO, LB_ADDSTRING, (WPARAM)0, (LPARAM)buff); | |
1120 | 1121 | |
1121 | 1122 | sprintf(buff, "%s %d", "Height :-", geBitmap_Height(NewBitmapList[Location]->Bitmap)); |
1122 | - SendDlgItemMessage(pData->hwnd, IDC_GEINFO, LB_ADDSTRING, (WPARAM)0, (LPARAM)buff); | |
1123 | + SendDlgItemMessage(p_Data->hwnd, IDC_GEINFO, LB_ADDSTRING, (WPARAM)0, (LPARAM)buff); | |
1123 | 1124 | |
1124 | 1125 | |
1125 | 1126 | geBitmap_GetInfo(NewBitmapList[Location]->Bitmap, &MPInfo, &MSInfo); |
@@ -1149,12 +1150,12 @@ | ||
1149 | 1150 | // Ouput to the current directory |
1150 | 1151 | GetCurrentDirectory(MAX_PATH, szPath); |
1151 | 1152 | |
1152 | - nSel = SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0); | |
1153 | + nSel = SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0); | |
1153 | 1154 | if (nSel == LB_ERR) |
1154 | 1155 | { |
1155 | 1156 | // Entry = NULL; |
1156 | 1157 | } |
1157 | - SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_GETTEXT, (WPARAM)nSel, (LPARAM)&szName[0]); | |
1158 | + SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_GETTEXT, (WPARAM)nSel, (LPARAM)&szName[0]); | |
1158 | 1159 | |
1159 | 1160 | |
1160 | 1161 | // App->CL_Vm_TextLib->pEntry = FindBitmap(pData, szName); |
@@ -1385,8 +1386,8 @@ | ||
1385 | 1386 | GetCurrentDirectory(sizeof(Dir), Dir); |
1386 | 1387 | |
1387 | 1388 | ofn.lStructSize = sizeof(OPENFILENAME); |
1388 | - ofn.hwndOwner = pData->hwnd; | |
1389 | - ofn.hInstance = pData->Instance; | |
1389 | + ofn.hwndOwner = p_Data->hwnd; | |
1390 | + ofn.hInstance = p_Data->Instance; | |
1390 | 1391 | { |
1391 | 1392 | char *c; |
1392 | 1393 |
@@ -1430,7 +1431,7 @@ | ||
1430 | 1431 | return 0; |
1431 | 1432 | } |
1432 | 1433 | |
1433 | - for (i = 0; i < pData->BitmapCount; i++) | |
1434 | + for (i = 0; i < p_Data->BitmapCount; i++) | |
1434 | 1435 | { |
1435 | 1436 | geVFile * File; |
1436 | 1437 | geBoolean WriteResult; |
@@ -1454,13 +1455,13 @@ | ||
1454 | 1455 | } |
1455 | 1456 | } |
1456 | 1457 | |
1457 | - strcpy(pData->TXLFileName, Path); | |
1458 | - pData->FileNameIsValid = TRUE; | |
1458 | + strcpy(p_Data->TXLFileName, Path); | |
1459 | + p_Data->FileNameIsValid = TRUE; | |
1459 | 1460 | |
1460 | 1461 | if (geVFile_Close(VFS) == GE_FALSE) |
1461 | 1462 | NonFatalError("I/O error writing %s", Path); |
1462 | 1463 | else |
1463 | - pData->Dirty = FALSE; | |
1464 | + p_Data->Dirty = FALSE; | |
1464 | 1465 | return 1; |
1465 | 1466 | } |
1466 | 1467 |
@@ -1483,8 +1484,8 @@ | ||
1483 | 1484 | bool VM_TextLib::GetName() |
1484 | 1485 | { |
1485 | 1486 | |
1486 | - int Index = SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0); | |
1487 | - SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_GETTEXT, (WPARAM)Index, (LPARAM)&TextureName[0]); | |
1487 | + int Index = SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0); | |
1488 | + SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_GETTEXT, (WPARAM)Index, (LPARAM)&TextureName[0]); | |
1488 | 1489 | return 1; |
1489 | 1490 | } |
1490 | 1491 | // ************************************************************************* |
@@ -1493,9 +1494,9 @@ | ||
1493 | 1494 | bool VM_TextLib::ReName(const char *NewName) |
1494 | 1495 | { |
1495 | 1496 | |
1496 | - int Index = SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0); | |
1497 | - SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_GETTEXT, (WPARAM)Index, (LPARAM)&TextureName[0]); | |
1498 | - int location = FindBitmap(pData, TextureName); | |
1497 | + int Index = SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0); | |
1498 | + SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_GETTEXT, (WPARAM)Index, (LPARAM)&TextureName[0]); | |
1499 | + int location = FindBitmap(p_Data, TextureName); | |
1499 | 1500 | |
1500 | 1501 | strcpy(NewBitmapList[location]->Name, NewName); |
1501 | 1502 | return 1; |
@@ -1507,19 +1508,19 @@ | ||
1507 | 1508 | bool VM_TextLib::UpDateList(const char *NewName) |
1508 | 1509 | { |
1509 | 1510 | |
1510 | - int Index = SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0); | |
1511 | - SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_RESETCONTENT, (WPARAM)0, (LPARAM)0); | |
1511 | + int Index = SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0); | |
1512 | + SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_RESETCONTENT, (WPARAM)0, (LPARAM)0); | |
1512 | 1513 | |
1513 | 1514 | int i; |
1514 | 1515 | |
1515 | - for (i = 0; i < pData->BitmapCount; i++) | |
1516 | + for (i = 0; i < p_Data->BitmapCount; i++) | |
1516 | 1517 | { |
1517 | 1518 | |
1518 | - SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_ADDSTRING, (WPARAM)0, (LPARAM)NewBitmapList[i]->Name); | |
1519 | + SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_ADDSTRING, (WPARAM)0, (LPARAM)NewBitmapList[i]->Name); | |
1519 | 1520 | |
1520 | 1521 | } |
1521 | 1522 | |
1522 | - SendDlgItemMessage(pData->hwnd, IDC_TEXTURELIST, LB_SETCURSEL, (WPARAM)Index, (LPARAM)0); | |
1523 | + SendDlgItemMessage(p_Data->hwnd, IDC_TEXTURELIST, LB_SETCURSEL, (WPARAM)Index, (LPARAM)0); | |
1523 | 1524 | |
1524 | 1525 | return 1; |
1525 | 1526 | } |
@@ -99,7 +99,7 @@ | ||
99 | 99 | |
100 | 100 | |
101 | 101 | |
102 | - TPack_WindowData *pData; | |
102 | + TPack_WindowData *p_Data; | |
103 | 103 | BitmapEntry * NewBitmapList[200]; |
104 | 104 | BitmapEntry * Entry; |
105 | 105 |
@@ -345,6 +345,8 @@ | ||
345 | 345 | glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); |
346 | 346 | glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR); |
347 | 347 | |
348 | + //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); | |
349 | + | |
348 | 350 | return 1; |
349 | 351 | } |
350 | 352 |
@@ -58,3 +58,8 @@ | ||
58 | 58 | Size=450,655 |
59 | 59 | Collapsed=0 |
60 | 60 | |
61 | +[Window][OpenGL Texture Text] | |
62 | +Pos=406,76 | |
63 | +Size=321,373 | |
64 | +Collapsed=0 | |
65 | + |