Browse Source

added assets

develop
Robin Thoni 8 years ago
parent
commit
03ffabbf0c

BIN
TheGame/assets/objs/enterprise/NormalMap.png View File


+ 14
- 0
TheGame/assets/objs/enterprise/USSEnterprise.mtl View File

1
+# Blender MTL File: 'USSEnterprise.blend'
2
+# Material Count: 1
3
+
4
+newmtl Material
5
+Ns 96.078431
6
+Ka 0.000000 0.000000 0.000000
7
+Kd 0.800000 0.800000 0.800000
8
+Ks 0.800000 0.800000 0.800000
9
+Ni 1.000000
10
+d 1.000000
11
+illum 2
12
+map_Kd /home/robin/Downloads/UV Maps/UV Textur.png
13
+map_Bump /home/robin/Downloads/UV Maps/NormalMap.png
14
+map_Ks /home/robin/Downloads/UV Maps/UV Textur.png

+ 8888
- 0
TheGame/assets/objs/enterprise/USSEnterprise.obj
File diff suppressed because it is too large
View File


BIN
TheGame/assets/objs/enterprise/UV Textur.png View File


BIN
TheGame/assets/textures/rubiks.png View File


+ 3
- 3
TheGame/renderwidget.cpp View File

25
 
25
 
26
     for (int i = 0; i < 1000; ++i) {
26
     for (int i = 0; i < 1000; ++i) {
27
         UGEEntityCube* cube = new GameCube(_engine);
27
         UGEEntityCube* cube = new GameCube(_engine);
28
-        cube->setTextureId("test");
28
+        cube->setTextureId("rubiks");
29
 //        cube->rotate(Vector3D(0.0, 45.0, 45.0));
29
 //        cube->rotate(Vector3D(0.0, 45.0, 45.0));
30
         cube->move(Vector3D(0, i, i));
30
         cube->move(Vector3D(0, i, i));
31
 //        cube->setScale(Vector3D(1.0, 2.0, 1.0));
31
 //        cube->setScale(Vector3D(1.0, 2.0, 1.0));
34
     }
34
     }
35
 
35
 
36
     WaveFrontObj* wavefrontObj = new WaveFrontObj(this);
36
     WaveFrontObj* wavefrontObj = new WaveFrontObj(this);
37
-    wavefrontObj->openFile("/home/robin/Downloads/enterprise/obj/USSEnterprise.obj");
37
+    wavefrontObj->openFile("./assets/objs/enterprise/USSEnterprise.obj");
38
     UGEEntityWaveFrontObj* obj = new UGEEntityWaveFrontObj(wavefrontObj, this);
38
     UGEEntityWaveFrontObj* obj = new UGEEntityWaveFrontObj(wavefrontObj, this);
39
     _engine->addEntity(obj);
39
     _engine->addEntity(obj);
40
     _entities.append(obj);
40
     _entities.append(obj);
47
     _engine->setClearColor(Qt::gray);
47
     _engine->setClearColor(Qt::gray);
48
     _engine->initialize(70, width(), height());
48
     _engine->initialize(70, width(), height());
49
 
49
 
50
-    _engine->loadTextureFromFile("test", "/home/robin/Downloads/test.png");
50
+    _engine->loadTextureFromFile("rubiks", "./assets/textures/rubiks.png");
51
 }
51
 }
52
 
52
 
53
 void RenderWidget::paintGL()
53
 void RenderWidget::paintGL()

Loading…
Cancel
Save