działające smiglo
This commit is contained in:
parent
b95e0e48c9
commit
73db74da7a
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1,4 @@
|
||||
projekt.vcxproj -> C:\Users\Tomek\source\repos\Grafika\GrafikaProjekt\Debug\grk-cw6.exe
|
||||
main.cpp
|
||||
C:\Users\Tomek\source\repos\Grafika\GrafikaProjekt\pliki\src\main.cpp(302,12): warning C4244: "argument": konwersja z "time_t" do "unsigned int", możliwa utrata danych
|
||||
Camera.obj : warning LNK4075: zignorowano opcję „/EDITANDCONTINUE” z powodu określenia opcji „/INCREMENTAL:NO”
|
||||
projekt.vcxproj -> C:\Users\Tomek\source\repos\Grafika\GrafikaProjekt\Debug\grk-cw6.exe
|
||||
|
Binary file not shown.
Binary file not shown.
13
GrafikaProjekt/pliki/models/smiglo.mtl
Normal file
13
GrafikaProjekt/pliki/models/smiglo.mtl
Normal file
@ -0,0 +1,13 @@
|
||||
# Blender MTL File: 'None'
|
||||
# Material Count: 1
|
||||
|
||||
newmtl lambert1.001
|
||||
Ns 225.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.800000 0.800000 0.800000
|
||||
Ks 0.500000 0.500000 0.500000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 2
|
||||
map_Kd C:\\Users\\Tomek\\Dropbox\\Komputer\\Desktop\\annie-spratt-kG-ZwDuQ8ME-unsplash.jpg
|
File diff suppressed because it is too large
Load Diff
@ -257,7 +257,7 @@ void renderScene()
|
||||
drawObjectTexture(fish1Context, glm::translate(glm::vec3(0, 0, 0)), textureFish1);
|
||||
rypa = (rypa + 1) % 360;
|
||||
drawObjectTexture(fish2Context, glm::translate(glm::vec3(0.25f, 0, (float)rypa/(float)360)) * glm::rotate(glm::degrees((float)rypa / (float)360), glm::vec3(0, 1, 0)), textureFish2);
|
||||
drawObjectTexture(smiglo, shipModelMatrix * glm::translate(glm::vec3(0.01, -0.27, -1)) * glm::rotate(glm::degrees((float)rypa / (float)360), glm::vec3(0, 0, 1)), textureSmiglo);
|
||||
drawObjectTexture(smiglo, shipModelMatrix * glm::translate(glm::vec3(0, -0.3, -1)) * glm::rotate(glm::degrees((float)rypa), glm::vec3(0, 0, 1)), textureSmiglo);
|
||||
drawObjectTexture(grass, glm::translate(glm::vec3(0, 1, 0)), texturePlant3);
|
||||
drawObjectTexture(plant4, glm::translate(glm::vec3(0, 1, 0)), texturePlant4);
|
||||
drawObjectTexture(plant5, glm::translate(glm::vec3(0, 1, 0)), texturePlant5);
|
||||
|
Loading…
Reference in New Issue
Block a user