OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

vima19: Commit


Commit MetaInfo

Revision733 (tree)
Time2022-08-02 01:36:33
Authorhgtterry

Log Message

Equity_SB 010822 Project (WIP)

Change Summary

Incremental Difference

--- Anim19_OSDN/SB_Dialogs.cpp (revision 732)
+++ Anim19_OSDN/SB_Dialogs.cpp (revision 733)
@@ -228,10 +228,10 @@
228228 //char buf[255];
229229
230230 //sprintf(buf, "%s", "App Info");
231- SendDlgItemMessage(hDlg, IDC_LISTGROUP, LB_ADDSTRING, (WPARAM)0, (LPARAM)App->SBC_Project->Project_Path);
231+ SendDlgItemMessage(hDlg, IDC_LISTGROUP, LB_ADDSTRING, (WPARAM)0, (LPARAM)App->SBC_Project->m_Project_Sub_Folder);
232232
233233 //sprintf(buf, "%s", " ");
234- SendDlgItemMessage(hDlg, IDC_LISTGROUP, LB_ADDSTRING, (WPARAM)0, (LPARAM)App->SBC_Project->Level_File_Name);
234+ SendDlgItemMessage(hDlg, IDC_LISTGROUP, LB_ADDSTRING, (WPARAM)0, (LPARAM)App->SBC_Project->m_Project_Full_Path);
235235
236236 /*sprintf(buf, "%s", " ");
237237 SendDlgItemMessage(hDlg, IDC_LISTGROUP, LB_ADDSTRING, (WPARAM)0, (LPARAM)buf);
--- Anim19_OSDN/SB_Project.cpp (revision 732)
+++ Anim19_OSDN/SB_Project.cpp (revision 733)
@@ -29,9 +29,9 @@
2929
3030 SB_Project::SB_Project()
3131 {
32- strcpy(Project_Path,App->EquityDirecory_FullPath);
33- strcat(Project_Path, "\\");
34- strcat(Project_Path, "Projects\\");
32+ strcpy(m_Project_Sub_Folder,App->EquityDirecory_FullPath);
33+ strcat(m_Project_Sub_Folder, "\\");
34+ strcat(m_Project_Sub_Folder, "Projects\\");
3535
3636 strcpy(m_Project_Full_Path, App->EquityDirecory_FullPath);
3737 strcat(m_Project_Full_Path, "\\");
@@ -47,7 +47,6 @@
4747 m_Players_Folder_Path[0] = 0;
4848
4949 Project_Ini_FilePath[0] = 0;
50- Level_Folder_Path[0] = 0;
5150 Level_Folder_Path_World[0] = 0;
5251
5352 strcpy(Level_File_Name, "No Level");
@@ -211,7 +210,7 @@
211210 strcat(App->SBC_Project->m_Project_Full_Path, App->SBC_Project->m_Project_Name);
212211 strcat(App->SBC_Project->m_Project_Full_Path, "_Prj");
213212
214- strcpy(App->SBC_Project->Project_Path, App->Com_CDialogs->szSelectedDir);
213+ strcpy(App->SBC_Project->m_Project_Sub_Folder, App->Com_CDialogs->szSelectedDir);
215214
216215 SetDlgItemText(hDlg, IDC_STPJFOLDERPATH, (LPCTSTR)App->SBC_Project->m_Project_Full_Path);
217216
@@ -227,7 +226,7 @@
227226
228227 strcpy(App->SBC_Project->m_Project_Name,App->SBC_Dialogs->Chr_Text);
229228
230- strcpy(App->SBC_Project->m_Project_Full_Path, App->SBC_Project->Project_Path);
229+ strcpy(App->SBC_Project->m_Project_Full_Path, App->SBC_Project->m_Project_Sub_Folder);
231230 strcat(App->SBC_Project->m_Project_Full_Path, App->SBC_Project->m_Project_Name);
232231 strcat(App->SBC_Project->m_Project_Full_Path, "_Prj");
233232
@@ -261,8 +260,8 @@
261260 strcat(App->SBC_Project->m_Project_Full_Path, App->SBC_Project->m_Project_Name);
262261 strcat(App->SBC_Project->m_Project_Full_Path, "_Prj");
263262
264- strcpy(App->SBC_Project->Project_Path, App->CL_Vm_FileIO->DeskTop_Folder);
265- strcat(App->SBC_Project->Project_Path, "\\");
263+ strcpy(App->SBC_Project->m_Project_Sub_Folder, App->CL_Vm_FileIO->DeskTop_Folder);
264+ strcat(App->SBC_Project->m_Project_Sub_Folder, "\\");
266265
267266 SetDlgItemText(hDlg, IDC_STPJFOLDERPATH, (LPCTSTR)App->SBC_Project->m_Project_Full_Path);
268267
@@ -365,9 +364,9 @@
365364 strcat(Project_Ini_FilePath, "\\");
366365 strcat(Project_Ini_FilePath, "Project.eif");
367366
368- strcpy(Level_Folder_Path, App->SBC_Project->m_Project_Full_Path);
369- strcat(Level_Folder_Path, "\\");
370- strcat(Level_Folder_Path, "Level_1");
367+ strcpy(m_Project_Sub_Folder, App->SBC_Project->m_Project_Full_Path);
368+ strcat(m_Project_Sub_Folder, "\\");
369+ strcat(m_Project_Sub_Folder, "Level_1");
371370 return 1;
372371 }
373372
@@ -412,14 +411,14 @@
412411 {
413412 Level_Folder_Path_World[0] = 0;
414413
415- strcpy(Level_Folder_Path_World, Level_Folder_Path);
414+ strcpy(Level_Folder_Path_World, m_Project_Sub_Folder);
416415 strcat(Level_Folder_Path_World, "\\");
417416 strcat(Level_Folder_Path_World, "World1");
418417
419418 // First Level Folder
420- if (_mkdir(Level_Folder_Path) == 0)
419+ if (_mkdir(m_Project_Sub_Folder) == 0)
421420 {
422- _chdir(Level_Folder_Path);
421+ _chdir(m_Project_Sub_Folder);
423422
424423 }
425424 else
@@ -431,7 +430,7 @@
431430 // First world Folder
432431 if (_mkdir(Level_Folder_Path_World) == 0)
433432 {
434- _chdir(Level_Folder_Path);
433+ _chdir(m_Project_Sub_Folder);
435434
436435 }
437436 else
@@ -450,7 +449,7 @@
450449 {
451450 char File[1024];
452451
453- strcpy(File, Level_Folder_Path);
452+ strcpy(File, m_Project_Sub_Folder);
454453 strcat(File, "\\");
455454 strcat(File, "Objects.obf");
456455
@@ -488,7 +487,7 @@
488487 Ogre::Vector3 Pos;
489488 char File[1024];
490489
491- strcpy(File, Level_Folder_Path);
490+ strcpy(File, m_Project_Sub_Folder);
492491 strcat(File, "\\");
493492 strcat(File, "Player1.ply");
494493
@@ -554,7 +553,7 @@
554553 {
555554 char File[1024];
556555
557- strcpy(File, Level_Folder_Path);
556+ strcpy(File, m_Project_Sub_Folder);
558557 strcat(File, "\\");
559558 strcat(File, "Camera1.cam");
560559
@@ -596,7 +595,7 @@
596595
597596 WriteFile = NULL;
598597
599- strcpy(File, Level_Folder_Path);
598+ strcpy(File, m_Project_Sub_Folder);
600599 strcat(File, "\\");
601600 strcat(File, "Level.SBLevel");
602601
@@ -732,8 +731,8 @@
732731 // Get path no file
733732 int len1 = strlen(Level_File_Name);
734733 int len2 = strlen(Level_Path_File_Name);
735- strcpy(Level_Folder_Path, Level_Path_File_Name);
736- Level_Folder_Path[len2 - len1] = 0;
734+ strcpy(m_Project_Sub_Folder, Level_Path_File_Name);
735+ m_Project_Sub_Folder[len2 - len1] = 0;
737736
738737 // -------------------------------------------------------------------
739738
@@ -803,7 +802,7 @@
803802
804803 // -------------------------------------------------------------------
805804 char Path[1024];
806- strcpy(Path, Level_Folder_Path);
805+ strcpy(Path, m_Project_Sub_Folder);
807806 strcat(Path, "Player1.ply");
808807
809808 // -------------------------------------------------------------------
@@ -883,7 +882,7 @@
883882
884883 // -------------------------------------------------------------------
885884 char Path[1024];
886- strcpy(Path, Level_Folder_Path);
885+ strcpy(Path, m_Project_Sub_Folder);
887886 strcat(Path, "Camera1.cam");
888887
889888 // -------------------------------------------------------------------
@@ -1217,8 +1216,8 @@
12171216 // Get path no file
12181217 int len1 = strlen(Level_File_Name);
12191218 int len2 = strlen(Level_Path_File_Name);
1220- strcpy(Level_Folder_Path, Level_Path_File_Name);
1221- Level_Folder_Path[len2 - len1] = 0;
1219+ strcpy(m_Project_Sub_Folder, Level_Path_File_Name);
1220+ m_Project_Sub_Folder[len2 - len1] = 0;
12221221
12231222 // -------------------------------------------------------------------
12241223 Load_Options* Options = new Load_Options;
@@ -1329,7 +1328,7 @@
13291328 char Mesh_FileName[MAX_PATH];
13301329 char Resource_Location[MAX_PATH];
13311330
1332- strcpy(Area_Ini_Path, Level_Folder_Path);
1331+ strcpy(Area_Ini_Path, m_Project_Sub_Folder);
13331332
13341333 strcat(Area_Ini_Path, m_Level_Name);
13351334 strcat(Area_Ini_Path, "\\");
--- Anim19_OSDN/SB_Project.h (revision 732)
+++ Anim19_OSDN/SB_Project.h (revision 733)
@@ -65,6 +65,7 @@
6565
6666 char m_Ini_Path_File_Name[MAX_PATH];
6767
68+ char m_Project_Sub_Folder[MAX_PATH]; // Curent Default Project Location not including project folder
6869 //------------------------------------------------
6970
7071 bool Load_Scene_Auto();
@@ -75,8 +76,6 @@
7576 bool Write_Camera();
7677 bool Write_Objects();
7778
78- char Project_Path[1024];
79-
8079 char Project_Ini_FilePath[1024];
8180
8281 char Level_Folder_Path_World[1024];
@@ -85,7 +84,7 @@
8584 // ---------------------------------------------------------------------------
8685 char Level_File_Name[MAX_PATH]; // Level File Name ( 211121 )
8786 char Level_Path_File_Name[MAX_PATH]; // Level Path and File Name ( 211121 )
88- char Level_Folder_Path[MAX_PATH]; // Level Just Path
87+ //char Level_Folder_Path[MAX_PATH]; // Level Just Path
8988
9089 bool Project_Loaded;
9190
--- Anim19_OSDN/VM_ImGui.cpp (revision 732)
+++ Anim19_OSDN/VM_ImGui.cpp (revision 733)
@@ -1031,7 +1031,7 @@
10311031
10321032 ImGui::Text("Level Name: = %s", App->SBC_Project->Level_File_Name);
10331033 ImGui::Text("Level File Name: = %s", App->SBC_Project->Level_File_Name);
1034- ImGui::Text("Level Path: = %s", App->SBC_Project->Level_Folder_Path);
1034+ ImGui::Text("Level Path: = %s", App->SBC_Project->m_Project_Sub_Folder);
10351035
10361036 ImGui::Spacing();
10371037
Show on old repository browser