• R/O
  • SSH
  • HTTPS

gd10: Commit


Commit MetaInfo

Revisão100 (tree)
Hora2019-08-08 21:00:04
Autorhgtterry

Mensagem de Log

Class PB and Create Project 080819

Mudança Sumário

Diff

--- Equity10/GD10_PB.cpp (revision 99)
+++ Equity10/GD10_PB.cpp (revision 100)
@@ -178,7 +178,7 @@
178178 }
179179
180180 // *************************************************************************
181-// * SetMainText *
181+// * Set_Progress *
182182 // *************************************************************************
183183 bool GD10_PB::Set_Progress(char* ProcessText, float TotalSteps)
184184 {
@@ -207,6 +207,27 @@
207207 }
208208
209209 // *************************************************************************
210+// * Set_Progress_Text *
211+// *************************************************************************
212+bool GD10_PB::Set_Progress_Text(char* ProcessText)
213+{
214+ MSG msg;
215+ char buff[1024];
216+ strcpy(buff, "Processing :- ");
217+ strcat(buff, ProcessText);
218+
219+ SetDlgItemText(ProgBarHwnd, IDC_PBACTION, (LPCTSTR)buff);
220+ InvalidateRect(ProgBarHwnd, NULL, FALSE);
221+ if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
222+ {
223+ TranslateMessage(&msg);
224+ DispatchMessage(&msg);
225+ }
226+ InvalidateRect(ProgBarHwnd, NULL, FALSE);
227+ return 1;
228+}
229+
230+// *************************************************************************
210231 // * Nudge *
211232 // *************************************************************************
212233 bool GD10_PB::Nudge()
@@ -213,16 +234,9 @@
213234 {
214235 MSG msg;
215236
216- //DrawTheImage(Dio,HourimageList,0,0);
217-
218237 App->CL10_PB->g_pos++;
219238 InvalidateRect(ProgBarHwnd, NULL, FALSE);
220239
221- Pani++;
222- if (Pani > 11)
223- {
224- Pani = 0;
225- }
226240 if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
227241 {
228242 TranslateMessage(&msg);
@@ -229,8 +243,6 @@
229243 DispatchMessage(&msg);
230244 }
231245
232- /*C_ProgBar->g_pos++;
233- InvalidateRect(ProgBarHwnd, NULL, FALSE);*/
234246 return 1;
235247 }
236248 // *************************************************************************
--- Equity10/GD10_PB.h (revision 99)
+++ Equity10/GD10_PB.h (revision 100)
@@ -8,6 +8,7 @@
88
99 bool StartNewProgressBar();
1010 bool Set_Progress(char* ProcessText, float TotalSteps);
11+ bool Set_Progress_Text(char* ProcessText);
1112 bool Nudge();
1213 bool Close();
1314
--- Equity10/GD10_Project.cpp (revision 99)
+++ Equity10/GD10_Project.cpp (revision 100)
@@ -262,7 +262,7 @@
262262 App->CL10_PB = new GD10_PB();
263263 App->CL10_PB->StartNewProgressBar();
264264
265- App->CL_Dialogs->MessageLoad("Please Wait");
265+ //App->CL_Dialogs->MessageLoad("Please Wait");
266266
267267 strcpy(ProjectFolder, App->CL_FileIO->szSelectedDir);
268268 strcat(ProjectFolder, "\\");
@@ -316,36 +316,49 @@
316316 strcat(SoundFolder, "Sounds");
317317 CreateDirectory(SoundFolder, NULL);
318318
319+ App->CL10_PB->Set_Progress("Copy_SystemFiles", 10);
319320 Copy_SystemFiles();
321+ App->CL10_PB->Nudge();
320322
321- App->CL10_PB->Set_Progress("Copy_ZipFiles", 0);
323+ App->CL10_PB->Set_Progress_Text("Copy_ZipFiles");
322324 Copy_ZipFiles();
325+ App->CL10_PB->Nudge();
323326
324- App->CL10_PB->Set_Progress("Copy_Level_Files", 0);
327+ App->CL10_PB->Set_Progress_Text("Copy_Level_Files");
325328 Copy_Level_Files();
329+ App->CL10_PB->Nudge();
326330
331+ App->CL10_PB->Set_Progress_Text("Transfer_UsedMaterials");
327332 Transfer_UsedMaterials();
333+ App->CL10_PB->Nudge();
328334
329- App->CL10_PB->Set_Progress("Transfer_Meshes", 0);
335+ App->CL10_PB->Set_Progress_Text("Transfer_Meshes");
330336 Transfer_Meshes();
337+ App->CL10_PB->Nudge();
331338
339+ App->CL10_PB->Set_Progress_Text("Transfer_Textures");
332340 Transfer_Textures();
341+ App->CL10_PB->Nudge();
333342
334- App->CL10_PB->Set_Progress("Transfer_Environment_Sound", 0);
343+ App->CL10_PB->Set_Progress_Text("Transfer_Environment_Sound");
335344 Transfer_Environment_Sound();
345+ App->CL10_PB->Nudge();
336346
337- App->CL10_PB->Set_Progress("Transfer_Sounds", 0);
347+ App->CL10_PB->Set_Progress_Text("Transfer_Sounds");
338348 Transfer_Sounds();
349+ App->CL10_PB->Nudge();
339350
340- App->CL10_PB->Set_Progress("Create_Game_IniFile", 0);
351+ App->CL10_PB->Set_Progress_Text("Create_Game_IniFile");
341352 Create_Game_IniFile();
353+ App->CL10_PB->Nudge();
342354
343- App->CL10_PB->Set_Progress("Create_Config_File", 0);
355+ App->CL10_PB->Set_Progress_Text("Create_Config_File");
344356 Create_Config_File();
357+ App->CL10_PB->Nudge();
345358
346- App->CL_Dialogs->MessageLoad_Finish("Project Created");
359+ //App->CL_Dialogs->MessageLoad_Finish("Project Created");
347360
348- App->CL10_PB->Close();
361+ //App->CL10_PB->Close();
349362 delete App->CL10_PB;
350363 App->CL10_PB = nullptr;
351364
@@ -357,8 +370,7 @@
357370 // *************************************************************************
358371 void GD10_Project::Copy_SystemFiles(void)
359372 {
360- App->CL10_PB->Set_Progress("Copy_SystemFiles", 9);
361-
373+
362374 //----------------------------- OgreMain.dll
363375 strcpy(SourceFile, App->EquityDirecory_FullPath);
364376 strcat(SourceFile, "\\OgreMain.dll");
@@ -368,7 +380,7 @@
368380
369381 CopyFile(SourceFile, DestinationFile, false);
370382
371- App->CL10_PB->Nudge();
383+
372384
373385 //----------------------------- RenderSystem_GL.dll
374386 strcpy(SourceFile, App->EquityDirecory_FullPath);
@@ -379,7 +391,7 @@
379391
380392 CopyFile(SourceFile, DestinationFile, false);
381393
382- App->CL10_PB->Nudge();
394+
383395 //----------------------------- cg.dll
384396 strcpy(SourceFile, App->EquityDirecory_FullPath);
385397 strcat(SourceFile, "\\cg.dll");
@@ -389,7 +401,7 @@
389401
390402 CopyFile(SourceFile, DestinationFile, false);
391403
392- App->CL10_PB->Nudge();
404+
393405 //----------------------------- msvcp100.dll
394406 strcpy(SourceFile, App->EquityDirecory_FullPath);
395407 strcat(SourceFile, "\\msvcp100.dll");
@@ -399,7 +411,7 @@
399411
400412 CopyFile(SourceFile, DestinationFile, false);
401413
402- App->CL10_PB->Nudge();
414+
403415 //----------------------------- msvcr100.dll
404416 strcpy(SourceFile, App->EquityDirecory_FullPath);
405417 strcat(SourceFile, "\\msvcr100.dll");
@@ -409,7 +421,6 @@
409421
410422 CopyFile(SourceFile, DestinationFile, false);
411423
412- App->CL10_PB->Nudge();
413424 //----------------------------- irrKlang.dll
414425 strcpy(SourceFile, App->EquityDirecory_FullPath);
415426 strcat(SourceFile, "\\irrKlang.dll");
@@ -419,7 +430,6 @@
419430
420431 CopyFile(SourceFile, DestinationFile, false);
421432
422- App->CL10_PB->Nudge();
423433 //----------------------------- Plugin_CgProgramManager.dll
424434 strcpy(SourceFile, App->EquityDirecory_FullPath);
425435 strcat(SourceFile, "\\Plugin_CgProgramManager.dll");
@@ -429,7 +439,6 @@
429439
430440 CopyFile(SourceFile, DestinationFile, false);
431441
432- App->CL10_PB->Nudge();
433442 //----------------------------- Game FIle
434443 strcpy(SourceFile, App->EquityDirecory_FullPath);
435444 strcat(SourceFile, "\\GDShell.gex");
@@ -440,7 +449,7 @@
440449 strcat(DestinationFile, ".exe");
441450
442451 CopyFile(SourceFile, DestinationFile, false);
443- App->CL10_PB->Nudge();
452+
444453 //----------------------------- Game FIle
445454 strcpy(SourceFile, App->EquityDirecory_FullPath);
446455 strcat(SourceFile, "\\plugins.cfg");
@@ -450,7 +459,6 @@
450459
451460 CopyFile(SourceFile, DestinationFile, false);
452461
453- App->CL10_PB->Nudge();
454462 }
455463
456464 // *************************************************************************
@@ -564,19 +572,8 @@
564572 Ogre::ResourcePtr pp;
565573 Ogre::ResourceManager::ResourceMapIterator materialIterator = Ogre::MaterialManager::getSingleton().getResourceIterator();
566574
567- int Total = 0;
568575 while (materialIterator.hasMoreElements())
569576 {
570- Total++;
571- materialIterator.moveNext();
572- }
573-
574- App->CL10_PB->Set_Progress("Transfer_UsedMaterials", Total);
575-
576- materialIterator = Ogre::MaterialManager::getSingleton().getResourceIterator();
577-
578- while (materialIterator.hasMoreElements())
579- {
580577 strcpy(pScriptName, (static_cast<Ogre::MaterialPtr>(materialIterator.peekNextValue()))->getName().c_str());
581578
582579 pp = Ogre::MaterialManager::getSingleton().getByName(pScriptName);
@@ -631,7 +628,6 @@
631628 }
632629 }
633630
634- App->CL10_PB->Nudge();
635631 materialIterator.moveNext();
636632 }
637633
@@ -740,19 +736,8 @@
740736
741737 Ogre::ResourceManager::ResourceMapIterator TextureIterator = Ogre::TextureManager::getSingleton().getResourceIterator();
742738
743- int Total = 0;
744739 while (TextureIterator.hasMoreElements())
745740 {
746- Total++;
747- TextureIterator.moveNext();
748- }
749-
750- App->CL10_PB->Set_Progress("Transfer_UsedMaterials", Total);
751-
752- TextureIterator = Ogre::TextureManager::getSingleton().getResourceIterator();
753-
754- while (TextureIterator.hasMoreElements())
755- {
756741 strcpy(pScriptName, (static_cast<Ogre::MaterialPtr>(TextureIterator.peekNextValue()))->getName().c_str());
757742
758743 pp = Ogre::TextureManager::getSingleton().getByName(pScriptName);
@@ -809,7 +794,6 @@
809794 CopyFile(SourceFile, DestinationFile, false);
810795 }
811796
812- App->CL10_PB->Nudge();
813797 TextureIterator.moveNext();
814798 }
815799
--- Equity10/VersionNo2.h (revision 99)
+++ Equity10/VersionNo2.h (revision 100)
@@ -39,21 +39,21 @@
3939 #ifndef _VERSIONNO__H_
4040 #define _VERSIONNO__H_
4141
42-#define VERSION_FULL 1.20.219.7
42+#define VERSION_FULL 1.20.219.15
4343
4444 #define VERSION_BASEYEAR 2019
4545 #define VERSION_DATE "2019-08-08"
46-#define VERSION_TIME "11:25:51"
46+#define VERSION_TIME "12:57:47"
4747
4848 #define VERSION_MAJOR 1
4949 #define VERSION_MINOR 20
5050 #define VERSION_BUILDNO 219
51-#define VERSION_EXTEND 7
51+#define VERSION_EXTEND 15
5252
53-#define VERSION_FILE 1,20,219,7
54-#define VERSION_PRODUCT 1,20,219,14
55-#define VERSION_FILESTR "1,20,219,7\0"
56-#define VERSION_PRODUCTSTR "1,20,219,14\0"
53+#define VERSION_FILE 1,20,219,15
54+#define VERSION_PRODUCT 1,20,219,22
55+#define VERSION_FILESTR "1,20,219,15\0"
56+#define VERSION_PRODUCTSTR "1,20,219,22\0"
5757 #define VERSION_EVERSION "0.3.4.0\0"
5858
5959 #endif
\ No newline at end of file
Show on old repository browser