• R/O
  • SSH
  • HTTPS

gd10: Commit


Commit MetaInfo

Revisão203 (tree)
Hora2019-09-02 02:20:27
Autorhgtterry

Mensagem de Log

Particles 010919

Mudança Sumário

Diff

--- Equity10/GD10_Objects_New.cpp (revision 202)
+++ Equity10/GD10_Objects_New.cpp (revision 203)
@@ -1124,9 +1124,11 @@
11241124
11251125
11261126 Object->Ogre_Particle = App->Cl_Ogre->mSceneMgr->createParticleSystem(ATest, "Examples/Smoke1");
1127+ Object->Ogre_Particle->setKeepParticlesInLocalSpace(true);
1128+
11271129 Object->OgreNode = App->Cl_Ogre->mSceneMgr->getRootSceneNode()->createChildSceneNode();
11281130 Object->OgreNode->attachObject(Object->Ogre_Particle);
1129- Object->OgreNode->scale(0.03, 0.03, 0.03);
1131+ Object->OgreNode->scale(1,1,1);
11301132 //Object->OgreNode->setVisible(true);
11311133
11321134 Ogre::Vector3 Pos = Object->GetPlacement();
--- Equity10/GD10_Properties.cpp (revision 202)
+++ Equity10/GD10_Properties.cpp (revision 203)
@@ -1555,6 +1555,21 @@
15551555 return;
15561556 }
15571557
1558+ // Collectables
1559+ if (App->CL10_Properties->Edit_Category == Enums::Edit_Particles)
1560+ {
1561+ if (Edit_Physics == 0)
1562+ {
1563+ Edit_Particles_OnClick(lParam);
1564+ }
1565+ else
1566+ {
1567+ ListView_Object_Physics_OnClick(lParam);
1568+ }
1569+
1570+ return;
1571+ }
1572+
15581573 return;
15591574 }
15601575
@@ -2169,7 +2184,7 @@
21692184 }
21702185
21712186 // *************************************************************************
2172-// * Edit_Collectables_OnClick Terry Bernie *
2187+// * Edit_Collectables_OnClick Terry Bernie *
21732188 // *************************************************************************
21742189 bool GD10_Properties::Edit_Collectables_OnClick(LPARAM lParam)
21752190 {
@@ -2205,6 +2220,87 @@
22052220 }
22062221
22072222 // *************************************************************************
2223+// * Edit_Particles_OnClick Terry Bernie *
2224+// *************************************************************************
2225+bool GD10_Properties::Edit_Particles_OnClick(LPARAM lParam)
2226+{
2227+ int Index = App->CL10_Properties->Current_Selected_Object; // Get Selected Object Index
2228+ int result = 1;
2229+ int test;
2230+
2231+ LPNMLISTVIEW poo = (LPNMLISTVIEW)lParam;
2232+ test = poo->iItem;
2233+ ListView_GetItemText(Properties_hLV, test, 0, btext, 20);
2234+
2235+ result = strcmp(btext, "Name");
2236+ if (result == 0)
2237+ {
2238+ strcpy(App->GDCL_Dialogs->btext, "Change Object Name");
2239+ strcpy(App->GDCL_Dialogs->Chr_Text, App->GDCL_Scene_Data->CL_Object[Index]->Name);
2240+
2241+ App->GDCL_Dialogs->Dialog_Text(Enums::Check_Names_Objects);
2242+
2243+ if (App->GDCL_Dialogs->Canceled == 1)
2244+ {
2245+ return TRUE;
2246+ }
2247+
2248+ strcpy(App->GDCL_Scene_Data->CL_Object[Index]->Name, App->GDCL_Dialogs->Chr_Text);
2249+
2250+ App->CL_FileView->ChangeItem_Name(NULL, App->GDCL_Dialogs->Chr_Text);
2251+ Update_ListView_Collectables();
2252+ }
2253+
2254+
2255+ result = strcmp(btext, "Scale");
2256+ if (result == 0)
2257+ {
2258+ strcpy(App->GDCL_Dialogs->btext, "Set Particle Scale");
2259+
2260+ char buff[256];
2261+ sprintf(buff, "%f", App->GDCL_Scene_Data->CL_Object[Index]->Mesh_Scale.x);
2262+ strcpy(App->GDCL_Dialogs->Chr_Float, buff);
2263+
2264+ App->GDCL_Dialogs->Dialog_Float();
2265+
2266+ if (App->GDCL_Dialogs->Canceled == 0)
2267+ {
2268+ App->GDCL_Scene_Data->CL_Object[Index]->Mesh_Scale.x = App->GDCL_Dialogs->mFloat;
2269+ App->GDCL_Scene_Data->CL_Object[Index]->Mesh_Scale.y = App->GDCL_Dialogs->mFloat;
2270+ App->GDCL_Scene_Data->CL_Object[Index]->Mesh_Scale.z = App->GDCL_Dialogs->mFloat;
2271+
2272+ App->GDCL_Scene_Data->CL_Object[Index]->OgreNode->setScale(App->GDCL_Scene_Data->CL_Object[Index]->Mesh_Scale);
2273+
2274+ Update_ListView_Particles();
2275+ }
2276+ }
2277+
2278+ result = strcmp(btext, "Speed");
2279+ if (result == 0)
2280+ {
2281+
2282+ strcpy(App->GDCL_Dialogs->btext, "Set Particle Speed");
2283+
2284+ char buff[256];
2285+ sprintf(buff, "%f", App->GDCL_Scene_Data->CL_Object[Index]->Ogre_Particle->getSpeedFactor());
2286+ strcpy(App->GDCL_Dialogs->Chr_Float, buff);
2287+
2288+ App->GDCL_Dialogs->Dialog_Float();
2289+
2290+ if (App->GDCL_Dialogs->Canceled == 0)
2291+ {
2292+ App->GDCL_Scene_Data->CL_Object[Index]->Ogre_Particle->setSpeedFactor(App->GDCL_Dialogs->mFloat);
2293+
2294+ Update_ListView_Particles();
2295+ }
2296+ }
2297+
2298+
2299+
2300+ return 1;
2301+}
2302+
2303+// *************************************************************************
22082304 // * Edit_Teleport_OnClick Terry Bernie *
22092305 // *************************************************************************
22102306 bool GD10_Properties::Edit_Teleport_OnClick(LPARAM lParam)
--- Equity10/GD10_Properties.h (revision 202)
+++ Equity10/GD10_Properties.h (revision 203)
@@ -53,6 +53,7 @@
5353 bool Edit_Move_Entity_OnClick(LPARAM lParam);
5454 bool Edit_Collectables_OnClick(LPARAM lParam);
5555 bool Edit_Teleport_OnClick(LPARAM lParam);
56+ bool Edit_Particles_OnClick(LPARAM lParam);
5657
5758
5859 void ListView_OnClickOptions(LPARAM lParam);
--- Equity10/VersionNo2.h (revision 202)
+++ Equity10/VersionNo2.h (revision 203)
@@ -39,21 +39,21 @@
3939 #ifndef _VERSIONNO__H_
4040 #define _VERSIONNO__H_
4141
42-#define VERSION_FULL 1.25.243.69
42+#define VERSION_FULL 1.25.243.75
4343
4444 #define VERSION_BASEYEAR 2019
4545 #define VERSION_DATE "2019-09-01"
46-#define VERSION_TIME "17:47:18"
46+#define VERSION_TIME "18:15:50"
4747
4848 #define VERSION_MAJOR 1
4949 #define VERSION_MINOR 25
5050 #define VERSION_BUILDNO 243
51-#define VERSION_EXTEND 69
51+#define VERSION_EXTEND 75
5252
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"
53+#define VERSION_FILE 1,25,243,75
54+#define VERSION_PRODUCT 1,25,243,82
55+#define VERSION_FILESTR "1,25,243,75\0"
56+#define VERSION_PRODUCTSTR "1,25,243,82\0"
5757 #define VERSION_EVERSION "0.3.4.0\0"
5858
5959 #endif
\ No newline at end of file
Show on old repository browser