Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts: Escape-the-Dawn/GameWorld.cpp
This commit is contained in:
@@ -1,97 +0,0 @@
|
||||
newmtl default_body2
|
||||
d 1
|
||||
Ns 0.75
|
||||
Ni 0
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 1 1 1
|
||||
Km 0
|
||||
map_Kd /Maps/as2.jpg
|
||||
|
||||
newmtl default
|
||||
d 1
|
||||
Ns 0.75
|
||||
Ni 0
|
||||
Ka 0 0 0
|
||||
Kd 0.27451 0.27451 0.27451
|
||||
Ks 1 1 1
|
||||
Km 0
|
||||
|
||||
newmtl default_cockpits_1_cushions
|
||||
d 1
|
||||
Ns 0.75
|
||||
Ni 0
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 1 1 1
|
||||
Km 0
|
||||
map_Kd /Maps/yx1_02_01_01_02.jpg
|
||||
|
||||
newmtl default_cockpits_1_display
|
||||
d 1
|
||||
Ns 0.75
|
||||
Ni 0
|
||||
Ka 1 1 1
|
||||
Kd 1 1 1
|
||||
Ks 1 1 1
|
||||
Km 0
|
||||
map_Kd /Maps/ggt1.jpg
|
||||
|
||||
newmtl default_cockpits_joysticks
|
||||
d 1
|
||||
Ns 0.75
|
||||
Ni 0
|
||||
Ka 0 0 0
|
||||
Kd 0 0 0
|
||||
Ks 1 1 1
|
||||
Km 0
|
||||
|
||||
newmtl default_skin
|
||||
d 1
|
||||
Ns 0.75
|
||||
Ni 0
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 1 1 1
|
||||
Km 0
|
||||
map_Kd /Maps/ahm1_01_01.jpg
|
||||
|
||||
newmtl default_cabins1glass
|
||||
d 0.65
|
||||
Ns 0.75
|
||||
Ni 0
|
||||
Ka 0 0 0
|
||||
Kd 0.501961 1 0
|
||||
Ks 1 1 1
|
||||
Km 0
|
||||
|
||||
newmtl default_ship_door
|
||||
d 1
|
||||
Ns 1
|
||||
Ni 0
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 1 1 1
|
||||
Km 0
|
||||
map_Kd /Maps/as1_02.jpg
|
||||
|
||||
newmtl default_door
|
||||
d 1
|
||||
Ns 0.75
|
||||
Ni 0
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 1 1 1
|
||||
Km 0
|
||||
map_Kd /Maps/as1_02.jpg
|
||||
|
||||
newmtl default_steps
|
||||
d 1
|
||||
Ns 1
|
||||
Ni 0
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 1 1 1
|
||||
Km 0
|
||||
map_Kd /Maps/rmp1.jpg
|
||||
|
||||
@@ -95,8 +95,6 @@ void GameWorld::Initialize()
|
||||
transform->Position = glm::vec3(10.f, 0.f, 0.f);
|
||||
model = AddComponent<Components::Model>(ent, "Model");
|
||||
model->ModelFile = "ship.obj";
|
||||
|
||||
// Camera
|
||||
}
|
||||
|
||||
void GameWorld::Update(double dt)
|
||||
|
||||
@@ -1,150 +0,0 @@
|
||||
#
|
||||
# Wavefront material file
|
||||
# Converted by the DEEP Exploration Deep Exploration 6.5 x64 6.5.0.9182
|
||||
# Right Hemisphere, LTD
|
||||
# http://www.righthemisphere.com/
|
||||
#
|
||||
|
||||
newmtl MG_MovieCycle_Body_MI
|
||||
Ka 0 0 0
|
||||
Kd 0 0 0
|
||||
Ks 1 1 1
|
||||
illum 2
|
||||
Ns 32
|
||||
map_Kd MG_MovieCycle_BodyHeadLight_EMSS.tga
|
||||
map_bump MG_MovieCycle_Body_NORM.tga
|
||||
bump MG_MovieCycle_Body_NORM.tga
|
||||
map_opacity
|
||||
map_d
|
||||
refl
|
||||
map_kS MG_MovieCycle_Body_SPEC.tga
|
||||
map_kA
|
||||
map_Ns
|
||||
|
||||
newmtl MG_MovieCycle_Glass_MI
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 0.84 0.84 0.84
|
||||
illum 2
|
||||
Ns 33.6359
|
||||
map_Kd Glass.tga
|
||||
map_bump
|
||||
bump
|
||||
map_opacity Glass.tga
|
||||
map_d Glass.tga
|
||||
refl
|
||||
map_kS
|
||||
map_kA
|
||||
map_Ns
|
||||
|
||||
newmtl MG_MovieCycle_Tire_MI
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 0 0 0
|
||||
illum 2
|
||||
Ns 10
|
||||
map_Kd MG_MovieCycle_Tire_EMSS.tga
|
||||
map_bump MG_MovieCycle_Tire_NORM.tga
|
||||
bump MG_MovieCycle_Tire_NORM.tga
|
||||
map_opacity
|
||||
map_d
|
||||
refl
|
||||
map_kS
|
||||
map_kA
|
||||
map_Ns
|
||||
|
||||
newmtl MG_MovieCycle_Engine_MI
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 0 0 0
|
||||
illum 2
|
||||
Ns 10
|
||||
map_Kd MG_MovieCycle_Engine_EMSS.tga
|
||||
map_bump MG_MovieCycle_Engine_NORM.tga
|
||||
bump MG_MovieCycle_Engine_NORM.tga
|
||||
map_opacity
|
||||
map_d
|
||||
refl
|
||||
map_kS
|
||||
map_kA
|
||||
map_Ns
|
||||
|
||||
newmtl MG_MovieCycle_PlayerBody_MI
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 1 1 1
|
||||
illum 2
|
||||
Ns 10
|
||||
map_Kd MG_Player_Body_EMSS.tga
|
||||
map_bump MG_Player_Body_NORM.tga
|
||||
bump MG_Player_Body_NORM.tga
|
||||
map_opacity
|
||||
map_d
|
||||
refl
|
||||
map_kS MG_Player_Body_SPEC.tga
|
||||
map_kA
|
||||
map_Ns
|
||||
|
||||
newmtl MG_MovieCycle_PlayerHelmet_MI
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 1 1 1
|
||||
illum 2
|
||||
Ns 6.27667
|
||||
map_Kd MG_Player_Helmet_EMSS.tga
|
||||
map_bump MG_Player_Helmet_NORM.tga
|
||||
bump MG_Player_Helmet_NORM.tga
|
||||
map_opacity
|
||||
map_d
|
||||
refl
|
||||
map_kS MG_Player_Helmet_SPEC.tga
|
||||
map_kA
|
||||
map_Ns
|
||||
|
||||
newmtl MG_MovieCycle_PlayerDisc_MI
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 1 1 1
|
||||
illum 2
|
||||
Ns 10
|
||||
map_Kd MG_Player_Disc_EMSS.tga
|
||||
map_bump MG_Player_Disc_NORM.tga
|
||||
bump MG_Player_Disc_NORM.tga
|
||||
map_opacity
|
||||
map_d
|
||||
refl
|
||||
map_kS MG_Player_Disc_SPEC.tga
|
||||
map_kA
|
||||
map_Ns
|
||||
|
||||
newmtl MG_MovieCycle_PlayerBaton_MI
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 1 1 1
|
||||
illum 2
|
||||
Ns 10
|
||||
map_Kd MG_Player_Baton_EMSS.tga
|
||||
map_bump MG_Player_Baton_NORM.tga
|
||||
bump MG_Player_Baton_NORM.tga
|
||||
map_opacity
|
||||
map_d
|
||||
refl
|
||||
map_kS MG_Player_Baton_SPEC.tga
|
||||
map_kA
|
||||
map_Ns
|
||||
|
||||
newmtl Explorer_Default
|
||||
Ka 0.117647 0.117647 0.117647
|
||||
Kd 0.752941 0.752941 0.752941
|
||||
Ks 0.752941 0.752941 0.752941
|
||||
illum 2
|
||||
Ns 8
|
||||
map_Kd
|
||||
map_bump
|
||||
bump
|
||||
map_opacity
|
||||
map_d
|
||||
refl
|
||||
map_kS
|
||||
map_kA
|
||||
map_Ns
|
||||
@@ -1,40 +0,0 @@
|
||||
newmtl material_1
|
||||
d 1
|
||||
Ns 1
|
||||
Ni 0
|
||||
Ka 0.121569 0.121569 0.121569
|
||||
Kd 1 1 1
|
||||
Ks 0 0 0
|
||||
Km 0
|
||||
map_Kd /Maps/snd2_01.jpg
|
||||
|
||||
newmtl material_1_mountain
|
||||
d 1
|
||||
Ns 1
|
||||
Ni 0
|
||||
Ka 0 0 0
|
||||
Kd 0.501961 0.501961 0.501961
|
||||
Ks 0 0 0
|
||||
Km 0
|
||||
map_Kd /Maps/mtlm1.jpg
|
||||
|
||||
newmtl default
|
||||
d 1
|
||||
Ns 1
|
||||
Ni 0
|
||||
Ka 0 0 0
|
||||
Kd 0.290196 0.282353 0.254902
|
||||
Ks 1 1 1
|
||||
Km 0
|
||||
map_Kd /Maps/1thr.jpg
|
||||
|
||||
newmtl default_bldgs2
|
||||
d 1
|
||||
Ns 1
|
||||
Ni 0
|
||||
Ka 0 0 0
|
||||
Kd 1 1 1
|
||||
Ks 1 1 1
|
||||
Km 0
|
||||
map_Kd /Maps/axq2.jpg
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
# Blender v2.69 (sub 0) OBJ File: 'obstaclesandstuff.blend'
|
||||
# www.blender.org
|
||||
mtllib plane.mtl
|
||||
o Plane_Plane.001
|
||||
v 102.461288 0.778257 97.553291
|
||||
v -97.538712 0.778257 97.553291
|
||||
v 102.461288 0.778257 -102.446709
|
||||
v -97.538712 0.778257 -102.446709
|
||||
vt 0.000100 0.000100
|
||||
vt 0.999900 0.000100
|
||||
vt 0.000100 0.999900
|
||||
vt 0.999900 0.999900
|
||||
vn 0.000000 1.000000 0.000000
|
||||
usemtl Material.004
|
||||
s off
|
||||
f 2/1/1 1/2/1 4/3/1
|
||||
f 1/2/1 3/4/1 4/3/1
|
||||
@@ -0,0 +1,211 @@
|
||||
# Blender v2.69 (sub 0) OBJ File: 'obstaclesandstuff.blend'
|
||||
# www.blender.org
|
||||
mtllib sphere.mtl
|
||||
o Icosphere
|
||||
v -0.000000 -0.184854 -0.000000
|
||||
v 0.133761 -0.082670 0.097182
|
||||
v -0.051091 -0.082670 0.157246
|
||||
v -0.165338 -0.082669 -0.000000
|
||||
v -0.051091 -0.082670 -0.157246
|
||||
v 0.133761 -0.082670 -0.097182
|
||||
v 0.051091 0.082670 0.157246
|
||||
v -0.133761 0.082670 0.097182
|
||||
v -0.133761 0.082670 -0.097182
|
||||
v 0.051091 0.082670 -0.157246
|
||||
v 0.165338 0.082669 -0.000000
|
||||
v -0.000000 0.184854 -0.000000
|
||||
v -0.030031 -0.157247 0.092426
|
||||
v 0.078622 -0.157247 0.057122
|
||||
v 0.048592 -0.097185 0.149549
|
||||
v 0.157245 -0.097184 -0.000000
|
||||
v 0.078622 -0.157247 -0.057122
|
||||
v -0.097183 -0.157246 -0.000000
|
||||
v -0.127214 -0.097184 0.092426
|
||||
v -0.030031 -0.157247 -0.092426
|
||||
v -0.127214 -0.097184 -0.092426
|
||||
v 0.048592 -0.097185 -0.149549
|
||||
v 0.175807 0.000000 0.057122
|
||||
v 0.175807 0.000000 -0.057122
|
||||
v -0.000000 0.000000 0.184854
|
||||
v 0.108654 0.000000 0.149550
|
||||
v -0.175807 0.000000 0.057122
|
||||
v -0.108654 0.000000 0.149550
|
||||
v -0.108654 0.000000 -0.149550
|
||||
v -0.175807 0.000000 -0.057122
|
||||
v 0.108654 0.000000 -0.149550
|
||||
v -0.000000 0.000000 -0.184854
|
||||
v 0.127214 0.097184 0.092426
|
||||
v -0.048592 0.097185 0.149549
|
||||
v -0.157245 0.097184 -0.000000
|
||||
v -0.048592 0.097185 -0.149549
|
||||
v 0.127214 0.097184 -0.092426
|
||||
v 0.030031 0.157247 0.092426
|
||||
v 0.097183 0.157246 -0.000000
|
||||
v -0.078622 0.157247 0.057122
|
||||
v -0.078622 0.157247 -0.057122
|
||||
v 0.030031 0.157247 -0.092426
|
||||
vt 0.000000 0.000000
|
||||
vt 1.000000 0.000000
|
||||
vt 1.000000 1.000000
|
||||
vn 0.102381 -0.943523 0.315090
|
||||
vn 0.700224 -0.661699 0.268032
|
||||
vn -0.268034 -0.943523 0.194737
|
||||
vn -0.268034 -0.943523 -0.194737
|
||||
vn 0.102381 -0.943523 -0.315090
|
||||
vn 0.904989 -0.330385 0.268031
|
||||
vn 0.024747 -0.330386 0.943521
|
||||
vn -0.889697 -0.330385 0.315095
|
||||
vn -0.574602 -0.330387 -0.748784
|
||||
vn 0.534576 -0.330386 -0.777865
|
||||
vn 0.802609 -0.125627 0.583127
|
||||
vn -0.306569 -0.125628 0.943522
|
||||
vn -0.992077 -0.125629 0.000000
|
||||
vn -0.306569 -0.125628 -0.943522
|
||||
vn 0.802609 -0.125627 -0.583127
|
||||
vn 0.408946 0.661699 0.628425
|
||||
vn -0.471300 0.661699 0.583122
|
||||
vn -0.700224 0.661699 -0.268032
|
||||
vn 0.038530 0.661699 -0.748779
|
||||
vn 0.724042 0.661695 -0.194736
|
||||
vn -0.038530 -0.661699 0.748779
|
||||
vn 0.187594 -0.794658 0.577345
|
||||
vn 0.471300 -0.661699 0.583122
|
||||
vn 0.700224 -0.661699 -0.268032
|
||||
vn 0.607060 -0.794656 0.000000
|
||||
vn 0.331304 -0.943524 0.000000
|
||||
vn -0.724042 -0.661695 0.194736
|
||||
vn -0.491119 -0.794658 0.356821
|
||||
vn -0.408946 -0.661699 0.628425
|
||||
vn -0.408946 -0.661699 -0.628425
|
||||
vn -0.491119 -0.794657 -0.356821
|
||||
vn -0.724042 -0.661695 -0.194736
|
||||
vn 0.471300 -0.661699 -0.583122
|
||||
vn 0.187594 -0.794658 -0.577345
|
||||
vn -0.038530 -0.661699 -0.748779
|
||||
vn 0.992077 0.125629 0.000000
|
||||
vn 0.982246 -0.187599 0.000000
|
||||
vn 0.904989 -0.330385 -0.268031
|
||||
vn 0.306569 0.125628 0.943522
|
||||
vn 0.303531 -0.187597 0.934171
|
||||
vn 0.534576 -0.330386 0.777865
|
||||
vn -0.802609 0.125627 0.583127
|
||||
vn -0.794655 -0.187595 0.577348
|
||||
vn -0.574602 -0.330387 0.748783
|
||||
vn -0.802609 0.125627 -0.583127
|
||||
vn -0.794655 -0.187595 -0.577348
|
||||
vn -0.889697 -0.330385 -0.315095
|
||||
vn 0.306569 0.125628 -0.943522
|
||||
vn 0.303531 -0.187597 -0.934171
|
||||
vn 0.024747 -0.330386 -0.943521
|
||||
vn 0.574602 0.330387 0.748784
|
||||
vn 0.794656 0.187595 0.577348
|
||||
vn 0.889697 0.330385 0.315095
|
||||
vn -0.534576 0.330386 0.777864
|
||||
vn -0.303531 0.187597 0.934171
|
||||
vn -0.024747 0.330386 0.943521
|
||||
vn -0.904989 0.330385 -0.268031
|
||||
vn -0.982246 0.187599 0.000000
|
||||
vn -0.904989 0.330384 0.268031
|
||||
vn -0.024747 0.330386 -0.943521
|
||||
vn -0.303531 0.187597 -0.934171
|
||||
vn -0.534576 0.330386 -0.777865
|
||||
vn 0.889697 0.330385 -0.315095
|
||||
vn 0.794655 0.187595 -0.577348
|
||||
vn 0.574602 0.330387 -0.748784
|
||||
vn 0.268034 0.943523 0.194737
|
||||
vn 0.491120 0.794657 0.356821
|
||||
vn 0.724042 0.661695 0.194736
|
||||
vn -0.102381 0.943523 0.315090
|
||||
vn -0.187594 0.794658 0.577345
|
||||
vn 0.038530 0.661699 0.748779
|
||||
vn -0.331304 0.943524 0.000000
|
||||
vn -0.607060 0.794656 0.000000
|
||||
vn -0.700224 0.661699 0.268032
|
||||
vn -0.102381 0.943524 -0.315090
|
||||
vn -0.187594 0.794658 -0.577345
|
||||
vn -0.471300 0.661699 -0.583122
|
||||
vn 0.268034 0.943523 -0.194736
|
||||
vn 0.491120 0.794657 -0.356821
|
||||
vn 0.408947 0.661699 -0.628425
|
||||
usemtl Material.001
|
||||
s off
|
||||
f 1/1/1 14/2/1 13/3/1
|
||||
f 2/1/2 14/2/2 16/3/2
|
||||
f 1/1/3 13/2/3 18/3/3
|
||||
f 1/1/4 18/2/4 20/3/4
|
||||
f 1/1/5 20/2/5 17/3/5
|
||||
f 2/1/6 16/2/6 23/3/6
|
||||
f 3/1/7 15/2/7 25/3/7
|
||||
f 4/1/8 19/2/8 27/3/8
|
||||
f 5/1/9 21/2/9 29/3/9
|
||||
f 6/1/10 22/2/10 31/3/10
|
||||
f 2/1/11 23/2/11 26/3/11
|
||||
f 3/1/12 25/2/12 28/3/12
|
||||
f 4/1/13 27/2/13 30/3/13
|
||||
f 5/1/14 29/2/14 32/3/14
|
||||
f 6/1/15 31/2/15 24/3/15
|
||||
f 7/1/16 33/2/16 38/3/16
|
||||
f 8/1/17 34/2/17 40/3/17
|
||||
f 9/1/18 35/2/18 41/3/18
|
||||
f 10/1/19 36/2/19 42/3/19
|
||||
f 11/1/20 37/2/20 39/3/20
|
||||
f 13/1/21 15/2/21 3/3/21
|
||||
f 13/1/22 14/2/22 15/3/22
|
||||
f 14/1/23 2/2/23 15/3/23
|
||||
f 16/1/24 17/2/24 6/3/24
|
||||
f 16/1/25 14/2/25 17/3/25
|
||||
f 14/1/26 1/2/26 17/3/26
|
||||
f 18/1/27 19/2/27 4/3/27
|
||||
f 18/1/28 13/2/28 19/3/28
|
||||
f 13/1/29 3/2/29 19/3/29
|
||||
f 20/1/30 21/2/30 5/3/30
|
||||
f 20/1/31 18/2/31 21/3/31
|
||||
f 18/1/32 4/2/32 21/3/32
|
||||
f 17/1/33 22/2/33 6/3/33
|
||||
f 17/1/34 20/2/34 22/3/34
|
||||
f 20/1/35 5/2/35 22/3/35
|
||||
f 23/1/36 24/2/36 11/3/36
|
||||
f 23/1/37 16/2/37 24/3/37
|
||||
f 16/1/38 6/2/38 24/3/38
|
||||
f 25/1/39 26/2/39 7/3/39
|
||||
f 25/1/40 15/2/40 26/3/40
|
||||
f 15/1/41 2/2/41 26/3/41
|
||||
f 27/1/42 28/2/42 8/3/42
|
||||
f 27/1/43 19/2/43 28/3/43
|
||||
f 19/1/44 3/2/44 28/3/44
|
||||
f 29/1/45 30/2/45 9/3/45
|
||||
f 29/1/46 21/2/46 30/3/46
|
||||
f 21/1/47 4/2/47 30/3/47
|
||||
f 31/1/48 32/2/48 10/3/48
|
||||
f 31/1/49 22/2/49 32/3/49
|
||||
f 22/1/50 5/2/50 32/3/50
|
||||
f 26/1/51 33/2/51 7/3/51
|
||||
f 26/1/52 23/2/52 33/3/52
|
||||
f 23/1/53 11/2/53 33/3/53
|
||||
f 28/1/54 34/2/54 8/3/54
|
||||
f 28/1/55 25/2/55 34/3/55
|
||||
f 25/1/56 7/2/56 34/3/56
|
||||
f 30/1/57 35/2/57 9/3/57
|
||||
f 30/1/58 27/2/58 35/3/58
|
||||
f 27/1/59 8/2/59 35/3/59
|
||||
f 32/1/60 36/2/60 10/3/60
|
||||
f 32/1/61 29/2/61 36/3/61
|
||||
f 29/1/62 9/2/62 36/3/62
|
||||
f 24/1/63 37/2/63 11/3/63
|
||||
f 24/1/64 31/2/64 37/3/64
|
||||
f 31/1/65 10/2/65 37/3/65
|
||||
f 38/1/66 39/2/66 12/3/66
|
||||
f 38/1/67 33/2/67 39/3/67
|
||||
f 33/1/68 11/2/68 39/3/68
|
||||
f 40/1/69 38/2/69 12/3/69
|
||||
f 40/1/70 34/2/70 38/3/70
|
||||
f 34/1/71 7/2/71 38/3/71
|
||||
f 41/1/72 40/2/72 12/3/72
|
||||
f 41/1/73 35/2/73 40/3/73
|
||||
f 35/1/74 8/2/74 40/3/74
|
||||
f 42/1/75 41/2/75 12/3/75
|
||||
f 42/1/76 36/2/76 41/3/76
|
||||
f 36/1/77 9/2/77 41/3/77
|
||||
f 39/1/78 42/2/78 12/3/78
|
||||
f 39/1/79 37/2/79 42/3/79
|
||||
f 37/1/80 10/2/80 42/3/80
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user