Added basic texture that is applied to all objects

TODO: Create more objects with textures

Debug/grk-cw9.log

@@ -1,41 +1,41 @@
   main.cpp
 C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition
 D:\git\grk\GRK-2023\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY'
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(75,30): warning C4305: 'initializing': truncation from 'double' to 'float'
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(89,38): warning C4305: '=': truncation from 'double' to 'float'
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(112,16): warning C4305: 'initializing': truncation from 'double' to 'float'
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(173,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(186,59): warning C4305: 'argument': truncation from 'double' to 'T'
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(79,30): warning C4305: 'initializing': truncation from 'double' to 'float'
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(93,38): warning C4305: '=': truncation from 'double' to 'float'
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(116,16): warning C4305: 'initializing': truncation from 'double' to 'float'
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(179,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(192,59): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(189,59): warning C4305: 'argument': truncation from 'double' to 'T'
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(195,59): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(233,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(240,108): warning C4305: 'argument': truncation from 'double' to 'T'
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(239,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(246,108): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(249,59): warning C4305: 'argument': truncation from 'double' to 'T'
-          with
-          [
-              T=float
-          ]
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(252,6): warning C4305: 'argument': truncation from 'double' to 'float'
 D:\git\grk\GRK-2023\src\ex_9_1.hpp(255,59): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
 D:\git\grk\GRK-2023\src\ex_9_1.hpp(258,6): warning C4305: 'argument': truncation from 'double' to 'float'
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(290,2): warning C4305: 'argument': truncation from 'double' to 'float'
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(404,21): warning C4305: '-=': truncation from 'double' to 'float'
-D:\git\grk\GRK-2023\src\ex_9_1.hpp(406,21): warning C4305: '+=': truncation from 'double' to 'float'
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(261,59): warning C4305: 'argument': truncation from 'double' to 'T'
+          with
+          [
+              T=float
+          ]
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(264,6): warning C4305: 'argument': truncation from 'double' to 'float'
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(296,2): warning C4305: 'argument': truncation from 'double' to 'float'
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(410,21): warning C4305: '-=': truncation from 'double' to 'float'
+D:\git\grk\GRK-2023\src\ex_9_1.hpp(412,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 -> D:\git\grk\GRK-2023\Debug\grk-cw9.exe

models2/Frame/Frame.mtl

@@ -0,0 +1,12 @@
+# Blender 3.4.1 MTL File: 'untitled.blend'
+# www.blender.org
+
+newmtl Material.001
+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 D:/git/grk/GRK-2023/textures/WindowFrame_Color.png

models2/Frame/Frame.obj

@@ -0,0 +1,368 @@
+# Blender 3.4.1
+# www.blender.org
+mtllib Frame.mtl
+o WindowFrame
+v -2.511461 0.916247 0.313948
+v -2.511461 2.187191 0.313948
+v -2.511461 0.916247 -1.736995
+v -2.511461 2.187191 -1.736995
+v -2.420518 0.916247 0.313948
+v -2.420518 2.187191 0.313948
+v -2.420518 0.916247 -1.736995
+v -2.420518 2.187191 -1.736995
+v -2.511461 0.916247 -1.677378
+v -2.511461 0.916247 0.254332
+v -2.511461 2.187191 0.254332
+v -2.511461 2.187191 -1.677378
+v -2.420518 0.916247 0.254332
+v -2.420518 0.916247 -1.677378
+v -2.420518 2.187191 -1.677378
+v -2.420518 2.187191 0.254332
+v -2.511461 0.978625 0.313948
+v -2.511461 2.124814 0.313948
+v -2.511461 2.124814 -1.736995
+v -2.511461 0.978625 -1.736995
+v -2.420518 2.124814 -1.736995
+v -2.420518 0.978625 -1.736995
+v -2.420518 2.124814 0.313948
+v -2.420518 0.978625 0.313948
+v -2.420518 2.124814 -1.677378
+v -2.420518 0.978625 -1.677378
+v -2.420518 2.124814 0.254331
+v -2.420518 0.978625 0.254331
+v -2.511461 2.124814 0.254331
+v -2.511461 0.978625 0.254331
+v -2.511461 2.124814 -1.677378
+v -2.511461 0.978625 -1.677378
+v -2.420518 0.916247 0.254332
+v -2.420518 0.916247 -1.677378
+v -2.290355 0.916247 0.313948
+v -2.290355 0.916247 -1.736995
+v -2.290355 0.916247 0.254332
+v -2.290355 0.916247 -1.677378
+v -2.290355 0.916247 0.254332
+v -2.290355 0.916247 -1.677378
+v -2.420518 0.970021 -1.677378
+v -2.420518 0.970020 -1.736995
+v -2.420518 0.970020 0.313948
+v -2.420518 0.970021 0.254332
+v -2.420518 0.970021 0.254332
+v -2.420518 0.970021 -1.677378
+v -2.290355 0.970021 -1.677378
+v -2.290355 0.970020 -1.736995
+v -2.290355 0.970020 0.313948
+v -2.290355 0.970021 0.254332
+v -2.290355 0.970021 0.254332
+v -2.290355 0.970021 -1.677378
+v -2.229700 0.916247 -1.677378
+v -2.229700 0.916247 -1.736995
+v -2.229700 0.916247 0.313948
+v -2.229700 0.916247 0.254332
+v -2.229700 0.916247 0.254332
+v -2.229700 0.916247 -1.677378
+v -2.229700 0.970021 -1.677378
+v -2.229700 0.970020 -1.736995
+v -2.229700 0.970020 0.313948
+v -2.229700 0.970021 0.254332
+v -2.229700 0.970021 0.254332
+v -2.229700 0.970021 -1.677378
+vn -0.9999 -0.0000 0.0149
+vn -0.9974 0.0714 -0.0000
+vn -0.9965 0.0713 -0.0442
+vn -0.9990 -0.0000 -0.0446
+vn 0.9965 0.0713 -0.0442
+vn 0.9990 -0.0000 -0.0440
+vn 0.9999 -0.0000 -0.0147
+vn 0.9974 0.0714 -0.0000
+vn 0.9965 0.0713 0.0442
+vn 0.9984 0.0355 0.0440
+vn -0.9965 0.0713 0.0442
+vn -0.9984 0.0360 0.0446
+vn -0.9974 -0.0714 -0.0000
+vn 0.9990 -0.0000 -0.0443
+vn -0.0000 -0.6279 0.7783
+vn -0.9965 -0.0713 0.0442
+vn -0.9965 -0.0713 -0.0442
+vn -0.0000 -0.6279 -0.7783
+vn 0.9990 -0.0000 0.0443
+vn 0.9999 -0.0000 0.0147
+vn -0.9996 0.0240 -0.0149
+vn -0.9996 0.0238 -0.0148
+vn -0.9999 -0.0000 0.0148
+vn -0.9990 -0.0000 0.0443
+vn 0.9999 -0.0000 0.0148
+vn 0.9996 0.0243 -0.0148
+vn 0.9984 -0.0357 -0.0443
+vn -0.9984 -0.0357 -0.0443
+vn -0.9890 0.1415 0.0439
+vn -0.9890 0.1415 -0.0439
+vn -0.0000 -0.0000 1.0000
+vn -0.0000 0.8500 0.5267
+vn -0.0000 -0.0000 -1.0000
+vn -0.0000 0.8500 -0.5267
+vn 0.9965 -0.0713 -0.0442
+vn -0.0000 -1.0000 -0.0000
+vn 0.9965 -0.0713 0.0442
+vt 0.429362 0.193960
+vt 0.606083 0.228438
+vt 0.218164 0.228627
+vt 0.218164 0.405348
+vt 0.640561 0.017239
+vt 0.606083 0.405158
+vt 0.429362 0.017239
+vt 0.394884 0.439826
+vt 0.429362 0.228438
+vt 0.429362 0.405158
+vt 0.394884 0.616547
+vt 0.640561 0.193960
+vt 0.606083 0.193960
+vt 0.394884 0.228627
+vt 0.429362 0.439636
+vt 0.851760 0.388037
+vt 0.429362 0.616357
+vt 0.394884 0.405348
+vt 0.817282 0.017239
+vt 0.606083 0.017239
+vt 0.606083 0.439636
+vt 0.218164 0.439826
+vt 0.841890 0.810434
+vt 0.218164 0.616547
+vt 0.817282 0.193960
+vt 0.606083 0.616357
+vt 0.429362 0.022376
+vt 0.434499 0.228438
+vt 0.429362 0.188823
+vt 0.600946 0.228438
+vt 0.640561 0.022376
+vt 0.600946 0.405158
+vt 0.640561 0.188823
+vt 0.434499 0.405158
+vt 0.606083 0.188823
+vt 0.434499 0.439636
+vt 0.851760 0.393174
+vt 0.297393 0.651025
+vt 0.883845 0.810434
+vt 0.606083 0.022376
+vt 0.600946 0.439636
+vt 0.297393 0.651025
+vt 0.901191 0.017239
+vt 0.841890 0.815571
+vt 0.817282 0.188823
+vt 0.600946 0.616357
+vt 0.817282 0.022376
+vt 0.434499 0.616357
+vt 0.606083 0.237111
+vt 0.218164 0.237301
+vt 0.606083 0.396485
+vt 0.218164 0.396675
+vt 0.218164 0.194149
+vt 0.394884 0.607873
+vt 0.429362 0.396485
+vt 0.394884 0.194149
+vt 0.812145 0.228438
+vt 0.394884 0.448499
+vt 0.429362 0.237111
+vt 0.670752 0.650835
+vt 0.606083 0.607684
+vt 0.218164 0.607873
+vt 0.394884 0.017429
+vt 0.812145 0.405158
+vt 0.606083 0.448310
+vt 0.218164 0.448499
+vt 0.670752 0.827556
+vt 0.394884 0.396675
+vt 0.429362 0.607684
+vt 0.218164 0.017429
+vt 0.394884 0.237301
+vt 0.429362 0.448310
+vt 0.600946 0.607684
+vt 0.389748 0.017429
+vt 0.017239 0.810434
+vt 0.807008 0.405158
+vt 0.600946 0.448310
+vt 0.665615 0.827556
+vt 0.176613 0.810434
+vt 0.183686 0.422514
+vt 0.434499 0.607684
+vt 0.223301 0.017429
+vt 0.640561 0.405158
+vt 0.640561 0.439636
+vt 0.434499 0.448310
+vt 0.223301 0.017239
+vt 0.799935 0.439636
+vt 0.017239 0.422514
+vt 0.600946 0.396485
+vt 0.223301 0.194149
+vt 0.640561 0.228438
+vt 0.640561 0.616357
+vt 0.600946 0.237111
+vt 0.799935 0.616357
+vt 0.017239 0.599235
+vt 0.434499 0.396485
+vt 0.389748 0.194149
+vt 0.017239 0.633713
+vt 0.807008 0.228438
+vt 0.434499 0.237111
+vt 0.665615 0.650835
+vt 0.176613 0.633713
+vt 0.183686 0.599235
+vt 0.943146 0.017239
+vt 0.297393 0.651025
+vt 0.631137 0.817282
+vt 0.297393 0.651025
+vt 0.925800 0.810434
+vt 0.631137 0.650835
+vt 0.851760 0.135104
+vt 0.705230 0.650835
+vt 0.749981 0.650835
+vt 0.841890 0.557501
+vt 0.297393 0.651025
+vt 0.710367 0.650835
+vt 0.883845 0.557501
+vt 0.297393 0.651025
+vt 0.744845 0.650835
+vt 0.901191 0.270172
+vt 0.297393 0.651025
+vt 0.429362 0.817282
+vt 0.943146 0.270172
+vt 0.297393 0.651025
+vt 0.925800 0.557501
+vt 0.429362 0.650835
+vt 0.982761 0.017239
+vt 0.893714 0.017239
+vt 0.834413 0.815571
+vt 0.977624 0.017239
+vt 0.834413 0.810434
+vt 0.960278 0.810433
+vt 0.859236 0.388037
+vt 0.859236 0.393174
+vt 0.965414 0.810433
+vt 0.876368 0.810434
+vt 0.935669 0.017239
+vt 0.017239 0.388036
+vt 0.623660 0.817282
+vt 0.183686 0.388036
+vt 0.918323 0.810434
+vt 0.623660 0.650835
+vt 0.982761 0.270171
+vt 0.893714 0.270172
+vt 0.834413 0.557501
+vt 0.977624 0.270171
+vt 0.859236 0.135104
+vt 0.960278 0.557501
+vt 0.876368 0.557501
+vt 0.965414 0.557501
+vt 0.017239 0.135104
+vt 0.935669 0.270172
+vt 0.918323 0.557501
+vt 0.183686 0.135104
+vt 0.262915 0.658502
+vt 0.744845 0.768700
+vt 0.901191 0.388037
+vt 0.257779 0.658502
+vt 0.749981 0.768700
+vt 0.841890 0.439636
+vt 0.218164 0.651025
+vt 0.851760 0.017239
+vt 0.705230 0.768700
+vt 0.223301 0.651025
+vt 0.710367 0.768700
+vt 0.883845 0.439636
+vt 0.547227 0.817282
+vt 0.589182 0.650835
+vt 0.943146 0.388037
+vt 0.925800 0.439636
+vt 0.547227 0.650835
+vt 0.589182 0.817282
+vt 0.262915 0.651025
+vt 0.982761 0.388036
+vt 0.893714 0.388037
+vt 0.257779 0.651025
+vt 0.834413 0.439636
+vt 0.977624 0.388036
+vt 0.218164 0.658502
+vt 0.859236 0.017239
+vt 0.960278 0.439636
+vt 0.223301 0.658502
+vt 0.876368 0.439636
+vt 0.965414 0.439636
+vt 0.017239 0.017239
+vt 0.581705 0.650835
+vt 0.935669 0.388037
+vt 0.918323 0.439636
+vt 0.183686 0.017239
+vt 0.581705 0.817282
+s 1
+g WindowFrame_Material.001
+usemtl Material.001
+f 31/96/1 12/34/2 4/10/3 19/55/4
+f 19/54/4 4/11/3 8/24/5 21/62/6
+f 27/81/7 16/48/8 6/17/9 23/69/10
+f 23/68/10 6/18/9 2/4/11 18/52/12
+f 10/29/13 13/35/14 5/13/15 1/1/16
+f 16/47/8 11/31/2 2/5/11 6/19/9
+f 8/25/5 4/12/3 12/33/2 15/45/8
+f 15/45/8 12/33/2 11/31/2 16/47/8
+f 3/7/17 7/20/18 14/40/19 9/27/13
+f 9/27/13 14/40/19 13/35/14 10/29/13
+f 21/61/6 8/26/5 15/46/8 25/73/20
+f 25/73/20 15/46/8 16/48/8 27/81/7
+f 18/51/12 2/6/11 11/32/2 29/89/21
+f 29/89/21 11/32/2 12/34/2 31/96/1
+f 10/30/13 30/93/22 32/100/23 9/28/13
+f 1/2/16 17/49/24 30/93/22 10/30/13
+f 17/49/24 18/51/12 29/89/21 30/93/22
+f 14/41/19 26/77/25 28/85/26 13/36/14
+f 7/21/18 22/65/27 26/77/25 14/41/19
+f 22/65/27 21/61/6 25/73/20 26/77/25
+f 5/14/15 24/71/19 17/50/24 1/3/16
+f 24/71/19 23/68/10 18/52/12 17/50/24
+f 13/36/14 28/85/26 24/72/19 5/15/15
+f 28/85/26 27/81/7 23/69/10 24/72/19
+f 3/8/17 20/58/28 22/66/27 7/22/18
+f 20/58/28 19/54/4 21/62/6 22/66/27
+f 9/28/13 32/100/23 20/59/28 3/9/17
+f 32/100/23 31/96/1 19/55/4 20/59/28
+f 23/70/10 28/86/26 27/82/7 25/74/20 21/63/6 19/56/4 31/97/1 29/90/21 18/53/12
+f 19/57/4 21/64/6 25/76/20 31/99/1
+f 20/60/28 22/67/27 26/78/25 32/101/23
+f 26/79/25 25/75/20 31/98/1 32/102/23
+f 27/83/7 29/91/21 31/99/1 25/76/20
+f 29/92/21 27/84/7 28/87/26 30/94/22
+f 30/95/22 28/88/26 26/80/25 32/103/23
+f 14/42/19 13/38/14 33/105/29 34/107/30
+f 13/37/14 5/16/15 43/132/11 44/133/3
+f 33/104/29 39/122/31 51/151/32 45/136/11
+f 33/105/29 13/38/14 37/114/33 39/120/31
+f 40/124/33 52/152/34 64/187/5 58/169/35
+f 14/42/19 34/107/30 40/123/33 38/117/31
+f 42/129/3 41/126/11 47/142/32 48/145/34
+f 44/134/3 43/131/11 49/147/32 50/149/34
+f 46/139/3 45/137/11 51/150/32 52/153/34
+f 14/43/19 38/119/31 47/143/32 41/127/11
+f 40/124/33 34/108/30 46/140/3 52/152/34
+f 52/153/34 51/150/32 63/184/9 64/188/5
+f 37/116/33 13/39/14 44/135/3 50/148/34
+f 7/23/18 14/44/19 41/128/11 42/130/3
+f 34/109/30 33/106/29 45/138/11 46/141/3
+s 0
+f 39/121/36 40/125/36 58/170/36 57/166/36
+s 1
+f 5/16/15 35/110/15 49/146/32 43/132/11
+f 36/113/18 7/23/18 42/130/3 48/144/34
+f 57/167/37 58/171/35 64/189/5 63/185/9
+f 53/154/37 54/157/35 60/175/5 59/172/9
+f 55/160/37 56/163/35 62/181/5 61/178/9
+f 49/146/32 35/110/15 55/161/37 61/179/9
+s 0
+f 38/118/36 36/112/36 54/158/36 53/155/36
+s 1
+f 51/151/32 39/122/31 57/168/37 63/186/9
+f 36/113/18 48/144/34 60/176/5 54/159/35
+f 48/145/34 47/142/32 59/173/9 60/177/5
+f 47/143/32 38/119/31 53/156/37 59/174/9
+s 0
+f 35/111/36 37/115/36 56/164/36 55/162/36
+s 1
+f 37/116/33 50/148/34 62/182/5 56/165/35
+f 50/149/34 49/147/32 61/180/9 62/183/5

shaders/shader_9_1.frag

@@ -4,10 +4,11 @@ float AMBIENT = 0.03;
 float PI = 3.14;
 
 uniform sampler2D depthMap;
+uniform sampler2D colorTexture;
 
 uniform vec3 cameraPos;
 
-uniform vec3 color;
+//uniform vec3 color;
 
 uniform vec3 sunDir;
 uniform vec3 sunColor;
@@ -27,6 +28,7 @@ uniform float exposition;
 
 in vec3 vecNormal;
 in vec3 worldPos;
+in vec2 vecTex;
 
 out vec4 outColor;
 
@@ -39,7 +41,7 @@ in vec3 sunDirTS;
 in vec3 test;
 
 in vec4 sunSpacePos;
-
+vec3 color;
 float calculateShadow()
 {
     vec4 lightSpacePosNormalized = (0.5*sunSpacePos / (sunSpacePos.w)) + 0.5;
@@ -83,6 +85,7 @@ vec3 fresnelSchlick(float cosTheta, vec3 F0){
 } 
 
 vec3 PBRLight(vec3 lightDir, vec3 radiance, vec3 normal, vec3 V){
+	color = texture2D(colorTexture, vecTex).xyz;
     float diffuse=max(0,dot(normal,lightDir));
 
 	//vec3 V = normalize(cameraPos-worldPos);
@@ -112,6 +115,7 @@ vec3 PBRLight(vec3 lightDir, vec3 radiance, vec3 normal, vec3 V){
 
 void main()
 {
+	color = texture2D(colorTexture, vecTex).xyz;
 	//vec3 normal = vec3(0,0,1);
     vec3 normal = normalize(vecNormal);
 

shaders/shader_9_1.vert

@@ -12,6 +12,7 @@ uniform mat4 LightVP;
 
 out vec3 vecNormal;
 out vec3 worldPos;
+out vec2 vecTex;
 
 uniform vec3 lightPos;
 uniform vec3 spotlightPos;
@@ -30,6 +31,8 @@ void main()
 	worldPos = (modelMatrix* vec4(vertexPosition,1)).xyz;
 	vecNormal = (modelMatrix* vec4(vertexNormal,0)).xyz;
 	gl_Position = transformation * vec4(vertexPosition, 1.0);
+	vecTex = vertexTexCoord;
+	vecTex.y = 1.0 - vecTex.y;
 
 	vec3 w_tangent = normalize(mat3(modelMatrix)*vertexTangent);
 	vec3 w_bitangent = normalize(mat3(modelMatrix)*vertexBitangent);

src/ex_9_1.hpp

@@ -7,7 +7,7 @@
 
 #include "Shader_Loader.h"
 #include "Render_Utils.h"
-//#include "Texture.h"
+#include "Texture.h"
 
 #include "Box.cpp"
 #include <assimp/Importer.hpp>
@@ -15,6 +15,7 @@
 #include <assimp/postprocess.h>
 #include <string>
 
+
 const unsigned int SHADOW_WIDTH = 1024, SHADOW_HEIGHT = 1024;
 
 int WIDTH = 500, HEIGHT = 500;
@@ -35,6 +36,9 @@ namespace models {
 	Core::RenderContext windowContext;
 	Core::RenderContext testContext;
 }
+namespace textures {
+	GLuint test;
+}
 
 GLuint depthMapFBO;
 GLuint depthMap;
@@ -138,7 +142,7 @@ void drawObjectPBR(Core::RenderContext& context, glm::mat4 modelMatrix, glm::vec
 	glUniform1f(glGetUniformLocation(program, "roughness"), roughness);
 	glUniform1f(glGetUniformLocation(program, "metallic"), metallic);
 
-	glUniform3f(glGetUniformLocation(program, "color"), color.x, color.y, color.z);
+	//glUniform3f(glGetUniformLocation(program, "color"), color.x, color.y, color.z);
 
 	glUniform3f(glGetUniformLocation(program, "cameraPos"), cameraPos.x, cameraPos.y, cameraPos.z);
 
@@ -159,6 +163,8 @@ void drawObjectPBR(Core::RenderContext& context, glm::mat4 modelMatrix, glm::vec
 	glm::mat4 lightVP = 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, "LightVP"), 1, GL_FALSE, (float*)&lightVP);
 
+	Core::SetActiveTexture(textures::test, "colorTexture", program, 0);
+
 	Core::DrawContext(context);
 
 }
@@ -348,7 +354,6 @@ void init(GLFWwindow* window)
 	loadModelToContext("./models/sphere.obj", sphereContext);
 	loadModelToContext("./models/spaceship.obj", shipContext);
 
-
 	loadModelToContext("./models/bed.obj", models::bedContext);
 	loadModelToContext("./models/chair.obj", models::chairContext);
 	loadModelToContext("./models/desk.obj", models::deskContext);
@@ -363,6 +368,7 @@ void init(GLFWwindow* window)
 	loadModelToContext("./models/sphere.obj", models::sphereContext);
 	loadModelToContext("./models/window.obj", models::windowContext);
 
+	textures::test = Core::LoadTexture("./textures/WindowFrame_Color.png");
 }
 
 void shutdown(GLFWwindow* window)