Compare commits

...

1 Commits

Author SHA1 Message Date
Angelika Iskra
f87230cfae added old room; 2023-02-13 01:52:02 +01:00
27 changed files with 544 additions and 19 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,33 +1,68 @@
C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(513,5): warning MSB8028: Katalog pośredni (Debug\) zawiera pliki udostępnione z innego projektu (grk-cw9.vcxproj). Może to spowodować niepoprawne zachowanie podczas oczyszczania i ponownej kompilacji. C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(513,5): warning MSB8028: Katalog pośredni (Debug\) zawiera pliki udostępnione z innego projektu (grk-cw9.vcxproj). Może to spowodować niepoprawne zachowanie podczas oczyszczania i ponownej kompilacji.
Box.cpp
Camera.cpp
main.cpp main.cpp
C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: "APIENTRY": ponowna definicja makra C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: "APIENTRY": ponowna definicja makra
C:\Users\annas\Desktop\grafika_proj\GRK_Room\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY” D:\UAM\Grafika komputerowa\projekt\GRK_Room\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY”
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(180,30): warning C4305: "inicjowanie": obcięcie z "double" do "float" D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(180,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(199,38): warning C4305: "=": obcięcie z "double" do "float" D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(199,38): warning C4305: "=": obcięcie z "double" do "float"
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(222,16): warning C4305: "inicjowanie": obcięcie z "double" do "float" D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(222,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(241,16): warning C4305: "inicjowanie": obcięcie z "double" do "float" D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(241,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(259,15): warning C4101: "textureID": lokalna zmienna, do której nie istnieje odwołanie D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(259,15): warning C4101: "textureID": lokalna zmienna, do której nie istnieje odwołanie
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(347,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(347,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(353,96): warning C4305: "argument": obcięcie z "double" do "T" D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(353,96): warning C4305: "argument": obcięcie z "double" do "T"
with with
[ [
T=float T=float
] ]
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(356,59): warning C4305: "argument": obcięcie z "double" do "T" D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(356,59): warning C4305: "argument": obcięcie z "double" do "T"
with with
[ [
T=float T=float
] ]
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(505,29): warning C4018: "<": niezgodność typu ze znakiem/bez znaku D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(505,29): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(530,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(530,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(544,109): warning C4305: "argument": obcięcie z "double" do "T" D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(544,109): warning C4305: "argument": obcięcie z "double" do "T"
with with
[ [
T=float T=float
] ]
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(791,21): warning C4305: "-=": obcięcie z "double" do "float" D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(791,21): warning C4305: "-=": obcięcie z "double" do "float"
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(793,21): warning C4305: "+=": obcięcie z "double" do "float" D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(793,21): warning C4305: "+=": obcięcie z "double" do "float"
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(803,30): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(803,30): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych
Render_Utils.cpp
Shader_Loader.cpp
Texture.cpp
Generowanie kodu...
image_DXT.c
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\image_DXT.c(92,9): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
image_helper.c
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\image_helper.c(325,1): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\image_helper.c(366,58): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\image_helper.c(373,46): warning C4244: "=": konwersja z "float" do "int", możliwa utrata danych
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\image_helper.c(415,58): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\image_helper.c(422,62): warning C4244: "=": konwersja z "float" do "int", możliwa utrata danych
SOIL.c
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\SOIL.c(1719,36): warning C4018: "<=": niezgodność typu ze znakiem/bez znaku
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\SOIL.c(1729,19): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\SOIL.c(1841,6): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
stb_image_aug.c
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stb_image_aug.c(177,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stb_image_aug.c(251,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stb_image_aug.c(303,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stb_image_aug.c(1557,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stb_image_aug.c(2394,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stb_image_aug.c(2709,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stb_image_aug.c(2995,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stb_image_aug.c(3209,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stb_image_aug.c(3548,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stb_image_aug.c(3644,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stbi_DDS_aug_c.h(362,19): warning C4018: ">": niezgodność typu ze znakiem/bez znaku
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stbi_DDS_aug_c.h(366,19): warning C4018: ">": niezgodność typu ze znakiem/bez znaku
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stbi_DDS_aug_c.h(390,19): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stbi_DDS_aug_c.h(427,19): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\SOIL\stbi_DDS_aug_c.h(498,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
Generowanie kodu...
Box.obj : warning LNK4075: zignorowano opcję „/EDITANDCONTINUE” z powodu określenia opcji „/INCREMENTAL:NO” Box.obj : warning LNK4075: zignorowano opcję „/EDITANDCONTINUE” z powodu określenia opcji „/INCREMENTAL:NO”
LINK : warning LNK4098: domyślna biblioteka „MSVCRT” powoduje konflikt z innymi bibliotekami; użyj opcji /NODEFAULTLIB:biblioteka LINK : warning LNK4098: domyślna biblioteka „MSVCRT” powoduje konflikt z innymi bibliotekami; użyj opcji /NODEFAULTLIB:biblioteka
grk-cw9.vcxproj -> C:\Users\annas\Desktop\grafika_proj\GRK_Room\Debug\room.exe grk-cw9.vcxproj -> D:\UAM\Grafika komputerowa\projekt\GRK_Room\Debug\room.exe

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -2,7 +2,7 @@
<Project> <Project>
<ProjectOutputs> <ProjectOutputs>
<ProjectOutput> <ProjectOutput>
<FullPath>C:\Users\annas\Desktop\grafika_proj\GRK_Room\Debug\room.exe</FullPath> <FullPath>D:\UAM\Grafika komputerowa\projekt\GRK_Room\Debug\room.exe</FullPath>
</ProjectOutput> </ProjectOutput>
</ProjectOutputs> </ProjectOutputs>
<ContentFiles /> <ContentFiles />

Binary file not shown.

Binary file not shown.

View File

@ -1,2 +1,2 @@
PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0: PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:
Debug|Win32|C:\Users\annas\Desktop\grafika_proj\GRK_Room\| Debug|Win32|D:\UAM\Grafika komputerowa\projekt\GRK_Room\|

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,490 @@
# Blender v3.2.1 OBJ File: 'untitled.blend'
# www.blender.org
mtllib room.mtl
o room_Cube.001
v -2.000000 0.000000 2.500000
v -2.000000 2.500000 2.500000
v -2.000000 0.000000 -2.500000
v -2.000000 2.500000 -2.500000
v 2.000000 0.000000 2.500000
v 2.000000 2.500000 2.500000
v 2.000000 0.000000 -2.500000
v 2.000000 2.500000 -2.500000
v 1.800000 0.000000 -2.500000
v 1.800000 2.500000 -2.500000
v 1.800000 0.000000 2.500000
v 1.800000 2.500000 2.500000
v -1.800000 0.000000 -2.500000
v -1.800000 2.500000 2.500000
v -1.800000 2.500000 -2.500000
v -1.800000 0.000000 2.500000
v -2.000000 0.000000 -2.300000
v -2.000000 0.000000 2.300000
v -2.000000 2.500000 2.300000
v -2.000000 2.500000 -2.300000
v 2.000000 0.000000 2.300000
v 2.000000 0.000000 -2.300000
v 2.000000 2.500000 -2.300000
v 2.000000 2.500000 2.300000
v 1.800000 2.500000 -2.300000
v 1.800000 2.500000 2.300000
v 1.800000 0.000000 -2.300000
v 1.800000 0.000000 2.300000
v -1.800000 0.000000 -2.300000
v -1.800000 0.000000 2.300000
v -1.800000 2.500000 -2.300000
v -1.800000 2.500000 2.300000
v 1.800000 2.300000 -2.300000
v 1.800000 2.300000 2.300000
v -1.800000 2.300000 -2.300000
v -1.800000 2.300000 2.300000
v -0.480000 2.500000 -2.500000
v -0.480000 0.000000 2.500000
v -0.480000 0.000000 -2.500000
v -0.480000 2.500000 2.500000
v -0.480000 2.500000 -2.300000
v -0.480000 2.500000 2.300000
v -0.480000 0.000000 -2.300000
v -0.480000 0.000000 2.300000
v -0.480000 2.300000 -2.300000
v -0.480000 2.300000 2.300000
v 0.480000 2.500000 -2.500000
v 0.480000 0.000000 2.500000
v 0.480000 2.500000 -2.300000
v 0.480000 2.500000 2.300000
v 0.480000 0.000000 -2.500000
v 0.480000 2.500000 2.500000
v 0.480000 0.000000 -2.300000
v 0.480000 0.000000 2.300000
v 0.480000 2.300000 -2.300000
v 0.480000 2.300000 2.300000
v -2.000000 1.970000 2.500000
v -2.000000 1.970000 -2.500000
v 2.000000 1.970000 -2.500000
v 2.000000 1.970000 2.500000
v 1.800000 1.970000 2.500000
v 1.800000 1.970000 -2.500000
v -1.800000 1.970000 -2.500000
v -1.800000 1.970000 2.500000
v 2.000000 1.970000 -2.300000
v 2.000000 1.970000 2.300000
v -2.000000 1.970000 2.300000
v -2.000000 1.970000 -2.300000
v -0.480000 1.970000 2.500000
v -0.480000 1.970000 -2.500000
v 0.480000 1.970000 2.500000
v 0.480000 1.970000 -2.500000
v -1.800000 1.970000 2.300000
v 1.800000 1.970000 2.300000
v -1.800000 1.970000 -2.300000
v 1.800000 1.970000 -2.300000
v -0.480000 1.970000 -2.300000
v -0.480000 1.970000 2.300000
v 0.480000 1.970000 2.300000
v 0.480000 1.970000 -2.300000
v -2.000000 0.000000 0.750000
v -2.000000 2.500000 0.750000
v 2.000000 0.000000 0.750000
v 2.000000 2.500000 0.750000
v 1.800000 2.500000 0.750000
v 1.800000 0.000000 0.750000
v -1.800000 0.000000 0.750000
v -1.800000 2.500000 0.750000
v 1.800000 2.300000 0.750000
v -1.800000 2.300000 0.750000
v -0.480000 2.300000 0.750000
v -0.480000 2.500000 0.750000
v 0.480000 2.500000 0.750000
v 0.480000 2.300000 0.750000
v -2.000000 1.970000 0.750000
v 2.000000 1.970000 0.750000
v 1.800000 1.970000 0.750000
v -1.800000 1.970000 0.750000
v -2.000000 2.500000 -0.250000
v 2.000000 0.000000 -0.250000
v -2.000000 1.970000 -0.250000
v 1.800000 1.970000 -0.250000
v -2.000000 0.000000 -0.250000
v 2.000000 2.500000 -0.250000
v 1.800000 2.500000 -0.250000
v 1.800000 0.000000 -0.250000
v -1.800000 0.000000 -0.250000
v -1.800000 2.500000 -0.250000
v 1.800000 2.300000 -0.250000
v -1.800000 2.300000 -0.250000
v -0.480000 2.300000 -0.250000
v -0.480000 2.500000 -0.250000
v 0.480000 2.500000 -0.250000
v 0.480000 2.300000 -0.250000
v 2.000000 1.970000 -0.250000
v -1.800000 1.970000 -0.250000
v -2.000000 1.015374 -2.500000
v 2.000000 1.015374 -2.500000
v 2.000000 1.015374 2.500000
v 1.800000 1.015374 2.500000
v 1.800000 1.015374 -2.500000
v -1.800000 1.015374 -2.500000
v -1.800000 1.015374 2.500000
v 2.000000 1.015374 -2.300000
v 2.000000 1.015374 2.300000
v -2.000000 1.015374 2.300000
v -2.000000 1.015374 -2.300000
v 1.800000 1.015374 2.300000
v 1.800000 1.015374 -2.300000
v -0.480000 1.015374 2.500000
v -0.480000 1.015374 -2.500000
v 0.480000 1.015374 2.500000
v 0.480000 1.015374 -2.500000
v -2.000000 1.015374 2.500000
v -1.800000 1.015374 2.300000
v -1.800000 1.015374 -2.300000
v -0.480000 1.015374 -2.300000
v -0.480000 1.015374 2.300000
v 0.480000 1.015374 2.300000
v 0.480000 1.015374 -2.300000
v -1.800000 1.015374 0.750000
v 1.800000 1.015374 0.750000
v 2.000000 1.015374 0.750000
v -2.000000 1.015374 0.750000
v 2.000000 1.015374 -0.250000
v 1.800000 1.015374 -0.250000
v -1.800000 1.015374 -0.250000
v -2.000000 1.015374 -0.250000
vt 0.571865 0.237945
vt 0.625000 0.237945
vt 0.625000 0.250000
vt 0.571865 0.250000
vt 0.571865 0.481764
vt 0.625000 0.481764
vt 0.625000 0.500000
vt 0.571865 0.500000
vt 0.571865 0.733848
vt 0.625000 0.733848
vt 0.625000 0.750000
vt 0.571865 0.750000
vt 0.571865 0.942864
vt 0.625000 0.942864
vt 0.625000 1.000000
vt 0.571865 1.000000
vt 0.356764 0.733848
vt 0.375000 0.733848
vt 0.375000 0.750000
vt 0.356764 0.750000
vt 0.817864 0.733848
vt 0.875000 0.733848
vt 0.875000 0.750000
vt 0.817864 0.750000
vt 0.643236 0.733848
vt 0.643236 0.750000
vt 0.303586 0.733848
vt 0.303586 0.750000
vt 0.625000 0.768236
vt 0.571865 0.768236
vt 0.571865 0.428586
vt 0.625000 0.428586
vt 0.625000 0.307136
vt 0.571865 0.307136
vt 0.125000 0.733848
vt 0.182136 0.733848
vt 0.182136 0.750000
vt 0.125000 0.750000
vt 0.752288 0.733848
vt 0.752288 0.750000
vt 0.571865 0.877288
vt 0.625000 0.877288
vt 0.752288 0.500000
vt 0.817864 0.500000
vt 0.817864 0.512055
vt 0.752288 0.512055
vt 0.752288 0.622952
vt 0.817864 0.622952
vt 0.125000 0.500000
vt 0.182136 0.500000
vt 0.182136 0.512055
vt 0.125000 0.512055
vt 0.125000 0.622952
vt 0.182136 0.622952
vt 0.303586 0.500000
vt 0.356764 0.500000
vt 0.356764 0.512055
vt 0.303586 0.512055
vt 0.247712 0.733848
vt 0.182136 0.733848
vt 0.182136 0.733848
vt 0.247712 0.733848
vt 0.643236 0.500000
vt 0.643236 0.512055
vt 0.625000 0.512055
vt 0.625000 0.622952
vt 0.643236 0.622952
vt 0.875000 0.500000
vt 0.875000 0.512055
vt 0.875000 0.622952
vt 0.375000 0.500000
vt 0.375000 0.512055
vt 0.356764 0.622952
vt 0.375000 0.622952
vt 0.571865 0.512055
vt 0.571865 0.622952
vt 0.571865 0.000000
vt 0.625000 0.000000
vt 0.625000 0.016152
vt 0.571865 0.016152
vt 0.571865 0.182497
vt 0.625000 0.182497
vt 0.303586 0.622952
vt 0.356764 0.622952
vt 0.356764 0.733848
vt 0.303586 0.733848
vt 0.182136 0.567503
vt 0.182136 0.512055
vt 0.182136 0.512055
vt 0.182136 0.567503
vt 0.356764 0.622952
vt 0.356764 0.733848
vt 0.303586 0.512055
vt 0.356764 0.512055
vt 0.356764 0.512055
vt 0.303586 0.512055
vt 0.247712 0.512055
vt 0.247712 0.512055
vt 0.182136 0.622952
vt 0.247712 0.622952
vt 0.303586 0.733848
vt 0.247712 0.500000
vt 0.247712 0.512055
vt 0.696414 0.622952
vt 0.696414 0.733848
vt 0.696414 0.500000
vt 0.696414 0.512055
vt 0.571865 0.821414
vt 0.625000 0.821414
vt 0.696414 0.750000
vt 0.625000 0.372712
vt 0.571865 0.372712
vt 0.247712 0.733848
vt 0.247712 0.750000
vt 0.476468 0.768236
vt 0.476468 0.821414
vt 0.476468 0.307136
vt 0.476468 0.372712
vt 0.476468 0.877288
vt 0.476468 0.182497
vt 0.476468 0.237945
vt 0.476468 0.000000
vt 0.476468 0.016152
vt 0.476468 0.622952
vt 0.476468 0.733848
vt 0.476468 0.500000
vt 0.476468 0.512055
vt 0.476468 0.942864
vt 0.476468 0.250000
vt 0.476468 0.428586
vt 0.476468 0.481764
vt 0.476468 0.750000
vt 0.476468 1.000000
vt 0.303586 0.512055
vt 0.441862 0.463192
vt 0.356764 0.733848
vt 0.303586 0.733848
vt 0.247712 0.733848
vt 0.182136 0.512055
vt 0.247712 0.512055
vt 0.356764 0.512055
vt 0.356764 0.622952
vt 0.182136 0.567503
vt 0.182136 0.733848
vt 0.414786 0.434393
vt 0.182136 0.622952
vt 0.182136 0.622952
vt 0.356764 0.567503
vt 0.356764 0.567503
vt 0.476468 0.567503
vt 0.571865 0.567503
vt 0.571865 0.127048
vt 0.476468 0.127048
vt 0.247712 0.567503
vt 0.303586 0.567503
vt 0.643236 0.567503
vt 0.696414 0.567503
vt 0.752288 0.567503
vt 0.356764 0.567503
vt 0.625000 0.127048
vt 0.625000 0.567503
vt 0.356764 0.567503
vt 0.375000 0.567503
vt 0.817864 0.567503
vt 0.875000 0.567503
vt 0.125000 0.567503
vt 0.182136 0.567503
vt 0.375000 0.127048
vt 0.375000 0.182497
vt 0.375000 0.016152
vt 0.375000 0.237945
vt 0.375000 0.250000
vt 0.375000 0.481764
vt 0.375000 0.942864
vt 0.375000 1.000000
vt 0.375000 0.768236
vt 0.375000 0.428586
vt 0.375000 0.307136
vt 0.375000 0.877288
vt 0.375000 0.000000
vt 0.375000 0.821414
vt 0.375000 0.372712
vn -1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 0.0000 1.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 0.0000
usemtl None
s off
f 68/1/1 20/2/1 4/3/1 58/4/1
f 62/5/2 10/6/2 8/7/2 59/8/2
f 66/9/3 24/10/3 6/11/3 60/12/3
f 64/13/4 14/14/4 2/15/4 57/16/4
f 28/17/5 21/18/5 5/19/5 11/20/5
f 32/21/6 19/22/6 2/23/6 14/24/6
f 24/10/6 26/25/6 12/26/6 6/11/6
f 54/27/5 28/17/5 11/20/5 48/28/5
f 60/12/4 6/11/4 12/29/4 61/30/4
f 72/31/2 47/32/2 10/6/2 62/5/2
f 58/4/2 4/3/2 15/33/2 63/34/2
f 18/35/5 30/36/5 16/37/5 1/38/5
f 42/39/6 32/21/6 14/24/6 40/40/6
f 69/41/4 40/42/4 14/14/4 64/13/4
f 37/43/6 15/44/6 31/45/6 41/46/6
f 92/47/6 88/48/6 32/21/6 42/39/6
f 3/49/5 13/50/5 29/51/5 17/52/5
f 81/53/5 87/54/5 30/36/5 18/35/5
f 51/55/5 9/56/5 27/57/5 53/58/5
f 78/59/2 73/60/2 36/61/2 46/62/2
f 8/7/6 10/63/6 25/64/6 23/65/6
f 84/66/6 85/67/6 26/25/6 24/10/6
f 15/44/6 4/68/6 20/69/6 31/45/6
f 88/48/6 82/70/6 19/22/6 32/21/6
f 9/56/5 7/71/5 22/72/5 27/57/5
f 86/73/5 83/74/5 21/18/5 28/17/5
f 59/8/3 8/7/3 23/65/3 65/75/3
f 96/76/3 84/66/3 24/10/3 66/9/3
f 57/77/1 2/78/1 19/79/1 67/80/1
f 101/81/1 99/82/1 20/2/1 68/1/1
f 94/83/5 89/84/5 34/85/5 56/86/5
f 116/87/3 75/88/3 35/89/3 110/90/3
f 97/91/1 74/92/1 34/85/1 89/84/1
f 80/93/4 76/94/4 33/95/4 55/96/4
f 75/88/4 77/97/4 45/98/4 35/89/4
f 90/99/5 91/100/5 46/62/5 36/61/5
f 79/101/2 78/59/2 46/62/2 56/86/2
f 13/50/5 39/102/5 43/103/5 29/51/5
f 93/104/6 92/47/6 42/39/6 50/105/6
f 47/106/6 37/43/6 41/46/6 49/107/6
f 71/108/4 52/109/4 40/42/4 69/41/4
f 50/105/6 42/39/6 40/40/6 52/110/6
f 63/34/2 15/33/2 37/111/2 70/112/2
f 30/36/5 44/113/5 38/114/5 16/37/5
f 26/25/6 50/105/6 52/110/6 12/26/6
f 61/30/4 12/29/4 52/109/4 71/108/4
f 10/63/6 47/106/6 49/107/6 25/64/6
f 85/67/6 93/104/6 50/105/6 26/25/6
f 74/92/2 79/101/2 56/86/2 34/85/2
f 77/97/4 80/93/4 55/96/4 45/98/4
f 91/100/5 94/83/5 56/86/5 46/62/5
f 70/112/2 37/111/2 47/32/2 72/31/2
f 44/113/5 54/27/5 48/28/5 38/114/5
f 77/97/5 70/112/5 72/31/5 80/93/5
f 120/115/4 61/30/4 71/108/4 132/116/4
f 122/117/2 63/34/2 70/112/2 131/118/2
f 132/116/4 71/108/4 69/41/4 130/119/4
f 148/120/1 101/81/1 68/1/1 127/121/1
f 134/122/1 57/77/1 67/80/1 126/123/1
f 143/124/3 96/76/3 66/9/3 125/125/3
f 118/126/3 59/8/3 65/75/3 124/127/3
f 130/119/4 69/41/4 64/13/4 123/128/4
f 117/129/2 58/4/2 63/34/2 122/117/2
f 133/130/2 72/31/2 62/5/2 121/131/2
f 119/132/4 60/12/4 61/30/4 120/115/4
f 123/128/4 64/13/4 57/16/4 134/133/4
f 125/125/3 66/9/3 60/12/3 119/132/3
f 121/131/2 62/5/2 59/8/2 118/126/2
f 127/121/1 68/1/1 58/4/1 117/129/1
f 140/134/1 133/135/1 51/55/1 53/58/1
f 128/136/2 139/137/2 79/101/2 74/92/2
f 139/137/2 138/138/2 78/59/2 79/101/2
f 136/139/4 137/140/4 77/97/4 75/88/4
f 140/134/4 129/141/4 76/94/4 80/93/4
f 142/142/1 128/136/1 74/92/1 97/91/1
f 147/143/3 136/139/3 75/88/3 116/87/3
f 138/138/2 135/144/2 73/60/2 78/59/2
f 137/140/3 43/103/3 39/102/3 131/145/3
f 135/144/3 141/146/3 98/147/3 73/60/3
f 146/148/1 142/142/1 97/91/1 102/149/1
f 145/150/3 115/151/3 96/76/3 143/124/3
f 126/123/1 67/80/1 95/152/1 144/153/1
f 111/154/5 114/155/5 94/83/5 91/100/5
f 105/156/6 113/157/6 93/104/6 85/67/6
f 113/157/6 112/158/6 92/47/6 93/104/6
f 110/90/5 111/154/5 91/100/5 90/99/5
f 102/149/1 97/91/1 89/84/1 109/159/1
f 73/60/3 98/147/3 90/99/3 36/61/3
f 114/155/5 109/159/5 89/84/5 94/83/5
f 67/80/1 19/79/1 82/160/1 95/152/1
f 115/151/3 104/161/3 84/66/3 96/76/3
f 106/162/5 100/163/5 83/74/5 86/73/5
f 108/164/6 99/165/6 82/70/6 88/48/6
f 104/161/6 105/156/6 85/67/6 84/66/6
f 103/166/5 107/167/5 87/54/5 81/53/5
f 112/158/6 108/164/6 88/48/6 92/47/6
f 41/46/6 31/45/6 108/164/6 112/158/6
f 17/52/5 29/51/5 107/167/5 103/166/5
f 23/65/6 25/64/6 105/156/6 104/161/6
f 31/45/6 20/69/6 99/165/6 108/164/6
f 27/57/5 22/72/5 100/163/5 106/162/5
f 65/75/3 23/65/3 104/161/3 115/151/3
f 55/96/5 33/95/5 109/159/5 114/155/5
f 76/94/1 102/149/1 109/159/1 33/95/1
f 35/89/5 45/98/5 111/154/5 110/90/5
f 49/107/6 41/46/6 112/158/6 113/157/6
f 25/64/6 49/107/6 113/157/6 105/156/6
f 45/98/5 55/96/5 114/155/5 111/154/5
f 124/127/3 65/75/3 115/151/3 145/150/3
f 129/141/1 146/148/1 102/149/1 76/94/1
f 98/147/3 116/87/3 110/90/3 90/99/3
f 95/152/1 82/160/1 99/82/1 101/81/1
f 81/168/1 144/153/1 148/120/1 103/169/1
f 87/54/3 107/167/3 147/143/3 141/146/3
f 27/57/1 106/162/1 146/148/1 129/141/1
f 22/72/3 124/127/3 145/150/3 100/163/3
f 18/170/1 126/123/1 144/153/1 81/168/1
f 100/163/3 145/150/3 143/124/3 83/74/3
f 106/162/1 86/73/1 142/142/1 146/148/1
f 30/36/3 87/54/3 141/146/3 135/144/3
f 77/97/3 137/140/3 131/145/3 70/112/3
f 44/113/2 30/36/2 135/144/2 138/138/2
f 107/167/3 29/51/3 136/139/3 147/143/3
f 86/73/1 28/17/1 128/136/1 142/142/1
f 53/58/4 27/57/4 129/141/4 140/134/4
f 29/51/4 43/103/4 137/140/4 136/139/4
f 54/27/2 44/113/2 138/138/2 139/137/2
f 28/17/2 54/27/2 139/137/2 128/136/2
f 80/93/1 72/31/1 133/135/1 140/134/1
f 17/171/1 127/121/1 117/129/1 3/172/1
f 9/173/2 121/131/2 118/126/2 7/71/2
f 21/18/3 125/125/3 119/132/3 5/19/3
f 16/174/4 123/128/4 134/133/4 1/175/4
f 5/19/4 119/132/4 120/115/4 11/176/4
f 51/177/2 133/130/2 121/131/2 9/173/2
f 3/172/2 117/129/2 122/117/2 13/178/2
f 38/179/4 130/119/4 123/128/4 16/174/4
f 7/71/3 118/126/3 124/127/3 22/72/3
f 83/74/3 143/124/3 125/125/3 21/18/3
f 1/180/1 134/122/1 126/123/1 18/170/1
f 103/169/1 148/120/1 127/121/1 17/171/1
f 48/181/4 132/116/4 130/119/4 38/179/4
f 13/178/2 122/117/2 131/118/2 39/182/2
f 11/176/4 120/115/4 132/116/4 48/181/4
f 144/153/6 141/146/6 147/143/6 148/120/6
f 147/143/4 116/87/4 101/81/4 148/120/4
f 116/87/5 98/147/5 95/152/5 101/81/5
f 141/146/2 144/153/2 95/152/2 98/147/2

View File

@ -719,7 +719,7 @@ void init(GLFWwindow* window)
loadModelToContext("./models/door.obj", models::doorContext); loadModelToContext("./models/door.obj", models::doorContext);
loadModelToContext("./models/drawer.obj", models::drawerContext); loadModelToContext("./models/drawer.obj", models::drawerContext);
loadModelToContext("./models/plane.obj", models::planeContext); loadModelToContext("./models/plane.obj", models::planeContext);
loadModelToContext("./models/room/room_with_roof.obj", models::roomContext); loadModelToContext("./models/room/room_old.obj", models::roomContext);
//loadModelToContext("./models/roof/roof.obj", models::roofContext); //loadModelToContext("./models/roof/roof.obj", models::roofContext);
loadModelToContext("./models/spaceship.obj", models::spaceshipContext); loadModelToContext("./models/spaceship.obj", models::spaceshipContext);
loadModelToContext("./models/sphere.obj", models::sphereContext); loadModelToContext("./models/sphere.obj", models::sphereContext);