add two fish models
This commit is contained in:
parent
7af54405c3
commit
5c9ddf6a8c
Binary file not shown.
@ -1 +1,4 @@
|
|||||||
grafika_projekt.vcxproj -> C:\Users\sanan\source\repos\GRK-Projekt\Debug\grafika_projekt.exe
|
main.cpp
|
||||||
|
C:\Users\sanan\source\repos\GRK-Projekt\grafika_projekt\src\main.cpp(112,10): warning C4244: "=": konwersja z "int" do "float", możliwa utrata danych
|
||||||
|
C:\Users\sanan\source\repos\GRK-Projekt\grafika_projekt\src\main.cpp(113,10): warning C4244: "=": konwersja z "int" do "float", możliwa utrata danych
|
||||||
|
grafika_projekt.vcxproj -> C:\Users\sanan\source\repos\GRK-Projekt\Debug\grafika_projekt.exe
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0
grafika_projekt/models/Blank image.jpg
Normal file
0
grafika_projekt/models/Blank image.jpg
Normal file
0
grafika_projekt/models/Blank.mtl
Normal file
0
grafika_projekt/models/Blank.mtl
Normal file
31780
grafika_projekt/models/Blank.obj
Normal file
31780
grafika_projekt/models/Blank.obj
Normal file
File diff suppressed because it is too large
Load Diff
BIN
grafika_projekt/models/fish.3ds
Normal file
BIN
grafika_projekt/models/fish.3ds
Normal file
Binary file not shown.
BIN
grafika_projekt/models/fish.blend
Normal file
BIN
grafika_projekt/models/fish.blend
Normal file
Binary file not shown.
13
grafika_projekt/models/fish.mtl
Normal file
13
grafika_projekt/models/fish.mtl
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
# Blender MTL File: 'fish.blend'
|
||||||
|
# Material Count: 1
|
||||||
|
|
||||||
|
newmtl Material
|
||||||
|
Ns 96.078431
|
||||||
|
Ka 1.000000 1.000000 1.000000
|
||||||
|
Kd 0.800000 0.800000 0.800000
|
||||||
|
Ks 0.050000 0.050000 0.050000
|
||||||
|
Ke 0.000000 0.000000 0.000000
|
||||||
|
Ni 1.000000
|
||||||
|
d 1.000000
|
||||||
|
illum 2
|
||||||
|
map_Kd fish_texture.png
|
1395
grafika_projekt/models/fish.obj
Normal file
1395
grafika_projekt/models/fish.obj
Normal file
File diff suppressed because it is too large
Load Diff
BIN
grafika_projekt/models/fish_texture.png
Normal file
BIN
grafika_projekt/models/fish_texture.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 126 KiB |
@ -258,7 +258,7 @@ void init()
|
|||||||
glEnable(GL_DEPTH_TEST);
|
glEnable(GL_DEPTH_TEST);
|
||||||
skyboxProgram = shaderLoader.CreateProgram((char *) "shaders/skybox.vert", (char *) "shaders/skybox.frag");
|
skyboxProgram = shaderLoader.CreateProgram((char *) "shaders/skybox.vert", (char *) "shaders/skybox.frag");
|
||||||
cubemapTexture = loadCubemap();
|
cubemapTexture = loadCubemap();
|
||||||
|
loadModelToContext("models/Blank.obj", fishContext);
|
||||||
initSkybox();
|
initSkybox();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user