changed room obj;
This commit is contained in:
parent
de5862f670
commit
065e8f6321
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.vs/*
|
||||
0
.vs/CMake Overview
Normal file
0
.vs/CMake Overview
Normal file
3
.vs/ProjectSettings.json
Normal file
3
.vs/ProjectSettings.json
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"CurrentProjectSetting": "x64-Debug"
|
||||
}
|
||||
9
.vs/VSWorkspaceState.json
Normal file
9
.vs/VSWorkspaceState.json
Normal file
@ -0,0 +1,9 @@
|
||||
{
|
||||
"ExpandedNodes": [
|
||||
"",
|
||||
"\\cw 9",
|
||||
"\\cw 9\\src"
|
||||
],
|
||||
"SelectedNode": "\\cw 9\\src\\room.hpp",
|
||||
"PreviewInSolutionExplorer": false
|
||||
}
|
||||
BIN
.vs/grk-cw1/v16/.suo
Normal file
BIN
.vs/grk-cw1/v16/.suo
Normal file
Binary file not shown.
BIN
.vs/grk-cw1/v16/Browse.VC.db
Normal file
BIN
.vs/grk-cw1/v16/Browse.VC.db
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.vs/grk/v16/.suo
Normal file
BIN
.vs/grk/v16/.suo
Normal file
Binary file not shown.
BIN
.vs/grk/v16/Browse.VC.db
Normal file
BIN
.vs/grk/v16/Browse.VC.db
Normal file
Binary file not shown.
BIN
.vs/grk/v16/ipch/AutoPCH/18ab760fd1ce32ba/EX_1_7.ipch
Normal file
BIN
.vs/grk/v16/ipch/AutoPCH/18ab760fd1ce32ba/EX_1_7.ipch
Normal file
Binary file not shown.
BIN
.vs/slnx.sqlite
Normal file
BIN
.vs/slnx.sqlite
Normal file
Binary file not shown.
BIN
Debug/room.exe
BIN
Debug/room.exe
Binary file not shown.
BIN
Debug/room.pdb
BIN
Debug/room.pdb
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.
@ -1,44 +1,44 @@
|
||||
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:\software\vs19\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(513,5): warning MSB8028: The intermediate directory (Debug\) contains files shared from another project (grk-cw9.vcxproj). This can lead to incorrect clean and rebuild behavior.
|
||||
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:\Users\Genos\Source\Repos\GRK_Room2\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY”
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(97,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(112,38): warning C4305: "=": obcięcie z "double" do "float"
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(135,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(156,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(175,15): warning C4101: "textureID": lokalna zmienna, do której nie istnieje odwołanie
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(258,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(269,96): warning C4305: "argument": obcięcie z "double" do "T"
|
||||
C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition
|
||||
J:\GrafikaKomputerowa\grk\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY'
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(97,30): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(112,38): warning C4305: '=': truncation from 'double' to 'float'
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(135,16): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(156,16): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(175,15): warning C4101: 'textureID': unreferenced local variable
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(258,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(269,96): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(273,59): warning C4305: "argument": obcięcie z "double" do "T"
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(273,59): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(349,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(359,108): warning C4305: "argument": obcięcie z "double" do "T"
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(349,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(359,108): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(367,87): warning C4305: "argument": obcięcie z "double" do "T"
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(367,87): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(367,223): warning C4305: "argument": obcięcie z "double" do "float"
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(370,59): warning C4305: "argument": obcięcie z "double" do "T"
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(367,223): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(370,59): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(371,37): warning C4305: "argument": obcięcie z "double" do "float"
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(399,2): warning C4305: "argument": obcięcie z "double" do "float"
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(510,21): warning C4305: "-=": obcięcie z "double" do "float"
|
||||
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(512,21): warning C4305: "+=": obcięcie z "double" do "float"
|
||||
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
|
||||
grk-cw9.vcxproj -> C:\Users\Genos\Source\Repos\GRK_Room2\Debug\room.exe
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(371,37): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(404,2): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(515,21): warning C4305: '-=': truncation from 'double' to 'float'
|
||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(517,21): warning C4305: '+=': truncation from 'double' to 'float'
|
||||
Box.obj : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/INCREMENTAL:NO' specification
|
||||
LINK : warning LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
|
||||
grk-cw9.vcxproj -> J:\GrafikaKomputerowa\grk\Debug\room.exe
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -2,7 +2,7 @@
|
||||
<Project>
|
||||
<ProjectOutputs>
|
||||
<ProjectOutput>
|
||||
<FullPath>C:\Users\Genos\Source\Repos\GRK_Room2\Debug\room.exe</FullPath>
|
||||
<FullPath>J:\GrafikaKomputerowa\grk\Debug\room.exe</FullPath>
|
||||
</ProjectOutput>
|
||||
</ProjectOutputs>
|
||||
<ContentFiles />
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1,2 @@
|
||||
PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:
|
||||
Debug|Win32|C:\Users\Genos\Source\Repos\GRK_Room2\|
|
||||
Debug|Win32|J:\GrafikaKomputerowa\grk\|
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
610
cw 9/models/room_2.obj
Normal file
610
cw 9/models/room_2.obj
Normal file
@ -0,0 +1,610 @@
|
||||
# Blender v2.93.2 OBJ File: ''
|
||||
# www.blender.org
|
||||
mtllib room_2.mtl
|
||||
o room_Cube.009_room_Cube.013
|
||||
v 0.480000 1.970000 2.300000
|
||||
v 0.480000 1.970000 2.500000
|
||||
v -0.480000 1.970000 2.500000
|
||||
v -0.480000 1.970000 2.300000
|
||||
v 0.480000 1.015374 2.500000
|
||||
v -0.480000 1.015374 2.500000
|
||||
v 0.480000 1.015374 2.300000
|
||||
v -0.480000 1.015374 2.300000
|
||||
v 0.480000 1.970000 2.300000
|
||||
v 0.480000 1.970000 2.500000
|
||||
v 0.480000 1.015374 2.500000
|
||||
v 0.480000 1.015374 2.300000
|
||||
v -0.480000 1.970000 2.500000
|
||||
v -0.480000 1.970000 2.300000
|
||||
v -0.480000 1.015374 2.500000
|
||||
v -0.480000 1.015374 2.300000
|
||||
v -2.000000 1.970000 -2.300000
|
||||
v -2.000000 2.500000 -2.299999
|
||||
v -2.000000 2.500000 -2.500000
|
||||
v -2.000000 1.970000 -2.500000
|
||||
v 1.800000 1.970000 -2.500000
|
||||
v 1.800000 2.500000 -2.500000
|
||||
v 2.000000 2.500000 -2.500000
|
||||
v 2.000000 1.970000 -2.500000
|
||||
v 2.000000 1.970000 2.300000
|
||||
v 2.000000 2.500000 2.300000
|
||||
v 2.000000 2.500000 2.500000
|
||||
v 2.000000 1.970000 2.500000
|
||||
v -1.800000 1.970000 2.500000
|
||||
v -1.800000 2.500000 2.500000
|
||||
v -2.000000 2.500000 2.500000
|
||||
v -2.000000 1.970000 2.500000
|
||||
v 1.800000 -0.000000 2.300000
|
||||
v 2.000000 -0.000000 2.300000
|
||||
v 2.000000 -0.000000 2.500000
|
||||
v 1.800000 -0.000000 2.500000
|
||||
v -1.800000 2.500000 2.300000
|
||||
v -2.000000 2.500000 2.300000
|
||||
v 1.800000 2.500000 2.300000
|
||||
v 1.800000 2.500000 2.500000
|
||||
v 0.480000 -0.000000 2.300000
|
||||
v 0.480000 -0.000000 2.500000
|
||||
v 1.800000 1.970000 2.500000
|
||||
v 0.480000 1.970000 -2.500000
|
||||
v 0.480000 2.500000 -2.500000
|
||||
v -1.800000 2.500000 -2.500000
|
||||
v -1.800000 1.970000 -2.500000
|
||||
v -2.000000 -0.000000 2.300000
|
||||
v -1.800000 -0.000000 2.300000
|
||||
v -1.800000 -0.000000 2.500000
|
||||
v -2.000000 -0.000000 2.500000
|
||||
v -0.480000 2.500000 2.300000
|
||||
v -0.480000 2.500000 2.500000
|
||||
v -0.480000 1.970000 2.500000
|
||||
v -0.480000 2.500000 -2.500000
|
||||
v -1.800000 2.500000 -2.299999
|
||||
v -0.480000 2.500000 -2.299999
|
||||
v -0.469353 2.501344 1.259008
|
||||
v -1.789353 2.501344 1.259008
|
||||
v -2.000000 0.000000 -2.500000
|
||||
v -1.800000 0.000000 -2.500000
|
||||
v -1.800000 0.000000 -2.300000
|
||||
v -2.000000 0.000000 -2.300000
|
||||
v -1.989353 0.001344 1.259008
|
||||
v -1.789353 0.001344 1.259008
|
||||
v 0.480000 0.000000 -2.500000
|
||||
v 1.800000 0.000000 -2.500000
|
||||
v 1.800000 0.000000 -2.300000
|
||||
v 0.480000 0.000000 -2.300000
|
||||
v -0.480000 1.970000 2.300000
|
||||
v -1.800000 1.970000 2.300000
|
||||
v -1.800000 2.299999 2.300000
|
||||
v -0.480000 2.299999 2.300000
|
||||
v 1.800000 2.500000 -2.299999
|
||||
v 2.000000 2.500000 -2.299999
|
||||
v 2.010647 2.501344 1.259008
|
||||
v 1.810647 2.501344 1.259008
|
||||
v -1.989353 2.501344 1.259008
|
||||
v 2.000000 0.000000 -2.500000
|
||||
v 2.000000 0.000000 -2.300000
|
||||
v 1.810647 0.001344 1.259008
|
||||
v 2.010647 0.001344 1.259008
|
||||
v 2.000000 1.970000 -2.300000
|
||||
v 2.010647 1.971344 1.259008
|
||||
v -2.000000 1.970000 2.300000
|
||||
v -2.000934 1.972826 -1.031157
|
||||
v -2.000934 2.502826 -1.031157
|
||||
v 0.490647 2.301344 1.259008
|
||||
v 1.810647 2.301344 1.259008
|
||||
v 1.800000 2.299999 2.300000
|
||||
v 0.480000 2.299999 2.300000
|
||||
v -1.800934 1.972826 -1.031157
|
||||
v -1.800000 1.970000 -2.300000
|
||||
v -1.800000 2.300000 -2.299999
|
||||
v -1.800934 2.302826 -1.031157
|
||||
v 1.810647 1.971344 1.259008
|
||||
v 1.800000 1.970000 2.300000
|
||||
v 0.480000 1.970000 -2.300000
|
||||
v 1.800000 1.970000 -2.300000
|
||||
v 1.800000 2.300000 -2.299999
|
||||
v 0.480000 2.300000 -2.299999
|
||||
v -0.480000 1.970000 -2.300000
|
||||
v -0.480000 2.300000 -2.299999
|
||||
v -1.789353 2.301344 1.259008
|
||||
v -0.469353 2.301344 1.259008
|
||||
v 0.480000 1.970000 2.300000
|
||||
v -0.480000 0.000000 -2.500000
|
||||
v -0.480000 0.000000 -2.300000
|
||||
v 0.490647 2.501344 1.259008
|
||||
v 0.480000 2.500000 2.300000
|
||||
v 0.480000 2.500000 -2.299999
|
||||
v 0.480000 1.970000 2.500000
|
||||
v 0.480000 2.500000 2.500000
|
||||
v -0.480000 1.970000 -2.500000
|
||||
v -0.480000 -0.000000 2.300000
|
||||
v -0.480000 -0.000000 2.500000
|
||||
v 1.800000 1.015374 2.500000
|
||||
v 0.480000 1.015374 2.500000
|
||||
v -1.800000 1.015374 -2.500000
|
||||
v -0.480000 1.015374 -2.500000
|
||||
v -0.480000 1.015374 2.500000
|
||||
v -2.000934 1.018200 -1.031157
|
||||
v -2.000000 1.015374 -2.300000
|
||||
v -2.000000 1.015374 2.500000
|
||||
v -2.000000 1.015374 2.300000
|
||||
v 2.010647 1.016718 1.259008
|
||||
v 2.000000 1.015374 2.300000
|
||||
v 2.000000 1.015374 -2.500000
|
||||
v 2.000000 1.015374 -2.300000
|
||||
v -1.800000 1.015374 2.500000
|
||||
v -2.000000 1.015374 -2.500000
|
||||
v 0.480000 1.015374 -2.500000
|
||||
v 1.800000 1.015374 -2.500000
|
||||
v 2.000000 1.015374 2.500000
|
||||
v 0.480000 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 -1.800000 1.015374 -2.300000
|
||||
v -0.480000 1.015374 -2.300000
|
||||
v 1.800000 1.015374 -2.300000
|
||||
v 1.810647 1.016718 1.259008
|
||||
v -1.800934 1.018200 -1.031157
|
||||
v -1.800000 1.015374 2.300000
|
||||
v -1.789353 1.016718 1.259008
|
||||
v -1.789353 1.971344 1.259008
|
||||
v 1.799066 1.018200 -1.031157
|
||||
v 1.799066 1.972826 -1.031157
|
||||
v 1.999066 1.018200 -1.031157
|
||||
v 1.999066 1.972826 -1.031157
|
||||
v -1.989353 1.971344 1.259008
|
||||
v -1.989353 1.016718 1.259008
|
||||
v -0.480934 2.302826 -1.031157
|
||||
v 0.479066 2.302826 -1.031157
|
||||
v 1.799066 2.502826 -1.031157
|
||||
v 0.479066 2.502826 -1.031157
|
||||
v -0.480934 2.502826 -1.031157
|
||||
v 1.799066 2.302826 -1.031157
|
||||
v 1.999066 2.502826 -1.031157
|
||||
v 1.799066 0.002826 -1.031157
|
||||
v 1.999066 0.002826 -1.031157
|
||||
v -1.800934 2.502826 -1.031157
|
||||
v -2.000934 0.002826 -1.031157
|
||||
v -1.800934 0.002826 -1.031157
|
||||
v -0.480000 1.970000 2.500000
|
||||
v -0.480000 1.970000 2.300000
|
||||
v -0.480000 1.015374 2.500000
|
||||
v -0.480000 1.015374 2.300000
|
||||
v 2.010647 1.016718 1.259008
|
||||
v 1.810647 1.016718 1.259008
|
||||
v 1.799066 1.018200 -1.031157
|
||||
v 1.999066 1.018200 -1.031157
|
||||
v 1.799066 1.972826 -1.031157
|
||||
v 1.999066 1.018200 -1.031157
|
||||
v 1.999066 1.972826 -1.031157
|
||||
v 1.799066 1.018200 -1.031157
|
||||
v 1.799066 1.972826 -1.031157
|
||||
v 1.999066 1.018200 -1.031157
|
||||
v 1.999066 1.972826 -1.031157
|
||||
v 2.010647 1.971344 1.259008
|
||||
v 1.810647 1.971344 1.259008
|
||||
v 1.799066 1.972826 -1.031157
|
||||
v 1.999066 1.972826 -1.031157
|
||||
v 2.010647 1.971344 1.259008
|
||||
v 1.810647 1.971344 1.259008
|
||||
v 2.010647 1.016718 1.259008
|
||||
v 1.810647 1.016718 1.259008
|
||||
vt 0.000000 0.000000
|
||||
vt 0.000000 0.000000
|
||||
vt 0.000000 0.000000
|
||||
vt 0.000000 0.000000
|
||||
vt 0.247712 0.733848
|
||||
vt 0.476468 0.877288
|
||||
vt 0.476468 0.821414
|
||||
vt 0.303586 0.733848
|
||||
vt 0.303586 0.733848
|
||||
vt 0.476468 0.821414
|
||||
vt 0.571865 0.821414
|
||||
vt 0.303586 0.733848
|
||||
vt 0.476468 0.877288
|
||||
vt 0.247712 0.733848
|
||||
vt 0.247712 0.733848
|
||||
vt 0.571865 0.877288
|
||||
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.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.877288
|
||||
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.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.247712 0.733848
|
||||
vt 0.182136 0.733848
|
||||
vt 0.414786 0.434393
|
||||
vt 0.182136 0.622952
|
||||
vt 0.182136 0.622952
|
||||
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.356764 0.567503
|
||||
vt 0.625000 0.127048
|
||||
vt 0.571865 0.567503
|
||||
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.476468 0.567503
|
||||
vt 0.356764 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
|
||||
vt 0.247712 0.733848
|
||||
vt 0.247712 0.733848
|
||||
vt 0.476468 0.877288
|
||||
vt 0.571865 0.877288
|
||||
vt 0.356764 0.567503
|
||||
vt 0.356764 0.622952
|
||||
vt 0.476468 0.622952
|
||||
vt 0.476468 0.567503
|
||||
vt 0.571865 0.567503
|
||||
vt 0.356764 0.567503
|
||||
vt 0.356764 0.567503
|
||||
vt 0.476468 0.567503
|
||||
vt 0.356764 0.567503
|
||||
vt 0.571865 0.567503
|
||||
vt 0.571865 0.622952
|
||||
vt 0.356764 0.622952
|
||||
vt 0.476468 0.622952
|
||||
vt 0.356764 0.622952
|
||||
vt 0.356764 0.622952
|
||||
vt 0.571865 0.622952
|
||||
vn 0.0000 -1.0000 0.0000
|
||||
vn 0.0000 1.0000 0.0000
|
||||
vn -1.0000 0.0000 0.0000
|
||||
vn 1.0000 0.0000 0.0000
|
||||
vn -1.0000 0.0000 -0.0004
|
||||
vn 0.0000 0.0000 -1.0000
|
||||
vn 1.0000 0.0000 0.0051
|
||||
vn 0.0000 -0.0000 1.0000
|
||||
vn 0.0000 -1.0000 -0.0004
|
||||
vn 0.0000 -1.0000 -0.0006
|
||||
vn 0.0000 1.0000 0.0006
|
||||
vn 0.0000 1.0000 -0.0011
|
||||
vn 0.0000 1.0000 0.0010
|
||||
vn 0.0000 -1.0000 0.0007
|
||||
vn 0.0000 -1.0000 0.0011
|
||||
vn 0.0000 -1.0000 -0.0010
|
||||
vn 1.0000 0.0000 0.0004
|
||||
vn 1.0000 0.0000 0.0026
|
||||
vn -1.0000 0.0000 -0.0051
|
||||
vn -1.0000 0.0000 0.0012
|
||||
vn -1.0000 0.0000 0.0022
|
||||
vn 0.0000 -1.0000 -0.0013
|
||||
vn 1.0000 0.0000 -0.0012
|
||||
vn 1.0000 0.0000 0.0007
|
||||
vn 1.0000 0.0000 -0.0022
|
||||
vn -0.9999 0.0000 -0.0102
|
||||
vn -1.0000 0.0000 -0.0026
|
||||
vn 0.9999 0.0000 0.0102
|
||||
vn 0.0000 -1.0000 0.0008
|
||||
vn 0.0000 1.0000 -0.0008
|
||||
vn 1.0000 0.0000 -0.0020
|
||||
vn 0.0000 -1.0000 0.0022
|
||||
vn -1.0000 0.0000 -0.0007
|
||||
vn 1.0000 0.0000 -0.0021
|
||||
vn -0.0025 1.0000 0.0006
|
||||
vn -0.0005 1.0000 0.0014
|
||||
vn -0.0007 -0.0004 1.0000
|
||||
vn -0.0008 0.0005 1.0000
|
||||
vn -0.0004 -1.0000 0.0000
|
||||
vn -0.0025 -1.0000 -0.0006
|
||||
vn -0.0000 0.0025 -1.0000
|
||||
vn 0.0000 -0.0025 -1.0000
|
||||
usemtl None
|
||||
s off
|
||||
f 4/1/1 1/2/1 2/3/1 3/4/1
|
||||
s 1
|
||||
f 8/5/2 6/6/2 5/7/2 7/8/2
|
||||
f 12/9/3 11/10/3 10/11/3 9/12/3
|
||||
f 15/13/4 16/14/4 14/15/4 13/16/4
|
||||
f 17/17/5 18/18/5 19/19/3 20/20/3
|
||||
f 21/21/6 22/22/6 23/23/6 24/24/6
|
||||
f 25/25/7 26/26/7 27/27/4 28/28/4
|
||||
f 29/29/8 30/30/8 31/31/8 32/32/8
|
||||
f 33/33/9 34/34/10 35/35/1 36/36/1
|
||||
f 37/37/11 38/38/11 31/39/2 30/40/2
|
||||
f 26/26/11 39/41/11 40/42/2 27/27/2
|
||||
f 41/43/1 33/33/9 36/36/1 42/44/1
|
||||
f 28/28/8 27/27/8 40/45/8 43/46/8
|
||||
f 44/47/6 45/48/6 22/22/6 21/21/6
|
||||
f 20/20/6 19/19/6 46/49/6 47/50/6
|
||||
f 48/51/10 49/52/9 50/53/1 51/54/1
|
||||
f 52/55/11 37/37/11 30/40/2 53/56/2
|
||||
f 54/57/8 53/58/8 30/30/8 29/29/8
|
||||
f 55/59/2 46/60/2 56/61/12 57/62/12
|
||||
f 58/63/13 59/64/13 37/37/11 52/55/11
|
||||
f 60/65/1 61/66/1 62/67/14 63/68/15
|
||||
f 64/69/16 65/70/16 49/52/9 48/51/10
|
||||
f 66/71/1 67/72/1 68/73/14 69/74/1
|
||||
f 70/75/6 71/76/6 72/77/6 73/78/6
|
||||
f 23/23/2 22/79/2 74/80/12 75/81/12
|
||||
f 76/82/13 77/83/13 39/41/11 26/26/11
|
||||
f 46/60/2 19/84/2 18/85/12 56/61/12
|
||||
f 59/64/13 78/86/13 38/38/11 37/37/11
|
||||
f 67/72/1 79/87/1 80/88/15 68/73/14
|
||||
f 81/89/16 82/90/16 34/34/10 33/33/9
|
||||
f 24/24/4 23/23/4 75/81/17 83/91/17
|
||||
f 84/92/18 76/82/18 26/26/7 25/25/7
|
||||
f 32/93/3 31/94/3 38/95/19 85/96/19
|
||||
f 86/97/20 87/98/21 18/18/5 17/17/5
|
||||
f 88/99/16 89/100/16 90/101/22 91/102/22
|
||||
f 92/103/23 93/104/24 94/105/24 95/106/25
|
||||
f 96/107/19 97/108/26 90/101/26 89/100/27
|
||||
f 98/109/8 99/110/8 100/111/8 101/112/8
|
||||
f 93/104/8 102/113/8 103/114/8 94/105/8
|
||||
f 104/115/16 105/116/16 73/78/22 72/77/22
|
||||
f 106/117/6 70/75/6 73/78/6 91/102/6
|
||||
f 61/66/1 107/118/1 108/119/1 62/67/14
|
||||
f 109/120/13 58/63/13 52/55/11 110/121/11
|
||||
f 45/122/2 55/59/2 57/62/12 111/123/12
|
||||
f 112/124/8 113/125/8 53/58/8 54/57/8
|
||||
f 110/121/11 52/55/11 53/56/2 113/126/2
|
||||
f 47/50/6 46/49/6 55/127/6 114/128/6
|
||||
f 49/52/9 115/129/1 116/130/1 50/53/1
|
||||
f 39/41/11 110/121/11 113/126/2 40/42/2
|
||||
f 43/46/8 40/45/8 113/125/8 112/124/8
|
||||
f 22/79/2 45/122/2 111/123/12 74/80/12
|
||||
f 77/83/13 109/120/13 110/121/11 39/41/11
|
||||
f 97/108/6 106/117/6 91/102/6 90/101/6
|
||||
f 102/113/8 98/109/8 101/112/8 103/114/8
|
||||
f 105/116/16 88/99/16 91/102/22 73/78/22
|
||||
f 114/128/6 55/127/6 45/48/6 44/47/6
|
||||
f 115/129/1 41/43/1 42/44/1 116/130/1
|
||||
f 102/113/1 114/128/1 44/47/1 98/109/1
|
||||
f 117/131/8 43/46/8 112/124/8 118/132/8
|
||||
f 119/133/6 47/50/6 114/128/6 120/134/6
|
||||
f 122/135/20 86/97/20 17/17/5 123/136/5
|
||||
f 124/137/3 32/93/3 85/96/19 125/138/19
|
||||
f 126/139/18 84/92/18 25/25/7 127/140/7
|
||||
f 128/141/4 24/24/4 83/91/17 129/142/17
|
||||
f 121/143/8 54/57/8 29/29/8 130/144/8
|
||||
f 131/145/6 20/20/6 47/50/6 119/133/6
|
||||
f 132/146/6 44/47/6 21/21/6 133/147/6
|
||||
f 134/148/8 28/28/8 43/46/8 117/131/8
|
||||
f 130/144/8 29/29/8 32/32/8 124/149/8
|
||||
f 127/140/7 25/25/7 28/28/4 134/148/4
|
||||
f 133/147/6 21/21/6 24/24/6 128/141/6
|
||||
f 123/136/5 17/17/5 20/20/3 131/145/3
|
||||
f 135/150/3 132/151/3 66/71/3 69/74/3
|
||||
f 136/152/6 137/153/6 106/117/6 97/108/6
|
||||
f 139/154/8 140/155/8 102/113/8 93/104/8
|
||||
f 135/150/8 141/156/8 99/110/8 98/109/8
|
||||
f 142/157/19 136/152/26 97/108/26 96/107/19
|
||||
f 143/158/23 139/154/24 93/104/24 92/103/23
|
||||
f 138/159/6 144/160/6 71/76/6 70/75/6
|
||||
f 140/155/4 108/119/4 107/118/4 120/161/4
|
||||
f 144/160/28 145/162/7 146/163/7 71/76/28
|
||||
f 125/138/19 85/96/19 151/164/19 152/165/19
|
||||
f 153/166/29 154/167/29 88/99/16 105/116/16
|
||||
f 155/168/30 156/169/30 109/120/13 77/83/13
|
||||
f 156/169/30 157/170/30 58/63/13 109/120/13
|
||||
f 95/106/29 153/166/29 105/116/16 104/115/16
|
||||
f 148/171/20 96/107/19 89/100/27 158/172/21
|
||||
f 71/76/28 146/163/7 104/115/18 72/77/28
|
||||
f 154/167/29 158/172/29 89/100/16 88/99/16
|
||||
f 85/96/19 38/95/19 78/173/27 151/164/19
|
||||
f 150/174/31 159/175/25 76/82/18 84/92/18
|
||||
f 160/176/29 161/177/29 82/90/16 81/89/16
|
||||
f 162/178/30 87/179/30 78/86/13 59/64/13
|
||||
f 159/175/30 155/168/30 77/83/13 76/82/13
|
||||
f 163/180/29 164/181/29 65/70/16 64/69/16
|
||||
f 157/170/30 162/178/30 59/64/13 58/63/13
|
||||
f 57/62/12 56/61/12 162/178/30 157/170/30
|
||||
f 63/68/15 62/67/14 164/181/29 163/180/29
|
||||
f 75/81/12 74/80/12 155/168/30 159/175/30
|
||||
f 56/61/12 18/85/12 87/179/30 162/178/30
|
||||
f 68/73/14 80/88/15 161/177/29 160/176/29
|
||||
f 83/91/17 75/81/17 159/175/25 150/174/31
|
||||
f 101/112/32 100/111/32 158/172/29 154/167/29
|
||||
f 99/110/33 148/171/20 158/172/21 100/111/33
|
||||
f 94/105/32 103/114/32 153/166/29 95/106/29
|
||||
f 111/123/12 57/62/12 157/170/30 156/169/30
|
||||
f 74/80/12 111/123/12 156/169/30 155/168/30
|
||||
f 103/114/32 101/112/32 154/167/29 153/166/29
|
||||
f 129/142/17 83/91/17 150/174/31 149/182/34
|
||||
f 141/156/33 147/183/20 148/171/20 99/110/33
|
||||
f 146/163/7 92/103/23 95/106/25 104/115/18
|
||||
f 151/164/19 78/173/27 87/98/21 86/97/20
|
||||
f 64/184/27 152/165/19 122/135/20 163/185/21
|
||||
f 65/70/18 164/181/25 143/158/23 145/162/7
|
||||
f 68/73/33 160/176/21 147/183/20 141/156/33
|
||||
f 80/88/17 129/142/17 149/182/34 161/177/25
|
||||
f 48/186/19 125/138/19 152/165/19 64/184/27
|
||||
f 161/177/25 149/182/34 126/139/18 82/90/18
|
||||
f 160/176/21 81/89/27 142/157/19 147/183/20
|
||||
f 49/52/28 65/70/18 145/162/7 144/160/28
|
||||
f 102/113/4 140/155/4 120/161/4 114/128/4
|
||||
f 115/129/6 49/52/6 144/160/6 138/159/6
|
||||
f 164/181/25 62/67/24 139/154/24 143/158/23
|
||||
f 81/89/27 33/33/26 136/152/26 142/157/19
|
||||
f 69/74/8 68/73/8 141/156/8 135/150/8
|
||||
f 62/67/8 108/119/8 140/155/8 139/154/8
|
||||
f 41/43/6 115/129/6 138/159/6 137/153/6
|
||||
f 33/33/6 41/43/6 137/153/6 136/152/6
|
||||
f 98/109/3 44/47/3 132/151/3 135/150/3
|
||||
f 63/187/5 123/136/5 131/145/3 60/188/3
|
||||
f 67/189/6 133/147/6 128/141/6 79/87/6
|
||||
f 34/34/7 127/140/7 134/148/4 35/35/4
|
||||
f 50/190/8 130/144/8 124/149/8 51/191/8
|
||||
f 35/35/8 134/148/8 117/131/8 36/192/8
|
||||
f 66/193/6 132/146/6 133/147/6 67/189/6
|
||||
f 60/188/6 131/145/6 119/133/6 61/194/6
|
||||
f 116/195/8 121/143/8 130/144/8 50/190/8
|
||||
f 79/87/4 128/141/4 129/142/17 80/88/17
|
||||
f 82/90/18 126/139/18 127/140/7 34/34/7
|
||||
f 51/196/3 124/137/3 125/138/19 48/186/19
|
||||
f 163/185/21 122/135/20 123/136/5 63/187/5
|
||||
f 42/197/8 118/132/8 121/143/8 116/195/8
|
||||
f 61/194/6 119/133/6 120/134/6 107/198/6
|
||||
f 36/192/8 117/131/8 118/132/8 42/197/8
|
||||
f 152/165/11 145/162/11 143/158/11 122/135/11
|
||||
f 143/158/8 92/103/8 86/97/8 122/135/8
|
||||
f 92/103/10 146/163/10 151/164/10 86/97/10
|
||||
f 145/162/6 152/165/6 151/164/6 146/163/6
|
||||
f 138/159/6 70/75/6 166/199/8 168/200/8
|
||||
f 54/57/8 121/143/8 167/201/8 165/202/8
|
||||
f 171/203/11 170/204/11 169/205/35 172/206/36
|
||||
f 179/207/37 177/208/8 176/209/8 178/210/38
|
||||
f 182/211/10 183/212/39 180/213/40 181/214/10
|
||||
f 186/215/41 187/216/6 185/217/6 184/218/42
|
||||
l 174 175
|
||||
l 175 173
|
||||
@ -375,8 +375,13 @@ void renderScene(GLFWwindow* window)
|
||||
drawObjectPBR(models::coffeeTableContext, glm::translate(glm::vec3(2.8f, 0, 0.5f)), glm::vec3(1.f, 1.f, 1.f), 0.4f, 0.0f);
|
||||
drawObjectPBR(models::doorContext, glm::mat4(), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
|
||||
drawObjectPBR(models::planeContext, glm::mat4(), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
|
||||
drawObjectPBR(models::roomContext, glm::mat4(), glm::vec3(1.0f, 1.0f, 1.0f), 0.8f, 0.0f);
|
||||
drawObjectPBR(models::windowContext, glm::translate(glm::vec3(-3.35f, 0, 0)), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
|
||||
drawObjectPBR(models::roomContext, glm::scale(glm::vec3(2.5f, 1.0f, 1.f)), glm::vec3(1.0f, 1.0f, 1.0f), 0.8f, 0.0f);
|
||||
|
||||
// draw windows
|
||||
drawObjectPBR(models::windowContext, glm::scale(glm::vec3(1.0f, 1.0f, 2.3f)) * glm::translate(glm::vec3(-2.9f, 0, -0.2f)), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
|
||||
drawObjectPBR(models::windowContext, glm::eulerAngleY(3.14f) * glm::scale(glm::vec3(1.0f, 1.0f, 2.3f)) * glm::translate(glm::vec3(-2.9f, 0, -0.3f)), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
|
||||
drawObjectPBR(models::windowContext, glm::eulerAngleY(1.57f) * glm::scale(glm::vec3(1.0f, 1.0f, 2.45f)) * glm::translate(glm::vec3(-0.6f, 0, -0.25f)), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
|
||||
|
||||
|
||||
glm::vec3 spaceshipSide = glm::normalize(glm::cross(spaceshipDir, glm::vec3(0.f, 1.f, 0.f)));
|
||||
glm::vec3 spaceshipUp = glm::normalize(glm::cross(spaceshipSide, spaceshipDir));
|
||||
@ -460,7 +465,7 @@ void init(GLFWwindow* window)
|
||||
loadModelToContext("./models/door.obj", models::doorContext);
|
||||
loadModelToContext("./models/drawer.obj", models::drawerContext);
|
||||
loadModelToContext("./models/plane.obj", models::planeContext);
|
||||
loadModelToContext("./models/room.obj", models::roomContext);
|
||||
loadModelToContext("./models/room_2.obj", models::roomContext);
|
||||
loadModelToContext("./models/spaceship.obj", models::spaceshipContext);
|
||||
loadModelToContext("./models/sphere.obj", models::sphereContext);
|
||||
loadModelToContext("./models/window.obj", models::windowContext);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user