new_texture_error
This commit is contained in:
parent
65286f2b54
commit
9638cd85c3
Binary file not shown.
Binary file not shown.
BIN
Release/room.exe
BIN
Release/room.exe
Binary file not shown.
BIN
Release/room.pdb
BIN
Release/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,35 +1,32 @@
|
|||||||
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
|
||||||
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\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY”
|
||||||
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(167,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
|
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(175,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
|
||||||
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(186,38): warning C4305: "=": obcięcie z "double" do "float"
|
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(194,38): warning C4305: "=": obcięcie z "double" do "float"
|
||||||
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(209,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
|
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(217,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
|
||||||
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(228,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
|
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(236,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
|
||||||
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(246,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(254,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(334,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(342,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(340,96): warning C4305: "argument": obcięcie z "double" do "T"
|
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(348,96): warning C4305: "argument": obcięcie z "double" do "T"
|
||||||
with
|
with
|
||||||
[
|
[
|
||||||
T=float
|
T=float
|
||||||
]
|
]
|
||||||
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(343,59): warning C4305: "argument": obcięcie z "double" do "T"
|
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(351,59): warning C4305: "argument": obcięcie z "double" do "T"
|
||||||
with
|
with
|
||||||
[
|
[
|
||||||
T=float
|
T=float
|
||||||
]
|
]
|
||||||
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(491,29): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
|
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(500,29): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
|
||||||
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(516,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(525,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,109): warning C4305: "argument": obcięcie z "double" do "T"
|
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(539,109): warning C4305: "argument": obcięcie z "double" do "T"
|
||||||
with
|
with
|
||||||
[
|
[
|
||||||
T=float
|
T=float
|
||||||
]
|
]
|
||||||
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(763,21): warning C4305: "-=": obcięcie z "double" do "float"
|
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(782,21): warning C4305: "-=": obcięcie z "double" do "float"
|
||||||
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(765,21): warning C4305: "+=": obcięcie z "double" do "float"
|
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(784,21): warning C4305: "+=": obcięcie z "double" do "float"
|
||||||
D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(775,30): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych
|
C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(794,30): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych
|
||||||
Trwa generowanie kodu
|
Trwa generowanie kodu
|
||||||
3 of 608 functions ( 0.5%) were compiled, the rest were copied from previous compilation.
|
c:\users\annas\desktop\grafika_proj\grk_room\cw 9\src\texture.cpp : fatal error C1301: błąd dostępu do programu bazy danych Release\room.ipdb, nieprawidłowy format, usuń i przebuduj
|
||||||
0 functions were new in current compilation
|
LINK : fatal error LNK1257: generowanie kodu nie powiodło się
|
||||||
8 functions had inline decision re-evaluated but remain unchanged
|
|
||||||
Zakończono generowanie kodu
|
|
||||||
grk-cw9.vcxproj -> D:\UAM\Grafika komputerowa\projekt\GRK_Room\Release\room.exe
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -2,7 +2,7 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<ProjectOutputs>
|
<ProjectOutputs>
|
||||||
<ProjectOutput>
|
<ProjectOutput>
|
||||||
<FullPath>D:\UAM\Grafika komputerowa\projekt\GRK_Room\Release\room.exe</FullPath>
|
<FullPath>C:\Users\annas\Desktop\grafika_proj\GRK_Room\Release\room.exe</FullPath>
|
||||||
</ProjectOutput>
|
</ProjectOutput>
|
||||||
</ProjectOutputs>
|
</ProjectOutputs>
|
||||||
<ContentFiles />
|
<ContentFiles />
|
||||||
|
|||||||
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,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:
|
||||||
Release|Win32|D:\UAM\Grafika komputerowa\projekt\GRK_Room\|
|
Release|Win32|C:\Users\annas\Desktop\grafika_proj\GRK_Room\|
|
||||||
|
|||||||
0
cw 9/Release/room.tlog/unsuccessfulbuild
Normal file
0
cw 9/Release/room.tlog/unsuccessfulbuild
Normal file
Binary file not shown.
Binary file not shown.
12
cw 9/models/room/room_without_roof2.mtl
Normal file
12
cw 9/models/room/room_without_roof2.mtl
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# Blender 3.4.1 MTL File: 'None'
|
||||||
|
# www.blender.org
|
||||||
|
|
||||||
|
newmtl Material.003
|
||||||
|
Ns 250.000000
|
||||||
|
Ka 1.000000 1.000000 1.000000
|
||||||
|
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/annas/Desktop/grafika_proj/GRK_Room/cw 9/textures/room/brick.jpg
|
||||||
601
cw 9/models/room/room_without_roof2.obj
Normal file
601
cw 9/models/room/room_without_roof2.obj
Normal file
@ -0,0 +1,601 @@
|
|||||||
|
# Blender 3.4.1
|
||||||
|
# www.blender.org
|
||||||
|
mtllib room_without_roof2.mtl
|
||||||
|
o room_Cube.009_room_Cube.013
|
||||||
|
v 1.200000 1.970000 2.300000
|
||||||
|
v 1.200000 1.970000 2.500000
|
||||||
|
v -1.200000 1.970000 2.500000
|
||||||
|
v -1.200000 1.970000 2.300000
|
||||||
|
v 1.200000 1.015374 2.500000
|
||||||
|
v -1.200000 1.015374 2.500000
|
||||||
|
v 1.200000 1.015374 2.300000
|
||||||
|
v -1.200000 1.015374 2.300000
|
||||||
|
v 1.200000 1.970000 2.300000
|
||||||
|
v 1.200000 1.970000 2.500000
|
||||||
|
v 1.200000 1.015374 2.500000
|
||||||
|
v 1.200000 1.015374 2.300000
|
||||||
|
v -1.200000 1.970000 2.500000
|
||||||
|
v -1.200000 1.970000 2.300000
|
||||||
|
v -1.200000 1.015374 2.500000
|
||||||
|
v -1.200000 1.015374 2.300000
|
||||||
|
v -5.000000 1.970000 -2.300000
|
||||||
|
v -5.000000 2.500000 -2.299999
|
||||||
|
v -5.000000 2.500000 -2.500000
|
||||||
|
v -5.000000 1.970000 -2.500000
|
||||||
|
v 4.500000 1.970000 -2.500000
|
||||||
|
v 4.500000 2.500000 -2.500000
|
||||||
|
v 5.000000 2.500000 -2.500000
|
||||||
|
v 5.000000 1.970000 -2.500000
|
||||||
|
v 5.000000 1.970000 2.300000
|
||||||
|
v 5.000000 2.500000 2.300000
|
||||||
|
v 5.000000 2.500000 2.500000
|
||||||
|
v 5.000000 1.970000 2.500000
|
||||||
|
v -4.500000 1.970000 2.500000
|
||||||
|
v -4.500000 2.500000 2.500000
|
||||||
|
v -5.000000 2.500000 2.500000
|
||||||
|
v -5.000000 1.970000 2.500000
|
||||||
|
v 4.500000 -0.000000 2.300000
|
||||||
|
v 5.000000 -0.000000 2.300000
|
||||||
|
v 5.000000 -0.000000 2.500000
|
||||||
|
v 4.500000 -0.000000 2.500000
|
||||||
|
v -5.000000 2.500000 2.300000
|
||||||
|
v 4.500000 2.500000 2.500000
|
||||||
|
v 1.200000 -0.000000 2.300000
|
||||||
|
v 1.200000 -0.000000 2.500000
|
||||||
|
v 4.500000 1.970000 2.500000
|
||||||
|
v 0.502662 1.970000 -2.500000
|
||||||
|
v 0.502662 2.500000 -2.500000
|
||||||
|
v -4.500000 2.500000 -2.500000
|
||||||
|
v -4.500000 1.970000 -2.500000
|
||||||
|
v -5.000000 -0.000000 2.300000
|
||||||
|
v -4.500000 -0.000000 2.300000
|
||||||
|
v -4.500000 -0.000000 2.500000
|
||||||
|
v -5.000000 -0.000000 2.500000
|
||||||
|
v -1.200000 2.500000 2.500000
|
||||||
|
v -1.200000 1.970000 2.500000
|
||||||
|
v -0.487569 2.500000 -2.500000
|
||||||
|
v -5.000000 0.000000 -2.500000
|
||||||
|
v -4.500000 0.000000 -2.500000
|
||||||
|
v -4.500000 0.000000 -2.300000
|
||||||
|
v -5.000000 0.000000 -2.300000
|
||||||
|
v -4.973382 0.001344 1.259008
|
||||||
|
v -4.473382 0.001344 1.259008
|
||||||
|
v 0.502662 0.000000 -2.500000
|
||||||
|
v 4.500000 0.000000 -2.500000
|
||||||
|
v 4.500000 0.000000 -2.300000
|
||||||
|
v 0.502662 0.000000 -2.300000
|
||||||
|
v -1.200000 1.970000 2.300000
|
||||||
|
v -4.500000 1.970000 2.300000
|
||||||
|
v -4.500000 2.299999 2.300000
|
||||||
|
v -1.200000 2.299999 2.300000
|
||||||
|
v 5.000000 2.500000 -2.299999
|
||||||
|
v 5.026618 2.501344 1.259008
|
||||||
|
v -4.973382 2.501344 1.259008
|
||||||
|
v 5.000000 0.000000 -2.500000
|
||||||
|
v 5.000000 0.000000 -2.300000
|
||||||
|
v 4.526618 0.001344 1.259008
|
||||||
|
v 5.026618 0.001344 1.259008
|
||||||
|
v 5.000000 1.970000 -2.300000
|
||||||
|
v 5.026618 1.971344 1.259008
|
||||||
|
v -5.000000 1.970000 2.300000
|
||||||
|
v -5.002335 1.972826 -1.031157
|
||||||
|
v -5.002335 2.502826 -1.031157
|
||||||
|
v 4.526618 2.301344 1.259008
|
||||||
|
v 4.500000 2.299999 2.300000
|
||||||
|
v 1.200000 2.299999 2.300000
|
||||||
|
v -4.502335 1.972826 -1.031157
|
||||||
|
v -4.500000 1.970000 -2.300000
|
||||||
|
v -4.500000 2.300000 -2.299999
|
||||||
|
v -4.502335 2.302826 -1.031157
|
||||||
|
v 4.526618 1.971344 1.259008
|
||||||
|
v 4.500000 1.970000 2.300000
|
||||||
|
v 0.502662 1.970000 -2.300000
|
||||||
|
v 4.500000 1.970000 -2.300000
|
||||||
|
v 4.500000 2.300000 -2.299999
|
||||||
|
v 1.200000 2.300000 -2.299999
|
||||||
|
v -0.487569 1.970000 -2.300000
|
||||||
|
v -1.200000 2.300000 -2.299999
|
||||||
|
v -4.473382 2.301344 1.259008
|
||||||
|
v 1.200000 1.970000 2.300000
|
||||||
|
v -0.487569 0.000000 -2.500000
|
||||||
|
v -0.487569 0.000000 -2.300000
|
||||||
|
v 1.200000 1.970000 2.500000
|
||||||
|
v 1.200000 2.500000 2.500000
|
||||||
|
v -0.487569 1.970000 -2.500000
|
||||||
|
v -1.200000 -0.000000 2.300000
|
||||||
|
v -1.200000 -0.000000 2.500000
|
||||||
|
v 4.500000 1.015374 2.500000
|
||||||
|
v 1.200000 1.015374 2.500000
|
||||||
|
v -4.500000 1.015374 -2.500000
|
||||||
|
v -0.487569 1.015374 -2.500000
|
||||||
|
v -1.200000 1.015374 2.500000
|
||||||
|
v -5.002335 1.018200 -1.031157
|
||||||
|
v -5.000000 1.015374 -2.300000
|
||||||
|
v -5.000000 1.015374 2.500000
|
||||||
|
v -5.000000 1.015374 2.300000
|
||||||
|
v 5.026618 1.016718 1.259008
|
||||||
|
v 5.000000 1.015374 2.300000
|
||||||
|
v 5.000000 1.015374 -2.500000
|
||||||
|
v 5.000000 1.015374 -2.300000
|
||||||
|
v -4.500000 1.015374 2.500000
|
||||||
|
v -5.000000 1.015374 -2.500000
|
||||||
|
v 0.502662 1.015374 -2.500000
|
||||||
|
v 4.500000 1.015374 -2.500000
|
||||||
|
v 5.000000 1.015374 2.500000
|
||||||
|
v 0.502662 1.015374 -2.300000
|
||||||
|
v 4.500000 1.015374 2.300000
|
||||||
|
v 1.200000 1.015374 2.300000
|
||||||
|
v -1.200000 1.015374 2.300000
|
||||||
|
v -4.500000 1.015374 -2.300000
|
||||||
|
v -0.487569 1.015374 -2.300000
|
||||||
|
v 4.500000 1.015374 -2.300000
|
||||||
|
v 4.526618 1.016718 1.259008
|
||||||
|
v -4.502335 1.018200 -1.031157
|
||||||
|
v -4.500000 1.015374 2.300000
|
||||||
|
v -4.473382 1.016718 1.259008
|
||||||
|
v -4.473382 1.971344 1.259008
|
||||||
|
v 4.497665 1.018200 -1.031157
|
||||||
|
v 4.497665 1.972826 -1.031157
|
||||||
|
v 4.997665 1.018200 -1.031157
|
||||||
|
v 4.997665 1.972826 -1.031157
|
||||||
|
v -4.973382 1.971344 1.259008
|
||||||
|
v -4.973382 1.016718 1.259008
|
||||||
|
v 4.497665 2.302826 -1.031157
|
||||||
|
v 4.997665 2.502826 -1.031157
|
||||||
|
v 4.497665 0.002826 -1.031157
|
||||||
|
v 4.997665 0.002826 -1.031157
|
||||||
|
v -5.002335 0.002826 -1.031157
|
||||||
|
v -4.502335 0.002826 -1.031157
|
||||||
|
v -1.200000 1.970000 2.500000
|
||||||
|
v -1.200000 1.970000 2.300000
|
||||||
|
v -1.200000 1.015374 2.500000
|
||||||
|
v -1.200000 1.015374 2.300000
|
||||||
|
v 5.026618 1.016718 1.259008
|
||||||
|
v 4.526618 1.016718 1.259008
|
||||||
|
v 4.497665 1.018200 -1.031157
|
||||||
|
v 4.997665 1.018200 -1.031157
|
||||||
|
v 4.497665 1.972826 -1.031157
|
||||||
|
v 4.997665 1.018200 -1.031157
|
||||||
|
v 4.997665 1.972826 -1.031157
|
||||||
|
v 4.497665 1.018200 -1.031157
|
||||||
|
v 4.497665 1.972826 -1.031157
|
||||||
|
v 4.997665 1.018200 -1.031157
|
||||||
|
v 4.997665 1.972826 -1.031157
|
||||||
|
v 5.026618 1.971344 1.259008
|
||||||
|
v 4.526618 1.971344 1.259008
|
||||||
|
v 4.497665 1.972826 -1.031157
|
||||||
|
v 4.997665 1.972826 -1.031157
|
||||||
|
v 5.026618 1.971344 1.259008
|
||||||
|
v 4.526618 1.971344 1.259008
|
||||||
|
v 5.026618 1.016718 1.259008
|
||||||
|
v 4.526618 1.016718 1.259008
|
||||||
|
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.0009
|
||||||
|
vn -0.0000 -0.0000 -1.0000
|
||||||
|
vn 0.9999 -0.0000 0.0128
|
||||||
|
vn -0.0000 -0.0000 1.0000
|
||||||
|
vn -0.0000 -1.0000 -0.0004
|
||||||
|
vn -0.0000 -1.0000 -0.0007
|
||||||
|
vn -0.0000 -1.0000 -0.0006
|
||||||
|
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.0009
|
||||||
|
vn 1.0000 -0.0000 0.0066
|
||||||
|
vn 1.0000 -0.0000 0.0064
|
||||||
|
vn -0.9999 -0.0000 -0.0128
|
||||||
|
vn -1.0000 -0.0000 0.0030
|
||||||
|
vn -1.0000 -0.0000 0.0054
|
||||||
|
vn 1.0000 -0.0000 -0.0030
|
||||||
|
vn 1.0000 -0.0000 0.0018
|
||||||
|
vn 1.0000 -0.0000 -0.0054
|
||||||
|
vn -0.9997 -0.0000 -0.0256
|
||||||
|
vn -1.0000 -0.0000 -0.0064
|
||||||
|
vn 0.9997 -0.0000 0.0256
|
||||||
|
vn 1.0000 -0.0000 -0.0050
|
||||||
|
vn -0.0000 -1.0000 0.0008
|
||||||
|
vn -1.0000 -0.0000 -0.0018
|
||||||
|
vn 1.0000 -0.0000 -0.0051
|
||||||
|
vn -1.0000 -0.0000 -0.0065
|
||||||
|
vn 1.0000 -0.0000 0.0065
|
||||||
|
vn -0.0000 1.0000 0.0006
|
||||||
|
vn -0.0009 1.0000 0.0006
|
||||||
|
vn -0.0002 1.0000 0.0013
|
||||||
|
vn -0.0002 -0.0003 1.0000
|
||||||
|
vn -0.0003 0.0005 1.0000
|
||||||
|
vn -0.0001 -1.0000 -0.0003
|
||||||
|
vn -0.0009 -1.0000 -0.0006
|
||||||
|
vn -0.0000 0.0025 -1.0000
|
||||||
|
vn -0.0000 -0.0025 -1.0000
|
||||||
|
vt -0.561253 1.095860
|
||||||
|
vt -0.561722 1.143530
|
||||||
|
vt -0.056388 1.149902
|
||||||
|
vt -0.055920 1.102231
|
||||||
|
vt -0.056858 1.197573
|
||||||
|
vt -0.562191 1.191201
|
||||||
|
vt -0.056388 1.149902
|
||||||
|
vt -0.561722 1.143530
|
||||||
|
vt -0.435131 -0.928866
|
||||||
|
vt -0.435600 -0.881195
|
||||||
|
vt -0.636602 -0.883730
|
||||||
|
vt -0.636133 -0.931401
|
||||||
|
vt -0.435599 -0.881195
|
||||||
|
vt -0.435131 -0.928866
|
||||||
|
vt -0.234598 -0.878661
|
||||||
|
vt -0.234129 -0.926332
|
||||||
|
vt 0.132293 -0.285222
|
||||||
|
vt 0.131050 -0.158894
|
||||||
|
vt 0.173161 -0.158363
|
||||||
|
vt 2.068155 -0.133797
|
||||||
|
vt 2.066912 -0.007469
|
||||||
|
vt 0.174404 -0.284691
|
||||||
|
vt 0.066634 -0.032688
|
||||||
|
vt 0.067877 -0.159017
|
||||||
|
vt -0.037401 -0.160344
|
||||||
|
vt -0.043263 0.435546
|
||||||
|
vt -0.044506 0.561874
|
||||||
|
vt -0.038644 -0.034016
|
||||||
|
vt -1.055162 0.549132
|
||||||
|
vt -1.053919 0.422803
|
||||||
|
vt -1.096030 0.422273
|
||||||
|
vt 2.062292 0.462093
|
||||||
|
vt 2.061049 0.588421
|
||||||
|
vt -1.097273 0.548601
|
||||||
|
vt 0.060771 0.563202
|
||||||
|
vt 0.062014 0.436873
|
||||||
|
vt -0.043263 0.435546
|
||||||
|
vt -0.879606 -0.171636
|
||||||
|
vt -0.878363 -0.297964
|
||||||
|
vt -0.044506 0.561875
|
||||||
|
vt 1.945077 1.104256
|
||||||
|
vt -1.006402 -0.126232
|
||||||
|
vt 0.178548 -0.705909
|
||||||
|
vt 2.050356 1.105583
|
||||||
|
vt -1.059782 1.018694
|
||||||
|
vt 2.050826 1.057912
|
||||||
|
vt -1.101893 1.018163
|
||||||
|
vt 2.056429 1.057983
|
||||||
|
vt 1.945547 1.056585
|
||||||
|
vt 1.951152 1.056655
|
||||||
|
vt -0.837495 -0.171105
|
||||||
|
vt 1.957015 0.460765
|
||||||
|
vt 1.250244 1.095495
|
||||||
|
vt 0.873382 -0.697148
|
||||||
|
vt 1.250713 1.047825
|
||||||
|
vt 1.256319 1.047895
|
||||||
|
vt 1.955772 0.587094
|
||||||
|
vt -0.470714 1.097001
|
||||||
|
vt 0.908295 -0.022076
|
||||||
|
vt -0.055451 1.054560
|
||||||
|
vt 0.909538 -0.148405
|
||||||
|
vt 1.962877 -0.135125
|
||||||
|
vt 1.961634 -0.008796
|
||||||
|
vt -0.055200 1.079036
|
||||||
|
vt -0.831632 -0.766995
|
||||||
|
vt 0.050079 1.080364
|
||||||
|
vt -0.061547 1.674247
|
||||||
|
vt 2.073548 -0.682016
|
||||||
|
vt 0.050548 1.032693
|
||||||
|
vt 0.056151 1.032763
|
||||||
|
vt -0.054731 1.031366
|
||||||
|
vt -0.049126 1.031436
|
||||||
|
vt -0.873743 -0.767526
|
||||||
|
vt 0.756847 0.445634
|
||||||
|
vt 0.755604 0.571962
|
||||||
|
vt -0.043257 0.434872
|
||||||
|
vt 1.118037 -0.145777
|
||||||
|
vt -0.066457 2.223145
|
||||||
|
vt 0.179024 -0.754253
|
||||||
|
vt 2.062292 0.462093
|
||||||
|
vt 0.038822 2.224473
|
||||||
|
vt 1.957015 0.460765
|
||||||
|
vt 0.039291 2.176802
|
||||||
|
vt -1.030092 1.662035
|
||||||
|
vt 0.173155 -0.157690
|
||||||
|
vt -0.065988 2.175475
|
||||||
|
vt 0.136913 -0.754784
|
||||||
|
vt -0.052036 1.327234
|
||||||
|
vt -0.612426 -0.763911
|
||||||
|
vt 0.053241 1.328562
|
||||||
|
vt -0.280760 1.671803
|
||||||
|
vt 1.092160 2.237754
|
||||||
|
vt -0.470245 1.049330
|
||||||
|
vt 0.903675 0.447485
|
||||||
|
vt 1.933821 2.248365
|
||||||
|
vt 0.062014 0.436873
|
||||||
|
vt 1.934290 2.200694
|
||||||
|
vt -0.037856 -0.114021
|
||||||
|
vt 2.068155 -0.133797
|
||||||
|
vt 1.092629 2.190083
|
||||||
|
vt -0.470714 1.097001
|
||||||
|
vt 1.226493 -0.144409
|
||||||
|
vt 1.383335 -1.160338
|
||||||
|
vt -0.043257 0.434872
|
||||||
|
vt 2.078168 -1.151577
|
||||||
|
vt -0.066167 2.143808
|
||||||
|
vt 2.078942 -1.230235
|
||||||
|
vt -0.066941 2.222466
|
||||||
|
vt 1.384109 -1.238995
|
||||||
|
vt -0.085374 0.435015
|
||||||
|
vt -0.834707 0.425247
|
||||||
|
vt -0.618288 -0.168021
|
||||||
|
vt 2.039100 2.249692
|
||||||
|
vt -0.043263 0.435546
|
||||||
|
vt -0.049126 1.031436
|
||||||
|
vt 2.039569 2.202022
|
||||||
|
vt -0.091237 1.030905
|
||||||
|
vt 1.948242 1.352453
|
||||||
|
vt -0.787195 -0.123148
|
||||||
|
vt 2.053519 1.353781
|
||||||
|
vt -0.840569 1.021137
|
||||||
|
vt -0.086617 0.561343
|
||||||
|
vt -0.835950 0.551576
|
||||||
|
vt -0.836252 -0.297434
|
||||||
|
vt -0.134874 -0.287917
|
||||||
|
vt -0.020805 -0.875965
|
||||||
|
vt -0.059203 1.435910
|
||||||
|
vt -0.136117 -0.161589
|
||||||
|
vt -0.792589 0.425071
|
||||||
|
vt -1.011795 0.421987
|
||||||
|
vt 0.183942 -1.254127
|
||||||
|
vt 0.878776 -1.245367
|
||||||
|
vt -0.767558 2.135639
|
||||||
|
vt -0.021978 -0.756788
|
||||||
|
vt -0.059361 1.316724
|
||||||
|
vt 0.177774 -0.627251
|
||||||
|
vt -1.034712 2.131597
|
||||||
|
vt -1.035486 2.210254
|
||||||
|
vt 0.178548 -0.705909
|
||||||
|
vt -0.768332 2.214296
|
||||||
|
vt -0.791815 0.346414
|
||||||
|
vt 0.183168 -1.175470
|
||||||
|
vt -1.011021 0.343329
|
||||||
|
vt -0.470245 1.049330
|
||||||
|
vt 1.231113 -0.613970
|
||||||
|
vt -0.055920 1.102231
|
||||||
|
vt 2.072774 -0.603359
|
||||||
|
vt -0.042476 0.355541
|
||||||
|
vt 2.073548 -0.682016
|
||||||
|
vt -0.043250 0.434198
|
||||||
|
vt 1.378715 -0.690777
|
||||||
|
vt -0.678744 1.046701
|
||||||
|
vt 1.022614 -0.616599
|
||||||
|
vt -0.234598 -0.878661
|
||||||
|
vt 0.873382 -0.697148
|
||||||
|
vt -0.286154 2.220023
|
||||||
|
vt 0.878002 -1.166709
|
||||||
|
vt 0.883661 2.235125
|
||||||
|
vt 0.180666 -0.921102
|
||||||
|
vt 1.112174 0.450114
|
||||||
|
vt 0.884130 2.187454
|
||||||
|
vt 0.180196 -0.873431
|
||||||
|
vt 1.017994 -0.147038
|
||||||
|
vt 1.260938 0.578334
|
||||||
|
vt 1.262181 0.452005
|
||||||
|
vt -0.679213 1.094372
|
||||||
|
vt 1.116794 -0.019448
|
||||||
|
vt -0.234129 -0.926332
|
||||||
|
vt 0.744912 1.089124
|
||||||
|
vt 1.378715 -0.690777
|
||||||
|
vt 0.745381 1.041453
|
||||||
|
vt 0.750985 1.041524
|
||||||
|
vt 1.953533 0.814635
|
||||||
|
vt 1.258700 0.805874
|
||||||
|
vt 1.959396 0.218745
|
||||||
|
vt -0.033127 -0.923798
|
||||||
|
vt 1.114555 0.208093
|
||||||
|
vt 0.753366 0.799503
|
||||||
|
vt -0.043257 0.434872
|
||||||
|
vt -0.132636 -0.515458
|
||||||
|
vt -0.060375 1.555079
|
||||||
|
vt -0.221807 -0.878500
|
||||||
|
vt 0.134532 -0.512763
|
||||||
|
vt -0.046745 0.789415
|
||||||
|
vt -0.876124 -0.525506
|
||||||
|
vt -0.834013 -0.524975
|
||||||
|
vt -0.838188 0.779116
|
||||||
|
vt -1.057401 0.776673
|
||||||
|
vt -0.040882 0.193525
|
||||||
|
vt -0.046745 0.789415
|
||||||
|
vt -0.088856 0.788884
|
||||||
|
vt 0.058532 0.790743
|
||||||
|
vt 0.176643 -0.512232
|
||||||
|
vt 2.064673 0.220072
|
||||||
|
vt -0.256452 1.052026
|
||||||
|
vt 0.906056 0.205464
|
||||||
|
vt 0.064395 0.194852
|
||||||
|
vt -1.099512 0.776142
|
||||||
|
vt 2.058810 0.815962
|
||||||
|
vt 1.228874 -0.386430
|
||||||
|
vt -0.256921 1.099696
|
||||||
|
vt -1.008783 0.115788
|
||||||
|
vt 0.180929 -0.947929
|
||||||
|
vt 0.875764 -0.939168
|
||||||
|
vt 1.381096 -0.932797
|
||||||
|
vt -0.043257 0.434872
|
||||||
|
vt -1.032474 1.904056
|
||||||
|
vt 0.175536 -0.399710
|
||||||
|
vt -0.033596 -0.876127
|
||||||
|
vt 1.020375 -0.389058
|
||||||
|
vt -0.040237 0.128000
|
||||||
|
vt 2.070536 -0.375818
|
||||||
|
vt -0.789576 0.118873
|
||||||
|
vt -0.765319 1.908098
|
||||||
|
vt -0.062878 1.674231
|
||||||
|
vt -0.222979 -0.759322
|
||||||
|
vt -0.063928 1.916267
|
||||||
|
vt 2.075930 -0.924037
|
||||||
|
vt -0.283141 1.913824
|
||||||
|
vt -0.545124 1.668151
|
||||||
|
vt -0.020805 -0.875965
|
||||||
|
vt -0.285380 2.141366
|
||||||
|
vt -0.541607 1.310644
|
||||||
|
vt 0.180196 -0.873431
|
||||||
|
vt -0.307406 0.125305
|
||||||
|
vt -0.309644 0.352846
|
||||||
|
vt -0.356010 0.784842
|
||||||
|
vt -0.353771 0.557302
|
||||||
|
vt -0.617045 -0.294350
|
||||||
|
vt -0.541448 1.429830
|
||||||
|
vt 0.179024 -0.754254
|
||||||
|
vt -0.614807 -0.521891
|
||||||
|
vt -0.542620 1.548999
|
||||||
|
vt -0.021978 -0.756788
|
||||||
|
vt -0.310418 0.431503
|
||||||
|
vt -0.352528 0.430973
|
||||||
|
vt 1.936775 1.898251
|
||||||
|
vt -0.305025 -0.116716
|
||||||
|
vt 2.042052 1.899578
|
||||||
|
vt -0.358391 1.026863
|
||||||
|
vt -0.063503 1.873031
|
||||||
|
vt -0.130255 -0.757479
|
||||||
|
vt 0.041774 1.874359
|
||||||
|
vt -0.762938 1.666077
|
||||||
|
vt -0.043257 0.434872
|
||||||
|
vt -0.043257 0.434872
|
||||||
|
vt -0.043257 0.434872
|
||||||
|
vt -0.043257 0.434872
|
||||||
|
vt -0.543951 1.548982
|
||||||
|
vt -0.541448 1.429830
|
||||||
|
vt -0.059203 1.435910
|
||||||
|
vt -0.061706 1.555062
|
||||||
|
vt -0.623810 -0.883568
|
||||||
|
vt -0.422809 -0.881034
|
||||||
|
vt -0.624983 -0.764391
|
||||||
|
vt -0.423981 -0.761856
|
||||||
|
vt -0.540434 1.191475
|
||||||
|
vt -0.540276 1.310661
|
||||||
|
vt -0.058030 1.316741
|
||||||
|
vt -0.058188 1.197555
|
||||||
|
vt -0.221807 -0.878500
|
||||||
|
vt -0.222980 -0.759322
|
||||||
|
vt -0.422809 -0.881034
|
||||||
|
vt -0.423981 -0.761856
|
||||||
|
s 0
|
||||||
|
usemtl Material.003
|
||||||
|
f 4/4/1 1/1/1 2/2/1 3/3/1
|
||||||
|
s 1
|
||||||
|
f 8/8/2 6/6/2 5/5/2 7/7/2
|
||||||
|
f 12/12/3 11/11/3 10/10/3 9/9/3
|
||||||
|
f 15/15/4 16/16/4 14/14/4 13/13/4
|
||||||
|
f 17/17/5 18/18/5 19/19/3 20/22/3
|
||||||
|
f 21/23/6 22/24/6 23/25/6 24/28/6
|
||||||
|
f 25/29/7 26/30/7 27/31/4 28/34/4
|
||||||
|
f 29/35/8 30/36/8 31/37/8 32/40/8
|
||||||
|
f 33/41/9 34/44/10 35/46/1 36/49/1
|
||||||
|
f 39/53/1 33/41/9 36/49/1 40/55/1
|
||||||
|
f 28/33/8 27/32/8 38/52/8 41/57/8
|
||||||
|
f 42/59/6 43/61/6 22/24/6 21/23/6
|
||||||
|
f 20/21/6 19/20/6 44/62/6 45/63/6
|
||||||
|
f 46/64/11 47/66/9 48/69/1 49/71/1
|
||||||
|
f 51/75/8 50/74/8 30/36/8 29/35/8
|
||||||
|
f 53/78/1 54/81/1 55/83/12 56/86/13
|
||||||
|
f 57/88/14 58/90/14 47/66/9 46/64/11
|
||||||
|
f 59/92/1 60/95/1 61/97/12 62/100/1
|
||||||
|
f 63/103/6 64/105/6 65/107/6 66/109/6
|
||||||
|
f 60/95/1 70/113/1 71/116/13 61/97/12
|
||||||
|
f 72/118/14 73/120/14 34/44/10 33/41/9
|
||||||
|
f 24/27/4 23/26/4 67/110/15 74/122/15
|
||||||
|
f 75/123/16 68/111/17 26/30/7 25/29/7
|
||||||
|
f 32/39/3 31/38/3 37/51/18 76/124/18
|
||||||
|
f 77/125/19 78/128/20 18/18/5 17/17/5
|
||||||
|
f 82/133/21 83/137/22 84/138/22 85/140/23
|
||||||
|
f 86/141/18 87/143/24 80/130/24 79/129/25
|
||||||
|
f 88/145/8 89/147/8 90/149/8 91/151/8
|
||||||
|
f 83/136/8 92/153/8 93/155/8 84/139/8
|
||||||
|
f 95/157/6 63/103/6 66/109/6 81/132/6
|
||||||
|
f 54/81/1 96/158/1 97/161/1 55/83/12
|
||||||
|
f 98/164/8 99/165/8 50/74/8 51/75/8
|
||||||
|
f 45/63/6 44/62/6 52/77/6 100/167/6
|
||||||
|
f 47/66/9 101/169/1 102/171/1 48/69/1
|
||||||
|
f 41/57/8 38/52/8 99/165/8 98/164/8
|
||||||
|
f 87/142/6 95/157/6 81/132/6 80/131/6
|
||||||
|
f 92/153/8 88/145/8 91/151/8 93/155/8
|
||||||
|
f 100/167/6 52/77/6 43/61/6 42/59/6
|
||||||
|
f 101/169/1 39/53/1 40/55/1 102/171/1
|
||||||
|
f 92/152/1 100/166/1 42/58/1 88/144/1
|
||||||
|
f 103/173/8 41/57/8 98/164/8 104/174/8
|
||||||
|
f 105/175/6 45/63/6 100/167/6 106/177/6
|
||||||
|
f 108/180/19 77/125/19 17/17/5 109/183/5
|
||||||
|
f 110/185/3 32/39/3 76/124/18 111/186/18
|
||||||
|
f 112/187/16 75/123/16 25/29/7 113/188/7
|
||||||
|
f 114/190/4 24/27/4 74/122/15 115/191/15
|
||||||
|
f 107/178/8 51/75/8 29/35/8 116/192/8
|
||||||
|
f 117/194/6 20/21/6 45/63/6 105/175/6
|
||||||
|
f 118/196/6 42/59/6 21/23/6 119/197/6
|
||||||
|
f 120/199/8 28/33/8 41/57/8 103/173/8
|
||||||
|
f 116/192/8 29/35/8 32/40/8 110/184/8
|
||||||
|
f 113/188/7 25/29/7 28/34/4 120/198/4
|
||||||
|
f 119/197/6 21/23/6 24/28/6 114/189/6
|
||||||
|
f 109/183/5 17/17/5 20/22/3 117/193/3
|
||||||
|
f 121/201/3 118/195/3 59/93/3 62/101/3
|
||||||
|
f 122/203/6 123/204/6 95/157/6 87/142/6
|
||||||
|
f 125/208/8 126/210/8 92/153/8 83/136/8
|
||||||
|
f 121/200/8 127/212/8 89/147/8 88/145/8
|
||||||
|
f 128/213/18 122/202/24 87/143/24 86/141/18
|
||||||
|
f 129/214/21 125/207/22 83/137/22 82/133/21
|
||||||
|
f 124/205/6 130/218/6 64/105/6 63/103/6
|
||||||
|
f 126/209/4 97/162/4 96/159/4 106/176/4
|
||||||
|
f 130/217/26 131/219/7 132/222/7 64/106/26
|
||||||
|
f 111/186/18 76/124/18 137/229/18 138/232/18
|
||||||
|
f 134/226/19 86/141/18 79/129/25 139/235/20
|
||||||
|
f 64/106/26 132/222/7 94/156/17 65/108/26
|
||||||
|
f 76/124/18 37/51/18 69/112/25 137/229/18
|
||||||
|
f 136/228/27 140/236/23 68/111/17 75/123/16
|
||||||
|
f 141/237/28 142/239/28 73/120/14 72/118/14
|
||||||
|
f 143/241/28 144/243/28 58/90/14 57/88/14
|
||||||
|
f 56/86/13 55/83/12 144/243/28 143/241/28
|
||||||
|
f 61/97/12 71/116/13 142/239/28 141/237/28
|
||||||
|
f 74/122/15 67/110/15 140/236/23 136/228/27
|
||||||
|
f 89/148/29 134/226/19 139/235/20 90/150/29
|
||||||
|
f 115/191/15 74/122/15 136/228/27 135/227/30
|
||||||
|
f 127/211/29 133/225/19 134/226/19 89/148/29
|
||||||
|
f 132/222/7 82/133/21 85/140/23 94/156/17
|
||||||
|
f 137/229/18 69/112/25 78/128/20 77/125/19
|
||||||
|
f 57/89/31 138/232/18 108/180/19 143/242/20
|
||||||
|
f 58/91/32 144/244/23 129/214/21 131/219/7
|
||||||
|
f 61/98/29 141/238/20 133/225/19 127/211/29
|
||||||
|
f 71/117/15 115/191/15 135/227/30 142/240/23
|
||||||
|
f 46/65/18 111/186/18 138/232/18 57/89/31
|
||||||
|
f 142/240/23 135/227/30 112/187/16 73/121/32
|
||||||
|
f 141/238/20 72/119/31 128/213/18 133/225/19
|
||||||
|
f 47/67/26 58/91/32 131/219/7 130/217/26
|
||||||
|
f 92/154/4 126/209/4 106/176/4 100/168/4
|
||||||
|
f 101/170/6 47/68/6 130/218/6 124/205/6
|
||||||
|
f 144/244/23 55/84/22 125/207/22 129/214/21
|
||||||
|
f 72/119/31 33/42/24 122/202/24 128/213/18
|
||||||
|
f 62/102/8 61/99/8 127/212/8 121/200/8
|
||||||
|
f 55/85/8 97/163/8 126/210/8 125/208/8
|
||||||
|
f 39/54/6 101/170/6 124/205/6 123/204/6
|
||||||
|
f 33/43/6 39/54/6 123/204/6 122/203/6
|
||||||
|
f 88/146/3 42/60/3 118/195/3 121/201/3
|
||||||
|
f 56/87/5 109/183/5 117/193/3 53/79/3
|
||||||
|
f 60/96/6 119/197/6 114/189/6 70/114/6
|
||||||
|
f 34/45/7 113/188/7 120/198/4 35/47/4
|
||||||
|
f 48/70/8 116/192/8 110/184/8 49/72/8
|
||||||
|
f 35/48/8 120/199/8 103/173/8 36/50/8
|
||||||
|
f 59/94/6 118/196/6 119/197/6 60/96/6
|
||||||
|
f 53/80/6 117/194/6 105/175/6 54/82/6
|
||||||
|
f 102/172/8 107/178/8 116/192/8 48/70/8
|
||||||
|
f 70/115/4 114/190/4 115/191/15 71/117/15
|
||||||
|
f 73/121/32 112/187/16 113/188/7 34/45/7
|
||||||
|
f 49/73/3 110/185/3 111/186/18 46/65/18
|
||||||
|
f 143/242/20 108/180/19 109/183/5 56/87/5
|
||||||
|
f 40/56/8 104/174/8 107/178/8 102/172/8
|
||||||
|
f 54/82/6 105/175/6 106/177/6 96/160/6
|
||||||
|
f 36/50/8 103/173/8 104/174/8 40/56/8
|
||||||
|
f 138/233/33 131/220/33 129/215/33 108/181/33
|
||||||
|
f 129/216/8 82/134/8 77/126/8 108/182/8
|
||||||
|
f 82/135/11 132/223/11 137/230/11 77/127/11
|
||||||
|
f 131/221/6 138/234/6 137/231/6 132/224/6
|
||||||
|
f 124/206/6 63/104/6 146/246/8 148/248/8
|
||||||
|
f 51/76/8 107/179/8 147/247/8 145/245/8
|
||||||
|
f 151/251/33 150/250/33 149/249/34 152/252/35
|
||||||
|
f 159/256/36 157/254/8 156/253/8 158/255/37
|
||||||
|
f 162/259/11 163/260/38 160/257/39 161/258/11
|
||||||
|
f 166/263/40 167/264/6 165/262/6 164/261/41
|
||||||
|
l 155 153
|
||||||
|
l 154 155
|
||||||
20
cw 9/shaders/geo_ssao.frag
Normal file
20
cw 9/shaders/geo_ssao.frag
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
#version 430 core
|
||||||
|
layout (location = 0) out vec4 FragColor;
|
||||||
|
layout (location = 1) out vec4 BloomColor;
|
||||||
|
|
||||||
|
uniform vec3 color;
|
||||||
|
uniform float exposition;
|
||||||
|
|
||||||
|
out vec4 outColor;
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
outColor = vec4(vec3(1.0) - exp(-color*exposition),1);
|
||||||
|
//outColor = vec4(color, 1.0);
|
||||||
|
float brightness = dot(FragColor.rgb, vec3(0.2126, 0.7152, 0.0722));
|
||||||
|
if(brightness > 1.0)
|
||||||
|
BloomColor = vec4(FragColor.rgb, 1.0);
|
||||||
|
else
|
||||||
|
BloomColor = vec4(0.0, 0.0, 0.0, 1.0);
|
||||||
|
|
||||||
|
BloomColor = vec4(color, 1.0);
|
||||||
|
}
|
||||||
25
cw 9/shaders/geo_ssao.vert
Normal file
25
cw 9/shaders/geo_ssao.vert
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
#version 330 core
|
||||||
|
layout(location = 0) in vec3 aPos;
|
||||||
|
layout(location = 1) in vec3 aNormal;
|
||||||
|
layout(location = 2) in vec2 aTexCoord;
|
||||||
|
|
||||||
|
out vec3 FragPos;
|
||||||
|
out vec2 TexCoords;
|
||||||
|
out vec3 Normal;
|
||||||
|
|
||||||
|
uniform bool invertedNormals;
|
||||||
|
|
||||||
|
uniform mat4 model;
|
||||||
|
uniform mat4 view;
|
||||||
|
uniform mat4 projection;
|
||||||
|
|
||||||
|
void main(){
|
||||||
|
vec4 viewPos = view * model * vec4(aPos, 1.0);
|
||||||
|
FragPos = viewPos.xyz;
|
||||||
|
TexCoords = aTexCoords;
|
||||||
|
|
||||||
|
mat3 normalMatrix = transpose(inverse(mat3(view * model)));
|
||||||
|
Normal = normalMatrix * (invertedNormals ? -aNormal : aNormal);
|
||||||
|
|
||||||
|
gl_Position = projection * viewPos;
|
||||||
|
}
|
||||||
@ -82,6 +82,10 @@ namespace texture {
|
|||||||
GLuint woodNormal2;
|
GLuint woodNormal2;
|
||||||
GLuint woodARM2;
|
GLuint woodARM2;
|
||||||
|
|
||||||
|
GLuint wall;
|
||||||
|
GLuint wallNorm;
|
||||||
|
GLuint wallArm;
|
||||||
|
|
||||||
GLuint wood3;
|
GLuint wood3;
|
||||||
GLuint woodNormal3;
|
GLuint woodNormal3;
|
||||||
GLuint woodARM3;
|
GLuint woodARM3;
|
||||||
@ -645,6 +649,11 @@ void init(GLFWwindow* window)
|
|||||||
texture::brickNormal = Core::LoadTexture("textures/room/brick_normal.jpg");
|
texture::brickNormal = Core::LoadTexture("textures/room/brick_normal.jpg");
|
||||||
texture::brickARM = Core::LoadTexture("textures/room/brick_arm.jpg");
|
texture::brickARM = Core::LoadTexture("textures/room/brick_arm.jpg");
|
||||||
|
|
||||||
|
//texture::wall = Core::LoadTexture("textures/walls/wall.jpg");
|
||||||
|
//texture::wallNorm = Core::LoadTexture("textures/walls/wall_norm.jpg");
|
||||||
|
//texture::wallArm = Core::LoadTexture("textures/walls/wall_arm.jpg");
|
||||||
|
|
||||||
|
|
||||||
texture::spaceship = Core::LoadTexture("textures/spaceship/spaceship_albedo.png");
|
texture::spaceship = Core::LoadTexture("textures/spaceship/spaceship_albedo.png");
|
||||||
texture::spaceshipNormal = Core::LoadTexture("textures/spaceship/spaceship_normal.png");
|
texture::spaceshipNormal = Core::LoadTexture("textures/spaceship/spaceship_normal.png");
|
||||||
texture::spaceshipARM = Core::LoadTexture("textures/spaceship/spaceship_amr.png");
|
texture::spaceshipARM = Core::LoadTexture("textures/spaceship/spaceship_amr.png");
|
||||||
@ -701,7 +710,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_without_roof.obj", models::roomContext);
|
loadModelToContext("./models/room/room_without_roof2.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);
|
||||||
|
|||||||
BIN
cw 9/textures/walls/wall.jpg
Normal file
BIN
cw 9/textures/walls/wall.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.1 MiB |
BIN
cw 9/textures/walls/wall_arm.jpg
Normal file
BIN
cw 9/textures/walls/wall_arm.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 MiB |
BIN
cw 9/textures/walls/wall_norm.jpg
Normal file
BIN
cw 9/textures/walls/wall_norm.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 14 MiB |
Loading…
Reference in New Issue
Block a user