• R/O
  • SSH
  • HTTPS

vima19: Commit


Commit MetaInfo

Revision759 (tree)
Time2022-08-14 02:50:30
Authorhgtterry

Log Message

Equity_SB 130822 Project (WIP)

Change Summary

Incremental Difference

--- Anim19_OSDN/SB_Debug.cpp (revision 758)
+++ Anim19_OSDN/SB_Debug.cpp (revision 759)
@@ -102,8 +102,27 @@
102102 }
103103 else
104104 {
105- ImGui::Text("Project Folder Location: = %s", App->SBC_Project->m_Project_Folder_Path);
105+
106+ ImGui::Text("Project Loaded: = %i", App->SBC_Scene->Scene_Loaded);
106107
108+ ImGui::Text(" ");
109+
110+ ImGui::Text("Project Name: = %s", App->SBC_Project->m_Project_Name);
111+ ImGui::Text("Level Name: = %s", App->SBC_Project->m_Level_Name);
112+ ImGui::Text("Level File Name: = %s", App->SBC_Project->m_Level_File_Name);
113+
114+ ImGui::Text(" ");
115+
116+ ImGui::Text("Aera Folder Path: = %s", App->SBC_Project->m_Aera_Folder_Path);
117+ ImGui::Text("Level Folder Path: = %s", App->SBC_Project->m_Level_Folder_Path);
118+ ImGui::Text("Player Folder Path: = %s", App->SBC_Project->m_Players_Folder_Path);
119+
120+ ImGui::Text(" ");
121+
122+ //ImGui::Text("Project Folder Location: = %s", App->SBC_Project->m_Project_Folder_Path);
123+ ImGui::Text("Ini Location: = %s", App->SBC_Project->m_Ini_Path_File_Name);
124+ ImGui::Text("Sub Folder Location: = %s", App->SBC_Project->m_Project_Sub_Folder);
125+
107126 ImGui::Spacing();
108127 ImGui::Spacing();
109128
--- Anim19_OSDN/SB_Dialogs.cpp (revision 758)
+++ Anim19_OSDN/SB_Dialogs.cpp (revision 759)
@@ -45,6 +45,8 @@
4545 // *************************************************************************
4646 bool SB_Dialogs::Dialog_Text()
4747 {
48+ Canceled = 0;
49+
4850 DialogBox(App->hInst, (LPCTSTR)IDD_PROP_TEXT, App->Fdlg, (DLGPROC)Dialog_Text_Proc);
4951
5052 return 1;
--- Anim19_OSDN/SB_Project.cpp (revision 758)
+++ Anim19_OSDN/SB_Project.cpp (revision 759)
@@ -29,16 +29,16 @@
2929
3030 SB_Project::SB_Project()
3131 {
32- strcpy(m_Project_Sub_Folder,App->EquityDirecory_FullPath);
32+ /*strcpy(m_Project_Sub_Folder,App->EquityDirecory_FullPath);
3333 strcat(m_Project_Sub_Folder, "\\");
34- strcat(m_Project_Sub_Folder, "Projects\\");
34+ strcat(m_Project_Sub_Folder, "Projects\\");*/
3535
36- strcpy(m_Project_Folder_Path, App->EquityDirecory_FullPath);
37- strcat(m_Project_Folder_Path, "\\");
38- strcat(m_Project_Folder_Path, "Projects");
39- strcat(m_Project_Folder_Path, "\\");
40- strcat(m_Project_Folder_Path, "No Project?");
41- strcat(m_Project_Folder_Path, "_Prj");
36+ strcpy(m_Project_Sub_Folder, App->EquityDirecory_FullPath);
37+ strcat(m_Project_Sub_Folder, "\\");
38+ strcat(m_Project_Sub_Folder, "Projects");
39+ strcat(m_Project_Sub_Folder, "\\");
40+ strcat(m_Project_Sub_Folder, "No Project?");
41+ strcat(m_Project_Sub_Folder, "_Prj");
4242
4343 strcpy(m_Project_Name, "Project_X");
4444 strcpy(m_Level_Name,"Level_X");
@@ -98,7 +98,7 @@
9898
9999 SetDlgItemText(hDlg, IDC_STPROJECTNAME, (LPCTSTR)App->SBC_Project->m_Project_Name);
100100 SetDlgItemText(hDlg, IDC_STLEVELNAME, (LPCTSTR)App->SBC_Project->m_Level_Name);
101- SetDlgItemText(hDlg, IDC_STPJFOLDERPATH, (LPCTSTR)App->SBC_Project->m_Project_Folder_Path);
101+ SetDlgItemText(hDlg, IDC_STPJFOLDERPATH, (LPCTSTR)App->SBC_Project->m_Project_Sub_Folder);
102102
103103
104104 SetDlgItemText(hDlg, IDC_STBANNER, (LPCTSTR)"Save Project As");
@@ -217,13 +217,12 @@
217217
218218 if (Test == 0){return true;}
219219
220- strcpy(App->SBC_Project->m_Project_Folder_Path, App->Com_CDialogs->szSelectedDir);
221- strcat(App->SBC_Project->m_Project_Folder_Path, App->SBC_Project->m_Project_Name);
222- strcat(App->SBC_Project->m_Project_Folder_Path, "_Prj");
223-
224220 strcpy(App->SBC_Project->m_Project_Sub_Folder, App->Com_CDialogs->szSelectedDir);
221+ strcat(App->SBC_Project->m_Project_Sub_Folder, App->SBC_Project->m_Project_Name);
222+ strcat(App->SBC_Project->m_Project_Sub_Folder, "_Prj");
225223
226- SetDlgItemText(hDlg, IDC_STPJFOLDERPATH, (LPCTSTR)App->SBC_Project->m_Project_Folder_Path);
224+
225+ SetDlgItemText(hDlg, IDC_STPJFOLDERPATH, (LPCTSTR)App->SBC_Project->m_Project_Sub_Folder);
227226
228227 return TRUE;
229228 }
@@ -235,14 +234,25 @@
235234
236235 App->SBC_Dialogs->Dialog_Text();
237236
237+ if (App->SBC_Dialogs->Canceled == 1)
238+ {
239+ return TRUE;
240+ }
241+
242+ int len1 = strlen(App->SBC_Project->m_Project_Sub_Folder);
243+ int len2 = strlen(App->SBC_Project->m_Project_Name);
244+ App->SBC_Project->m_Project_Sub_Folder[len1 - (len2+5)] = 0;
245+
246+
238247 strcpy(App->SBC_Project->m_Project_Name,App->SBC_Dialogs->Chr_Text);
239248
240- strcpy(App->SBC_Project->m_Project_Folder_Path, App->SBC_Project->m_Project_Sub_Folder);
241- strcat(App->SBC_Project->m_Project_Folder_Path, App->SBC_Project->m_Project_Name);
242- strcat(App->SBC_Project->m_Project_Folder_Path, "_Prj");
249+ strcpy(App->SBC_Project->m_Project_Sub_Folder, App->SBC_Project->m_Project_Sub_Folder);
250+ strcat(App->SBC_Project->m_Project_Sub_Folder, "\\");
251+ strcat(App->SBC_Project->m_Project_Sub_Folder, App->SBC_Project->m_Project_Name);
252+ strcat(App->SBC_Project->m_Project_Sub_Folder, "_Prj");
243253
244254 SetDlgItemText(hDlg, IDC_STPROJECTNAME, (LPCTSTR)App->SBC_Project->m_Project_Name);
245- SetDlgItemText(hDlg, IDC_STPJFOLDERPATH, (LPCTSTR)App->SBC_Project->m_Project_Folder_Path);
255+ SetDlgItemText(hDlg, IDC_STPJFOLDERPATH, (LPCTSTR)App->SBC_Project->m_Project_Sub_Folder);
246256
247257 return TRUE;
248258 }
@@ -266,15 +276,12 @@
266276 if (LOWORD(wParam) == IDC_BTDESKTOP)
267277 {
268278
269- strcpy(App->SBC_Project->m_Project_Folder_Path, App->CL_Vm_FileIO->DeskTop_Folder);
270- strcat(App->SBC_Project->m_Project_Folder_Path, "\\");
271- strcat(App->SBC_Project->m_Project_Folder_Path, App->SBC_Project->m_Project_Name);
272- strcat(App->SBC_Project->m_Project_Folder_Path, "_Prj");
273-
274279 strcpy(App->SBC_Project->m_Project_Sub_Folder, App->CL_Vm_FileIO->DeskTop_Folder);
275280 strcat(App->SBC_Project->m_Project_Sub_Folder, "\\");
281+ strcat(App->SBC_Project->m_Project_Sub_Folder, App->SBC_Project->m_Project_Name);
282+ strcat(App->SBC_Project->m_Project_Sub_Folder, "_Prj");
276283
277- SetDlgItemText(hDlg, IDC_STPJFOLDERPATH, (LPCTSTR)App->SBC_Project->m_Project_Folder_Path);
284+ SetDlgItemText(hDlg, IDC_STPJFOLDERPATH, (LPCTSTR)App->SBC_Project->m_Project_Sub_Folder);
278285
279286 return TRUE;
280287 }
@@ -306,13 +313,13 @@
306313 {
307314
308315
309- if (_mkdir(m_Project_Folder_Path) == 0)
316+ if (_mkdir(m_Project_Sub_Folder) == 0)
310317 {
311- _chdir(m_Project_Folder_Path);
318+ _chdir(m_Project_Sub_Folder);
312319 }
313320 else
314321 {
315- _chdir(m_Project_Folder_Path);
322+ _chdir(m_Project_Sub_Folder);
316323 }
317324
318325 Save_Project_Ini();
@@ -352,7 +359,7 @@
352359 {
353360 m_Ini_Path_File_Name[0] = 0;
354361
355- strcpy(m_Ini_Path_File_Name, m_Project_Folder_Path);
362+ strcpy(m_Ini_Path_File_Name, m_Project_Sub_Folder);
356363 strcat(m_Ini_Path_File_Name, "\\");
357364 strcat(m_Ini_Path_File_Name, "Project.SBProj");
358365
@@ -374,7 +381,7 @@
374381 fprintf(WriteFile, "%s\n", "[Files]");
375382 fprintf(WriteFile, "%s%s\n", "Project_Name=", App->SBC_Project->m_Project_Name);
376383 fprintf(WriteFile, "%s%s\n", "Level_Name=", App->SBC_Project->m_Level_Name);
377- fprintf(WriteFile, "%s%s\n", "Folder_Path=", App->SBC_Project->m_Project_Folder_Path);
384+ fprintf(WriteFile, "%s%s\n", "Folder_Path=", App->SBC_Project->m_Project_Sub_Folder);
378385
379386 fprintf(WriteFile, "%s\n", " ");
380387
@@ -394,7 +401,7 @@
394401 // *************************************************************************
395402 bool SB_Project::Save_Level_Folder()
396403 {
397- strcpy(m_Level_Folder_Path, m_Project_Folder_Path);
404+ strcpy(m_Level_Folder_Path, m_Project_Sub_Folder);
398405 strcat(m_Level_Folder_Path, "\\");
399406 strcat(m_Level_Folder_Path, m_Level_Name);
400407
@@ -457,7 +464,7 @@
457464 if (!WriteFile)
458465 {
459466 App->Say("Cant Create File");
460- App->Say(File);
467+ App->Say_Win(File);
461468 return 0;
462469 }
463470
@@ -538,7 +545,7 @@
538545 if (!WriteFile)
539546 {
540547 App->Say("Cant Create File");
541- App->Say(File);
548+ App->Say_Win(File);
542549 return 0;
543550 }
544551
@@ -592,7 +599,7 @@
592599 void SB_Project::Set_Paths()
593600 {
594601 strcpy(m_Level_File_Name, App->CL_Vm_FileIO->Model_FileName);
595- strcpy(m_Project_Folder_Path, App->CL_Vm_FileIO->Model_Path_FileName);
602+ strcpy(m_Project_Sub_Folder, App->CL_Vm_FileIO->Model_Path_FileName);
596603 strcpy(m_Ini_Path_File_Name, App->CL_Vm_FileIO->Model_Path_FileName);
597604
598605 strcpy(m_Level_Folder_Path, App->CL_Vm_FileIO->Model_Path_FileName);
@@ -599,12 +606,10 @@
599606
600607 // Get path no file
601608 int len1 = strlen(m_Level_File_Name);
602- int len2 = strlen(m_Project_Folder_Path);
603- strcpy(m_Project_Sub_Folder, m_Project_Folder_Path);
609+ int len2 = strlen(m_Project_Sub_Folder);
610+ strcpy(m_Project_Sub_Folder, m_Project_Sub_Folder);
604611 m_Project_Sub_Folder[len2 - (len1+1)] = 0;
605612
606- strcpy(m_Project_Folder_Path, m_Project_Sub_Folder);
607-
608613 }
609614 // *************************************************************************
610615 // * Load_Project Terry Flanigan *
@@ -726,7 +731,7 @@
726731 char Mesh_FileName[MAX_PATH];
727732 char Resource_Location[MAX_PATH];
728733
729- strcpy(Area_Ini_Path, m_Project_Folder_Path);
734+ strcpy(Area_Ini_Path, m_Project_Sub_Folder);
730735 strcat(Area_Ini_Path, "\\");
731736
732737 strcat(Area_Ini_Path, m_Level_Name);
--- Anim19_OSDN/SB_Project.h (revision 758)
+++ Anim19_OSDN/SB_Project.h (revision 759)
@@ -53,10 +53,6 @@
5353
5454 char m_Ini_Path_File_Name[MAX_PATH];
5555
56- //------------------------------------------------ Good
57- char m_Project_Folder_Path[MAX_PATH]; // Project folder Location Full Path [10/08/22]
58-
59-
6056 string test;
6157
6258 bool Project_Loaded;
--- Anim19_OSDN/VM_ImGui.cpp (revision 758)
+++ Anim19_OSDN/VM_ImGui.cpp (revision 759)
@@ -1049,7 +1049,7 @@
10491049 char Header[255];
10501050 // ----------------------------- Project
10511051
1052- ImGui::Text("Project Folder Location: = %s", App->SBC_Project->m_Project_Folder_Path);
1052+ //ImGui::Text("Project Folder Location: = %s", App->SBC_Project->m_Project_Folder_Path);
10531053
10541054
10551055 ImGui::Spacing();
Show on old repository browser