BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Background fixes

Browse Source
This commit is contained in:
viktorljung
2015-10-22 14:13:38 +02:00
parent f59f123340
commit 2051c8186c
6 changed files with 98 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/Models/Brunn_Diffuse.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 MiB

assets/Models/Brunn_Normals.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 MiB

assets/Models/Brunn_Specular.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 926 KiB

assets/Models/Halfpipe.mtl
+6 -6
View File
@@ -1,14 +1,14 @@
# Blender MTL File: 'None' # Blender MTL File: 'Background.blend'
# Material Count: 1 # Material Count: 1
newmtl Material.001 newmtl Material.001
Ns 96.078431 Ns 92.156863
Ka 0.000000 0.000000 0.000000 Ka 0.000000 0.000000 0.000000
Kd 0.640000 0.640000 0.640000 Kd 0.512000 0.512000 0.512000
Ks 0.500000 0.500000 0.500000 Ks 0.500000 0.500000 0.500000
Ni 1.000000 Ni 1.000000
d 1.000000 d 1.000000
illum 2 illum 2
map_Kd Test/Brick_Diffuse.png map_Kd Brunn_Diffuse.png
map_Bump Test/Brick_Normal.png map_Bump Brunn_Normals.png
map_Ks Test/Brick_Specular.png map_Ks Brunn_Specular.png
assets/Models/Halfpipe.obj
+90 -92
View File
@@ -1,11 +1,10 @@
# Blender v2.75 (sub 0) OBJ File: '' # Blender v2.75 (sub 0) OBJ File: 'Background.blend'
# www.blender.org # www.blender.org
mtllib Halfpipe.mtl mtllib Halfpipe.mtl
o Cylinder o Cylinder
v 0.000000 -2.908792 -1.000000
v 0.000000 2.908792 -1.000000
v 0.195090 -2.908792 -0.980785 v 0.195090 -2.908792 -0.980785
v 0.195090 2.908792 -0.980785 v 0.195090 2.908792 -0.980785
v 0.000000 2.908792 -1.000000
v 0.382683 -2.908792 -0.923880 v 0.382683 -2.908792 -0.923880
v 0.382683 2.908792 -0.923880 v 0.382683 2.908792 -0.923880
v 0.555570 -2.908792 -0.831470 v 0.555570 -2.908792 -0.831470
@@ -19,11 +18,10 @@ v 0.923880 2.908792 -0.382683
v 0.980785 -2.908792 -0.195090 v 0.980785 -2.908792 -0.195090
v 0.980785 2.908792 -0.195090 v 0.980785 2.908792 -0.195090
v 1.000000 -2.908792 -0.000000 v 1.000000 -2.908792 -0.000000
v 1.000000 2.908792 -0.000000 v 1.000000 2.908792 0.000000
v -1.000000 -2.908792 -0.000001
v -1.000000 2.908792 -0.000001
v -0.980785 -2.908792 -0.195091 v -0.980785 -2.908792 -0.195091
v -0.980785 2.908792 -0.195091 v -0.980785 2.908792 -0.195091
v -1.000000 2.908792 -0.000001
v -0.923879 -2.908792 -0.382684 v -0.923879 -2.908792 -0.382684
v -0.923879 2.908792 -0.382684 v -0.923879 2.908792 -0.382684
v -0.831469 -2.908792 -0.555571 v -0.831469 -2.908792 -0.555571
@@ -34,91 +32,91 @@ v -0.555569 -2.908792 -0.831470
v -0.555569 2.908792 -0.831470 v -0.555569 2.908792 -0.831470
v -0.382682 -2.908792 -0.923880 v -0.382682 -2.908792 -0.923880
v -0.382682 2.908792 -0.923880 v -0.382682 2.908792 -0.923880
v -0.195089 -2.908792 -0.980786 v 0.000000 -2.908792 -1.000000
v -0.195089 2.908792 -0.980786 v -0.195089 2.908792 -0.980786
vt -1.156714 -1.419990 v -0.195089 -2.908792 -0.980787
vt -1.158346 2.336063 v -1.000000 -2.908792 -0.000001
vt -1.031779 2.336118 vt 0.572383 0.000045
vt -1.283288 -1.420045 vt 0.572387 1.000008
vt -1.284913 2.336008 vt 0.515062 1.000008
vt -1.409862 -1.420100 vt 0.629704 0.000045
vt -1.411480 2.335954 vt 0.629712 1.000008
vt -1.536436 -1.420155 vt 0.687026 0.000045
vt -1.538048 2.335899 vt 0.687036 1.000008
vt 2.387354 -1.418355 vt 0.744348 0.000044
vt 2.385534 2.337692 vt 0.744361 1.000008
vt 2.512101 2.337753 vt 0.801670 0.000044
vt 2.260782 -1.418416 vt 0.801686 1.000007
vt 2.258967 2.337631 vt 0.858992 0.000044
vt 2.134208 -1.418478 vt 0.859011 1.000007
vt 2.132400 2.337570 vt 0.916314 0.000043
vt 2.007634 -1.418538 vt 0.916335 1.000006
vt 2.005832 2.337510 vt 0.973636 0.000043
vt -0.144122 -1.419541 vt 0.973661 1.000006
vt -0.145809 2.336510 vt 0.113808 0.000043
vt -0.019241 2.336567 vt 0.113788 1.000007
vt -0.270696 -1.419598 vt 0.056463 1.000007
vt -0.272376 2.336454 vt 0.171130 0.000044
vt -0.397270 -1.419654 vt 0.171113 1.000008
vt -0.398943 2.336397 vt 0.228452 0.000044
vt -0.523844 -1.419711 vt 0.228437 1.000008
vt -0.525511 2.336341 vt 0.285774 0.000044
vt -0.650418 -1.419767 vt 0.285762 1.000008
vt -0.652078 2.336285 vt 0.343096 0.000045
vt -0.776992 -1.419823 vt 0.343087 1.000008
vt -0.778645 2.336229 vt 0.400418 0.000045
vt -1.030140 -1.419935 vt 0.400412 1.000008
vt -0.905212 2.336174 vt 0.515061 0.000045
vt -0.903566 -1.419879 vt 0.457737 1.000008
vt 2.513929 -1.418293 vt 0.457739 0.000045
vt -0.017548 -1.419484 vt 0.056486 0.000043
vn -0.098000 0.000000 0.995200 vn -0.098000 -0.000000 0.995200
vn -0.290300 0.000000 0.956900 vn -0.290300 -0.000000 0.956900
vn -0.471400 0.000000 0.881900 vn -0.471400 -0.000000 0.881900
vn -0.634400 0.000000 0.773000 vn -0.634400 -0.000000 0.773000
vn -0.773000 0.000000 0.634400 vn -0.773000 -0.000000 0.634400
vn -0.881900 0.000000 0.471400 vn -0.881900 -0.000000 0.471400
vn -0.956900 0.000000 0.290300 vn -0.956900 -0.000000 0.290300
vn -0.995200 0.000000 0.098000 vn -0.995200 -0.000000 0.098000
vn 0.995200 0.000000 0.098000 vn 0.995200 -0.000000 0.098000
vn 0.956900 0.000000 0.290300 vn 0.956900 -0.000000 0.290300
vn 0.881900 0.000000 0.471400 vn 0.881900 -0.000000 0.471400
vn 0.773000 0.000000 0.634400 vn 0.773000 -0.000000 0.634400
vn 0.634400 0.000000 0.773000 vn 0.634400 -0.000000 0.773000
vn 0.471400 0.000000 0.881900 vn 0.471400 -0.000000 0.881900
vn 0.098000 0.000000 0.995200 vn 0.098000 -0.000000 0.995200
vn 0.290300 0.000000 0.956900 vn 0.290300 -0.000000 0.956900
usemtl Material.001 usemtl Material.001
s off s 1
f 3/1/1 4/2/1 2/3/1 f 1/1/1 2/2/1 3/3/1
f 5/4/2 6/5/2 4/2/2 f 4/4/2 5/5/2 2/2/2
f 7/6/3 8/7/3 6/5/3 f 6/6/3 7/7/3 5/5/3
f 9/8/4 10/9/4 8/7/4 f 8/8/4 9/9/4 7/7/4
f 11/10/5 12/11/5 10/12/5 f 10/10/5 11/11/5 9/9/5
f 13/13/6 14/14/6 12/11/6 f 12/12/6 13/13/6 11/11/6
f 15/15/7 16/16/7 14/14/7 f 14/14/7 15/15/7 13/13/7
f 17/17/8 18/18/8 16/16/8 f 16/16/8 17/17/8 15/15/8
f 21/19/9 22/20/9 20/21/9 f 18/18/9 19/19/9 20/20/9
f 23/22/10 24/23/10 22/20/10 f 21/21/10 22/22/10 19/19/10
f 25/24/11 26/25/11 24/23/11 f 23/23/11 24/24/11 22/22/11
f 27/26/12 28/27/12 26/25/12 f 25/25/12 26/26/12 24/24/12
f 29/28/13 30/29/13 28/27/13 f 27/27/13 28/28/13 26/26/13
f 31/30/14 32/31/14 30/29/14 f 29/29/14 30/30/14 28/28/14
f 1/32/15 2/3/15 34/33/15 f 31/31/15 3/3/15 32/32/15
f 33/34/16 34/33/16 32/31/16 f 33/33/16 32/32/16 30/30/16
f 1/32/1 3/1/1 2/3/1 f 31/31/1 1/1/1 3/3/1
f 3/1/2 5/4/2 4/2/2 f 1/1/2 4/4/2 2/2/2
f 5/4/3 7/6/3 6/5/3 f 4/4/3 6/6/3 5/5/3
f 7/6/4 9/8/4 8/7/4 f 6/6/4 8/8/4 7/7/4
f 9/35/5 11/10/5 10/12/5 f 8/8/5 10/10/5 9/9/5
f 11/10/6 13/13/6 12/11/6 f 10/10/6 12/12/6 11/11/6
f 13/13/7 15/15/7 14/14/7 f 12/12/7 14/14/7 13/13/7
f 15/15/8 17/17/8 16/16/8 f 14/14/8 16/16/8 15/15/8
f 19/36/9 21/19/9 20/21/9 f 34/34/9 18/18/9 20/20/9
f 21/19/10 23/22/10 22/20/10 f 18/18/10 21/21/10 19/19/10
f 23/22/11 25/24/11 24/23/11 f 21/21/11 23/23/11 22/22/11
f 25/24/12 27/26/12 26/25/12 f 23/23/12 25/25/12 24/24/12
f 27/26/13 29/28/13 28/27/13 f 25/25/13 27/27/13 26/26/13
f 29/28/14 31/30/14 30/29/14 f 27/27/14 29/29/14 28/28/14
f 33/34/15 1/32/15 34/33/15 f 33/33/15 31/31/15 32/32/15
f 31/30/16 33/34/16 32/31/16 f 29/29/16 33/33/16 30/30/16
src/game/Game/LevelSystem.cpp
+2 -2
View File
@@ -61,8 +61,8 @@ void dd::Systems::LevelSystem::Initialize()
auto travels = m_World->AddComponent<Components::Travels>(t_halfPipe); auto travels = m_World->AddComponent<Components::Travels>(t_halfPipe);
travels->CurrentlyTraveling = false; travels->CurrentlyTraveling = false;
auto model = m_World->AddComponent<Components::Model>(t_halfPipe); auto model = m_World->AddComponent<Components::Model>(t_halfPipe);
model->ModelFile = "Models/Test/halfpipe/Halfpipe.obj"; model->ModelFile = "Models/Halfpipe.obj";
model->Color = glm::vec4(0.8f, 0.8f, 0.8f, 1.f); //model->Color = glm::vec4(0.8f, 0.8f, 0.8f, 1.f);
m_World->CommitEntity(t_halfPipe); m_World->CommitEntity(t_halfPipe);
auto t_halfPipe2 = m_World->CloneEntity(t_halfPipe); auto t_halfPipe2 = m_World->CloneEntity(t_halfPipe);