OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es
  • R/O
  • SSH
  • HTTPS

vima19: Commit


Commit MetaInfo

Revisión940 (tree)
Tiempo2022-09-30 00:09:15
Autorhgtterry

Log Message

Equity_SB 290922 FileView

Cambiar Resumen

Diferencia incremental

--- Anim19_OSDN/GD19_LookUps.cpp (revision 939)
+++ Anim19_OSDN/GD19_LookUps.cpp (revision 940)
@@ -248,7 +248,7 @@
248248 strcpy(strcat2, "Edit_None");
249249 return strcat2;
250250 }
251- if (App->SBC_Properties->Edit_Category == Enums::Edit_Mesh_Object)
251+ if (App->SBC_Properties->Edit_Category == Enums::FV_Edit_Object)
252252 {
253253 strcpy(strcat2, "Edit_Mesh_Object");
254254 return strcat2;
--- Anim19_OSDN/GD19_OSDN.cpp (revision 939)
+++ Anim19_OSDN/GD19_OSDN.cpp (revision 940)
@@ -87,9 +87,9 @@
8787 // SetMenuItemBitmaps(App->mMenu, ID_WINDOWS_FILEVIEW, MF_BYCOMMAND, 0, hBitMap);
8888
8989 App->SBC_FileView->Start_FileView();
90-
9190 App->Cl_Panels->Resize_FileView();
9291
92+
9393 App->SetMainWinCentre();
9494
9595 App->SBC_FileView->Init_FileView();
@@ -129,6 +129,7 @@
129129 App->Cl_Vm_Preferences->Read_Preferences(); // Read Preferences
130130
131131 App->Set_Main_TitleBar(" ");
132+ App->SBC_FileView->SelectItem(App->SBC_FileView->GD_LevelFolder);
132133
133134 SetTimer(App->MainHwnd, 1, 1, NULL);
134135
--- Anim19_OSDN/GD19_Object_Properties.cpp (revision 939)
+++ Anim19_OSDN/GD19_Object_Properties.cpp (revision 940)
@@ -49,7 +49,7 @@
4949 SendDlgItemMessage(hDlg,IDC_STOBJECTNAME, WM_SETFONT, (WPARAM)App->Font_CB15, MAKELPARAM(TRUE, 0));
5050 ///SendDlgItemMessage(hDlg,IDC_STTRANSFORM, WM_SETFONT, (WPARAM)App->Font_Arial20, MAKELPARAM(TRUE, 0));
5151
52- App->Cl_Object_Props->Edit_Type = Enums::Edit_Mesh_Object;
52+ App->Cl_Object_Props->Edit_Type = Enums::FV_Edit_Object;
5353 }
5454
5555 case WM_CTLCOLORSTATIC:
--- Anim19_OSDN/SB_Camera.cpp (revision 939)
+++ Anim19_OSDN/SB_Camera.cpp (revision 940)
@@ -151,9 +151,9 @@
151151
152152 App->Cl19_Ogre->mCamera->setPosition(Ogre::Vector3(0, 90, 100));
153153
154- //App->Cl19_Ogre->mCamera->lookAt(Ogre::Vector3(0, 90, 0));
154+ App->Cl19_Ogre->mCamera->lookAt(Ogre::Vector3(0, 30, 0));
155155
156- Ogre::Quaternion Test;
156+ /*Ogre::Quaternion Test;
157157 Test.IDENTITY;
158158
159159 App->Cl19_Ogre->mCamera->setOrientation(Test);
@@ -161,7 +161,7 @@
161161 App->Cl19_Ogre->mCamera->pitch(Radian(Ogre::Degree(-30)));
162162
163163 App->Cl19_Ogre->mCamera->yaw(Radian(Ogre::Degree(-101.260)));
164- App->Cl19_Ogre->mCamera->roll(Ogre::Degree(0));
164+ App->Cl19_Ogre->mCamera->roll(Ogre::Degree(0));*/
165165
166166 //App->Cl19_Ogre->mCamera->lookAt(Ogre::Vector3(0, 30, 0));
167167 }
--- Anim19_OSDN/SB_FileView.cpp (revision 939)
+++ Anim19_OSDN/SB_FileView.cpp (revision 940)
@@ -541,10 +541,12 @@
541541
542542 //--------------------------------------------------------------------------
543543
544- if (!strcmp(FileView_Folder, App->SBC_Project->m_Level_Name)) // Folder
544+ if (!strcmp(FileView_Folder, App->SBC_Project->m_Level_Name)) // Level Folder
545545 {
546546 HideRightPanes();
547547 ShowWindow(App->GD_Properties_Hwnd, 1);
548+
549+ App->SBC_Properties->Edit_Category = Enums::FV_Edit_Level;
548550 App->SBC_Properties->Update_ListView_Level();
549551 }
550552
@@ -611,9 +613,9 @@
611613
612614 App->Cl_Object_Props->Is_Player = 0; // Mark as Object selected
613615
614- App->Cl_Object_Props->Edit_Type = Enums::Edit_Mesh_Object;
616+ App->Cl_Object_Props->Edit_Type = Enums::FV_Edit_Object;
615617
616- App->SBC_Properties->Edit_Category = Enums::Edit_Mesh_Object;
618+ App->SBC_Properties->Edit_Category = Enums::FV_Edit_Object;
617619 App->SBC_Properties->Current_Selected_Object = Index;
618620 // App->SBC_Properties->Update_Transform_Dlg();
619621 App->SBC_Object->Update_Types();
@@ -853,12 +855,12 @@
853855
854856 if (App->Cl_Object_Props->Edit_Type == Enums::Edit_Player)
855857 {
856- App->Cl_Object_Props->Edit_Type = Enums::Edit_Mesh_Object;
858+ App->Cl_Object_Props->Edit_Type = Enums::FV_Edit_Object;
857859 App->Cl_Object_Props->Update_Properties_Mesh();
858860 return;
859861 }
860862
861- if (App->Cl_Object_Props->Edit_Type == Enums::Edit_Mesh_Object)
863+ if (App->Cl_Object_Props->Edit_Type == Enums::FV_Edit_Object)
862864 {
863865 App->Cl_Object_Props->Update_Properties_Mesh();
864866 return;
@@ -922,12 +924,12 @@
922924
923925 if (App->Cl_Object_Props->Edit_Type == Enums::Edit_Player)
924926 {
925- App->Cl_Object_Props->Edit_Type = Enums::Edit_Mesh_Object;
927+ App->Cl_Object_Props->Edit_Type = Enums::FV_Edit_Object;
926928 App->Cl_Object_Props->Update_Properties_Mesh();
927929 return;
928930 }
929931
930- if (App->Cl_Object_Props->Edit_Type == Enums::Edit_Mesh_Object)
932+ if (App->Cl_Object_Props->Edit_Type == Enums::FV_Edit_Object)
931933 {
932934 App->Cl_Object_Props->Update_Properties_Mesh();
933935 return;
--- Anim19_OSDN/SB_Project.cpp (revision 939)
+++ Anim19_OSDN/SB_Project.cpp (revision 940)
@@ -955,7 +955,6 @@
955955 }
956956
957957
958-
959958 App->Cl19_Ogre->OgreListener->GD_CameraMode = Enums::CamDetached;
960959
961960 App->SBC_FileView->Change_Level_Name();
@@ -970,6 +969,9 @@
970969
971970 App->Set_Main_TitleBar(App->SBC_FileIO->Project_Path_File_Name);
972971 App->SBC_FileIO->RecentFileHistory_Update();
972+
973+ App->SBC_FileView->SelectItem(App->SBC_FileView->GD_LevelFolder);
974+
973975 return 1;
974976 }
975977
--- Anim19_OSDN/SB_Properties.cpp (revision 939)
+++ Anim19_OSDN/SB_Properties.cpp (revision 940)
@@ -37,7 +37,7 @@
3737
3838 btext[0] = 0;
3939
40- Edit_Category = Enums::Edit_Mesh_Object;
40+ Edit_Category = Enums::FV_Edit_Object;
4141 Edit_Physics = 0;
4242
4343 Is_Player = 0;
@@ -95,7 +95,7 @@
9595 SendDlgItemMessage(hDlg, IDC_BTPHYSICS, WM_SETFONT, (WPARAM)App->Font_CB15, MAKELPARAM(TRUE, 0));
9696
9797
98- App->Cl_Object_Props->Edit_Type = Enums::Edit_Mesh_Object;
98+ App->Cl_Object_Props->Edit_Type = Enums::FV_Edit_Object;
9999
100100 return 1;
101101 }
@@ -310,7 +310,7 @@
310310 }
311311
312312 // Objects
313- if (Edit_Category == Enums::Edit_Mesh_Object)
313+ if (Edit_Category == Enums::FV_Edit_Object)
314314 {
315315 if (Edit_Physics == 0)
316316 {
@@ -715,10 +715,10 @@
715715 // *************************************************************************
716716 bool SB_Properties::Update_ListView_Level()
717717 {
718- if (App->SBC_Scene->Scene_Loaded == 0)
718+ /*if (App->SBC_Scene->Scene_Loaded == 0)
719719 {
720720 return 1;
721- }
721+ }*/
722722
723723 char buff[255];
724724 strcpy(buff, App->SBC_Project->m_Level_Name);
--- Anim19_OSDN/SB_Scene.cpp (revision 939)
+++ Anim19_OSDN/SB_Scene.cpp (revision 940)
@@ -150,6 +150,9 @@
150150 App->SBC_Camera->Reset_View();
151151
152152 Delete_Resources_Group();
153+
154+ App->SBC_FileView->SelectItem(App->SBC_FileView->GD_LevelFolder);
155+
153156 return 1;
154157 }
155158
--- Anim19_OSDN/stdafx.h (revision 939)
+++ Anim19_OSDN/stdafx.h (revision 940)
@@ -99,7 +99,7 @@
9999 enum Edit_Type
100100 {
101101 Edit_None = 0,
102- Edit_Mesh_Object = 1,
102+ FV_Edit_Object = 1,
103103 Edit_Physics_Object = 2,
104104 Edit_Player = 3,
105105 Edit_Message = 4,
@@ -112,7 +112,8 @@
112112 Edit_Change_Level = 11,
113113 Edit_Particles = 12,
114114 Edit_Camera = 13,
115- Edit_Area = 14
115+ Edit_Area = 14,
116+ FV_Edit_Level = 15
116117 };
117118
118119 enum Usage
Show on old repository browser