• R/O
  • SSH
  • HTTPS

gd10: Commit


Commit MetaInfo

Revisão202 (tree)
Hora2019-09-02 01:47:48
Autorhgtterry

Mensagem de Log

Particles 010919

Mudança Sumário

Diff

--- Equity10/GD10_Objects_New.cpp (revision 201)
+++ Equity10/GD10_Objects_New.cpp (revision 202)
@@ -1116,11 +1116,11 @@
11161116 Object->OgreNode->attachObject(Object->OgreEntity);
11171117 Object->OgreNode->scale(1, 1, 1);*/
11181118
1119- SceneNode* myNode = static_cast<SceneNode*>(App->Cl_Ogre->mSceneMgr->getRootSceneNode()->createChild());
1119+ /*SceneNode* myNode = static_cast<SceneNode*>(App->Cl_Ogre->mSceneMgr->getRootSceneNode()->createChild());
11201120 BillboardSet* mySet = App->Cl_Ogre->mSceneMgr->createBillboardSet("mySet");
11211121 Billboard* myBillboard = mySet->createBillboard(Vector3(0, 0, 0));
11221122 myNode->attachObject(mySet);
1123- mySet->setMaterialName("SoundEntityMat_GD1", App->Cl_Ogre->PermResourceGroup);
1123+ mySet->setMaterialName("SoundEntityMat_GD1", App->Cl_Ogre->PermResourceGroup);*/
11241124
11251125
11261126 Object->Ogre_Particle = App->Cl_Ogre->mSceneMgr->createParticleSystem(ATest, "Examples/Smoke1");
--- Equity10/GD10_Properties.cpp (revision 201)
+++ Equity10/GD10_Properties.cpp (revision 202)
@@ -976,7 +976,61 @@
976976
977977 return 1;
978978 }
979+
979980 // *************************************************************************
981+// * Update_ListView_Particles Terry Bernie *
982+// *************************************************************************
983+bool GD10_Properties::Update_ListView_Particles()
984+{
985+ if (App->GDCL_Scene_Data->SceneLoaded == 0)
986+ {
987+ return 1;
988+ }
989+
990+ int index = App->CL10_Properties->Current_Selected_Object;
991+
992+ char chr_Speed[100];
993+ sprintf(chr_Speed, "%.3f", App->GDCL_Scene_Data->CL_Object[index]->Ogre_Particle->getSpeedFactor());
994+
995+ char chr_Scale[100];
996+ sprintf(chr_Scale, "%.3f", App->GDCL_Scene_Data->CL_Object[index]->Mesh_Scale.x);
997+
998+ const int NUM_ITEMS = 6;
999+ const int NUM_COLS = 2;
1000+ string grid[NUM_COLS][NUM_ITEMS]; // string table
1001+ LV_ITEM pitem;
1002+ memset(&pitem, 0, sizeof(LV_ITEM));
1003+ pitem.mask = LVIF_TEXT;
1004+
1005+ grid[0][0] = "Name", grid[1][0] = App->GDCL_Scene_Data->CL_Object[index]->Name;
1006+ grid[0][1] = " ", grid[1][1] = " ";
1007+ grid[0][2] = "Particle", grid[1][2] = " ";
1008+ grid[0][3] = " ", grid[1][3] = " ";
1009+ grid[0][4] = "Scale", grid[1][4] = chr_Scale;
1010+ grid[0][5] = "Speed", grid[1][5] = chr_Speed;
1011+
1012+
1013+ ListView_DeleteAllItems(Properties_hLV);
1014+
1015+ for (DWORD row = 0; row < NUM_ITEMS; row++)
1016+ {
1017+ pitem.iItem = row;
1018+ pitem.pszText = const_cast<char*>(grid[0][row].c_str());
1019+ ListView_InsertItem(Properties_hLV, &pitem);
1020+
1021+ //ListView_SetItemText
1022+
1023+ for (DWORD col = 1; col < NUM_COLS; col++)
1024+ {
1025+ ListView_SetItemText(Properties_hLV, row, col,
1026+ const_cast<char*>(grid[col][row].c_str()));
1027+ }
1028+ }
1029+
1030+ return 1;
1031+}
1032+
1033+// *************************************************************************
9801034 // * Update_ListView_Mesages Terry Bernie *
9811035 // *************************************************************************
9821036 bool GD10_Properties::Update_ListView_Messages()
--- Equity10/GD10_Properties.h (revision 201)
+++ Equity10/GD10_Properties.h (revision 202)
@@ -42,6 +42,7 @@
4242 bool Update_ListView_Player();
4343 bool Update_ListView_Teleport();
4444 bool Update_ListView_Environment();
45+ bool Update_ListView_Particles();
4546
4647 bool Edit_Player_Onclick(LPARAM lParam);
4748 bool Edit_Player_Physics_Onclick(LPARAM lParam);
--- Equity10/GD_FileView.cpp (revision 201)
+++ Equity10/GD_FileView.cpp (revision 202)
@@ -718,27 +718,27 @@
718718 HideRightPanes();
719719 ShowWindow(App->GD_Properties_Hwnd, 1);
720720
721- //App->CL10_Properties->Enable_Delete_Button(1);
721+ App->CL10_Properties->Enable_Delete_Button(1);
722722
723- //App->GDCL_Object_Props->Is_Player = 0; // Mark as Object selected
723+ App->GDCL_Object_Props->Is_Player = 0; // Mark as Object selected
724724
725725 App->GDCL_Object_Props->Selected_Object_Index = Index;
726726 App->GDCL_Visuals->MarkerBB_Addjust(Index);
727727
728728
729- //App->CL10_Properties->Edit_Category = Enums::Edit_Environment;
729+ App->CL10_Properties->Edit_Category = Enums::Edit_Particles;
730730 App->CL10_Properties->Current_Selected_Object = Index;
731731
732732 App->CL10_Properties->Update_Transform_Dlg();
733733
734- //if (App->CL10_Properties->Edit_Physics == 0)
735- //{
736- // App->CL10_Properties->Update_ListView_Environment();
737- //}
738- //else
739- //{
740- // App->CL10_Properties->Update_ListView_Physics();
741- //}
734+ if (App->CL10_Properties->Edit_Physics == 0)
735+ {
736+ App->CL10_Properties->Update_ListView_Particles();
737+ }
738+ else
739+ {
740+ App->CL10_Properties->Update_ListView_Physics();
741+ }
742742
743743 return;
744744 }
--- Equity10/VersionNo2.h (revision 201)
+++ Equity10/VersionNo2.h (revision 202)
@@ -39,21 +39,21 @@
3939 #ifndef _VERSIONNO__H_
4040 #define _VERSIONNO__H_
4141
42-#define VERSION_FULL 1.25.242.63
42+#define VERSION_FULL 1.25.243.69
4343
4444 #define VERSION_BASEYEAR 2019
45-#define VERSION_DATE "2019-08-31"
46-#define VERSION_TIME "23:08:43"
45+#define VERSION_DATE "2019-09-01"
46+#define VERSION_TIME "17:47:18"
4747
4848 #define VERSION_MAJOR 1
4949 #define VERSION_MINOR 25
50-#define VERSION_BUILDNO 242
51-#define VERSION_EXTEND 63
50+#define VERSION_BUILDNO 243
51+#define VERSION_EXTEND 69
5252
53-#define VERSION_FILE 1,25,242,63
54-#define VERSION_PRODUCT 1,25,242,70
55-#define VERSION_FILESTR "1,25,242,63\0"
56-#define VERSION_PRODUCTSTR "1,25,242,70\0"
53+#define VERSION_FILE 1,25,243,69
54+#define VERSION_PRODUCT 1,25,243,76
55+#define VERSION_FILESTR "1,25,243,69\0"
56+#define VERSION_PRODUCTSTR "1,25,243,76\0"
5757 #define VERSION_EVERSION "0.3.4.0\0"
5858
5959 #endif
\ No newline at end of file
--- Equity10/stdafx.h (revision 201)
+++ Equity10/stdafx.h (revision 202)
@@ -110,8 +110,8 @@
110110 Edit_Teleport = 8,
111111 Edit_Environment = 9,
112112 Edit_Area_Change = 10,
113- Edit_Change_Level = 11
114-
113+ Edit_Change_Level = 11,
114+ Edit_Particles = 12
115115 };
116116
117117 enum Usage
Show on old repository browser