• R/O
  • SSH
  • HTTPS

gd10: Commit


Commit MetaInfo

Revisão52 (tree)
Hora2019-08-02 05:19:16
Autorhgtterry

Mensagem de Log

Shell 010819

Mudança Sumário

Diff

--- GD_Shell2/Shell2/Shell2/GD_Load_Scene.h (revision 51)
+++ GD_Shell2/Shell2/Shell2/GD_Load_Scene.h (nonexistent)
@@ -1,39 +0,0 @@
1-#pragma once
2-class GD_Load_Scene
3-{
4-public:
5- GD_Load_Scene(void);
6- ~GD_Load_Scene(void);
7-
8- bool OpenScene(bool AskForScene);
9-
10- bool LoadCameraDetails();
11- bool LoadOptionsDetails30();
12-
13- float LVolume;
14- float LPan;
15- float LData0;
16- float LData1;
17- bool LIs3d;
18- bool LLoop;
19-
20- char Scene_FileName[255];
21- char Scene_Path_FileName[2048];
22-
23-protected:
24-
25- bool gdLoader_LoadGDScene();
26-
27- void Load_Scene30();
28- bool Load_Player30();
29- bool Load_Environment30();
30- bool Load_Objects30();
31- bool Populate_Level30();
32-
33- void Load_MoveEntity(int Count);
34-
35- char ReadBuf[256];
36- FILE *LoadScene;
37- FILE *LoadObjects;
38-};
39-
--- GD_Shell2/Shell2/Shell2/GD_Load_Scene.cpp (revision 51)
+++ GD_Shell2/Shell2/Shell2/GD_Load_Scene.cpp (nonexistent)
@@ -1,587 +0,0 @@
1-#include "StdAfx.h"
2-#include "BT_App.h"
3-#include "GD_Load_Scene.h"
4-
5-#pragma warning( disable : 4800)
6-
7-GD_Load_Scene::GD_Load_Scene(void)
8-{
9- LoadScene = NULL;
10- LoadObjects = NULL;
11-}
12-
13-
14-GD_Load_Scene::~GD_Load_Scene(void)
15-{
16-}
17-
18-// *************************************************************************
19-// * OpenScene Terry Bernie *
20-// *************************************************************************
21-bool GD_Load_Scene::OpenScene(bool AskForScene)
22-{
23-
24- strcpy(App->GDCL_Scene_Data->S_Scene[0]->TerrainFileName,Scene_FileName);
25- strcpy(App->GDCL_Scene_Data->S_Scene[0]->GDSceneName,Scene_FileName);
26-
27- char mPath[256];
28- strcpy(mPath,Scene_Path_FileName);
29- int FLen=strlen(Scene_FileName);
30- int PLen=strlen(Scene_Path_FileName);
31- mPath[PLen-FLen]=0;
32- strcpy(App->LevelDirectory,mPath);
33-
34- char Temp[256];
35- strcpy(Temp,Scene_FileName);
36- int Len=strlen(Temp);
37- Temp[Len-8]=0;
38- strcpy(App->GDCL_Scene_Data->S_Scene[0]->LevelName,Temp);
39-
40-
41- gdLoader_LoadGDScene();
42- return 1;
43-}
44-
45-// *************************************************************************
46-// * gdLoader_LoadGDScene Terry Bernie *
47-// *************************************************************************
48-bool GD_Load_Scene::gdLoader_LoadGDScene()
49-{
50- LoadScene=NULL;
51- char Tag1[256];
52- int ObjectsCount=0;
53- int TagFloat=0;
54- int TagInt=0;
55-
56- LoadScene = fopen(Scene_Path_FileName,"r");
57- if(!LoadScene)
58- {
59- App->Say("Cant locate Scene File");
60- return 0;
61- }
62-
63- //========== Version
64- fgets(ReadBuf, 256,LoadScene);
65- sscanf(ReadBuf, "GDScene %s", &Tag1);
66- strcpy(App->GDCL_Scene_Data->S_Scene[0]->SceneVersion,Tag1); // Save for later
67-
68- int result = strcmp(Tag1, "3.0");
69- if (result == 0)
70- {
71- fgets(ReadBuf, 256,LoadScene);
72- sscanf(ReadBuf, "SceneType %i", &TagInt);
73- App->GDCL_Scene_Data->S_Scene[0]->SceneType = TagInt;
74-
75- Load_Scene30();
76- }
77-
78- fclose(LoadScene);
79-
80- return 1;
81-}
82-
83-// *************************************************************************
84-// Load_Scene30 Terry Bernie *
85-// *************************************************************************
86-void GD_Load_Scene::Load_Scene30()
87-{
88-
89- App->GDCL_Scene_Data->ClearScene();
90-
91- Load_Player30();
92- Load_Environment30();
93- Load_Objects30();
94-
95- Populate_Level30();
96-}
97-
98-// *************************************************************************
99-// Load_Player30 Terry Bernie *
100-// *************************************************************************
101-bool GD_Load_Scene::Load_Player30()
102-{
103- char chr_Tag1[256];
104- float x = 0;
105- float y = 0;
106- float z = 0;
107-
108- fgets(ReadBuf, 256,LoadScene); // Space
109- fgets(ReadBuf, 256,LoadScene); // [Player]
110- sscanf(ReadBuf, "%s", &chr_Tag1);
111-
112- int result = strcmp(chr_Tag1, "[Player]");
113- if (result |= 0)
114- {
115- App->Say("Player Fault");
116- return 0;
117- }
118-
119- fgets(ReadBuf, 256,LoadScene); // Player Name
120- sscanf(ReadBuf, "%s", &chr_Tag1);
121- strcpy(App->GDCL_Player->PlayerName,chr_Tag1);
122-
123- fgets(ReadBuf, 256,LoadScene); // Player Position
124- sscanf(ReadBuf, "Start_Position %f %f %f",&x,&y,&z);
125- App->GDCL_Player->StartPos.x = x;
126- App->GDCL_Player->StartPos.y = y;
127- App->GDCL_Player->StartPos.z = z;
128-
129- fgets(ReadBuf, 256,LoadScene); // Shape - Capsule
130-
131- fgets(ReadBuf, 256,LoadScene); // Mass
132- sscanf(ReadBuf, "Mass %f",&x);
133- App->GDCL_Player->Capsule_Mass = x;
134-
135- fgets(ReadBuf, 256,LoadScene); // Radius
136- sscanf(ReadBuf, "Radius %f",&x);
137- App->GDCL_Player->Capsule_Radius = x;
138-
139- fgets(ReadBuf, 256,LoadScene); // Height
140- sscanf(ReadBuf, "Height %f",&x);
141- App->GDCL_Player->Capsule_Height = x;
142-
143- fgets(ReadBuf, 256, LoadScene); // Height
144- fgets(ReadBuf, 256, LoadScene); // Height
145-
146- fgets(ReadBuf, 256,LoadScene); // End
147- sscanf(ReadBuf, "%s", &chr_Tag1);
148- result = strcmp(chr_Tag1, "[End]");
149- if (result |= 0)
150- {
151- App->Say("Player Fault");
152- return 0;
153- }
154-
155- return 1;
156-}
157-
158-// *************************************************************************
159-// Load_Environment30 Terry Bernie *
160-// *************************************************************************
161-bool GD_Load_Scene::Load_Environment30()
162-{
163- char chr_Tag1[256];
164- int Int_Tag = 0;
165- float x = 0;
166- float y = 0;
167- float z = 0;
168-
169- fgets(ReadBuf, 256,LoadScene); // Space
170- fgets(ReadBuf, 256,LoadScene); // [Player]
171- sscanf(ReadBuf, "%s", &chr_Tag1);
172-
173- int result = strcmp(chr_Tag1, "[Environment]");
174- if (result |= 0)
175- {
176- App->Say("Environment Fault");
177- return 0;
178- }
179-
180- //------------------------------------------------------- Fog
181- fgets(ReadBuf, 256,LoadScene); // [Fog]
182-
183- fgets(ReadBuf, 256,LoadScene); // Visible
184- sscanf(ReadBuf, "Visible %i",&Int_Tag);
185- App->GDCL_Scene_Data->S_Scene[0]->Fog[0].FogOn = Int_Tag;
186-
187- fgets(ReadBuf, 256,LoadScene); // Mode
188- sscanf(ReadBuf, "Mode %i",&Int_Tag);
189- App->GDCL_Scene_Data->S_Scene[0]->Fog[0].Mode = Int_Tag;
190-
191- fgets(ReadBuf, 256,LoadScene); // Colour
192- sscanf(ReadBuf, "Colour %f %f %f",&x,&y,&z);
193- App->GDCL_Scene_Data->S_Scene[0]->Fog[0].Colour.x = x;
194- App->GDCL_Scene_Data->S_Scene[0]->Fog[0].Colour.y = y;
195- App->GDCL_Scene_Data->S_Scene[0]->Fog[0].Colour.z = z;
196-
197- fgets(ReadBuf, 256,LoadScene); // Density
198- sscanf(ReadBuf, "Density %f",&x);
199- App->GDCL_Scene_Data->S_Scene[0]->Fog[0].Density = x;
200-
201- fgets(ReadBuf, 256,LoadScene); // Start
202- sscanf(ReadBuf, "Start %f",&x);
203- App->GDCL_Scene_Data->S_Scene[0]->Fog[0].Start = x;
204-
205- fgets(ReadBuf, 256,LoadScene); // End
206- sscanf(ReadBuf, "End %f",&x);
207- App->GDCL_Scene_Data->S_Scene[0]->Fog[0].End = x;
208-
209- //------------------------------------------------------- Light
210- fgets(ReadBuf, 256,LoadScene); // [Light]
211-
212- fgets(ReadBuf, 256,LoadScene); // Ambient
213- sscanf(ReadBuf, "Ambient %f %f %f",&x,&y,&z);
214- App->GDCL_Scene_Data->S_Scene[0]->AmbientColour.x = x;
215- App->GDCL_Scene_Data->S_Scene[0]->AmbientColour.y = y;
216- App->GDCL_Scene_Data->S_Scene[0]->AmbientColour.z = z;
217-
218- fgets(ReadBuf, 256,LoadScene); // Diffuse
219- sscanf(ReadBuf, "Diffuse %f %f %f",&x,&y,&z);
220- App->GDCL_Scene_Data->S_Scene[0]->DiffuseColour.x = x;
221- App->GDCL_Scene_Data->S_Scene[0]->DiffuseColour.y = y;
222- App->GDCL_Scene_Data->S_Scene[0]->DiffuseColour.z = z;
223-
224- fgets(ReadBuf, 256,LoadScene); // Specular
225- sscanf(ReadBuf, "Specular %f %f %f",&x,&y,&z);
226- App->GDCL_Scene_Data->S_Scene[0]->SpecularColour.x = x;
227- App->GDCL_Scene_Data->S_Scene[0]->SpecularColour.y = y;
228- App->GDCL_Scene_Data->S_Scene[0]->SpecularColour.z = z;
229-
230- fgets(ReadBuf, 256,LoadScene); // Position
231- sscanf(ReadBuf, "Position %f %f %f",&x,&y,&z);
232- App->GDCL_Scene_Data->S_Scene[0]->Light_Position.x = x;
233- App->GDCL_Scene_Data->S_Scene[0]->Light_Position.y = y;
234- App->GDCL_Scene_Data->S_Scene[0]->Light_Position.z = z;
235-
236- //------------------------------------------------------- Sound
237- fgets(ReadBuf, 256,LoadScene); // [Sound]
238-
239- fgets(ReadBuf, 256,LoadScene); // Track
240- sscanf(ReadBuf, "Track %s",&chr_Tag1);
241- strcpy(App->GDCL_Scene_Data->S_Scene[0]->Sound[0].SoundFile,chr_Tag1);
242- strcpy(App->GDCL_Scene_Data->S_Scene[0]->Sound[0].SoundFileAndPath,App->GDCL_SoundMgr->Default_Folder);
243- strcat(App->GDCL_Scene_Data->S_Scene[0]->Sound[0].SoundFileAndPath,"\\Media\\Sounds\\");
244- strcat(App->GDCL_Scene_Data->S_Scene[0]->Sound[0].SoundFileAndPath,chr_Tag1);
245-
246- fgets(ReadBuf, 256,LoadScene); // Volume
247- sscanf(ReadBuf, "Volume %f",&x);
248- App->GDCL_Scene_Data->S_Scene[0]->Sound[0].Volume = x;
249-
250- fgets(ReadBuf, 256,LoadScene); // Play
251- sscanf(ReadBuf, "Play %i",&Int_Tag);
252- App->GDCL_Scene_Data->S_Scene[0]->Sound[0].Play = Int_Tag;
253-
254- fgets(ReadBuf, 256,LoadScene); // Loop
255- sscanf(ReadBuf, "Loop %i",&Int_Tag);
256- App->GDCL_Scene_Data->S_Scene[0]->Sound[0].Loop = Int_Tag;
257-
258- //------------------------------------------------------- Sky
259- fgets(ReadBuf, 256,LoadScene); // [Sky]
260-
261- fgets(ReadBuf, 256,LoadScene); // Enabled
262- sscanf(ReadBuf, "Enabled %i",&Int_Tag);
263- App->GDCL_Scene_Data->S_Scene[0]->Sky[0].Enabled = Int_Tag;
264-
265- fgets(ReadBuf, 256,LoadScene); // Type
266- sscanf(ReadBuf, "Type %i",&Int_Tag);
267- App->GDCL_Scene_Data->S_Scene[0]->Sky[0].type = Int_Tag;
268-
269- fgets(ReadBuf, 256,LoadScene); // Material
270- sscanf(ReadBuf, "Material %s",&chr_Tag1);
271- strcpy(App->GDCL_Scene_Data->S_Scene[0]->Sky[0].Material,chr_Tag1);
272-
273- fgets(ReadBuf, 256,LoadScene); // Distance
274- sscanf(ReadBuf, "Distance %f",&x);
275- App->GDCL_Scene_Data->S_Scene[0]->Sky[0].Distance = x;
276-
277- fgets(ReadBuf, 256,LoadScene); // Tiling
278- sscanf(ReadBuf, "Tiling %f",&x);
279- App->GDCL_Scene_Data->S_Scene[0]->Sky[0].Tiling = x;
280-
281- fgets(ReadBuf, 256,LoadScene); // Curvature
282- sscanf(ReadBuf, "Curvature %f",&x);
283- App->GDCL_Scene_Data->S_Scene[0]->Sky[0].Curvature = x;
284-
285-
286- fgets(ReadBuf, 256,LoadScene); // End
287- sscanf(ReadBuf, "%s", &chr_Tag1);
288- result = strcmp(chr_Tag1, "[End]");
289- if (result |= 0)
290- {
291- App->Say("Environment Fault");
292- return 0;
293- }
294-
295- return 1;
296-}
297-
298-// *************************************************************************
299-// Load_Objects30 Terry Bernie *
300-// *************************************************************************
301-bool GD_Load_Scene::Load_Objects30()
302-{
303- char chr_Tag1[256];
304- int Int_Tag = 0;
305- float w = 0;
306- float x = 0;
307- float y = 0;
308- float z = 0;
309-
310- fgets(ReadBuf, 256,LoadScene); // Space
311- fgets(ReadBuf, 256,LoadScene); // [objects]
312- sscanf(ReadBuf, "%s", &chr_Tag1);
313-
314- int result = strcmp(chr_Tag1, "[Objects]");
315- if (result |= 0)
316- {
317- App->Say("Objects Fault");
318- return 0;
319- }
320-
321- fgets(ReadBuf, 256,LoadScene); // Count
322- sscanf(ReadBuf, "%i",&Int_Tag);
323- int Object_Count = Int_Tag;
324- int Count = 0;
325- while (Count < Object_Count)
326- {
327- App->GDCL_Scene_Data->S_Object[Count] = new Object_Type;
328- App->GDCL_Scene_Data->SetObjectDefaults(Count);
329-
330- fgets(ReadBuf, 256,LoadScene); // Object Name
331- sscanf(ReadBuf, "Name %s",&chr_Tag1);
332- strcpy(App->GDCL_Scene_Data->S_Object[Count]->Name,chr_Tag1);
333-
334- fgets(ReadBuf, 256,LoadScene); // Mesh Name
335- sscanf(ReadBuf, "Mesh %s",&chr_Tag1);
336- strcpy(App->GDCL_Scene_Data->S_Object[Count]->MeshName,chr_Tag1);
337-
338- fgets(ReadBuf, 256,LoadScene); // Type
339- sscanf(ReadBuf, "Type %i",&Int_Tag);
340- App->GDCL_Scene_Data->S_Object[Count]->Type = Int_Tag;
341-
342- fgets(ReadBuf, 256,LoadScene); // Shape
343- sscanf(ReadBuf, "Shape %i",&Int_Tag);
344- App->GDCL_Scene_Data->S_Object[Count]->Shape = Int_Tag;
345-
346- fgets(ReadBuf, 256,LoadScene); // Usage
347- sscanf(ReadBuf, "Usage %i",&Int_Tag);
348- App->GDCL_Scene_Data->S_Object[Count]->Usage = Int_Tag;
349-
350- fgets(ReadBuf, 256,LoadScene); // Usage
351- sscanf(ReadBuf, "Folder %i",&Int_Tag);
352- App->GDCL_Scene_Data->S_Object[Count]->Folder = Int_Tag;
353-
354- //------------------------------------------------------------- World Object
355- fgets(ReadBuf, 256,LoadScene); // Mesh_Pos
356- sscanf(ReadBuf, "Mesh_Pos %f %f %f",&x,&y,&z);
357- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Pos.x = x;
358- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Pos.y = y;
359- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Pos.z = z;
360-
361- fgets(ReadBuf, 256,LoadScene); // Mesh_Rot
362- sscanf(ReadBuf, "Mesh_Rot %f %f %f",&x,&y,&z);
363- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Rot.x = x;
364- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Rot.y = y;
365- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Rot.z = z;
366-
367- fgets(ReadBuf, 256,LoadScene); // Mesh_Quat
368- sscanf(ReadBuf, "Mesh_Quat %f %f %f %f",&w,&x,&y,&z);
369- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Quat.w = w;
370- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Quat.x = x;
371- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Quat.y = y;
372- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Quat.z = z;
373-
374- fgets(ReadBuf, 256,LoadScene); // Mesh_Scale
375- sscanf(ReadBuf, "Mesh_Scale %f %f %f",&x,&y,&z);
376- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Scale.x = x;
377- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Scale.y = y;
378- App->GDCL_Scene_Data->S_Object[Count]->Mesh_Scale.z = z;
379-
380- //------------------------------------------------------------- Physics
381- fgets(ReadBuf, 256,LoadScene); // Mass
382- sscanf(ReadBuf, "Mass %f",&x);
383- App->GDCL_Scene_Data->S_Object[Count]->Physics_Mass = x;
384-
385- fgets(ReadBuf, 256,LoadScene); // Restitution
386- sscanf(ReadBuf, "Restitution %f",&x);
387- App->GDCL_Scene_Data->S_Object[Count]->Physics_Restitution = x;
388-
389- fgets(ReadBuf, 256,LoadScene); // Physics_Pos
390- sscanf(ReadBuf, "Physics_Pos %f %f %f",&x,&y,&z);
391- App->GDCL_Scene_Data->S_Object[Count]->Physics_Pos.x = x;
392- App->GDCL_Scene_Data->S_Object[Count]->Physics_Pos.y = y;
393- App->GDCL_Scene_Data->S_Object[Count]->Physics_Pos.z = z;
394-
395- fgets(ReadBuf, 256,LoadScene); // Physics_Rot
396- sscanf(ReadBuf, "Physics_Rot %f %f %f",&x,&y,&z);
397- App->GDCL_Scene_Data->S_Object[Count]->Physics_Rot.x = x;
398- App->GDCL_Scene_Data->S_Object[Count]->Physics_Rot.y = y;
399- App->GDCL_Scene_Data->S_Object[Count]->Physics_Rot.z = z;
400-
401- fgets(ReadBuf, 256,LoadScene); // Physics_Quat
402- sscanf(ReadBuf, "Physics_Quat %f %f %f %f",&w,&x,&y,&z);
403- App->GDCL_Scene_Data->S_Object[Count]->Physics_Quat.w = w;
404- App->GDCL_Scene_Data->S_Object[Count]->Physics_Quat.x = x;
405- App->GDCL_Scene_Data->S_Object[Count]->Physics_Quat.y = y;
406- App->GDCL_Scene_Data->S_Object[Count]->Physics_Quat.z = z;
407-
408- fgets(ReadBuf, 256,LoadScene); // Physics_Scale
409- sscanf(ReadBuf, "Physics_Scale %f %f %f",&x,&y,&z);
410- App->GDCL_Scene_Data->S_Object[Count]->Physics_Scale.x = x;
411- App->GDCL_Scene_Data->S_Object[Count]->Physics_Scale.y = y;
412- App->GDCL_Scene_Data->S_Object[Count]->Physics_Scale.z = z;
413-
414- fgets(ReadBuf, 256,LoadScene); // Physics_Size
415- sscanf(ReadBuf, "Physics_Size %f %f %f",&x,&y,&z);
416- App->GDCL_Scene_Data->S_Object[Count]->Physics_Size.x = x;
417- App->GDCL_Scene_Data->S_Object[Count]->Physics_Size.y = y;
418- App->GDCL_Scene_Data->S_Object[Count]->Physics_Size.z = z;
419-
420- //-------- Entity
421- fgets(ReadBuf, 256,LoadScene); // Object Name
422- sscanf(ReadBuf, "Stock_Text %s",&chr_Tag1);
423- strcpy(App->GDCL_Scene_Data->S_Object[Count]->Entity[0].mTextItem,chr_Tag1);
424-
425- //--------------------------
426- if(App->GDCL_Scene_Data->S_Object[Count]->Usage == Enums::Usage_Sound)
427- {
428- char buff[1024];
429- strcpy(buff,App->GDCL_SoundMgr->Default_Folder);
430- strcat(buff,"\\Media\\Sounds\\");
431- strcat(buff,chr_Tag1);
432-
433- strcpy(App->GDCL_Scene_Data->S_Object[Count]->Entity[0].mFileAndPath,buff);
434- }
435- //--------------------------
436-
437- fgets(ReadBuf, 256,LoadScene); // Object Name
438- sscanf(ReadBuf, "Stock_Name %s",&chr_Tag1);
439- strcpy(App->GDCL_Scene_Data->S_Object[Count]->Entity[0].Stock_mName,chr_Tag1);
440-
441-
442- fgets(ReadBuf, 256,LoadScene); // Object Name
443- sscanf(ReadBuf, "Stock_Index %i",&Int_Tag);
444- App->GDCL_Scene_Data->S_Object[Count]->Entity[0].Stock_mIndex = Int_Tag;
445-
446-
447-
448- if(App->GDCL_Scene_Data->S_Object[Count]->Usage == Enums::Usage_Move)
449- {
450- Load_MoveEntity(Count);
451- }
452-
453-
454- fgets(ReadBuf, 256,LoadScene); // Seperator
455-
456- Count++;
457- }
458-
459- App->GDCL_Scene_Data->ObjectCount = Count;
460-
461- fgets(ReadBuf, 256,LoadScene); // End
462- sscanf(ReadBuf, "%s", &chr_Tag1);
463- result = strcmp(chr_Tag1, "[End]");
464- if (result |= 0)
465- {
466- App->Say("Object Fault");
467- return 0;
468- }
469-
470- return 1;
471-}
472-
473-// *************************************************************************
474-// * Load_MoveEntity Terry Bernie *
475-// *************************************************************************
476-void GD_Load_Scene::Load_MoveEntity(int Count)
477-{
478- char chr_Tag1[256];
479- int Int_Tag = 0;
480-
481- float x = 0;
482- float y = 0;
483-
484- fgets(ReadBuf, 256,LoadScene); // [objects]
485- sscanf(ReadBuf, "%s", &chr_Tag1);
486- int result = strcmp(chr_Tag1,"[Move_Data]");
487-
488- App->GDCL_Scene_Data->S_Object[Count]->S_MoveType = new Move_Type;
489- App->GDCL_Scene_Data->Set_Move_Defaults(Count);
490-
491- if (result |= 0){App->Say("Object Fault");return;} // Fault
492-
493- fgets(ReadBuf, 256,LoadScene);
494- sscanf(ReadBuf, "Object_To_Move %s",&chr_Tag1);
495- strcpy(App->GDCL_Scene_Data->S_Object[Count]->S_MoveType->Object_Name,chr_Tag1);
496-
497- fgets(ReadBuf, 256,LoadScene);
498- sscanf(ReadBuf, "Object_Index %i",&Int_Tag);
499- App->GDCL_Scene_Data->S_Object[Count]->S_MoveType->Object_Index = Int_Tag;
500-
501- fgets(ReadBuf, 256,LoadScene);
502- sscanf(ReadBuf, "Data %f %f %i",&x,&y,&Int_Tag);
503- App->GDCL_Scene_Data->S_Object[Count]->S_MoveType->Distance = x;
504- App->GDCL_Scene_Data->S_Object[Count]->S_MoveType->Speed = y;
505- App->GDCL_Scene_Data->S_Object[Count]->S_MoveType->IsNegative = Int_Tag;
506-
507- fgets(ReadBuf, 256,LoadScene);
508- sscanf(ReadBuf, "Axis %i",&Int_Tag);
509- App->GDCL_Scene_Data->S_Object[Count]->S_MoveType->WhatDirection = Int_Tag;
510-
511-}
512-
513-// *************************************************************************
514-// * LoadOptionsDetails Terry Bernie *
515-// *************************************************************************
516-bool GD_Load_Scene::LoadOptionsDetails30()
517-{
518- int TagInt=0;
519-
520- fgets(ReadBuf, 256,LoadScene); // Space
521- fgets(ReadBuf, 256,LoadScene); // [Options]
522-
523- fgets(ReadBuf, 256,LoadScene); // ID
524- sscanf(ReadBuf, "Has_Planes %i",& TagInt);
525- App->GDCL_Scene_Data->S_LoadOptions[0]->Has_Planes = (bool)TagInt;
526-
527- fgets(ReadBuf, 256,LoadScene); // ID
528- sscanf(ReadBuf, "Has_Objects %i",& TagInt);
529- App->GDCL_Scene_Data->S_LoadOptions[0]->Has_Objects = (bool)TagInt;
530-
531- fgets(ReadBuf, 256,LoadScene); // ID
532- sscanf(ReadBuf, "Has_Particles %i",& TagInt);
533- App->GDCL_Scene_Data->S_LoadOptions[0]->Has_Particles = (bool)TagInt;
534-
535- fgets(ReadBuf, 256,LoadScene); // ID
536- sscanf(ReadBuf, "Has_Weapons %i",& TagInt);
537- App->GDCL_Scene_Data->S_LoadOptions[0]->Has_Weapons = (bool)TagInt;
538-
539- fgets(ReadBuf, 256,LoadScene); // ID
540- sscanf(ReadBuf, "Has_Player %i",& TagInt);
541- App->GDCL_Scene_Data->S_LoadOptions[0]->Has_Player = (bool)TagInt;
542-
543- fgets(ReadBuf, 256,LoadScene); // ID
544- sscanf(ReadBuf, "Has_Debug %i",& TagInt);
545- App->GDCL_Scene_Data->S_LoadOptions[0]->Has_Debug = (bool)TagInt;
546-
547- return 1;
548-}
549-
550-// *************************************************************************
551-// LoadCameraDetails Terry Bernie *
552-// *************************************************************************
553-bool GD_Load_Scene::LoadCameraDetails()
554-{
555-
556- return 1;
557-}
558-
559-// *************************************************************************
560-// Populate_Level30 Terry Bernie *
561-// *************************************************************************
562-bool GD_Load_Scene::Populate_Level30()
563-{
564- App->GDCL_Environment->Load_Environment();
565-
566- if(App->GDCL_Scene_Data->S_LoadOptions[0]->Has_Player == 1)
567- {
568- App->GDCL_Player->Load_Player();
569- }
570-
571- if(App->GDCL_Scene_Data->S_LoadOptions[0]->Has_Objects == 1)
572- {
573- App->GDCL_Add_Objects->Add_Object();
574- }
575-
576- if(App->GDCL_Scene_Data->S_LoadOptions[0]->Has_Player == 1)
577- {
578- App->GDCL_Player->PlayerAdded = 1;
579- }
580-
581- App->GDCL_Scene_Data->SceneLoaded = 1;
582- App->GDCL_Bullet->GD_Physics_On = 1;
583- App->Ogre17->PhysicsFrameListener->GD_Run_Physics = 1;
584-
585- return 1;
586-}
587-
--- GD_Shell2/Shell2/Shell2/BT_App.cpp (revision 51)
+++ GD_Shell2/Shell2/Shell2/BT_App.cpp (revision 52)
@@ -45,7 +45,6 @@
4545 GDCL_Scene_Data = NULL;
4646 GDCL_SoundMgr = NULL;
4747 GDCL_Collision = NULL;
48- GDCL_Load_Scene = NULL;
4948 GDCL_Add_Objects = NULL;
5049 GDCL_Environment = NULL;
5150
@@ -95,7 +94,6 @@
9594 GDCL_Bullet = new GD_BULLET();
9695 GDCL_Scene_Data = new GD_Scene_Data();
9796 GDCL_SoundMgr = new GD_SoundMgr();
98- GDCL_Load_Scene = new GD_Load_Scene();
9997 GDCL_Add_Objects = new GD_Add_Objects();
10098 GDCL_Environment = new GD_Environment();
10199 GDCL_Collision = new GD_Collision();
--- GD_Shell2/Shell2/Shell2/BT_App.h (revision 51)
+++ GD_Shell2/Shell2/Shell2/BT_App.h (revision 52)
@@ -30,7 +30,7 @@
3030 #include "GD_Scene_Data.h"
3131 #include "GD_SoundMgr.h"
3232 #include "GD_Collision.h"
33-#include "GD_Load_Scene.h"
33+
3434 #include "GD_Add_Objects.h"
3535 #include "GD_Environment.h"
3636
@@ -50,7 +50,6 @@
5050 GD_Scene_Data* GDCL_Scene_Data;
5151 GD_SoundMgr* GDCL_SoundMgr;
5252 GD_Collision* GDCL_Collision;
53- GD_Load_Scene* GDCL_Load_Scene;
5453 GD_Add_Objects* GDCL_Add_Objects;
5554 GD_Environment* GDCL_Environment;
5655
--- GD_Shell2/Shell2/Shell2/GD_Scene_Data.cpp (revision 51)
+++ GD_Shell2/Shell2/Shell2/GD_Scene_Data.cpp (revision 52)
@@ -599,13 +599,9 @@
599599 strcat(ParhFile,"Media\\Levels\\");
600600 strcat(ParhFile,First_SceneFile); // Create Relative File from EXE
601601
602- strcpy(App->GDCL_Load_Scene->Scene_FileName,FileName);
603- strcpy(App->GDCL_Load_Scene->Scene_Path_FileName,ParhFile);
604-
605602 strcpy(App->CL10_Load_Scene->Scene_FileName, FileName);
606603 strcpy(App->CL10_Load_Scene->Scene_Path_FileName, ParhFile);
607604
608- //App->GDCL_Load_Scene->OpenScene(0);
609605 App->CL10_Load_Scene->OpenScene(0);
610606 return 1;
611607 }
Show on old repository browser