Texture loading fixed
This commit is contained in:
minni0n
parent
9b2ea53861
commit
c0ed1e080e
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.
@ -2,7 +2,7 @@
|
||||
<Project>
|
||||
<ProjectOutputs>
|
||||
<ProjectOutput>
|
||||
<FullPath>C:\Users\arciom\Desktop\GRK_game_scene_new\Debug\grk-cw9.exe</FullPath>
|
||||
<FullPath>C:\Users\Serhii\source\repos\GRK_game_scene2\Debug\grk-cw9.exe</FullPath>
|
||||
</ProjectOutput>
|
||||
</ProjectOutputs>
|
||||
<ContentFiles />
|
||||
|
||||
@ -1,62 +1,62 @@
|
||||
main.cpp
|
||||
C:\Program Files (x86)\Windows Kits\10\Include\10.0.22000.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(138,30): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(192,38): warning C4305: '=': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(215,16): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(256,20): warning C4018: '<': signed/unsigned mismatch
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(305,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(319,98): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(151,30): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(205,38): warning C4305: '=': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(228,16): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(269,20): warning C4018: '<': signed/unsigned mismatch
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(344,20): warning C4018: '<': signed/unsigned mismatch
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(374,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(388,98): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(322,68): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(391,68): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(360,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(392,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(421,80): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(430,80): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(453,80): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(516,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(527,108): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(429,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(461,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(490,80): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(499,80): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(522,80): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(585,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(596,108): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(535,87): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(604,87): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(535,223): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(538,59): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(604,223): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(607,59): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(539,37): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(579,2): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(595,20): warning C4018: '<': signed/unsigned mismatch
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(600,50): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(601,51): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(678,21): warning C4018: '<': signed/unsigned mismatch
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(680,49): warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(703,17): warning C4101: 'data': unreferenced local variable
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(807,28): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(808,28): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(809,28): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(832,32): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(833,32): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(834,32): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(870,28): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(871,28): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(872,28): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(992,21): warning C4305: '-=': truncation from 'double' to 'float'
|
||||
C:\Users\arciom\Desktop\GRK_game_scene_new\cw 9\src\ex_9_1.hpp(994,21): warning C4305: '+=': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(608,37): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(680,20): warning C4018: '<': signed/unsigned mismatch
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(685,50): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(686,51): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(763,21): warning C4018: '<': signed/unsigned mismatch
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(765,49): warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(788,17): warning C4101: 'data': unreferenced local variable
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(905,28): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(906,28): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(907,28): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(930,32): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(931,32): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(932,32): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(968,28): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(969,28): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(970,28): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(1090,21): warning C4305: '-=': truncation from 'double' to 'float'
|
||||
C:\Users\Serhii\source\repos\GRK_game_scene2\cw 9\src\ex_9_1.hpp(1092,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 -> C:\Users\arciom\Desktop\GRK_game_scene_new\Debug\grk-cw9.exe
|
||||
grk-cw9.vcxproj -> C:\Users\Serhii\source\repos\GRK_game_scene2\Debug\grk-cw9.exe
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1,2 @@
|
||||
PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:VCServicingVersionMFC=14.29.30136:VCServicingVersionCrtHeaders=14.29.30136:TargetPlatformVersion=10.0.22000.0:
|
||||
Debug|Win32|C:\Users\arciom\Desktop\GRK_game_scene_new\|
|
||||
PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:VcpkgTriplet=x86-windows:
|
||||
Debug|Win32|C:\Users\Serhii\source\repos\GRK_game_scene2\|
|
||||
|
||||
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.
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'bed.blend11'
|
||||
# www.blender.org
|
||||
|
||||
newmtl TVScreen.001
|
||||
Ns 0.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.800000 0.800000 0.800000
|
||||
Ks 0.000000 0.000000 0.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 1
|
||||
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'bed.blend11'
|
||||
# www.blender.org
|
||||
|
||||
newmtl Books
|
||||
Ns 0.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.800000 0.800000 0.800000
|
||||
Ks 0.000000 0.000000 0.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 1
|
||||
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'GrafikaScene.blend'
|
||||
# www.blender.org
|
||||
|
||||
newmtl 01_-_Default
|
||||
Ns 200.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.007843 0.007843 0.007843
|
||||
Ks 1.000000 1.000000 1.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 2
|
||||
@ -1,13 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'GrafikaScene.blend'
|
||||
# www.blender.org
|
||||
|
||||
newmtl wood_243
|
||||
Ns 200.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Ks 1.000000 1.000000 1.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 2
|
||||
map_Kd -o 1 2.18557e-08 0 -s 0.0653595 3.33333 1 D:/Kaplama Resimleri/Dogal Ahşap Kaplamaları/doğal bambu.jpg
|
||||
map_Bump -o 1 2.18557e-08 0 -s 0.0653595 3.33333 1 -bm 1.000000 C:/Users/prima/Documents/JAVA/blender/wood_86_diffuse.jpg
|
||||
483131
cw 9/models/enemyShip.obj
Normal file
483131
cw 9/models/enemyShip.obj
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'None'
|
||||
# www.blender.org
|
||||
|
||||
newmtl Blue_Lightsaber
|
||||
Ns 0.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.800000 0.800000 0.800000
|
||||
Ks 0.000000 0.000000 0.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 1
|
||||
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'None'
|
||||
# www.blender.org
|
||||
|
||||
newmtl Blue_Lightsaber
|
||||
Ns 0.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.800000 0.800000 0.800000
|
||||
Ks 0.000000 0.000000 0.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 1
|
||||
139
cw 9/models/onlywalls.obj
Normal file
139
cw 9/models/onlywalls.obj
Normal file
@ -0,0 +1,139 @@
|
||||
# Blender 3.4.1
|
||||
# www.blender.org
|
||||
mtllib onlywalls.mtl
|
||||
o room_Cube.001
|
||||
v 1.798200 0.000000 -2.297700
|
||||
v 1.798200 -0.000000 2.297700
|
||||
v -1.798200 0.000000 -2.297700
|
||||
v -1.798200 -0.000000 2.297700
|
||||
v 1.798200 2.297700 -2.297699
|
||||
v 1.798200 2.297699 2.297700
|
||||
v -1.798200 2.297700 -2.297699
|
||||
v -1.798200 2.297699 2.297700
|
||||
v -0.479520 0.000000 -2.297700
|
||||
v -0.479520 -0.000000 2.297700
|
||||
v -0.479520 2.297700 -2.297699
|
||||
v -0.479520 2.297699 2.297700
|
||||
v 0.479520 0.000000 -2.297700
|
||||
v 0.479520 -0.000000 2.297700
|
||||
v 0.479520 2.297700 -2.297699
|
||||
v 0.479520 2.297699 2.297700
|
||||
v -1.798200 1.968030 2.297700
|
||||
v 1.798200 1.968030 2.297700
|
||||
v -1.798200 1.968030 -2.297700
|
||||
v 1.798200 1.968030 -2.297700
|
||||
v -0.479520 1.968030 -2.297700
|
||||
v -0.479520 1.968030 2.297700
|
||||
v 0.479520 1.968030 2.297700
|
||||
v 0.479520 1.968030 -2.297700
|
||||
v 1.798200 -0.000000 0.749250
|
||||
v -1.798200 -0.000000 0.749250
|
||||
v 1.798200 2.297700 0.749250
|
||||
v -1.798200 2.297700 0.749250
|
||||
v 1.798200 1.968030 0.749250
|
||||
v -1.798200 1.968030 0.749250
|
||||
v 1.798200 1.968030 -0.249750
|
||||
v 1.798200 0.000000 -0.249750
|
||||
v -1.798200 0.000000 -0.249750
|
||||
v 1.798200 2.297700 -0.249750
|
||||
v -1.798200 2.297700 -0.249750
|
||||
v -1.798200 1.968030 -0.249750
|
||||
v 1.798200 1.014358 2.297700
|
||||
v 1.798200 1.014359 -2.297700
|
||||
v -1.798200 1.014358 2.297700
|
||||
v -1.798200 1.014359 -2.297700
|
||||
v -0.479520 1.014359 -2.297700
|
||||
v -0.479520 1.014358 2.297700
|
||||
v 0.479520 1.014358 2.297700
|
||||
v 0.479520 1.014359 -2.297700
|
||||
v -1.798200 1.014359 0.749250
|
||||
v 1.798200 1.014359 0.749250
|
||||
v 1.798200 1.014359 -0.249750
|
||||
v -1.798200 1.014359 -0.249750
|
||||
vn -0.0000 -0.0000 -1.0000
|
||||
vn 1.0000 -0.0000 -0.0000
|
||||
vn -1.0000 -0.0000 -0.0000
|
||||
vn -0.0000 -0.0000 1.0000
|
||||
vt 0.356764 0.512055
|
||||
vt 0.356764 0.733848
|
||||
vt 0.182136 0.512055
|
||||
vt 0.182136 0.733848
|
||||
vt 0.356764 0.512055
|
||||
vt 0.356764 0.733848
|
||||
vt 0.182136 0.512055
|
||||
vt 0.182136 0.733848
|
||||
vt 0.247712 0.512055
|
||||
vt 0.247712 0.733848
|
||||
vt 0.247712 0.512055
|
||||
vt 0.247712 0.733848
|
||||
vt 0.303586 0.512055
|
||||
vt 0.303586 0.733848
|
||||
vt 0.303586 0.512055
|
||||
vt 0.303586 0.733848
|
||||
vt 0.182136 0.733848
|
||||
vt 0.356764 0.733848
|
||||
vt 0.182136 0.512055
|
||||
vt 0.356764 0.512055
|
||||
vt 0.247712 0.512055
|
||||
vt 0.247712 0.733848
|
||||
vt 0.303586 0.733848
|
||||
vt 0.303586 0.512055
|
||||
vt 0.356764 0.622952
|
||||
vt 0.182136 0.622952
|
||||
vt 0.356764 0.622952
|
||||
vt 0.182136 0.622952
|
||||
vt 0.356764 0.622952
|
||||
vt 0.182136 0.622952
|
||||
vt 0.356764 0.567503
|
||||
vt 0.356764 0.567503
|
||||
vt 0.182136 0.567503
|
||||
vt 0.356764 0.567503
|
||||
vt 0.182136 0.567503
|
||||
vt 0.182136 0.567503
|
||||
vt 0.356764 0.733848
|
||||
vt 0.356764 0.512055
|
||||
vt 0.182136 0.733848
|
||||
vt 0.182136 0.512055
|
||||
vt 0.247712 0.512055
|
||||
vt 0.247712 0.733848
|
||||
vt 0.303586 0.733848
|
||||
vt 0.303586 0.512055
|
||||
vt 0.182136 0.622952
|
||||
vt 0.356764 0.622952
|
||||
vt 0.356764 0.567503
|
||||
vt 0.182136 0.567503
|
||||
s 0
|
||||
usemtl None.006
|
||||
f 22/22/1 17/17/1 8/8/1 12/12/1
|
||||
f 36/36/2 19/19/2 7/7/2 35/35/2
|
||||
f 29/29/3 18/18/3 6/6/3 27/27/3
|
||||
f 24/24/4 20/20/4 5/5/4 15/15/4
|
||||
f 19/19/4 21/21/4 11/11/4 7/7/4
|
||||
f 23/23/1 22/22/1 12/12/1 16/16/1
|
||||
f 18/18/1 23/23/1 16/16/1 6/6/1
|
||||
f 21/21/4 24/24/4 15/15/4 11/11/4
|
||||
f 37/37/1 43/43/1 23/23/1 18/18/1
|
||||
f 43/43/1 42/42/1 22/22/1 23/23/1
|
||||
f 40/40/4 41/41/4 21/21/4 19/19/4
|
||||
f 44/44/4 38/38/4 20/20/4 24/24/4
|
||||
f 46/46/3 37/37/3 18/18/3 29/29/3
|
||||
f 48/48/2 40/40/2 19/19/2 36/36/2
|
||||
f 42/42/1 39/39/1 17/17/1 22/22/1
|
||||
f 39/39/2 45/45/2 30/30/2 17/17/2
|
||||
f 47/47/3 46/46/3 29/29/3 31/31/3
|
||||
f 31/31/3 29/29/3 27/27/3 34/34/3
|
||||
f 17/17/2 30/30/2 28/28/2 8/8/2
|
||||
f 20/20/3 31/31/3 34/34/3 5/5/3
|
||||
f 38/38/3 47/47/3 31/31/3 20/20/3
|
||||
f 30/30/2 36/36/2 35/35/2 28/28/2
|
||||
f 26/26/2 33/33/2 48/48/2 45/45/2
|
||||
f 1/1/3 32/32/3 47/47/3 38/38/3
|
||||
f 32/32/3 25/25/3 46/46/3 47/47/3
|
||||
f 4/4/2 26/26/2 45/45/2 39/39/2
|
||||
f 10/10/1 4/4/1 39/39/1 42/42/1
|
||||
f 33/33/2 3/3/2 40/40/2 48/48/2
|
||||
f 25/25/3 2/2/3 37/37/3 46/46/3
|
||||
f 13/13/4 1/1/4 38/38/4 44/44/4
|
||||
f 3/3/4 9/9/4 41/41/4 40/40/4
|
||||
f 14/14/1 10/10/1 42/42/1 43/43/1
|
||||
f 2/2/1 14/14/1 43/43/1 37/37/1
|
||||
16
cw 9/models/roof.obj
Normal file
16
cw 9/models/roof.obj
Normal file
@ -0,0 +1,16 @@
|
||||
# Blender 3.4.1
|
||||
# www.blender.org
|
||||
mtllib roof.mtl
|
||||
o roof
|
||||
v -2.000000 2.190000 2.500000
|
||||
v 2.000000 2.190000 2.500000
|
||||
v -2.000000 2.190001 -2.500000
|
||||
v 2.000000 2.190001 -2.500000
|
||||
vn -0.0000 1.0000 -0.0000
|
||||
vt 0.000000 0.000000
|
||||
vt 1.000000 0.000000
|
||||
vt 0.000000 1.000000
|
||||
vt 1.000000 1.000000
|
||||
s 0
|
||||
usemtl Material.013
|
||||
f 1/1/1 2/2/1 4/4/1 3/3/1
|
||||
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'bed.blend11'
|
||||
# www.blender.org
|
||||
|
||||
newmtl wire_177028149.002
|
||||
Ns 0.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.800000 0.800000 0.800000
|
||||
Ks 0.000000 0.000000 0.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 1
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'GrafikaScene.blend'
|
||||
# www.blender.org
|
||||
|
||||
newmtl Gibas_Inciucio_201_21_mat1_mtl_1
|
||||
Ns 10.000005
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.784300 0.545100 0.262700
|
||||
Ks 0.000000 0.000000 0.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.500000
|
||||
d 1.000000
|
||||
illum 1
|
||||
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'bed.blend11'
|
||||
# www.blender.org
|
||||
|
||||
newmtl Material.008
|
||||
Ns 0.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.800000 0.800000 0.800000
|
||||
Ks 0.000000 0.000000 0.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 1
|
||||
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'bed.blend11'
|
||||
# www.blender.org
|
||||
|
||||
newmtl Front_Gray
|
||||
Ns 0.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.800000 0.800000 0.800000
|
||||
Ks 0.000000 0.000000 0.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 1
|
||||
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'GrafikaScene.blend'
|
||||
# www.blender.org
|
||||
|
||||
newmtl Contemporary_Vase
|
||||
Ns 0.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.800000 0.800000 0.800000
|
||||
Ks 0.000000 0.000000 0.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 1
|
||||
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'GrafikaScene.blend'
|
||||
# www.blender.org
|
||||
|
||||
newmtl Pomeroy_Olivia
|
||||
Ns 0.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.800000 0.800000 0.800000
|
||||
Ks 0.000000 0.000000 0.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 1
|
||||
48
cw 9/models/wall1.obj
Normal file
48
cw 9/models/wall1.obj
Normal file
@ -0,0 +1,48 @@
|
||||
# Blender 3.4.1
|
||||
# www.blender.org
|
||||
mtllib wall1.mtl
|
||||
o wall1
|
||||
v 1.798200 0.000000 -2.297700
|
||||
v 1.798200 -0.000000 2.297700
|
||||
v 1.798200 2.297700 -2.297699
|
||||
v 1.798200 2.297699 2.297700
|
||||
v 1.798200 1.968030 2.297700
|
||||
v 1.798200 1.968030 -2.297700
|
||||
v 1.798200 -0.000000 0.749250
|
||||
v 1.798200 2.297700 0.749250
|
||||
v 1.798200 1.968030 0.749250
|
||||
v 1.798200 1.968030 -0.249750
|
||||
v 1.798200 0.000000 -0.249750
|
||||
v 1.798200 2.297700 -0.249750
|
||||
v 1.798200 1.014358 2.297700
|
||||
v 1.798200 1.014359 -2.297700
|
||||
v 1.798200 1.014359 0.749250
|
||||
v 1.798200 1.014359 -0.249750
|
||||
vn -1.0000 -0.0000 -0.0000
|
||||
vt 0.356764 0.512055
|
||||
vt 0.356764 0.733848
|
||||
vt 0.356764 0.512055
|
||||
vt 0.356764 0.733848
|
||||
vt 0.356764 0.733848
|
||||
vt 0.356764 0.512055
|
||||
vt 0.356764 0.622952
|
||||
vt 0.356764 0.622952
|
||||
vt 0.356764 0.622952
|
||||
vt 0.356764 0.567503
|
||||
vt 0.356764 0.567503
|
||||
vt 0.356764 0.567503
|
||||
vt 0.356764 0.733848
|
||||
vt 0.356764 0.512055
|
||||
vt 0.356764 0.622952
|
||||
vt 0.356764 0.567503
|
||||
s 0
|
||||
usemtl None.006
|
||||
f 9/9/1 5/5/1 4/4/1 8/8/1
|
||||
f 15/15/1 13/13/1 5/5/1 9/9/1
|
||||
f 16/16/1 15/15/1 9/9/1 10/10/1
|
||||
f 10/10/1 9/9/1 8/8/1 12/12/1
|
||||
f 6/6/1 10/10/1 12/12/1 3/3/1
|
||||
f 14/14/1 16/16/1 10/10/1 6/6/1
|
||||
f 1/1/1 11/11/1 16/16/1 14/14/1
|
||||
f 11/11/1 7/7/1 15/15/1 16/16/1
|
||||
f 7/7/1 2/2/1 13/13/1 15/15/1
|
||||
48
cw 9/models/wall2.obj
Normal file
48
cw 9/models/wall2.obj
Normal file
@ -0,0 +1,48 @@
|
||||
# Blender 3.4.1
|
||||
# www.blender.org
|
||||
mtllib wall2.mtl
|
||||
o wall2
|
||||
v 1.798200 -0.000000 2.297700
|
||||
v -1.798200 -0.000000 2.297700
|
||||
v 1.798200 2.297699 2.297700
|
||||
v -1.798200 2.297699 2.297700
|
||||
v -0.479520 -0.000000 2.297700
|
||||
v -0.479520 2.297699 2.297700
|
||||
v 0.479520 -0.000000 2.297700
|
||||
v 0.479520 2.297699 2.297700
|
||||
v -1.798200 1.968030 2.297700
|
||||
v 1.798200 1.968030 2.297700
|
||||
v -0.479520 1.968030 2.297700
|
||||
v 0.479520 1.968030 2.297700
|
||||
v 1.798200 1.014358 2.297700
|
||||
v -1.798200 1.014358 2.297700
|
||||
v -0.479520 1.014358 2.297700
|
||||
v 0.479520 1.014358 2.297700
|
||||
vn -0.0000 -0.0000 -1.0000
|
||||
vt 0.356764 0.733848
|
||||
vt 0.182136 0.733848
|
||||
vt 0.356764 0.733848
|
||||
vt 0.182136 0.733848
|
||||
vt 0.247712 0.733848
|
||||
vt 0.247712 0.733848
|
||||
vt 0.303586 0.733848
|
||||
vt 0.303586 0.733848
|
||||
vt 0.182136 0.733848
|
||||
vt 0.356764 0.733848
|
||||
vt 0.247712 0.733848
|
||||
vt 0.303586 0.733848
|
||||
vt 0.356764 0.733848
|
||||
vt 0.182136 0.733848
|
||||
vt 0.247712 0.733848
|
||||
vt 0.303586 0.733848
|
||||
s 0
|
||||
usemtl None.007
|
||||
f 11/11/1 9/9/1 4/4/1 6/6/1
|
||||
f 12/12/1 11/11/1 6/6/1 8/8/1
|
||||
f 10/10/1 12/12/1 8/8/1 3/3/1
|
||||
f 13/13/1 16/16/1 12/12/1 10/10/1
|
||||
f 16/16/1 15/15/1 11/11/1 12/12/1
|
||||
f 15/15/1 14/14/1 9/9/1 11/11/1
|
||||
f 5/5/1 2/2/1 14/14/1 15/15/1
|
||||
f 7/7/1 5/5/1 15/15/1 16/16/1
|
||||
f 1/1/1 7/7/1 16/16/1 13/13/1
|
||||
47
cw 9/models/wall3.obj
Normal file
47
cw 9/models/wall3.obj
Normal file
@ -0,0 +1,47 @@
|
||||
# Blender 3.4.1
|
||||
# www.blender.org
|
||||
mtllib wall3.mtl
|
||||
o wall3
|
||||
v -1.798200 0.000000 -2.297700
|
||||
v -1.798200 -0.000000 2.297700
|
||||
v -1.798200 2.297700 -2.297699
|
||||
v -1.798200 2.297699 2.297700
|
||||
v -1.798200 1.968030 2.297700
|
||||
v -1.798200 1.968030 -2.297700
|
||||
v -1.798200 -0.000000 0.749250
|
||||
v -1.798200 2.297700 0.749250
|
||||
v -1.798200 1.968030 0.749250
|
||||
v -1.798200 0.000000 -0.249750
|
||||
v -1.798200 2.297700 -0.249750
|
||||
v -1.798200 1.968030 -0.249750
|
||||
v -1.798200 1.014358 2.297700
|
||||
v -1.798200 1.014359 -2.297700
|
||||
v -1.798200 1.014359 0.749250
|
||||
v -1.798200 1.014359 -0.249750
|
||||
vn 1.0000 -0.0000 -0.0000
|
||||
vt 0.182136 0.512055
|
||||
vt 0.182136 0.733848
|
||||
vt 0.182136 0.512055
|
||||
vt 0.182136 0.733848
|
||||
vt 0.182136 0.733848
|
||||
vt 0.182136 0.512055
|
||||
vt 0.182136 0.622952
|
||||
vt 0.182136 0.622952
|
||||
vt 0.182136 0.622952
|
||||
vt 0.182136 0.567503
|
||||
vt 0.182136 0.567503
|
||||
vt 0.182136 0.567503
|
||||
vt 0.182136 0.733848
|
||||
vt 0.182136 0.512055
|
||||
vt 0.182136 0.622952
|
||||
vt 0.182136 0.567503
|
||||
s 0
|
||||
usemtl None.008
|
||||
f 12/12/1 6/6/1 3/3/1 11/11/1
|
||||
f 16/16/1 14/14/1 6/6/1 12/12/1
|
||||
f 13/13/1 15/15/1 9/9/1 5/5/1
|
||||
f 5/5/1 9/9/1 8/8/1 4/4/1
|
||||
f 9/9/1 12/12/1 11/11/1 8/8/1
|
||||
f 7/7/1 10/10/1 16/16/1 15/15/1
|
||||
f 2/2/1 7/7/1 15/15/1 13/13/1
|
||||
f 10/10/1 1/1/1 14/14/1 16/16/1
|
||||
46
cw 9/models/wall4.obj
Normal file
46
cw 9/models/wall4.obj
Normal file
@ -0,0 +1,46 @@
|
||||
# Blender 3.4.1
|
||||
# www.blender.org
|
||||
mtllib wall4.mtl
|
||||
o wall4
|
||||
v 1.798200 0.000000 -2.297700
|
||||
v -1.798200 0.000000 -2.297700
|
||||
v 1.798200 2.297700 -2.297699
|
||||
v -1.798200 2.297700 -2.297699
|
||||
v -0.479520 0.000000 -2.297700
|
||||
v -0.479520 2.297700 -2.297699
|
||||
v 0.479520 0.000000 -2.297700
|
||||
v 0.479520 2.297700 -2.297699
|
||||
v -1.798200 1.968030 -2.297700
|
||||
v 1.798200 1.968030 -2.297700
|
||||
v -0.479520 1.968030 -2.297700
|
||||
v 0.479520 1.968030 -2.297700
|
||||
v 1.798200 1.014359 -2.297700
|
||||
v -1.798200 1.014359 -2.297700
|
||||
v -0.479520 1.014359 -2.297700
|
||||
v 0.479520 1.014359 -2.297700
|
||||
vn -0.0000 -0.0000 1.0000
|
||||
vt 0.356764 0.512055
|
||||
vt 0.182136 0.512055
|
||||
vt 0.356764 0.512055
|
||||
vt 0.182136 0.512055
|
||||
vt 0.247712 0.512055
|
||||
vt 0.247712 0.512055
|
||||
vt 0.303586 0.512055
|
||||
vt 0.303586 0.512055
|
||||
vt 0.182136 0.512055
|
||||
vt 0.356764 0.512055
|
||||
vt 0.247712 0.512055
|
||||
vt 0.303586 0.512055
|
||||
vt 0.356764 0.512055
|
||||
vt 0.182136 0.512055
|
||||
vt 0.247712 0.512055
|
||||
vt 0.303586 0.512055
|
||||
s 0
|
||||
usemtl None.009
|
||||
f 12/12/1 10/10/1 3/3/1 8/8/1
|
||||
f 9/9/1 11/11/1 6/6/1 4/4/1
|
||||
f 11/11/1 12/12/1 8/8/1 6/6/1
|
||||
f 14/14/1 15/15/1 11/11/1 9/9/1
|
||||
f 16/16/1 13/13/1 10/10/1 12/12/1
|
||||
f 7/7/1 1/1/1 13/13/1 16/16/1
|
||||
f 2/2/1 5/5/1 15/15/1 14/14/1
|
||||
456
cw 9/models/walls.obj
Normal file
456
cw 9/models/walls.obj
Normal file
@ -0,0 +1,456 @@
|
||||
# Blender 3.4.1
|
||||
# www.blender.org
|
||||
mtllib walls.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.299999
|
||||
v 2.000000 -0.000000 2.300000
|
||||
v 2.000000 0.000000 -2.300000
|
||||
v 2.000000 2.500000 -2.299999
|
||||
v 2.000000 2.500000 2.300000
|
||||
v 1.800000 2.500000 -2.299999
|
||||
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.299999
|
||||
v -1.800000 2.500000 2.300000
|
||||
v 1.800000 2.300000 -2.299999
|
||||
v 1.800000 2.299999 2.300000
|
||||
v -1.800000 2.300000 -2.299999
|
||||
v -1.800000 2.299999 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.299999
|
||||
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.299999
|
||||
v -0.480000 2.299999 2.300000
|
||||
v 0.480000 2.500000 -2.500000
|
||||
v 0.480000 -0.000000 2.500000
|
||||
v 0.480000 2.500000 -2.299999
|
||||
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.299999
|
||||
v 0.480000 2.299999 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 -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 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
|
||||
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
|
||||
vt 0.125000 0.750000
|
||||
vt 0.375000 1.000000
|
||||
vt 0.375000 0.000000
|
||||
vt 0.625000 1.000000
|
||||
vt 0.875000 0.750000
|
||||
vt 0.625000 0.000000
|
||||
vt 0.125000 0.500000
|
||||
vt 0.375000 0.250000
|
||||
vt 0.625000 0.250000
|
||||
vt 0.875000 0.500000
|
||||
vt 0.375000 0.750000
|
||||
vt 0.625000 0.750000
|
||||
vt 0.375000 0.500000
|
||||
vt 0.625000 0.500000
|
||||
vt 0.356764 0.500000
|
||||
vt 0.375000 0.481764
|
||||
vt 0.625000 0.481764
|
||||
vt 0.643236 0.500000
|
||||
vt 0.356764 0.750000
|
||||
vt 0.375000 0.768236
|
||||
vt 0.643236 0.750000
|
||||
vt 0.625000 0.768236
|
||||
vt 0.182136 0.500000
|
||||
vt 0.375000 0.307136
|
||||
vt 0.817864 0.750000
|
||||
vt 0.625000 0.942864
|
||||
vt 0.817864 0.500000
|
||||
vt 0.625000 0.307136
|
||||
vt 0.182136 0.750000
|
||||
vt 0.375000 0.942864
|
||||
vt 0.125000 0.512055
|
||||
vt 0.375000 0.237945
|
||||
vt 0.125000 0.733848
|
||||
vt 0.375000 0.016152
|
||||
vt 0.875000 0.733848
|
||||
vt 0.625000 0.016152
|
||||
vt 0.625000 0.237945
|
||||
vt 0.875000 0.512055
|
||||
vt 0.375000 0.733848
|
||||
vt 0.375000 0.512055
|
||||
vt 0.625000 0.512055
|
||||
vt 0.625000 0.733848
|
||||
vt 0.643236 0.512055
|
||||
vt 0.643236 0.733848
|
||||
vt 0.356764 0.512055
|
||||
vt 0.356764 0.733848
|
||||
vt 0.182136 0.512055
|
||||
vt 0.182136 0.733848
|
||||
vt 0.817864 0.512055
|
||||
vt 0.817864 0.733848
|
||||
vt 0.356764 0.512055
|
||||
vt 0.356764 0.733848
|
||||
vt 0.182136 0.512055
|
||||
vt 0.182136 0.733848
|
||||
vt 0.752288 0.500000
|
||||
vt 0.625000 0.372712
|
||||
vt 0.247712 0.750000
|
||||
vt 0.375000 0.877288
|
||||
vt 0.247712 0.500000
|
||||
vt 0.375000 0.372712
|
||||
vt 0.625000 0.877288
|
||||
vt 0.752288 0.750000
|
||||
vt 0.752288 0.512055
|
||||
vt 0.752288 0.733848
|
||||
vt 0.247712 0.512055
|
||||
vt 0.247712 0.733848
|
||||
vt 0.247712 0.512055
|
||||
vt 0.247712 0.733848
|
||||
vt 0.696414 0.500000
|
||||
vt 0.625000 0.428586
|
||||
vt 0.303586 0.750000
|
||||
vt 0.375000 0.821414
|
||||
vt 0.696414 0.512055
|
||||
vt 0.696414 0.733848
|
||||
vt 0.303586 0.500000
|
||||
vt 0.375000 0.428586
|
||||
vt 0.696414 0.750000
|
||||
vt 0.625000 0.821414
|
||||
vt 0.303586 0.512055
|
||||
vt 0.303586 0.733848
|
||||
vt 0.303586 0.512055
|
||||
vt 0.303586 0.733848
|
||||
vt 0.571865 0.000000
|
||||
vt 0.571865 1.000000
|
||||
vt 0.571865 0.250000
|
||||
vt 0.571865 0.500000
|
||||
vt 0.571865 0.750000
|
||||
vt 0.571865 0.768236
|
||||
vt 0.571865 0.481764
|
||||
vt 0.571865 0.307136
|
||||
vt 0.571865 0.942864
|
||||
vt 0.571865 0.512055
|
||||
vt 0.571865 0.733848
|
||||
vt 0.571865 0.016152
|
||||
vt 0.571865 0.237945
|
||||
vt 0.571865 0.877288
|
||||
vt 0.571865 0.372712
|
||||
vt 0.571865 0.821414
|
||||
vt 0.571865 0.428586
|
||||
vt 0.182136 0.733848
|
||||
vt 0.356764 0.733848
|
||||
vt 0.182136 0.512055
|
||||
vt 0.356764 0.512055
|
||||
vt 0.247712 0.512055
|
||||
vt 0.247712 0.733848
|
||||
vt 0.303586 0.733848
|
||||
vt 0.303586 0.512055
|
||||
vt 0.125000 0.622952
|
||||
vt 0.375000 0.127048
|
||||
vt 0.875000 0.622952
|
||||
vt 0.625000 0.127048
|
||||
vt 0.375000 0.622952
|
||||
vt 0.625000 0.622952
|
||||
vt 0.643236 0.622952
|
||||
vt 0.356764 0.622952
|
||||
vt 0.182136 0.622952
|
||||
vt 0.817864 0.622952
|
||||
vt 0.356764 0.622952
|
||||
vt 0.182136 0.622952
|
||||
vt 0.571865 0.127048
|
||||
vt 0.571865 0.622952
|
||||
vt 0.356764 0.622952
|
||||
vt 0.182136 0.622952
|
||||
vt 0.875000 0.567503
|
||||
vt 0.625000 0.182497
|
||||
vt 0.375000 0.567503
|
||||
vt 0.571865 0.182497
|
||||
vt 0.356764 0.567503
|
||||
vt 0.125000 0.567503
|
||||
vt 0.375000 0.182497
|
||||
vt 0.625000 0.567503
|
||||
vt 0.643236 0.567503
|
||||
vt 0.356764 0.567503
|
||||
vt 0.182136 0.567503
|
||||
vt 0.817864 0.567503
|
||||
vt 0.356764 0.567503
|
||||
vt 0.182136 0.567503
|
||||
vt 0.571865 0.567503
|
||||
vt 0.182136 0.567503
|
||||
vt 0.476468 0.250000
|
||||
vt 0.476468 0.500000
|
||||
vt 0.476468 0.750000
|
||||
vt 0.476468 0.768236
|
||||
vt 0.476468 0.481764
|
||||
vt 0.476468 0.307136
|
||||
vt 0.476468 0.942864
|
||||
vt 0.476468 0.512055
|
||||
vt 0.476468 0.733848
|
||||
vt 0.476468 0.016152
|
||||
vt 0.476468 0.237945
|
||||
vt 0.356764 0.733848
|
||||
vt 0.356764 0.512055
|
||||
vt 0.476468 0.877288
|
||||
vt 0.414786 0.434393
|
||||
vt 0.476468 0.372712
|
||||
vt 0.476468 0.821414
|
||||
vt 0.441862 0.463192
|
||||
vt 0.476468 0.428586
|
||||
vt 0.476468 1.000000
|
||||
vt 0.476468 0.000000
|
||||
vt 0.182136 0.733848
|
||||
vt 0.182136 0.512055
|
||||
vt 0.247712 0.512055
|
||||
vt 0.247712 0.733848
|
||||
vt 0.303586 0.733848
|
||||
vt 0.303586 0.512055
|
||||
vt 0.182136 0.622952
|
||||
vt 0.356764 0.622952
|
||||
vt 0.476468 0.622952
|
||||
vt 0.476468 0.127048
|
||||
vt 0.476468 0.567503
|
||||
vt 0.356764 0.567503
|
||||
vt 0.182136 0.567503
|
||||
vt 0.476468 0.182497
|
||||
s 0
|
||||
usemtl None.006
|
||||
f 68/95/1 20/37/1 4/9/1 58/85/1
|
||||
f 62/89/2 10/17/2 8/14/2 59/86/2
|
||||
f 66/93/3 24/42/3 6/12/3 60/87/3
|
||||
f 64/91/4 14/26/4 2/4/4 57/84/4
|
||||
f 28/46/5 21/39/5 5/11/5 11/19/5
|
||||
f 32/50/6 19/35/6 2/5/6 14/25/6
|
||||
f 24/42/6 26/44/6 12/21/6 6/12/6
|
||||
f 54/80/5 28/46/5 11/19/5 48/71/5
|
||||
f 60/87/4 6/12/4 12/22/4 61/88/4
|
||||
f 72/99/2 47/70/2 10/17/2 62/89/2
|
||||
f 58/85/2 4/9/2 15/28/2 63/90/2
|
||||
f 18/33/5 30/48/5 16/29/5 1/1/5
|
||||
f 42/64/6 32/50/6 14/25/6 40/62/6
|
||||
f 69/96/4 40/61/4 14/26/4 64/91/4
|
||||
f 37/55/6 15/27/6 31/49/6 41/63/6
|
||||
f 3/7/5 13/23/5 29/47/5 17/31/5
|
||||
f 81/108/5 87/116/5 30/48/5 18/33/5
|
||||
f 51/75/5 9/15/5 27/45/5 53/79/5
|
||||
f 78/105/2 73/100/2 36/54/2 46/68/2
|
||||
f 8/14/6 10/18/6 25/43/6 23/41/6
|
||||
f 84/113/6 85/114/6 26/44/6 24/42/6
|
||||
f 15/27/6 4/10/6 20/38/6 31/49/6
|
||||
f 88/117/6 82/110/6 19/35/6 32/50/6
|
||||
f 9/15/5 7/13/5 22/40/5 27/45/5
|
||||
f 86/115/5 83/112/5 21/39/5 28/46/5
|
||||
f 59/86/3 8/14/3 23/41/3 65/92/3
|
||||
f 92/121/3 84/113/3 24/42/3 66/93/3
|
||||
f 57/83/1 2/6/1 19/36/1 67/94/1
|
||||
f 97/127/1 95/125/1 20/37/1 68/95/1
|
||||
f 108/139/3 75/102/3 35/53/3 106/137/3
|
||||
f 93/122/1 74/101/1 34/52/1 89/118/1
|
||||
f 80/107/4 76/103/4 33/51/4 55/81/4
|
||||
f 75/102/4 77/104/4 45/67/4 35/53/4
|
||||
f 79/106/2 78/105/2 46/68/2 56/82/2
|
||||
f 13/23/5 39/59/5 43/65/5 29/47/5
|
||||
f 47/69/6 37/55/6 41/63/6 49/73/6
|
||||
f 71/98/4 52/78/4 40/61/4 69/96/4
|
||||
f 50/74/6 42/64/6 40/62/6 52/77/6
|
||||
f 63/90/2 15/28/2 37/56/2 70/97/2
|
||||
f 30/48/5 44/66/5 38/57/5 16/29/5
|
||||
f 26/44/6 50/74/6 52/77/6 12/21/6
|
||||
f 61/88/4 12/22/4 52/78/4 71/98/4
|
||||
f 10/18/6 47/69/6 49/73/6 25/43/6
|
||||
f 74/101/2 79/106/2 56/82/2 34/52/2
|
||||
f 77/104/4 80/107/4 55/81/4 45/67/4
|
||||
f 70/97/2 37/56/2 47/70/2 72/99/2
|
||||
f 44/66/5 54/80/5 48/71/5 38/57/5
|
||||
f 77/104/5 70/97/5 72/99/5 80/107/5
|
||||
f 112/143/4 61/88/4 71/98/4 124/156/4
|
||||
f 114/145/2 63/90/2 70/97/2 123/155/2
|
||||
f 124/156/4 71/98/4 69/96/4 122/153/4
|
||||
f 140/174/1 97/127/1 68/95/1 119/150/1
|
||||
f 126/160/1 57/83/1 67/94/1 118/149/1
|
||||
f 135/169/3 92/121/3 66/93/3 117/148/3
|
||||
f 110/141/3 59/86/3 65/92/3 116/147/3
|
||||
f 122/153/4 69/96/4 64/91/4 115/146/4
|
||||
f 109/140/2 58/85/2 63/90/2 114/145/2
|
||||
f 125/158/2 72/99/2 62/89/2 113/144/2
|
||||
f 111/142/4 60/87/4 61/88/4 112/143/4
|
||||
f 115/146/4 64/91/4 57/84/4 126/159/4
|
||||
f 117/148/3 66/93/3 60/87/3 111/142/3
|
||||
f 113/144/2 62/89/2 59/86/2 110/141/2
|
||||
f 119/150/1 68/95/1 58/85/1 109/140/1
|
||||
f 132/166/1 125/157/1 51/75/1 53/79/1
|
||||
f 120/151/2 131/165/2 79/106/2 74/101/2
|
||||
f 131/165/2 130/164/2 78/105/2 79/106/2
|
||||
f 128/162/4 129/163/4 77/104/4 75/102/4
|
||||
f 132/166/4 121/152/4 76/103/4 80/107/4
|
||||
f 134/168/1 120/151/1 74/101/1 93/122/1
|
||||
f 139/173/3 128/162/3 75/102/3 108/139/3
|
||||
f 130/164/2 127/161/2 73/100/2 78/105/2
|
||||
f 129/163/3 43/65/3 39/59/3 123/154/3
|
||||
f 127/161/3 133/167/3 94/123/3 73/100/3
|
||||
f 138/172/1 134/168/1 93/122/1 98/128/1
|
||||
f 137/171/3 107/138/3 92/121/3 135/169/3
|
||||
f 118/149/1 67/94/1 91/120/1 136/170/1
|
||||
f 98/128/1 93/122/1 89/118/1 105/136/1
|
||||
f 73/100/3 94/123/3 90/119/3 36/54/3
|
||||
f 67/94/1 19/36/1 82/111/1 91/120/1
|
||||
f 107/138/3 100/131/3 84/113/3 92/121/3
|
||||
f 102/133/5 96/126/5 83/112/5 86/115/5
|
||||
f 104/135/6 95/124/6 82/110/6 88/117/6
|
||||
f 100/131/6 101/132/6 85/114/6 84/113/6
|
||||
f 99/129/5 103/134/5 87/116/5 81/108/5
|
||||
f 17/31/5 29/47/5 103/134/5 99/129/5
|
||||
f 23/41/6 25/43/6 101/132/6 100/131/6
|
||||
f 31/49/6 20/38/6 95/124/6 104/135/6
|
||||
f 27/45/5 22/40/5 96/126/5 102/133/5
|
||||
f 65/92/3 23/41/3 100/131/3 107/138/3
|
||||
f 76/103/1 98/128/1 105/136/1 33/51/1
|
||||
f 116/147/3 65/92/3 107/138/3 137/171/3
|
||||
f 121/152/1 138/172/1 98/128/1 76/103/1
|
||||
f 94/123/3 108/139/3 106/137/3 90/119/3
|
||||
f 91/120/1 82/111/1 95/125/1 97/127/1
|
||||
f 81/109/1 136/170/1 140/174/1 99/130/1
|
||||
f 87/116/3 103/134/3 139/173/3 133/167/3
|
||||
f 27/45/1 102/133/1 138/172/1 121/152/1
|
||||
f 22/40/3 116/147/3 137/171/3 96/126/3
|
||||
f 18/34/1 118/149/1 136/170/1 81/109/1
|
||||
f 96/126/3 137/171/3 135/169/3 83/112/3
|
||||
f 102/133/1 86/115/1 134/168/1 138/172/1
|
||||
f 30/48/3 87/116/3 133/167/3 127/161/3
|
||||
f 77/104/3 129/163/3 123/154/3 70/97/3
|
||||
f 44/66/2 30/48/2 127/161/2 130/164/2
|
||||
f 103/134/3 29/47/3 128/162/3 139/173/3
|
||||
f 86/115/1 28/46/1 120/151/1 134/168/1
|
||||
f 53/79/4 27/45/4 121/152/4 132/166/4
|
||||
f 29/47/4 43/65/4 129/163/4 128/162/4
|
||||
f 54/80/2 44/66/2 130/164/2 131/165/2
|
||||
f 28/46/2 54/80/2 131/165/2 120/151/2
|
||||
f 80/107/1 72/99/1 125/157/1 132/166/1
|
||||
f 17/32/1 119/150/1 109/140/1 3/8/1
|
||||
f 9/16/2 113/144/2 110/141/2 7/13/2
|
||||
f 21/39/3 117/148/3 111/142/3 5/11/3
|
||||
f 16/30/4 115/146/4 126/159/4 1/2/4
|
||||
f 5/11/4 111/142/4 112/143/4 11/20/4
|
||||
f 51/76/2 125/158/2 113/144/2 9/16/2
|
||||
f 3/8/2 109/140/2 114/145/2 13/24/2
|
||||
f 38/58/4 122/153/4 115/146/4 16/30/4
|
||||
f 7/13/3 110/141/3 116/147/3 22/40/3
|
||||
f 83/112/3 135/169/3 117/148/3 21/39/3
|
||||
f 1/3/1 126/160/1 118/149/1 18/34/1
|
||||
f 99/130/1 140/174/1 119/150/1 17/32/1
|
||||
f 48/72/4 124/156/4 122/153/4 38/58/4
|
||||
f 13/24/2 114/145/2 123/155/2 39/60/2
|
||||
f 11/20/4 112/143/4 124/156/4 48/72/4
|
||||
f 136/170/6 133/167/6 139/173/6 140/174/6
|
||||
f 139/173/4 108/139/4 97/127/4 140/174/4
|
||||
f 108/139/5 94/123/5 91/120/5 97/127/5
|
||||
f 133/167/2 136/170/2 91/120/2 94/123/2
|
||||
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'bed.blend11'
|
||||
# www.blender.org
|
||||
|
||||
newmtl Material.007
|
||||
Ns 0.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.800000 0.800000 0.800000
|
||||
Ks 0.000000 0.000000 0.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 1
|
||||
@ -1,12 +0,0 @@
|
||||
# Blender 3.4.1 MTL File: 'bed.blend11'
|
||||
# www.blender.org
|
||||
|
||||
newmtl X
|
||||
Ns 0.000000
|
||||
Ka 1.000000 1.000000 1.000000
|
||||
Kd 0.800000 0.800000 0.800000
|
||||
Ks 0.000000 0.000000 0.000000
|
||||
Ke 0.000000 0.000000 0.000000
|
||||
Ni 1.450000
|
||||
d 1.000000
|
||||
illum 1
|
||||
@ -3,7 +3,7 @@
|
||||
float AMBIENT = 0.1;
|
||||
|
||||
uniform vec3 color;
|
||||
//uniform vec3 lightPos;
|
||||
uniform vec3 lightPos;
|
||||
uniform sampler2D colorTexture;
|
||||
|
||||
in vec3 vecNormal;
|
||||
@ -13,9 +13,9 @@ in vec2 vecTex;
|
||||
out vec4 outColor;
|
||||
void main()
|
||||
{
|
||||
//vec3 lightDir = normalize(lightPos-worldPos);
|
||||
vec3 lightDir = normalize(lightPos-worldPos);
|
||||
vec3 normal = normalize(vecNormal);
|
||||
vec3 textureColor = texture2D(colorTexture, vecTex).xyz;
|
||||
//float diffuse=max(0,dot(normal,lightDir));
|
||||
outColor = vec4(textureColor/**min(1,AMBIENT+diffuse)*/, 1.0);
|
||||
float diffuse=max(0,dot(normal,lightDir));
|
||||
outColor = vec4(textureColor*min(1,AMBIENT+diffuse), 1.0);
|
||||
}
|
||||
BIN
cw 9/skybox/floor.jpg
Normal file
BIN
cw 9/skybox/floor.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 266 KiB |
@ -27,6 +27,13 @@ int WIDTH = 950, HEIGHT = 950;
|
||||
namespace texture {
|
||||
GLuint skybox;
|
||||
GLuint sofa;
|
||||
GLuint floor;
|
||||
GLuint wall1;
|
||||
GLuint wall2;
|
||||
GLuint wall3;
|
||||
GLuint wall4;
|
||||
GLuint ship;
|
||||
GLuint roof;
|
||||
}
|
||||
|
||||
namespace models {
|
||||
@ -42,6 +49,12 @@ namespace models {
|
||||
Core::RenderContext xThingContext;
|
||||
Core::RenderContext planeContext;
|
||||
Core::RenderContext roomContext;
|
||||
Core::RenderContext roofContext;
|
||||
Core::RenderContext wall1Context;
|
||||
Core::RenderContext wall2Context;
|
||||
Core::RenderContext wall3Context;
|
||||
Core::RenderContext wall4Context;
|
||||
|
||||
Core::RenderContext spaceshipContext;
|
||||
Core::RenderContext sphereContext;
|
||||
Core::RenderContext windowContext;
|
||||
@ -301,6 +314,62 @@ void drawObjectDepth(Core::RenderContext context, glm::mat4 viewProjectionMatrix
|
||||
//
|
||||
//}
|
||||
|
||||
void drawObjectTexture(Core::RenderContext& context, glm::mat4 modelMatrix, GLuint textureID) {
|
||||
glUseProgram(programTex);
|
||||
glm::mat4 viewProjectionMatrix = createPerspectiveMatrix() * createCameraMatrix();
|
||||
glm::mat4 transformation = viewProjectionMatrix * modelMatrix;
|
||||
/*glm::mat4 transformation = modelMatrix;*/
|
||||
glUniformMatrix4fv(glGetUniformLocation(programTex, "transformation"), 1, GL_FALSE, (float*)&transformation);
|
||||
glUniformMatrix4fv(glGetUniformLocation(programTex, "modelMatrix"), 1, GL_FALSE, (float*)&modelMatrix);
|
||||
//glUniform3f(glGetUniformLocation(programTex, "lightPos"), pointlightPos.x, pointlightPos.y, pointlightPos.z);
|
||||
|
||||
|
||||
glUniform1f(glGetUniformLocation(program, "exposition"), exposition);
|
||||
|
||||
//glUniform1f(glGetUniformLocation(program, "roughness"), roughness);
|
||||
//glUniform1f(glGetUniformLocation(program, "metallic"), metallic);
|
||||
|
||||
//glUniform3f(glGetUniformLocation(program, "color"), color.x, color.y, color.z);
|
||||
|
||||
glUniform3f(glGetUniformLocation(program, "cameraPos"), cameraPos.x, cameraPos.y, cameraPos.z);
|
||||
|
||||
glUniform3f(glGetUniformLocation(program, "sunDir"), sunDir.x, sunDir.y, sunDir.z);
|
||||
glUniform3f(glGetUniformLocation(program, "sunColor"), sunColor.x, sunColor.y, sunColor.z);
|
||||
|
||||
glUniform3f(glGetUniformLocation(program, "lightPos"), pointlightPos.x, pointlightPos.y, pointlightPos.z);
|
||||
glUniform3f(glGetUniformLocation(program, "lightColor"), pointlightColor.x, pointlightColor.y, pointlightColor.z);
|
||||
|
||||
|
||||
//lasers light
|
||||
for (int i = 0; i < lasers.size(); i++) {
|
||||
std::string stringLaserPos = "laserLightPos";
|
||||
stringLaserPos += std::to_string(i);
|
||||
if (lasers[i].isLaserFly()) {
|
||||
glUniform3f(glGetUniformLocation(program, "laserLightColor"), laserLightColor.x, laserLightColor.y, laserLightColor.z);
|
||||
glUniform3f(glGetUniformLocation(program, stringLaserPos.c_str()), lasersLightPos[i].x, lasersLightPos[i].y, lasersLightPos[i].z);
|
||||
/*glUniform3fv(glGetUniformLocation(program, "lasersLightPos"), 3, &lasersLightPos[i][0]);
|
||||
glUniform1i(glGetUniformLocation(program, "lasersLightPosArrayIndex"), i);*/
|
||||
}
|
||||
}
|
||||
|
||||
glUniform3f(glGetUniformLocation(program, "spotlightConeDir"), spotlightConeDir.x, spotlightConeDir.y, spotlightConeDir.z);
|
||||
glUniform3f(glGetUniformLocation(program, "spotlightPos"), spotlightPos.x, spotlightPos.y, spotlightPos.z);
|
||||
glUniform3f(glGetUniformLocation(program, "spotlightColor"), spotlightColor.x, spotlightColor.y, spotlightColor.z);
|
||||
glUniform1f(glGetUniformLocation(program, "spotlightPhi"), spotlightPhi);
|
||||
|
||||
//For shadows
|
||||
glm::mat4 lightVPSun = glm::ortho(-3.f, 2.3f, -1.3f, 3.f, -1.0f, 40.0f) * glm::lookAt(sunPos, sunPos - sunDir, glm::vec3(0, 1, 0));
|
||||
glUniformMatrix4fv(glGetUniformLocation(program, "LightVPSun"), 1, GL_FALSE, (float*)&lightVPSun);
|
||||
glUniform1i(glGetUniformLocation(program, "depthMapSun"), 2);
|
||||
glActiveTexture(GL_TEXTURE0 + 2);
|
||||
glBindTexture(GL_TEXTURE_2D, depthMapSun);
|
||||
|
||||
Core::SetActiveTexture(textureID, "colorTexture", programTex, 0);
|
||||
Core::DrawContext(context);
|
||||
glUseProgram(0);
|
||||
}
|
||||
|
||||
|
||||
void renderShadowapSun(GLuint depthMapFBO, glm::mat4 lightVP) {
|
||||
float time = glfwGetTime();
|
||||
glViewport(0, 0, SHADOW_WIDTH, SHADOW_HEIGHT);
|
||||
@ -347,7 +416,7 @@ void renderShadowapSun(GLuint depthMapFBO, glm::mat4 lightVP) {
|
||||
});
|
||||
|
||||
drawObjectDepth(shipContext, lightVP,
|
||||
glm::translate(spaceShip.getSpaceShipPos()) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>()) * glm::scale(glm::vec3(0.03f)));
|
||||
glm::translate(spaceShip.getSpaceShipPos()) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>()) /** glm::scale(glm::vec3(0.03f))*/);
|
||||
|
||||
|
||||
glBindFramebuffer(GL_FRAMEBUFFER, 0);
|
||||
@ -543,7 +612,7 @@ void renderScene(GLFWwindow* window)
|
||||
drawObjectPBR(models::vase1Context, glm::mat4(), glm::vec3(0.320f, 0.11f, 0.131f), 0.2f, 0.0f);
|
||||
drawObjectPBR(models::vase2Context, glm::mat4(), glm::vec3(0.4f, 0.2f, 0.1f), 0.2f, 0.0f);
|
||||
|
||||
drawObjectPBR(models::sofaContext, glm::mat4(), glm::vec3(0.620f, 0.313f, 0.131f), 0.2f, 0.0f);
|
||||
//drawObjectPBR(models::sofaContext, glm::mat4(), glm::vec3(0.620f, 0.313f, 0.131f), 0.2f, 0.0f);
|
||||
drawObjectPBR(models::tvTableContext, glm::mat4(), glm::vec3(0.4f, 0.4f, 0.4f), 0.4f, 0.0f);
|
||||
drawObjectPBR(models::tableContext, glm::mat4(), glm::vec3(0.428691f, 0.08022f, 0.036889f), 0.2f, 0.0f);
|
||||
drawObjectPBR(models::doorContext, glm::mat4()/*glm::rotate(glm::mat4(), time * glm::radians(90.0f), glm::vec3(1.0f, 0.0f, 0.0f))*/, glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
|
||||
@ -551,12 +620,22 @@ void renderScene(GLFWwindow* window)
|
||||
drawObjectPBR(models::drawerContext, glm::mat4(), glm::vec3(0.428691f, 0.08022f, 0.036889f), 0.2f, 0.0f);
|
||||
drawObjectPBR(models::tvContext, glm::mat4(), glm::vec3(1.f, 1.f, 1.f), 0.5f, 1.0f);
|
||||
drawObjectPBR(models::xThingContext, glm::mat4(), glm::vec3(0.10039f, 0.018356f, 0.001935f), 0.1f, 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(0.9f, 0.9f, 0.9f), 0.8f, 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(0.9f, 0.9f, 0.9f), 0.8f, 0.0f);
|
||||
drawObjectPBR(models::windowContext, glm::mat4(), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
|
||||
|
||||
//drawObjectPBR(models::roofContext, glm::mat4(), glm::vec3(0.0f, 0.0f, 0.0f), 0.0f, 0.0f);
|
||||
|
||||
drawObjectTexture(models::planeContext, glm::mat4(), texture::floor);
|
||||
drawObjectTexture(models::sofaContext, glm::mat4(), texture::sofa);
|
||||
//drawObjectTexture(models::wall1Context, glm::mat4(), texture::wall1);
|
||||
//drawObjectTexture(models::wall2Context, glm::mat4(), texture::wall2);
|
||||
//drawObjectTexture(models::wall3Context, glm::mat4(), texture::wall3);
|
||||
//drawObjectTexture(models::wall4Context, glm::mat4(), texture::wall4);
|
||||
drawObjectTexture(models::roofContext, glm::mat4(), texture::roof);
|
||||
drawObjectTexture(models::roomContext, glm::mat4(), texture::wall1);
|
||||
|
||||
|
||||
|
||||
|
||||
glm::vec3 spaceshipSide = glm::normalize(glm::cross(spaceShip.getSpaceShipDir(), glm::vec3(0.f, 1.f, 0.f)));
|
||||
glm::vec3 spaceshipUp = glm::normalize(glm::cross(spaceshipSide, spaceShip.getSpaceShipDir()));
|
||||
glm::mat4 specshipCameraRotrationMatrix = glm::mat4({
|
||||
@ -566,27 +645,33 @@ void renderScene(GLFWwindow* window)
|
||||
0.,0.,0.,1.,
|
||||
});
|
||||
|
||||
//drawObjectColor(shipContext,
|
||||
// glm::translate(cameraPos + 1.5 * cameraDir + cameraUp * -0.5f) * inveseCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>()),
|
||||
// glm::vec3(0.3, 0.3, 0.5)
|
||||
// );
|
||||
drawObjectTexture(shipContext,
|
||||
glm::translate(spaceShip.getSpaceShipPos()) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>()) /** glm::scale(glm::vec3(0.015f))*/,
|
||||
texture::ship);
|
||||
|
||||
|
||||
drawObjectPBR(shipContext,
|
||||
glm::translate(spaceShip.getSpaceShipPos()) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>()) * glm::scale(glm::vec3(0.015f)),
|
||||
/*drawObjectPBR(shipContext,
|
||||
glm::translate(spaceShip.getSpaceShipPos()) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>()),
|
||||
glm::vec3(0.3, 0.3, 0.5),
|
||||
0.2, 1.0
|
||||
);
|
||||
);*/
|
||||
|
||||
/*drawObjectTexture(shipContext,
|
||||
glm::translate(spaceShip.getSpaceShipPos()) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>()) * glm::scale(glm::vec3(0.015f)),
|
||||
texture::floor);*/
|
||||
|
||||
/*drawObjectTexture(models::sofaContext,
|
||||
glm::mat4(),
|
||||
texture::sofa
|
||||
);*/
|
||||
/*Core::SetActiveTexture(texture::floor, "colorTexture", programTex, 0);
|
||||
drawObjectTexture(models::planeContext, glm::mat4(), texture::floor);*/
|
||||
|
||||
|
||||
enemyTime = time;
|
||||
|
||||
|
||||
enemyAIPilot(enemyShipContext);
|
||||
//enemyAIPilot(enemyShipContext);
|
||||
|
||||
spotlightPos = spaceShip.getSpaceShipPos() + 0.2 * spaceShip.getSpaceShipDir();
|
||||
spotlightConeDir = spaceShip.getSpaceShipDir();
|
||||
@ -751,9 +836,9 @@ void init(GLFWwindow* window)
|
||||
programTex = shaderLoader.CreateProgram("shaders/shader_tex.vert", "shaders/shader_tex.frag");
|
||||
|
||||
loadModelToContext("./models/sphere.obj", sphereContext);
|
||||
loadModelToContext("./models/spaceship.obj", shipContext);
|
||||
loadModelToContext("./models/spaceShip.obj", shipContext);
|
||||
|
||||
loadModelToContext("./models/spaceship.obj", enemyShipContext);
|
||||
//loadModelToContext("./models/enemyShip.obj", enemyShipContext);
|
||||
|
||||
loadModelToContext("./models/cube.obj", skyboxContext);
|
||||
|
||||
@ -773,12 +858,25 @@ void init(GLFWwindow* window)
|
||||
loadModelToContext("./models/x.obj", models::xThingContext);
|
||||
loadModelToContext("./models/plane.obj", models::planeContext);
|
||||
loadModelToContext("./models/room.obj", models::roomContext);
|
||||
loadModelToContext("./models/spaceship.obj", models::spaceshipContext);
|
||||
loadModelToContext("./models/roof.obj", models::roofContext);
|
||||
loadModelToContext("./models/wall1.obj", models::wall1Context);
|
||||
loadModelToContext("./models/wall2.obj", models::wall2Context);
|
||||
loadModelToContext("./models/wall3.obj", models::wall3Context);
|
||||
loadModelToContext("./models/wall4.obj", models::wall4Context);
|
||||
//loadModelToContext("./models/spaceShip.obj", models::spaceshipContext);
|
||||
loadModelToContext("./models/sphere.obj", models::sphereContext);
|
||||
loadModelToContext("./models/window.obj", models::windowContext);
|
||||
loadModelToContext("./models/test.obj", models::testContext);
|
||||
|
||||
texture::sofa = Core::LoadTexture("textures/sofa.jpg");
|
||||
texture::floor = Core::LoadTexture("textures/floor.jpg");
|
||||
texture::wall1 = Core::LoadTexture("textures/wall.jpg");
|
||||
texture::wall2 = Core::LoadTexture("textures/wall.jpg");
|
||||
texture::wall3 = Core::LoadTexture("textures/wall.jpg");
|
||||
texture::wall4 = Core::LoadTexture("textures/wall.jpg");
|
||||
texture::ship = Core::LoadTexture("textures/ship.jpg");
|
||||
texture::roof = Core::LoadTexture("textures/wall.jpg");
|
||||
|
||||
texture::skybox = LoadSkybox(new char* [6]{ "skybox/posx.jpg", "skybox/negx.jpg", "skybox/posy.jpg","skybox/negy.jpg", "skybox/posz.jpg", "skybox/negz.jpg" });
|
||||
|
||||
//lasersContexts.reserve(spaceShip.getMaxNumberOfLasers());
|
||||
|
||||
BIN
cw 9/textures/roof.jpg
Normal file
BIN
cw 9/textures/roof.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 120 KiB |
BIN
cw 9/textures/ship.jpg
Normal file
BIN
cw 9/textures/ship.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 226 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 1.4 MiB |
Loading…
Reference in New Issue
Block a user