• R/O
  • SSH
  • HTTPS

gd10: Commit


Commit MetaInfo

Revisão107 (tree)
Hora2019-08-09 01:26:07
Autorhgtterry

Mensagem de Log

Environment Entity 080819

Mudança Sumário

Diff

--- Equity10/GD10_Objects_New.cpp (revision 106)
+++ Equity10/GD10_Objects_New.cpp (revision 107)
@@ -808,7 +808,7 @@
808808 char ATest[256];
809809 char Name[256];
810810
811- strcpy_s(Name, "Teleport_");
811+ strcpy_s(Name, "Env_");
812812 itoa(Index, ConNum, 10);
813813 strcat(Name, ConNum);
814814
--- Equity10/GD10_Properties.cpp (revision 106)
+++ Equity10/GD10_Properties.cpp (revision 107)
@@ -863,6 +863,61 @@
863863 }
864864
865865 // *************************************************************************
866+// * Update_ListView_Environment Terry Bernie *
867+// *************************************************************************
868+bool GD10_Properties::Update_ListView_Environment()
869+{
870+ if (App->GDCL_Scene_Data->SceneLoaded == 0)
871+ {
872+ return 1;
873+ }
874+
875+ int index = App->CL10_Properties->Current_Selected_Object;
876+
877+ char buff[255];
878+ strcpy(buff, App->GDCL_Scene_Data->CL_Object[index]->Name);
879+ strcat(buff, " (Environment)");
880+ SetDlgItemText(App->CL10_Properties->Properties_Dlg_hWnd, IDC_STOBJECTNAME, (LPCTSTR)buff);
881+
882+ char chr_Volume[100];
883+ sprintf(chr_Volume, "%.3f", App->GDCL_Scene_Data->CL_Object[index]->S_Sounds[0]->Volume * 100);
884+
885+ const int NUM_ITEMS = 1;
886+ const int NUM_COLS = 2;
887+ string grid[NUM_COLS][NUM_ITEMS]; // string table
888+ LV_ITEM pitem;
889+ memset(&pitem, 0, sizeof(LV_ITEM));
890+ pitem.mask = LVIF_TEXT;
891+
892+ grid[0][0] = "Name", grid[1][0] = App->GDCL_Scene_Data->CL_Object[index]->Name;
893+ /*grid[0][1] = "Mesh File", grid[1][1] = App->GDCL_Scene_Data->CL_Object[index]->MeshName;
894+ grid[0][2] = " ", grid[1][2] = " ";
895+ grid[0][3] = "Goto", grid[1][3] = App->GDCL_Scene_Data->CL_Object[index]->S_Teleport[0]->Name;
896+ grid[0][4] = " ", grid[1][4] = " ";
897+ grid[0][5] = "Sound", grid[1][5] = App->GDCL_Scene_Data->CL_Object[index]->S_Sounds[0]->SoundFile;
898+ grid[0][6] = "Volume", grid[1][6] = chr_Volume;*/
899+
900+
901+ ListView_DeleteAllItems(Properties_hLV);
902+
903+ for (DWORD row = 0; row < NUM_ITEMS; row++)
904+ {
905+ pitem.iItem = row;
906+ pitem.pszText = const_cast<char*>(grid[0][row].c_str());
907+ ListView_InsertItem(Properties_hLV, &pitem);
908+
909+ //ListView_SetItemText
910+
911+ for (DWORD col = 1; col < NUM_COLS; col++)
912+ {
913+ ListView_SetItemText(Properties_hLV, row, col,
914+ const_cast<char*>(grid[col][row].c_str()));
915+ }
916+ }
917+
918+ return 1;
919+}
920+// *************************************************************************
866921 // * Update_ListView_Mesages Terry Bernie *
867922 // *************************************************************************
868923 bool GD10_Properties::Update_ListView_Messages()
--- Equity10/GD10_Properties.h (revision 106)
+++ Equity10/GD10_Properties.h (revision 107)
@@ -41,6 +41,7 @@
4141 bool Update_ListView_Player_Physics();
4242 bool Update_ListView_Player();
4343 bool Update_ListView_Teleport();
44+ bool Update_ListView_Environment();
4445
4546 bool Edit_Player_Onclick(LPARAM lParam);
4647 bool Edit_Player_Physics_Onclick(LPARAM lParam);
--- Equity10/GD_FileView.cpp (revision 106)
+++ Equity10/GD_FileView.cpp (revision 107)
@@ -777,35 +777,17 @@
777777 App->CL10_Properties->Edit_Category = Enums::Edit_Environment;
778778 App->CL10_Properties->Current_Selected_Object = Index;
779779
780- //App->CL10_Properties->Update_Transform_Dlg();
780+ App->CL10_Properties->Update_Transform_Dlg();
781781
782- //if (App->CL10_Properties->Edit_Physics == 0)
783- //{
784- // App->CL10_Properties->Update_ListView_Teleport();
785- //}
786- //else
787- //{
788- // App->CL10_Properties->Update_ListView_Physics();
789- //}
782+ if (App->CL10_Properties->Edit_Physics == 0)
783+ {
784+ App->CL10_Properties->Update_ListView_Environment();
785+ }
786+ else
787+ {
788+ App->CL10_Properties->Update_ListView_Physics();
789+ }
790790
791- //if (App->GDCL_Object_Props->Edit_Type == Enums::Edit_Player)
792- //{
793- // App->GDCL_Object_Props->Edit_Type = Enums::Edit_Mesh_Object;
794- // App->GDCL_Object_Props->Update_Properties_Mesh();
795- // return;
796- //}
797-
798- //if (App->GDCL_Object_Props->Edit_Type == Enums::Edit_Mesh_Object)
799- //{
800- // App->GDCL_Object_Props->Update_Properties_Mesh();
801- // return;
802- //}
803-
804- //if (App->GDCL_Object_Props->Edit_Type == Enums::Edit_Physics_Object)
805- //{
806- // App->GDCL_Object_Props->Update_Properties_Physics();
807- // return;
808- //}
809791 return;
810792 }
811793
--- Equity10/VersionNo2.h (revision 106)
+++ Equity10/VersionNo2.h (revision 107)
@@ -39,21 +39,21 @@
3939 #ifndef _VERSIONNO__H_
4040 #define _VERSIONNO__H_
4141
42-#define VERSION_FULL 1.20.219.37
42+#define VERSION_FULL 1.20.219.44
4343
4444 #define VERSION_BASEYEAR 2019
4545 #define VERSION_DATE "2019-08-08"
46-#define VERSION_TIME "17:11:44"
46+#define VERSION_TIME "17:25:21"
4747
4848 #define VERSION_MAJOR 1
4949 #define VERSION_MINOR 20
5050 #define VERSION_BUILDNO 219
51-#define VERSION_EXTEND 37
51+#define VERSION_EXTEND 44
5252
53-#define VERSION_FILE 1,20,219,37
54-#define VERSION_PRODUCT 1,20,219,44
55-#define VERSION_FILESTR "1,20,219,37\0"
56-#define VERSION_PRODUCTSTR "1,20,219,44\0"
53+#define VERSION_FILE 1,20,219,44
54+#define VERSION_PRODUCT 1,20,219,51
55+#define VERSION_FILESTR "1,20,219,44\0"
56+#define VERSION_PRODUCTSTR "1,20,219,51\0"
5757 #define VERSION_EVERSION "0.3.4.0\0"
5858
5959 #endif
\ No newline at end of file
Show on old repository browser