Particles 010919
@@ -1124,9 +1124,11 @@ | ||
1124 | 1124 | |
1125 | 1125 | |
1126 | 1126 | Object->Ogre_Particle = App->Cl_Ogre->mSceneMgr->createParticleSystem(ATest, "Examples/Smoke1"); |
1127 | + Object->Ogre_Particle->setKeepParticlesInLocalSpace(true); | |
1128 | + | |
1127 | 1129 | Object->OgreNode = App->Cl_Ogre->mSceneMgr->getRootSceneNode()->createChildSceneNode(); |
1128 | 1130 | Object->OgreNode->attachObject(Object->Ogre_Particle); |
1129 | - Object->OgreNode->scale(0.03, 0.03, 0.03); | |
1131 | + Object->OgreNode->scale(1,1,1); | |
1130 | 1132 | //Object->OgreNode->setVisible(true); |
1131 | 1133 | |
1132 | 1134 | Ogre::Vector3 Pos = Object->GetPlacement(); |
@@ -1555,6 +1555,21 @@ | ||
1555 | 1555 | return; |
1556 | 1556 | } |
1557 | 1557 | |
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 | + | |
1558 | 1573 | return; |
1559 | 1574 | } |
1560 | 1575 |
@@ -2169,7 +2184,7 @@ | ||
2169 | 2184 | } |
2170 | 2185 | |
2171 | 2186 | // ************************************************************************* |
2172 | -// * Edit_Collectables_OnClick Terry Bernie * | |
2187 | +// * Edit_Collectables_OnClick Terry Bernie * | |
2173 | 2188 | // ************************************************************************* |
2174 | 2189 | bool GD10_Properties::Edit_Collectables_OnClick(LPARAM lParam) |
2175 | 2190 | { |
@@ -2205,6 +2220,87 @@ | ||
2205 | 2220 | } |
2206 | 2221 | |
2207 | 2222 | // ************************************************************************* |
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 | +// ************************************************************************* | |
2208 | 2304 | // * Edit_Teleport_OnClick Terry Bernie * |
2209 | 2305 | // ************************************************************************* |
2210 | 2306 | bool GD10_Properties::Edit_Teleport_OnClick(LPARAM lParam) |
@@ -53,6 +53,7 @@ | ||
53 | 53 | bool Edit_Move_Entity_OnClick(LPARAM lParam); |
54 | 54 | bool Edit_Collectables_OnClick(LPARAM lParam); |
55 | 55 | bool Edit_Teleport_OnClick(LPARAM lParam); |
56 | + bool Edit_Particles_OnClick(LPARAM lParam); | |
56 | 57 | |
57 | 58 | |
58 | 59 | void ListView_OnClickOptions(LPARAM lParam); |
@@ -39,21 +39,21 @@ | ||
39 | 39 | #ifndef _VERSIONNO__H_ |
40 | 40 | #define _VERSIONNO__H_ |
41 | 41 | |
42 | -#define VERSION_FULL 1.25.243.69 | |
42 | +#define VERSION_FULL 1.25.243.75 | |
43 | 43 | |
44 | 44 | #define VERSION_BASEYEAR 2019 |
45 | 45 | #define VERSION_DATE "2019-09-01" |
46 | -#define VERSION_TIME "17:47:18" | |
46 | +#define VERSION_TIME "18:15:50" | |
47 | 47 | |
48 | 48 | #define VERSION_MAJOR 1 |
49 | 49 | #define VERSION_MINOR 25 |
50 | 50 | #define VERSION_BUILDNO 243 |
51 | -#define VERSION_EXTEND 69 | |
51 | +#define VERSION_EXTEND 75 | |
52 | 52 | |
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" | |
57 | 57 | #define VERSION_EVERSION "0.3.4.0\0" |
58 | 58 | |
59 | 59 | #endif |
\ No newline at end of file |