From 28c4f16d7147333a75a8759dbc269edafd6bbf35 Mon Sep 17 00:00:00 2001
From: hippoz <10706925-hippoz@users.noreply.gitlab.com>
Date: Tue, 25 Jul 2023 11:52:12 +0300
Subject: [PATCH] more work on lighting

---
 assets/fish-map.qoi              | Bin 0 -> 1893 bytes
 assets/fish.png                  | Bin 0 -> 10182 bytes
 shaders/fragment.glsl            |  14 ---
 shaders/light_cube_fragment.glsl |   7 ++
 shaders/light_cube_vertex.glsl   |  11 ++
 shaders/lighting_fragment.glsl   |  88 +++++++++++++++
 shaders/lighting_vertex.glsl     |  20 ++++
 shaders/vertex.glsl              |  18 ----
 src/main.cpp                     | 178 ++++++++++++++++++++-----------
 9 files changed, 240 insertions(+), 96 deletions(-)
 create mode 100644 assets/fish-map.qoi
 create mode 100644 assets/fish.png
 delete mode 100644 shaders/fragment.glsl
 create mode 100644 shaders/light_cube_fragment.glsl
 create mode 100644 shaders/light_cube_vertex.glsl
 create mode 100644 shaders/lighting_fragment.glsl
 create mode 100644 shaders/lighting_vertex.glsl
 delete mode 100644 shaders/vertex.glsl

diff --git a/assets/fish-map.qoi b/assets/fish-map.qoi
new file mode 100644
index 0000000000000000000000000000000000000000..0a595706ac052032abf5acb688964b5cc352b2d8
GIT binary patch
literal 1893
zcmb`I`)eFk6vxlzb-PV<x0B}4jOmgpC)P+pD->JDN>Nadih|Wrg+kSq8nF}ws}Sff
ziX!*`p%w)}{Kd!5f;Gs@Zu7F;q)l6!z9E}r+ceoEHpxEkj`w?J!GE9w`#I0MbMC$8
z-Z^sk&;cSkhF=YlzQ@msZ=Nb(53m`iCY^`WK-r7hkRJgXNoOHP0KXrQKUhzCg$E_?
z1Wmym@>If!llEXt@UTrc9R<C{0#^a800YkeuK{lZJ-|U=7w{~wvmp|;T;)O!xxQHr
z%JCUk$7$5@OsL-q!`uk$2EGD51U?472Yv(o2Ce~V;0`bkTn3WB0Prgy!#;&}4Cs9d
zd;!?m0j{#tDaer2<j@=^DXHLz0$UrvEx=*mDDW=Oljw{=YTM;=wk*^v?B34Rama(f
z(?FveRy5;q(l3|GMUwKX+Yxyl_zd_HklFP?`+rXV@-!SWt1qE_1AGGP2b!hs+fZwG
zgodQ_HkeZHacEb78Q=ylKrFV?Ey#iyG0??%TTz-vZO5g!!$oO?I+}9$Y&Ejl!@<6-
zhLL9N(4+~$C;~qL@7GH^{J`36NBA6^Qq_C}>I4V9bX`%Z5>3Is3@ogvM5SfJG|6K&
z>qNA{p%m+Jsb{Yl$Xa&zJ&RH%K8~SBjJu<v_Zq)r^oIg@32|wYm+(?p9_xP~uL92j
zp-LoHiO6E_QnIMQm{#+ui%4Ar-cmFPDa*XS5-Gv+MH@|u_jTi~h39MIk=Jgj<mIAP
zaJ=OFjIh42wL=9S8Spb-z_`2UlQI{cgwaCN4@3UK=Qlt~?|sV!=x-{Tmh<>Ik2S+_
zXdSo-c!T8<XrZ(ewZ}I%Pa)W~(}=$c+)s|`<}B2dX#pvAho8-6GkmtoqPPjl1red!
zEl4`SqY%66NzP0Yj505o_POOmP<6>Pxp^{miUt%fLH}KXHlMc1qG5Pm;kyuxG!wH~
zPQxON*g<Emr#mtu&BM(kJ+{~8Iiz2vS!X*BLG=_#e}yc}YA#r=8On6?;C94Y>0)@B
zUn~|UIBiqL=0SKLp-WQm%P``#JoO-Dg2;>TRMGej$Zf!Y&C;G@G|zIE$W+$R6<MNA
zq<jaQ!Mn47&)ymysts1Sj~0SqEp%PB<N+ji0SAD;{8FiuMuj*1d_I5PUtV55>F08}
z<Yq+V+{|v+@&t0FBXiKC0av2#<1prd63af6W!8PP#QpG|1ghwU<I2|8#qNVc?y$9w
zHANncxl)tdwC^A!HGKf>N4cPnHbU<aeIL|jD%hNWmajMW0(lN4tl(0pbuAUAB4P!O
g+im9K)6Jd@yNPrG@(*@H>Yji4v>wD)#5|$@0QsJXeE<Le

literal 0
HcmV?d00001

diff --git a/assets/fish.png b/assets/fish.png
new file mode 100644
index 0000000000000000000000000000000000000000..9102229c23d94c7cc31d2dd25628d0a02bed8dd0
GIT binary patch
literal 10182
zcmeHNcU)7;@;^y10i>yLZ6KkjSVAfxi8N^%m8M+5a>aBaB?ys(8o-VP6$@g)j$RN{
zss<@G?1+H$B8n(Q5Rqbl{5D{H?|pvn-uHX&{qwsElQU;`c6R1FvvYD5cDgz*Qdga(
z3PF%MeX;#=aE(%sG7@~=wqiVjAWaR9C!I^D&xMph-*^auDM2uW3?SGKJRF9A5TNe>
zAPpECnh355fF^=|g}j2M!N!eVe+T^ZFZ?yYn|zT`%*TVd>fm|<5CQPo;CderfBV?F
zb%56f%9KZc>;gFqA%~3?@rB;#MRX@uXlM=utpPG$uZm7I!4!`(C6a(f9Dzu~nbUAo
zG@e2OzXUP_hqfI+K~uq;&wya3zS|3KzqP+#Nd+2##%xmf_7xX}gI{q`@LzG+26)65
zKNaXAf8cd~@E-;r)45wQ_X{7R00gu#pXF8ZCP-_EBi#`!qyQFt$ZH`xNEwMlA;&4B
zP$(4@WmPq8b+z&1)uv9Iq^YepO@D^oG+kY^vFU8I;d~=qT@&*;^Kp0*iKIW9YDpnj
z0CWfnB`_5g6}9ndQ`FU`5Dat;2!FcC3!w?h3Y!oxLkK<rhL`}8-+}ajo#SAmZOj#L
z4@W4CL!y*bRL28>EG-362)Ghr+&CpAFd6~IA*Bi9CK})uA}6^qP=*_|3DNscD;wEf
zEz((D+HFi^2F9qU{xW&W)M+zk%{G}cmt;mZr%-8j_70AV7SorkaQ}6shv%x*EH;PB
z^X6{|5^f3>i9<p+Z`rzS`;MKl2jUMNI(#JIXyTc(=gwb9zIf^PYZ;kY**Uq_Z``_l
z=kC4Y`wt#IFDtKjQCU@8^RoHX>y|gIZ{M|j==s?Dsjq)v@Uy}%g`Z#Bm}h_E*971f
zTuBL`gi`nggNqc7Pf!|XfJaVT=!Rl!oMcFdR@S!NfBI^XiV<;nw+=I~RP`5Q(#x42
z6t0bW_QxEH`IkKV=Gb??Y9KWP3<M7`0kVb$M`BG*!T%zF!8|+rQZxMt?OJ@AQ$Y<j
zxxVG@%@x5F^Fx?W)1(Kd)IQI9X8n>LZYPIMhsmMYesXA_W#i|Dofij!Jd@}Zmq$t>
zkc|XPn@nWFcz8flX@)w)D|OI@-2OblPM`5kjN9>P2kFGD#?HxQ?|YgXE=e~Wwzvuf
zsJyPM{XA=DvN&kbX8Lo#krEcN%M{Zg6X98pCb}4(bP}UFUY_As*4#@^SzFtcUlyKp
zZRySJN8Zf;eF(96AO1e2(`(T)*jmXQ?DiX?JL-CvG_Q{SXS|Lh3A`S2!sJ1OiC+=E
z#QBU=)dcZUU0`1xPEB<=*Y-jV@$xqdj{fo~LV6I_LPy1DA~V|C<WStSStla8o4ZzC
z&uNUf&>=IHR)s{eOXqcKXxJ2^UuA`#wi&1GaYfAP3;*!TrM~peK{<3~=;le62YMwZ
zj=z^3P|v;fsa;wVWf2)GliZ%6(%rQ=zhXE#c{r|fjYU@@eOBl7+Wx9n(~l)z7HY$~
z$LaJBYr}d_Lvye@B)wS4>&^l>q?>lze)zcA^v)UMPpnxp@+d!|fs<6dQi4^p8GNx;
zH%e2FxVNG=LL2r`4h<2p!%mHZPI9O-Q*xUihsx{a(80!$S}z+n8-0q8BxBoI*4dJv
zbM2CvBM)*OWyt0hz2QVzFIXBKMQ=^RH{^oQFZa@tLvPo~p$D~+5vrG0sg1stIH}0W
zuv=6u$?26tSBFz1@v^tC>vN{(ztUv|e)^OanJ<UVL|H*+z%||aL(VO%#z1jrWxhw%
zCuur%WY+X^@&5H^hu3u{n@A<PpH6A+Gr9av0`L|(6KnD#AwWc;KF>PA>TWJunVnM|
zaY-OsE3Fzlx%T<*0nSKRF~qwWx-~>n7$I=ZAK1u0SG!h_UnUw(!|b*wAn;dFjZkP_
z%*KYBwo$4kXQEVlh6PR5n+2I6otek59n#j?mWGfFmzI~&)<*Qr`;=QR1l8QMjfDWL
zN<)T<$lVTWiO5)!_0hVSabt16f1Pzj*IeA5obHm<y{i9vsnN6^kTxX^EDJZ7U6m<^
zvVDScWvH&ao6>V}kK2lz-CP=aUnLI072xf*n&X`)+HPgkR^uEm=nI=-ku<soY<Gt+
z>96A-oYJuRo0_I689pj`!<R!jF2k3-Y&=TjPzHABiFMyQIh2+1RuwWi6Z?l~-fPW0
z1w9^FjWUrOdM<8n|2&9zB^Wx?DH;K3)O(T!ef+Ed?gz58YqH9@ST(dL^SNId*|TlU
zNaZhgt$0V&QjhQ79}`qGwad$+vJj*-r0wSLhe)Rfb+2)7UQO4qR1Uqf*z_qf=kmJ-
z-O|>IET6cHs-m37M_5+%kF^6%#XmqqdujQEHk@s?WJau6nJaVXm4!bDp6g$8dXXxm
z3sJOTNe<esuph}w!rB)xuW6dh`lWx)#euk&_u^AFRO)-@Cq4Z*v+9!6_vzWKkOriy
z3U!RamL|E^Fk237S#WD|jU1{PsqXW__RkO;kqTpz!cbG{Po79=R)s!WH%~6!L(|j4
z<V_Ci+x70_jgJr6GSe5fR&>_w_tT4Wyq0{>R2oPc(dwF9)h>rvGG29fNnJ?(y3W#T
z5god$;LzZ-$XG~GB*@)eyCXr7xEPVqA+_kLdoZKEy0*WZw_r{3d7)1Cww;&TtaM+X
zD>9G8Wi&37K03n8uYc&?UAVc(Xup@s+oTy5(<9Cn1*L!u%xSdhB9uH#9IF);W3{3j
z)~4;2wECy5^<|sA8ZijBEz8$``z|Oj2|!}a&UiFCDQlngQ=OPj&6A<M+OSqRlo<&k
z{`RwDyx+!a#mhhDk4F4(DIw6&QKdwQcQgFu>S+xMY(0}!R-{>#Mp!ixev3VpebMb!
z6bjN9$9wiuL=@2hw#q=YdR!)l{F7v>^WZn-P#;GQ9Zepox9-b=B47?WFXhk-D+B(s
zxBZdhvt2U1TrxWS4!d0I^gi#b`m$fs@m0ZjC}jKH#_5t<tmZ+hy8u7?tl}!`pq9>h
z-ALZAYJqK${mHr>Nu}QtF${GJyQ`pkS4b$b06Rpd_V8-KDw1}+e0SUDf?&4?gOP`N
zBX@!XG%9UUAfD-20uX1->P!WQPq+^dSN2%=GH$wfS5f1Jk-~DT;=ao#MekYh!F8Ro
zwvBt9l)Z?uYP`_p8d`bZt6LgrAcvmamO}?tf?Dk_RTuQdm5&yn6O&}7gMEXdqz$Wv
z@^G_XdtV8J>GnPib48U7KGFHOEl0Mf&Ai5<uf}=j@R4v?xU?i|{>Zv1lX^&=RA_G~
z&oagOwtlAmj?98AiJ)ls`WxS#NO5Q0ah|Ad_xq<F=}!5*u-;)E#Up}LIlRPra5;EH
zxJzz3Ny^X4p+ne_3LAYJH!qWL+kw)H1C5KEX4Tx5ncn@_mz&p;)H#LCetl|QW}4Wd
z_2i+JUf3s~#<X#JQZG&py*^Ydho+|=w*skC9*Oo*0ja~gx*4R-!-D<ST|w$B^`CPx
zRH##23Lchje^0_0Q$FPE$kXdf?@+hvkZh=KjeJ8j_j}rypFE|m-qI)OOq3;JWU}Cn
z_2(&)o+XWPXiw#jG5n*2<^Q{!L|z^2hDZmmC|me;cCK_gJ9I#xfXnygK#=%&#D2@g
zw{3LqdaXD=_mJvJt&R6xPjs9y+?%E9a8YZ+)|Gn8OowA;snd7uI@`25pqq8It*JRR
zWpfHzIWj8u24&8T#XIFoRWVEp%KKtzSe#T8^~{9$q%9VfxXx_F&fJ6tX|d5BO3!v_
zA#ujUM+x!gj4g^QEyKfa?&_J}6(rdkX~x4B&YoDDz*xD{d<T!5f^3aw#?5;;_XG9A
z7W!o4$k#WTd#1O>+=iE^9eY=9u`$7OzVOQPqEzn<cgpTe__b_~*Zthoz=r13Lq4gS
zTt;rKclKKKhW5nG_{xr%i?vRl+BWgwMZ+a2&aqpyJBuxcjP`mN9<fcEIEDI)Yc#U@
z!)AF=m;dFV@^i<ucO&Yt*~56GQgAf4KD!{!PZ|OrNQ$0!vooC(RqgV;-47F}v?V)w
zS9|t_4%m?eh28N6$F3O-@>K^dx+5JM4~|0$qVvsia$Z<D>qn6`9m<1gXheU2bJD}|
zq{$gMl9J5NGMIy5;6bH)&t3@9YT&zj3O${c(O3dMQwCeW<d};60!H7;EUd)=43-Z^
zh-Pwle1A*BE@^=wn$Na0^e}V6IR)5py!nem134=~o!wcXJ}fHR(ArAXLQDe+{5V1e
zTI}cRA4C&d8jk9v0bbFKHAIh!2z@LKJ;6DHogk2dCYh2<aTo_NKbT->rHZx)WOHfD
z?H#|U0C$##-a=sj4T}|tM5ZF5sUVPt#Z#$NERKLB5HLUj6BObvWQZ~TK}HG{V>;|P
zL99T2fRHcnM=NwPn1W40OG862j{a(&Ux1U-H}(EOUr+#eV8x68EZ!7{_4C92I3q~t
z5Db)jG3X!82yzbz;9!??f&`laSsaI8j=#|8M-^<=xA_5^0)0o_VY9FtUydIT4Fap;
ze_B#;BJ*vA0s<c2FJN>Q0Q)CNA)oslte<RCjEuVTqak4WH@!befAxJ-7)Uue(d-4R
zO$zhq_Lhc<^=WJYi_fNwvN$rAVvgtFF*qEah#|27$E2DQF=jYCfrO`0$YebA2UT?c
zAR)t_#ZjmN%1!w|4+lpj<B4P(hJ`0FF(h-mIfiP+W@1=OE)GY)n^D*#<_{`d0{I{-
z8NNSSrBKBNs#shCj%~(bVsPd-U=7iXg`rRZ$6=W>DO58inad!Js$#Qfj)Fix1_&qL
zkHO<$1N?cT0}8-t3tj1!h6GdG_a0YYhL8&;SQ;+l`)?9|A8_aUaaIT!3N-O#3WbU{
zqvFT}5&@5+d>2~D2@C?6sL(ljwl+GV2n!831At{H@)Rf-?FYWlMi0;gf$jo<uchI)
zQ@L-$PGCE+8A66VIL`x0zn#;$e?6z0hXW^fW9BQ=ISJT&Zpc5AR%{-$1&{|JU(62@
z3Ian$yT*3Z3eLu{yRlne{^(XhqenLdjlmjoA&3#oVUOAgbd3$MyczyH4yYbq()DXU
z{~x3Ro<hdsaArh|IY=K2$RChRWF`qiG$#=m6ucRiLmdO@oAw|9S14ixau)IcjsPo=
zo}(w2Xp_-E&H33Dkv9k6`~@BCf8HN5nZh8lfh!aOfq^06h+GVn$YNkXqHsB6CKqo;
zB>rsSzv2%_0I>f^7=oEQo=hX+X#~Q5&qa`kOtAGy7zTrBh9OaiEWlA&7y^?*CX(4^
z1Qzq(;35WRrby`jLdZBQ1`AIBHHgUukdp8qT1+;@9D^fLi8!(u15Ys{{~JR_amSNr
zBr1(S`R|2{OyQEvSR5{>uoN7IL?W<3ev)t)9KnobZpLM^NoHfk>;JUN6lDq2VGNG?
zw`J)|6fLldC-c|3VuAg;$}=YL!=oH**s(tF6#;zXz<&G6@nt6id;gQ|OU3(7E`dh>
zwaA~s_b<5qg6mHq@TY|T%C5iQ`cnw}DdE4e>)!^K>i0tnjz4(U5P>5Jd4+~8IM6^c
zmoBm&`*ZW4om2uim4L;of*{D$NI@|1dFx=%i4xMC98j$&70rp$wu$Nvg087T2T!4$
zz)$h+3;o^yG<Za7OopIwiFEsg?&6xxx~03df7QPCL4N6dG#3hSV06P0z3rDNTTR?k
zdguPFT!N|gnbNI^Z=dFtpYSnH3%_G;Zo1pl0e8<Hf5YwB6<5UEh5L$?cMy$;Wo5q=
zJJge(;MB^5^%s7Z$!4B-@L1^KQ6JQ1^?TbotqFgm?O)jZey3C*>c9Mco!d?|$7jdh
zpUl3wx}c!>z4@grpBD_s!XsPjBJ5{Y6sTO$x+E?5t^3uLY!5<l%CLOp3-PL_Tl-J}
z5wrF28RwLXG&uVq4K-LwG^bF#aP@izu?vENEWh3EvK~%BJkBInkCZ(Qcb(W2sM(7l
zhT)TKvW+uhHeP+D4}XCW!TVve?V2j#^X%ZM$iwi8?rG`^lQdMiH3L)=;E9F&CKH^7
zu7(PcSdyQ6^tyCSdi;44m8heuCN~~~JYYEx&kpKB9fn$MUAZZc%htj*TY9{)yNHF;
z4cxe0OA!M)Rr-<os5b85!*gM`s*ePJ7<4>fY^N7_0X|=o_a0HGcY2=(e9f)unoyVh
zoru0IHQw`$?>G||th%6dF*_^T%_lnGp4WH_WSy#oc8nFQu4?x1JN)|1M^9ju!prTD
zi<Uwn$s{pjAM#flGj7m69$f5<T6;95wa#zSiXP*OM^{<iyBB{vMnIkQy1vj+l%BQc
z`gS{)P_3yrz4q01Sy8AV^=^Z1qX4w9DI3;4#dqE<<z%sw&6c(hZBM14apknU-178D
zl>bwy^*-(1_3Z|*G?k;+D-%5Hx=s{UpU_`XCqDu|7PUEK9cGzoc%kaZ)|QPP4J`*Q
zu3dTvGIDT+Ja&gZR};HUYP#4wss5T_B{W?->Fu--fonum&w%>C`TI@~JBKt=12t>c
zNyufMbLsq<(%RK;8BMz#5pI*v{W62=Gi`Edo2H4Kuf`sRj`djaS>@2CyK@tlFnpr2
z_dZ;AcTSB~xBKY@(Wj?Ul!i`;Tl^1nOz5?ZgQLSb2G`$-N!St4dQ~kLo^-e+B+66N
z;|!%IRxdy#KwbwdP2y9g#BDjx&S3PAHS&;oE`0%aM1@ksK`7~tm_~6_Zz^mcIq?GP
z-t-rKEJSh1^k90g<&ERpT@4qpjt}D}HF@4#mvn#Qv2=v~v1-qhjHyqz)kGN=bzXgg
ze0>sP7<UI<UMVw4cCymwAY{DJZ9D|8EN%4Aw<Jm2UN@kWU6eJi%QAj@+^;k+y-HR0
zC|35wm$YoDPahxNvG@81@0`ujg#Io@Y*hs}SZwgCm$+n7L?Tpjkh!5Mb@loL-!t6g
zT76=M&To;TC2|Yb8x4>59=VE4$lo0tl2_Z5Q(@uKx3HkerlYAi6}G$M!ZTahl&~n&
z$JDl4R>u6qy@}Ox+ppO@_qkcqX#D(X7>c(ZQMF&RVDh%uCri#>yZ3lowB8=aSBrOs
zjvOSzXu1qvd<JWO$%Q%VJ+f9uOdYtPWVEfbML*B<@mWSz+`7&(rl_E@zCe9xg-+?n
zNwOJ$XQE(ma+NnXIrMk}vJRQ2<h!Z=341*5cutpIW|31*nCq+Y#9Fe63XaL0owi;*
zOUctNTdB^nu#cN@{Xu>5bJ7WK(zN1vhaM(w$ht9O@!Ug8wsu?#G8#(VTH+jUnOdEA
zeSr?G@KGyWO>^hRU(*rm4k``kigP`dp8o9&+53>4k9r~FS{6)m>*@_E)gQ(22341#
zy-?hi_33c(cKNV&T6E@K3B0O)mreo5uE|pLirLbK<|~^<9)*l2uk(c!Us?8Bd)MWR
z;h4cN4_axuJN$9hh6Kc}$EnfUw%Fut)GN+K`daTtR@FXx<BQ!MX86b2%uo997mQh(
Tx*Zh%5eLy7obA(W*T?)1$IKAZ

literal 0
HcmV?d00001

diff --git a/shaders/fragment.glsl b/shaders/fragment.glsl
deleted file mode 100644
index 1f16171..0000000
--- a/shaders/fragment.glsl
+++ /dev/null
@@ -1,14 +0,0 @@
-#version 330 core
-
-
-in vec2 TexCoord;
-
-out vec4 FragColor;
-
-uniform sampler2D tex;
-
-
-void main()
-{
-    FragColor = texture(tex, TexCoord);
-}
diff --git a/shaders/light_cube_fragment.glsl b/shaders/light_cube_fragment.glsl
new file mode 100644
index 0000000..1bd96c6
--- /dev/null
+++ b/shaders/light_cube_fragment.glsl
@@ -0,0 +1,7 @@
+#version 330 core
+out vec4 FragColor;
+
+void main()
+{
+    FragColor = vec4(1.0);
+}
diff --git a/shaders/light_cube_vertex.glsl b/shaders/light_cube_vertex.glsl
new file mode 100644
index 0000000..ae6d2c9
--- /dev/null
+++ b/shaders/light_cube_vertex.glsl
@@ -0,0 +1,11 @@
+#version 330 core
+layout (location = 0) in vec3 aPos;
+
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 projection;
+
+void main()
+{
+	gl_Position = projection * view * model * vec4(aPos, 1.0);
+}
diff --git a/shaders/lighting_fragment.glsl b/shaders/lighting_fragment.glsl
new file mode 100644
index 0000000..8428a05
--- /dev/null
+++ b/shaders/lighting_fragment.glsl
@@ -0,0 +1,88 @@
+#version 330 core
+out vec4 FragColor;
+
+in vec3 Normal;
+in vec3 FragPos;
+in vec2 TexCoords;
+
+struct Material {
+    sampler2D diffuse;
+    sampler2D specular;
+    float shininess;
+};
+
+struct PointLight {
+    vec3 position;
+
+    vec3 ambient;
+    vec3 diffuse;
+    vec3 specular;
+
+    float constant;
+    float linear;
+    float quadratic;
+};
+
+struct DirectionalLight {
+    vec3 direction;
+
+    vec3 ambient;
+    vec3 diffuse;
+    vec3 specular;
+};
+
+#define POINT_LIGHTS_COUNT 4
+
+uniform Material material;
+uniform vec3 viewPos;
+
+uniform DirectionalLight directionalLight;
+uniform PointLight pointLights[POINT_LIGHTS_COUNT];
+
+
+vec3 ComputeDirectionalLight(DirectionalLight light, vec3 norm, vec3 viewDir)
+{
+    vec3 lightDir = normalize(-light.direction);
+    vec3 reflectDir = reflect(-lightDir, norm);
+
+    float diff = max(dot(norm, lightDir), 0.0);
+    float spec = pow(max(dot(viewDir, reflectDir), 0.0), material.shininess);
+
+    vec3 ambient = light.ambient * vec3(texture(material.diffuse, TexCoords));
+    vec3 diffuse = light.diffuse * diff * vec3(texture(material.diffuse, TexCoords));
+    vec3 specular = light.specular * spec * vec3(texture(material.specular, TexCoords));
+
+    return (ambient + diffuse + specular);
+}
+
+vec3 ComputePointLight(PointLight light, vec3 norm, vec3 viewDir)
+{
+    float distance = length(light.position - FragPos);
+    float attenuation = 1.0 / (light.constant + light.linear * distance + light.quadratic * (distance * distance));
+
+    vec3 lightDir = normalize(light.position - FragPos);
+    vec3 reflectDir = reflect(-lightDir, norm);
+
+    float diff = max(dot(norm, lightDir), 0.0);
+    float spec = pow(max(dot(viewDir, reflectDir), 0.0), material.shininess);
+
+    vec3 ambient = light.ambient * vec3(texture(material.diffuse, TexCoords));
+    vec3 diffuse = light.diffuse * diff * vec3(texture(material.diffuse, TexCoords));
+    vec3 specular = light.specular * spec * vec3(texture(material.specular, TexCoords));
+
+    return (ambient * attenuation + diffuse * attenuation + specular * attenuation);
+}
+
+void main()
+{
+    vec3 norm = normalize(Normal);
+    vec3 viewDir = normalize(viewPos - FragPos);
+
+    vec3 result = vec3(0.0);
+    result += ComputeDirectionalLight(directionalLight, norm, viewDir);
+    for (int i = 0; i < POINT_LIGHTS_COUNT; i++) {
+        result += ComputePointLight(pointLights[i], norm, viewDir);
+    }
+
+    FragColor = vec4(result, 1.0);
+}
diff --git a/shaders/lighting_vertex.glsl b/shaders/lighting_vertex.glsl
new file mode 100644
index 0000000..4501f79
--- /dev/null
+++ b/shaders/lighting_vertex.glsl
@@ -0,0 +1,20 @@
+#version 330 core
+layout (location = 0) in vec3 aPos;
+layout (location = 1) in vec3 aNormal;
+layout (location = 2) in vec2 aTexCoords;
+
+out vec3 Normal;
+out vec3 FragPos;
+out vec2 TexCoords;
+
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 projection;
+
+void main()
+{
+	gl_Position = projection * view * model * vec4(aPos, 1.0);
+    FragPos = vec3(model * vec4(aPos, 1.0));
+    Normal = mat3(transpose(inverse(model))) * aNormal;
+    TexCoords = aTexCoords;
+}
diff --git a/shaders/vertex.glsl b/shaders/vertex.glsl
deleted file mode 100644
index ab99072..0000000
--- a/shaders/vertex.glsl
+++ /dev/null
@@ -1,18 +0,0 @@
-#version 330 core
-
-
-layout (location = 0) in vec3 aPos;
-layout (location = 1) in vec2 aTexCoord;
-
-out vec2 TexCoord;
-
-uniform mat4 model;
-uniform mat4 view;
-uniform mat4 projection;
-
-
-void main()
-{
-    gl_Position = projection * view * model * vec4(aPos, 1.0);
-    TexCoord = aTexCoord;
-}
diff --git a/src/main.cpp b/src/main.cpp
index bef521a..6ee14e1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,6 +26,9 @@ int main()
     qoi_desc fish_desc;
     void *fish_rgba = qoi_read("assets/fish.qoi", &fish_desc, 4);
 
+    qoi_desc fish_map_desc;
+    void *fish_map_rgba = qoi_read("assets/fish-map.qoi", &fish_map_desc, 4);
+
 
     if (!glfwInit()) {
         return 1;
@@ -59,81 +62,99 @@ int main()
 
     glEnable(GL_DEPTH_TEST);
 
-    float verts[] = {
-        -0.5f, -0.5f, -0.5f,  0.0f, 0.0f,
-        0.5f, -0.5f, -0.5f,  1.0f, 0.0f,
-        0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
-        0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
-        -0.5f,  0.5f, -0.5f,  0.0f, 1.0f,
-        -0.5f, -0.5f, -0.5f,  0.0f, 0.0f,
+    float cube_verts[] = {
+        // positions          // normals           // texture coords
+        -0.5f, -0.5f, -0.5f,  0.0f,  0.0f, -1.0f,  0.0f, 0.0f,
+        0.5f, -0.5f, -0.5f,  0.0f,  0.0f, -1.0f,  1.0f, 0.0f,
+        0.5f,  0.5f, -0.5f,  0.0f,  0.0f, -1.0f,  1.0f, 1.0f,
+        0.5f,  0.5f, -0.5f,  0.0f,  0.0f, -1.0f,  1.0f, 1.0f,
+        -0.5f,  0.5f, -0.5f,  0.0f,  0.0f, -1.0f,  0.0f, 1.0f,
+        -0.5f, -0.5f, -0.5f,  0.0f,  0.0f, -1.0f,  0.0f, 0.0f,
 
-        -0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
-        0.5f, -0.5f,  0.5f,  1.0f, 0.0f,
-        0.5f,  0.5f,  0.5f,  1.0f, 1.0f,
-        0.5f,  0.5f,  0.5f,  1.0f, 1.0f,
-        -0.5f,  0.5f,  0.5f,  0.0f, 1.0f,
-        -0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
+        -0.5f, -0.5f,  0.5f,  0.0f,  0.0f, 1.0f,   0.0f, 0.0f,
+        0.5f, -0.5f,  0.5f,  0.0f,  0.0f, 1.0f,   1.0f, 0.0f,
+        0.5f,  0.5f,  0.5f,  0.0f,  0.0f, 1.0f,   1.0f, 1.0f,
+        0.5f,  0.5f,  0.5f,  0.0f,  0.0f, 1.0f,   1.0f, 1.0f,
+        -0.5f,  0.5f,  0.5f,  0.0f,  0.0f, 1.0f,   0.0f, 1.0f,
+        -0.5f, -0.5f,  0.5f,  0.0f,  0.0f, 1.0f,   0.0f, 0.0f,
 
-        -0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
-        -0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
-        -0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
-        -0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
-        -0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
-        -0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+        -0.5f,  0.5f,  0.5f, -1.0f,  0.0f,  0.0f,  1.0f, 0.0f,
+        -0.5f,  0.5f, -0.5f, -1.0f,  0.0f,  0.0f,  1.0f, 1.0f,
+        -0.5f, -0.5f, -0.5f, -1.0f,  0.0f,  0.0f,  0.0f, 1.0f,
+        -0.5f, -0.5f, -0.5f, -1.0f,  0.0f,  0.0f,  0.0f, 1.0f,
+        -0.5f, -0.5f,  0.5f, -1.0f,  0.0f,  0.0f,  0.0f, 0.0f,
+        -0.5f,  0.5f,  0.5f, -1.0f,  0.0f,  0.0f,  1.0f, 0.0f,
 
-        0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
-        0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
-        0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
-        0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
-        0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
-        0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+        0.5f,  0.5f,  0.5f,  1.0f,  0.0f,  0.0f,  1.0f, 0.0f,
+        0.5f,  0.5f, -0.5f,  1.0f,  0.0f,  0.0f,  1.0f, 1.0f,
+        0.5f, -0.5f, -0.5f,  1.0f,  0.0f,  0.0f,  0.0f, 1.0f,
+        0.5f, -0.5f, -0.5f,  1.0f,  0.0f,  0.0f,  0.0f, 1.0f,
+        0.5f, -0.5f,  0.5f,  1.0f,  0.0f,  0.0f,  0.0f, 0.0f,
+        0.5f,  0.5f,  0.5f,  1.0f,  0.0f,  0.0f,  1.0f, 0.0f,
 
-        -0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
-        0.5f, -0.5f, -0.5f,  1.0f, 1.0f,
-        0.5f, -0.5f,  0.5f,  1.0f, 0.0f,
-        0.5f, -0.5f,  0.5f,  1.0f, 0.0f,
-        -0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
-        -0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+        -0.5f, -0.5f, -0.5f,  0.0f, -1.0f,  0.0f,  0.0f, 1.0f,
+        0.5f, -0.5f, -0.5f,  0.0f, -1.0f,  0.0f,  1.0f, 1.0f,
+        0.5f, -0.5f,  0.5f,  0.0f, -1.0f,  0.0f,  1.0f, 0.0f,
+        0.5f, -0.5f,  0.5f,  0.0f, -1.0f,  0.0f,  1.0f, 0.0f,
+        -0.5f, -0.5f,  0.5f,  0.0f, -1.0f,  0.0f,  0.0f, 0.0f,
+        -0.5f, -0.5f, -0.5f,  0.0f, -1.0f,  0.0f,  0.0f, 1.0f,
 
-        -0.5f,  0.5f, -0.5f,  0.0f, 1.0f,
-        0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
-        0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
-        0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
-        -0.5f,  0.5f,  0.5f,  0.0f, 0.0f,
-        -0.5f,  0.5f, -0.5f,  0.0f, 1.0f
+        -0.5f,  0.5f, -0.5f,  0.0f,  1.0f,  0.0f,  0.0f, 1.0f,
+        0.5f,  0.5f, -0.5f,  0.0f,  1.0f,  0.0f,  1.0f, 1.0f,
+        0.5f,  0.5f,  0.5f,  0.0f,  1.0f,  0.0f,  1.0f, 0.0f,
+        0.5f,  0.5f,  0.5f,  0.0f,  1.0f,  0.0f,  1.0f, 0.0f,
+        -0.5f,  0.5f,  0.5f,  0.0f,  1.0f,  0.0f,  0.0f, 0.0f,
+        -0.5f,  0.5f, -0.5f,  0.0f,  1.0f,  0.0f,  0.0f, 1.0f
     };
 
-    unsigned int program = create_program("shaders/vertex.glsl", "shaders/fragment.glsl");
-
-    unsigned int texture;
-    glGenTextures(1, &texture);
-    glBindTexture(GL_TEXTURE_2D, texture);
+    unsigned int fish_texture;
+    glGenTextures(1, &fish_texture);
+    glBindTexture(GL_TEXTURE_2D, fish_texture);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, fish_desc.width, fish_desc.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, fish_rgba);
     glGenerateMipmap(GL_TEXTURE_2D);
 
-    unsigned int vertex_array;
-    glGenVertexArrays(1, &vertex_array);
-    glBindVertexArray(vertex_array);
+    unsigned int fish_map_texture;
+    glGenTextures(1, &fish_map_texture);
+    glBindTexture(GL_TEXTURE_2D, fish_map_texture);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, fish_map_desc.width, fish_map_desc.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, fish_map_rgba);
+    glGenerateMipmap(GL_TEXTURE_2D);
+
+    unsigned int lighting_program = create_program("shaders/lighting_vertex.glsl", "shaders/lighting_fragment.glsl");
+    unsigned int light_cube_program = create_program("shaders/light_cube_vertex.glsl", "shaders/light_cube_fragment.glsl");
+
+    unsigned int cube_buffer = 0;
+    glGenBuffers(1, &cube_buffer);
+    glBindBuffer(GL_ARRAY_BUFFER, cube_buffer);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(cube_verts), &cube_verts, GL_STATIC_DRAW);
+
+    unsigned int object_vao;
+    glGenVertexArrays(1, &object_vao);
+    glBindVertexArray(object_vao);
 
-    unsigned int buffer = 0;
-    glGenBuffers(1, &buffer);
-    glBindBuffer(GL_ARRAY_BUFFER, buffer);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(verts), &verts, GL_STATIC_DRAW);
-    
     // position
-    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(float), (const void*)0);
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 8 * sizeof(float), (const void*)0);
+    glEnableVertexAttribArray(0);
+    // normal
+    glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 8 * sizeof(float), (const void*)(3 * sizeof(float)));
+    glEnableVertexAttribArray(1);
+    // texture coord
+    glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, 8 * sizeof(float), (const void*)(6 * sizeof(float)));
+    glEnableVertexAttribArray(2);
+
+    unsigned int light_source_vao;
+    glGenVertexArrays(1, &light_source_vao);
+    glBindVertexArray(light_source_vao);
+
+    // position
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 8 * sizeof(float), (const void*)0);
     glEnableVertexAttribArray(0);
 
-    // texture coords
-    glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(float), (const void*)(3 * sizeof(float)));
-    glEnableVertexAttribArray(1);
 
     glm::mat4 projection = glm::mat4(1.0f);
     Camera camera;
 
-    framebuffer_size_callback = [&projection, program](int width, int height) {
+    framebuffer_size_callback = [&projection](int width, int height) {
         projection = glm::perspective(glm::radians(45.0f), (float)width / (float)height, 0.1f, 100.0f);
-        glUniformMatrix4fv(glGetUniformLocation(program, "projection"), 1, GL_FALSE, glm::value_ptr(projection));
         glViewport(0, 0, width, height);
     };
 
@@ -144,6 +165,8 @@ int main()
     float delta_time = 0.0f;
     float last_frame_time = 0.0f;
 
+    glm::vec3 light_position(1.2f, 1.0f, 2.0f);
+
     while (!glfwWindowShouldClose(window)) {
         float current_frame_time = glfwGetTime();
         delta_time = current_frame_time - last_frame_time;
@@ -171,16 +194,43 @@ int main()
         glClearColor(0.5, 0.5, 0.5, 1.0);
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-        glUseProgram(program);
-        glUniformMatrix4fv(glGetUniformLocation(program, "view"), 1, GL_FALSE, glm::value_ptr(camera.view));
+        {
+            /* lit object */
+            {
+                glActiveTexture(GL_TEXTURE0);
+                glBindTexture(GL_TEXTURE_2D, fish_texture);
+                glActiveTexture (GL_TEXTURE1);
+                glBindTexture(GL_TEXTURE_2D, fish_map_texture);
 
-        glBindTexture(GL_TEXTURE_2D, texture);
-        glBindVertexArray(vertex_array);
+                glUseProgram(lighting_program);
 
-        for (int i = 0; i < 12; i++) {
-            glm::mat4 model = glm::translate(glm::mat4(1.0), glm::vec3(2 * i, 0.0f, 0.0f));
-            glUniformMatrix4fv(glGetUniformLocation(program, "model"), 1, GL_FALSE, glm::value_ptr(model));
-            glDrawArrays(GL_TRIANGLES, 0, 36);
+                glBindVertexArray(object_vao);
+                glUniformMatrix4fv(glGetUniformLocation(lighting_program, "projection"), 1, GL_FALSE, glm::value_ptr(projection));
+                glUniformMatrix4fv(glGetUniformLocation(lighting_program, "view"), 1, GL_FALSE, glm::value_ptr(camera.view));
+                glUniformMatrix4fv(glGetUniformLocation(lighting_program, "model"), 1, GL_FALSE, glm::value_ptr(glm::mat4(1.0f)));
+                glUniform3fv(glGetUniformLocation(lighting_program, "viewPos"), 1, glm::value_ptr(camera.position));
+
+                glUniform1i(glGetUniformLocation(lighting_program, "material.diffuse"), 0);
+                glUniform1i(glGetUniformLocation(lighting_program, "material.specular"), 1);
+                glUniform1f(glGetUniformLocation(lighting_program, "material.shininess"), 32.0f);
+
+                glUniform3fv(glGetUniformLocation(lighting_program, "light.position"), 1, glm::value_ptr(light_position));
+                glUniform3f(glGetUniformLocation(lighting_program, "light.ambient"), 0.2f, 0.2f, 0.2f);
+                glUniform3f(glGetUniformLocation(lighting_program, "light.diffuse"), 0.5f, 0.5f, 0.5f);
+                glUniform3f(glGetUniformLocation(lighting_program, "light.specular"), 1.0f, 1.0f, 1.0f);
+                glDrawArrays(GL_TRIANGLES, 0, 36);
+            }
+
+            /* lamp object */
+            {
+                glUseProgram(light_cube_program);
+                glBindVertexArray(light_source_vao);
+                glUniformMatrix4fv(glGetUniformLocation(light_cube_program, "projection"), 1, GL_FALSE, glm::value_ptr(projection));
+                glUniformMatrix4fv(glGetUniformLocation(light_cube_program, "view"), 1, GL_FALSE, glm::value_ptr(camera.view));
+                glUniformMatrix4fv(glGetUniformLocation(light_cube_program, "model"), 1, GL_FALSE, glm::value_ptr(glm::scale(glm::translate(glm::mat4(1.0f), light_position), glm::vec3(0.2f))));
+                glDrawArrays(GL_TRIANGLES, 0, 36);
+
+            }
         }
 
         glfwSwapBuffers(window);