s452722/grafika-uam-rybki-21-22
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ship model changed

Browse Source
This commit is contained in:
Mateusz Drewniak 2022-01-03 23:04:35 +01:00
parent 40c425b64e
commit 5f116faf2a
3 changed files with 35080 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cw 6/models/ship.mtl Normal file
View File

@ -0,0 +1,10 @@
# Blender MTL File: 'None'
# Material Count: 1
newmtl None
Ns 500
Ka 0.8 0.8 0.8
Kd 0.8 0.8 0.8
Ks 0.8 0.8 0.8
d 1
illum 2

35069
cw 6/models/ship.obj Normal file
View File

File diff suppressed because it is too large Load Diff

2
cw 6/src/main_6_1.cpp
View File

@ -158,7 +158,7 @@ void init()
glEnable(GL_DEPTH_TEST);
programColor = shaderLoader.CreateProgram("shaders/shader_color.vert", "shaders/shader_color.frag");
programTexture = shaderLoader.CreateProgram("shaders/shader_tex.vert", "shaders/shader_tex.frag");
loadModelToContext("models/spaceship.obj", shipContext);
loadModelToContext("models/ship.obj", shipContext);
loadModelToContext("models/sphere.obj", sphereContext);
loadModelToContext("models/seafloor.obj", seafloorContext);
loadModelToContext("models/skybox.obj", skyboxContext);