From 0be510ea83e48461171c97ad978f8cec20c2cecb Mon Sep 17 00:00:00 2001 From: "theo@manjaro" Date: Thu, 3 Mar 2022 20:24:10 +0100 Subject: [PATCH] Display game board --- assets/circles/regular/blue.png | Bin 0 -> 742 bytes assets/circles/regular/neutron.png | Bin 0 -> 911 bytes assets/circles/regular/pink.png | Bin 0 -> 742 bytes assets/circles/selected/blue.png | Bin 0 -> 796 bytes assets/circles/selected/neutron.png | Bin 0 -> 970 bytes assets/circles/selected/pink.png | Bin 0 -> 796 bytes assets/circles/shadow.png | Bin 0 -> 674 bytes assets/grid/blue.png | Bin 0 -> 677 bytes assets/grid/pink.png | Bin 0 -> 685 bytes assets/grid/tile.png | Bin 0 -> 636 bytes game.lua | 258 +++++++++++++++++++++++++ lib/push.lua | 281 ++++++++++++++++++++++++++++ lib/rect.lua | 75 ++++++++ main.lua | 72 +++++++ objects/base.lua | 27 +++ objects/circle.lua | 25 +++ objects/grid.lua | 42 +++++ 17 files changed, 780 insertions(+) create mode 100644 assets/circles/regular/blue.png create mode 100644 assets/circles/regular/neutron.png create mode 100644 assets/circles/regular/pink.png create mode 100644 assets/circles/selected/blue.png create mode 100644 assets/circles/selected/neutron.png create mode 100644 assets/circles/selected/pink.png create mode 100644 assets/circles/shadow.png create mode 100644 assets/grid/blue.png create mode 100644 assets/grid/pink.png create mode 100644 assets/grid/tile.png create mode 100644 game.lua create mode 100644 lib/push.lua create mode 100644 lib/rect.lua create mode 100644 main.lua create mode 100644 objects/base.lua create mode 100644 objects/circle.lua create mode 100644 objects/grid.lua diff --git a/assets/circles/regular/blue.png b/assets/circles/regular/blue.png new file mode 100644 index 0000000000000000000000000000000000000000..5f4685b425c83f66198f62395df504cfc0aae636 GIT binary patch literal 742 zcmVEX>4Tx04R}tkv&MmKp2MKrfNkh3U&~2$WWauh<`Y06^c+H)C#RSm|XfJG-*gu zTpR`0f`dPcRR6lU)%*uL#oY#UwgpW*M`Rl!Wj2x<`QTcQKyjU-#$eR&y2u0wVDYGfbO!op@@~ zHaPDSM_5r-iO-2gOu8WPBi9v=-#8as7IOjc8!_5-QY@tCJnrKkaQzaw6mo5V zkz*cZXpmh$_#gc4t(6}i^OC}Gp#8;hK8AqME>N#J&iAq7)K7rmGjOFh{pA`k{YiSY zsYQ=~o^9abx~VC9z~v6m|76If>`FmeLOu_?pV2pEfxcUyYt`#p;~b|CK$?1$ya5gl zf#CvWulc;Yv$b#k)-?L}138XzkiW??!2kdN32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rh0|OEdErdC+r2qf`8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b z0MAK8K~z}7?bpE#f9OfbO<20w1saL}h~w)Z{U^+Q^3wqbSem$NRba8zYWU8wLk zA3)^X=HL9TACibj>C!K(r7i@XqD#Q1RjpVUJV$%r^V^SLUEp_cbSN|%?1g)w9LH7K Y6Trn(@{zpAj{pDw07*qoM6N<$f_WuAPyhe` literal 0 HcmV?d00001 diff --git a/assets/circles/regular/neutron.png b/assets/circles/regular/neutron.png new file mode 100644 index 0000000000000000000000000000000000000000..5b7e97deb095885fd7916035e67e01f78f698de2 GIT binary patch literal 911 zcmV;A191F_P)EX>4Tx04R}tkv&MmKp2MKrfNkh3U&~2$WWauh<`Y06^c+H)C#RSm|XfJG-*gu zTpR`0f`dPcRR6lU)%*uL#oY#UwgpW*M`Rl!Wj2x<`QTcQKyjU-#$eR&y2u0wVDYGfbO!op@@~ zHaPDSM_5r-iO-2gOu8WPBi9v=-#8as7IOjc8!_5-QY@tCJnrKkaQzaw6mo5V zkz*cZXpmh$_#gc4t(6}i^OC}Gp#8;hK8AqME>N#J&iAq7)K7rmGjOFh{pA`k{YiSY zsYQ=~o^9abx~VC9z~v6m|76If>`FmeLOu_?pV2pEfxcUyYt`#p;~b|CK$?1$ya5gl zf#CvWulc;Yv$b#k)-?L}138XzkiW??!2kdN32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rh0|OEdH+fr0-v9sr8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b z0eDG7K~z}7?U=D{gD?<=&xnr9@E#QsTgA|sA&S(8$(V;hiZU=~Kx~mB-XqKzGti;B zHbqf-clKQ?)&Gpm$M3rz+W=8fQBjZNd?&ab_A}@Cr`MJH6<`Ey`U$!^hs)_q8kd!Y z7r65Q1ppRo2=J5(i=e*3kGvlCGY8uFz)Ib{=Qb5O(Qq~^i_ayex=n4~By{X#WdTh; zLDNqxXsQy+x((rSs`28kF1|IEnZr_dFQ>Bzmg2Hk4Qth@Y193AU~89yIE>I1;K5Sj zYj2^K5Gt{z4W4Q(off!yN`(GRo5flv=>M0))-FE;uC_bq>YP1kSLdQ}Sy@1}-Pt;f zr;v|bTW(tt^gz4$NMSjsK6pH%hbWDEr))~2 ziH`ZtFK;sdz;Uw{FZV4l#v8&?+-2YVAhZM=VV9sBST^ty`WBp1TFV~cj2B-9F2T9t lf_ei>!KI*4QBhGey#ugP+mUl>|6Tw9002ovPDHLkV1m<EX>4Tx04R}tkv&MmKp2MKrfNkh3U&~2$WWauh<`Y06^c+H)C#RSm|XfJG-*gu zTpR`0f`dPcRR6lU)%*uL#oY#UwgpW*M`Rl!Wj2x<`QTcQKyjU-#$eR&y2u0wVDYGfbO!op@@~ zHaPDSM_5r-iO-2gOu8WPBi9v=-#8as7IOjc8!_5-QY@tCJnrKkaQzaw6mo5V zkz*cZXpmh$_#gc4t(6}i^OC}Gp#8;hK8AqME>N#J&iAq7)K7rmGjOFh{pA`k{YiSY zsYQ=~o^9abx~VC9z~v6m|76If>`FmeLOu_?pV2pEfxcUyYt`#p;~b|CK$?1$ya5gl zf#CvWulc;Yv$b#k)-?L}138XzkiW??!2kdN32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rh0|OEdC5qxWmjD0&8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b z0MAK8K~z}7?bpE#f3K)f!f@?H17p^t29<C!K(r7i@XqD#Q1RjpVUJV$%r^V^SLUEp_cbSN|%?1g)w9LH7K Y6B>L{Hl&^=>i_@%07*qoM6N<$f+Y(<$p8QV literal 0 HcmV?d00001 diff --git a/assets/circles/selected/blue.png b/assets/circles/selected/blue.png new file mode 100644 index 0000000000000000000000000000000000000000..1bbb24eee6ac0cce2f341488d6eea9965b8ecb66 GIT binary patch literal 796 zcmV+%1LOROP)EX>4Tx04R}tkv&MmKp2MKrfNkh3U&~2$WWauh<`Y06^c+H)C#RSm|XfJG-*gu zTpR`0f`dPcRR6lU)%*uL#oY#UwgpW*M`Rl!Wj2x<`QTcQKyjU-#$eR&y2u0wVDYGfbO!op@@~ zHaPDSM_5r-iO-2gOu8WPBi9v=-#8as7IOjc8!_5-QY@tCJnrKkaQzaw6mo5V zkz*cZXpmh$_#gc4t(6}i^OC}Gp#8;hK8AqME>N#J&iAq7)K7rmGjOFh{pA`k{YiSY zsYQ=~o^9abx~VC9z~v6m|76If>`FmeLOu_?pV2pEfxcUyYt`#p;~b|CK$?1$ya5gl zf#CvWulc;Yv$b#k)-?L}138XzkiW??!2kdN32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rh0|OEd6x%#FtpET38FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b z0R>4!K~z}7?by8v!Y~jA@La%W=&J~V;Na{aeVdNHjW{?v2!%plCC}iXQzR5j?sEB3 z?>`oj`}JA^Ii(~LiNqJ+EPmWB&zNEX>4Tx04R}tkv&MmKp2MKrfNkh3U&~2$WWauh<`Y06^c+H)C#RSm|XfJG-*gu zTpR`0f`dPcRR6lU)%*uL#oY#UwgpW*M`Rl!Wj2x<`QTcQKyjU-#$eR&y2u0wVDYGfbO!op@@~ zHaPDSM_5r-iO-2gOu8WPBi9v=-#8as7IOjc8!_5-QY@tCJnrKkaQzaw6mo5V zkz*cZXpmh$_#gc4t(6}i^OC}Gp#8;hK8AqME>N#J&iAq7)K7rmGjOFh{pA`k{YiSY zsYQ=~o^9abx~VC9z~v6m|76If>`FmeLOu_?pV2pEfxcUyYt`#p;~b|CK$?1$ya5gl zf#CvWulc;Yv$b#k)-?L}138XzkiW??!2kdN32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rh0|OEd8KsRx5C8xG8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b z0kcU&K~z}7?by9)!!Qs4;FCzl&dz&;K)2$dvxiXV!*tBU1VRVT9Za@@$$Qwd#}4VF zR0#dtkE}MWZwy5Ge3s5S0W7h^ZHMCi@$>!dBANK^X{U;SZRo@P$ijZSKC|IU3biN4 zMCiX*xT0WvlQrE4ZC%0C4=C{cb{&Lc(29z+p#VU_#^6}AqGAoy1Q%?>DQJydb8}z; z0H%JpLNS|IV>X!&o64Gbq?#zG7(o#iYUHs})YRjz@)&lc{UYYnf}qTmJ9v=>Tu~SCy$qHU6BVhhaXAzK?YO1VYdr0r#9&|019kBB{$2` z?1nO}xlfAuOmmK=tmEbRbWoBko7yYM?)h|3tSVu5w9=*F>q2~OKKou`^Z0UcTX6Rx zg$oW{q{Om|0=t9xuBs^5*j1JJjScppLz8hDOy8I>EDCI+V{mRIu*XPY(O?%X`LKi@ s7K0^$LvU$ep=@w2I2F3Y5`QJW03j7OZQD-KrT_o{07*qoM6N<$f;Qp2b^rhX literal 0 HcmV?d00001 diff --git a/assets/circles/selected/pink.png b/assets/circles/selected/pink.png new file mode 100644 index 0000000000000000000000000000000000000000..f58b4898c2249710c314a7d76e85314edcce7f24 GIT binary patch literal 796 zcmV+%1LOROP)EX>4Tx04R}tkv&MmKp2MKrfNkh3U&~2$WWauh<`Y06^c+H)C#RSm|XfJG-*gu zTpR`0f`dPcRR6lU)%*uL#oY#UwgpW*M`Rl!Wj2x<`QTcQKyjU-#$eR&y2u0wVDYGfbO!op@@~ zHaPDSM_5r-iO-2gOu8WPBi9v=-#8as7IOjc8!_5-QY@tCJnrKkaQzaw6mo5V zkz*cZXpmh$_#gc4t(6}i^OC}Gp#8;hK8AqME>N#J&iAq7)K7rmGjOFh{pA`k{YiSY zsYQ=~o^9abx~VC9z~v6m|76If>`FmeLOu_?pV2pEfxcUyYt`#p;~b|CK$?1$ya5gl zf#CvWulc;Yv$b#k)-?L}138XzkiW??!2kdN32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rh0|OEd4^dh1K>z>%8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b z0R>4!K~z}7?by8v!Y~jA@Z`YJ-4_vD9D@%aeVdNHjrahiW0!(2;_m36QzR5j?sEB3 z?>`oj`}JA^Ii(~LiNqJpS^O9;&zN;9bJRt_F7$rAk=Cxa8x~xbf~JCNDwYfV1jnLv zO>7KW*Tz!OfY~fJmQn+999ub$N@$_Glv>bIcQLi0mF{9|g8H%uSik}nuz&^p$6zx| z#X+H(zt!Qn?}~QW43nDsE)L8Yc5vgX9sDIqbs5v$AlQA=oM?CNB)4Y!<~h)IPfT}F za|!p3wL6{P&&I<(SywGK$somtj)5<~5(P^FFK@F;I5qAskYyN{3LXn(fw{AbnrFO3 aQadkSRER#s)3{pz0000EX>4Tx04R}tkv&MmKp2MKrfNkh3U&~2$WWauh<`Y06^c+H)C#RSm|XfJG-*gu zTpR`0f`dPcRR6lU)%*uL#oY#UwgpW*M`Rl!Wj2x<`QTcQKyjU-#$eR&y2u0wVDYGfbO!op@@~ zHaPDSM_5r-iO-2gOu8WPBi9v=-#8as7IOjc8!_5-QY@tCJnrKkaQzaw6mo5V zkz*cZXpmh$_#gc4t(6}i^OC}Gp#8;hK8AqME>N#J&iAq7)K7rmGjOFh{pA`k{YiSY zsYQ=~o^9abx~VC9z~v6m|76If>`FmeLOu_?pV2pEfxcUyYt`#p;~b|CK$?1$ya5gl zf#CvWulc;Yv$b#k)-?L}138XzkiW??!2kdN32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rh0|OEe1C_P2^Z)<=8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b z0E?zXD3!mZ0dLI^3A58>N9E+SLVyZ`_I07*qo IM6N<$f(1JpdjJ3c literal 0 HcmV?d00001 diff --git a/assets/grid/blue.png b/assets/grid/blue.png new file mode 100644 index 0000000000000000000000000000000000000000..b417de92ef8973eb6d6c3444040beb2ad6380028 GIT binary patch literal 677 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!1SBUuI~&Hpz}TAU>>S|f?5t2wl%JNFlghxL zF|l@{t;b;piMIR8vRt*e$^;5e1kBaxsJF-x?Fvx5!nM|FM$9i|lT44G7#Y^XlSb3g8->O-DKb?*x zPyH;GzBVMWxB8QKTk)??Lf12Sl^R)foSHaTMROLgNE_ZN4boZi!sgv$`GUVfJ4K3e z8zv^prDjZswf`ai=iS<=^75Z29V%S#_h_MATf+stfb~}AzHfYd#lPW!alumazfYwM z{(4qzUFq82FfaGPqg^XCs}DToyYN5d#IiSDj!{l_{CnnKG*4~Z7rh|+>g(voGRyfL zW>rny!^p?i_>d`e{m(tSH*d}Vf6e6AcV^4Jq6zy?8XW}23ul2xWHAGSo-znCRxGtI z0}8U2c>21sKVxPVG+=!#(qjb_k}PqJC~?lu%}vcKVQ?-=O)N=GQ7F$W$xv|j^bH7a zhpAQ42d|LeC3KkibTeNBL*A{+;f&nOz}$J{eJ!I-bWlq7liB(xXW5&!6ZnB22I#7k!ZV5(I zpWPxSm7uukyWi1;j6RNHkEZf{HaW;4?<0Fa(dF1h!B`CjhD#H*Eb5nwS^!{XM7V!W8 literal 0 HcmV?d00001 diff --git a/assets/grid/pink.png b/assets/grid/pink.png new file mode 100644 index 0000000000000000000000000000000000000000..fac628d7f5930441dffe9393c864d35b0a5ee047 GIT binary patch literal 685 zcmV;e0#f~nP)EX>4Tx04R}tkv&MmKp2MKrfNkh3U&~2$WWauh<`Y06^c+H)C#RSm|XfJG-*gu zTpR`0f`dPcRR6lU)%*uL#oY#UwgpW*M`Rl!Wj2x<`QTcQKyjU-#$eR&y2u0wVDYGfbO!op@@~ zHaPDSM_5r-iO-2gOu8WPBi9v=-#8as7IOjc8!_5-QY@tCJnrKkaQzaw6mo5V zkz*cZXpmh$_#gc4t(6}i^OC}Gp#8;hK8AqME>N#J&iAq7)K7rmGjOFh{pA`k{YiSY zsYQ=~o^9abx~VC9z~v6m|76If>`FmeLOu_?pV2pEfxcUyYt`#p;~b|CK$?1$ya5gl zf#CvWulc;Yv$b#k)-?L}138XzkiW??!2kdN32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rh0|OB-3k6BBy0OgQE|J8YwAz<>b*2K*wpG(G$yrRiyQKHL)hXrO)fARVrZO&5zA)?SuP=*QUrp|2~~ Tk1%)H00000NkvXXu0mjfY%?7# literal 0 HcmV?d00001 diff --git a/assets/grid/tile.png b/assets/grid/tile.png new file mode 100644 index 0000000000000000000000000000000000000000..0d79b303f94a493b2b32442539426a9165a403fe GIT binary patch literal 636 zcmV-?0)zdDP)<@-0004nX+uL$Nkc;* zaB^>EX>4Tx04R}tkv&MmKp2MKrfNkh3U&~2$WWauh<`Y06^c+H)C#RSm|XfJG-*gu zTpR`0f`dPcRR6lU)%*uL#oY#UwgpW*M`Rl!Wj2x<`QTcQKyjU-#$eR&y2u0wVDYGfbO!op@@~ zHaPDSM_5r-iO-2gOu8WPBi9v=-#8as7IOjc8!_5-QY@tCJnrKkaQzaw6mo5V zkz*cZXpmh$_#gc4t(6}i^OC}Gp#8;hK8AqME>N#J&iAq7)K7rmGjOFh{pA`k{YiSY zsYQ=~o^9abx~VC9z~v6m|76If>`FmeLOu_?pV2pEfxcUyYt`#p;~b|CK$?1$ya5gl zf#CvWulc;Yv$b#k)-?L}138XzkiW??!2kdN32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rh0|OB+F$el~5dZ)H8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b z0A)!;K~z}7?bxvm01yy`VMJvCBcQbZBu21+S|b-0;1d6!W#1PBlyK!5-N0t5&UAV7cs0RjXFZHV=~8@;`MA?~YB&oKdq W$`Vq8sExt^0000self.inputs.deadzone then + pressed = true + end + end + end + + if pressed then + action.timer = action.timer+1 + if action.timer == 1 then + action.lastpress = 0 + end + else + action.timer = 0 + end + action.lastpress = action.lastpress + dt + end +end + +function Game:summon(obj) + obj.game = self + obj.id = self.maxobjects + self.maxobjects = self.maxobjects + 1 + insert(self.gameloop,obj) +end + +function Game:findName(askedname) + local result = {} + for i,v in ipairs(self.gameloop) do + if v~=nil then + for j,name in pairs(v.classes) do + if name==askedname then + insert(result,v) + end + end + end + end + return result +end + +function Game:delid(objid) + self.gameloop[objid] = nil +end + +function Game:delname(objName) + for i,v in ipairs(Game:findName(objName)) do + if v~=nil then + self:delid(v.id) + end + end +end + +function Game:step(dt) + self:updateInputs(dt) + for i,v in ipairs(self.gameloop) do + --Processing all the objects + if v~=nil then v:step(dt) end + end +end + +function Game:newImage(path) + local image = nil + if self.assets[path]~=nil then -- If already loaded + image = self.assets[path] + else + image = love.graphics.newImage("assets/"..path) -- Load it and save it + self.assets[path] = image + end + return image +end + +function Game:getSpriteDir(path,ext,func,folder) + if not ext then ext = ".png" end + if not func then func = self.newImage end + if not folder then folder = "assets/" end + local counter = 0 + local result = {} + while love.filesystem.getInfo(folder..path..counter..ext) do + insert(result,func(self,path..counter..ext)) + counter = counter + 1 + end + return result +end + +function Game:getLevel(i) + local level = nil + if self.levels[i]~=nil then + level = self.levels[i] + else + level = {} + level.folder = "maps/Level "..i.."/" + local module = level.folder.."data" + level.data = require(module) + level.backgrounds = {} + level.bgsizes = {} + -- Get backgrounds + local counter = 0 + while love.filesystem.getInfo(level.folder.."background"..counter..".png") do + img = love.graphics.newImage(level.folder.."background"..counter..".png") + table.insert(level.backgrounds,img) + table.insert(level.bgsizes,{img:getWidth(),img:getHeight()}) + counter = counter + 1 + end + self.levels[i] = level + end + return level +end + +function Game:draw(screen) + draworder = {} + for i,v in ipairs(self.gameloop) do + if v~=nil then + table.insert(draworder,v) + end + end + table.sort(draworder, function(a,b) return a.depth< b.depth end) + for i,v in ipairs(draworder) do + --Processing all the objects + if v~=nil then + if screen~= "bottom" then + if v.draw ~= nil then + local offset = 0 + if screen=="left" then offset = -love.graphics.get3DDepth() end + if screen=="right" then offset = love.graphics.get3DDepth() end + self.camerax = self.camerax + offset + v:draw() + self.camerax = self.camerax - offset + end + else + if v.bottomdraw~=nil then v.bottomdraw() end + end + end + end +end + +function Game:bint(bool) -- Convert Boolean to Integer + local result = 0 + if bool then result = 1 end + return result +end + +function Game:Timer(time) + local Timer = {} + Timer.maxcount = time + Timer.timer = time + Timer.loops = 0 + + function Timer:tick(advancement) + local result = false + self.timer = self.timer - advancement + if self.timer<0 then + result = true + self.timer = self.timer + self.maxcount + self.loops = self.loops + 1 + end + return result + end + + function Timer:getratio() + local result = self.timer/self.maxcount + if result<0 then result = 0 end + return result + end + + function Timer:reset() + self.timer = self.maxcount + self.loops = 0 + end + + return Timer +end + +Game:reinit() + +return Game diff --git a/lib/push.lua b/lib/push.lua new file mode 100644 index 0000000..890b279 --- /dev/null +++ b/lib/push.lua @@ -0,0 +1,281 @@ +-- push.lua v0.4 + +-- Copyright (c) 2020 Ulysse Ramage +-- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +-- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +local love11 = love.getVersion() == 11 +local getDPI = love11 and love.window.getDPIScale or love.window.getPixelScale +local windowUpdateMode = love11 and love.window.updateMode or function(width, height, settings) + local _, _, flags = love.window.getMode() + for k, v in pairs(settings) do flags[k] = v end + love.window.setMode(width, height, flags) +end + +local push = { + + defaults = { + fullscreen = false, + resizable = false, + pixelperfect = false, + highdpi = true, + canvas = true, + stencil = true + } + +} +setmetatable(push, push) + +function push:applySettings(settings) + for k, v in pairs(settings) do + self["_" .. k] = v + end +end + +function push:resetSettings() return self:applySettings(self.defaults) end + +function push:setupScreen(WWIDTH, WHEIGHT, RWIDTH, RHEIGHT, settings) + + settings = settings or {} + + self._WWIDTH, self._WHEIGHT = WWIDTH, WHEIGHT + self._RWIDTH, self._RHEIGHT = RWIDTH, RHEIGHT + + self:applySettings(self.defaults) --set defaults first + self:applySettings(settings) --then fill with custom settings + + windowUpdateMode(self._RWIDTH, self._RHEIGHT, { + fullscreen = self._fullscreen, + resizable = self._resizable, + highdpi = self._highdpi + }) + + self:initValues() + + if self._canvas then + self:setupCanvas({ "default" }) --setup canvas + end + + self._borderColor = {0, 0, 0} + + self._drawFunctions = { + ["start"] = self.start, + ["end"] = self.finish + } + + return self +end + +function push:setupCanvas(canvases) + table.insert(canvases, { name = "_render", private = true }) --final render + + self._canvas = true + self.canvases = {} + + for i = 1, #canvases do + push:addCanvas(canvases[i]) + end + + return self +end +function push:addCanvas(params) + table.insert(self.canvases, { + name = params.name, + private = params.private, + shader = params.shader, + canvas = love.graphics.newCanvas(self._WWIDTH, self._WHEIGHT), + stencil = params.stencil or self._stencil + }) +end + +function push:setCanvas(name) + if not self._canvas then return true end + local canvasTable = self:getCanvasTable(name) + return love.graphics.setCanvas({ canvasTable.canvas, stencil = canvasTable.stencil }) +end +function push:getCanvasTable(name) + for i = 1, #self.canvases do + if self.canvases[i].name == name then + return self.canvases[i] + end + end +end +function push:setShader(name, shader) + if not shader then + self:getCanvasTable("_render").shader = name + else + self:getCanvasTable(name).shader = shader + end +end + +function push:initValues() + self._PSCALE = (not love11 and self._highdpi) and getDPI() or 1 + + self._SCALE = { + x = self._RWIDTH/self._WWIDTH * self._PSCALE, + y = self._RHEIGHT/self._WHEIGHT * self._PSCALE + } + + if self._stretched then --if stretched, no need to apply offset + self._OFFSET = {x = 0, y = 0} + else + local scale = math.min(self._SCALE.x, self._SCALE.y) + if self._pixelperfect then scale = math.floor(scale) end + + self._OFFSET = {x = (self._SCALE.x - scale) * (self._WWIDTH/2), y = (self._SCALE.y - scale) * (self._WHEIGHT/2)} + self._SCALE.x, self._SCALE.y = scale, scale --apply same scale to X and Y + end + + self._GWIDTH = self._RWIDTH * self._PSCALE - self._OFFSET.x * 2 + self._GHEIGHT = self._RHEIGHT * self._PSCALE - self._OFFSET.y * 2 +end + +function push:apply(operation, shader) + self._drawFunctions[operation](self, shader) +end + +function push:start() + if self._canvas then + love.graphics.push() + love.graphics.setCanvas({ self.canvases[1].canvas, stencil = self.canvases[1].stencil }) + + else + love.graphics.translate(self._OFFSET.x, self._OFFSET.y) + love.graphics.setScissor(self._OFFSET.x, self._OFFSET.y, self._WWIDTH*self._SCALE.x, self._WHEIGHT*self._SCALE.y) + love.graphics.push() + love.graphics.scale(self._SCALE.x, self._SCALE.y) + end +end + +function push:applyShaders(canvas, shaders) + local _shader = love.graphics.getShader() + if #shaders <= 1 then + love.graphics.setShader(shaders[1]) + love.graphics.draw(canvas) + else + local _canvas = love.graphics.getCanvas() + + local _tmp = self:getCanvasTable("_tmp") + if not _tmp then --create temp canvas only if needed + self:addCanvas({ name = "_tmp", private = true, shader = nil }) + _tmp = self:getCanvasTable("_tmp") + end + + love.graphics.push() + love.graphics.origin() + local outputCanvas + for i = 1, #shaders do + local inputCanvas = i % 2 == 1 and canvas or _tmp.canvas + outputCanvas = i % 2 == 0 and canvas or _tmp.canvas + love.graphics.setCanvas(outputCanvas) + love.graphics.clear() + love.graphics.setShader(shaders[i]) + love.graphics.draw(inputCanvas) + love.graphics.setCanvas(inputCanvas) + end + love.graphics.pop() + + love.graphics.setCanvas(_canvas) + love.graphics.draw(outputCanvas) + end + love.graphics.setShader(_shader) +end + +function push:finish(shader) + love.graphics.setBackgroundColor(unpack(self._borderColor)) + if self._canvas then + local _render = self:getCanvasTable("_render") + + love.graphics.pop() + + local white = love11 and 1 or 255 + love.graphics.setColor(white, white, white) + + --draw canvas + love.graphics.setCanvas(_render.canvas) + for i = 1, #self.canvases do --do not draw _render yet + local _table = self.canvases[i] + if not _table.private then + local _canvas = _table.canvas + local _shader = _table.shader + self:applyShaders(_canvas, type(_shader) == "table" and _shader or { _shader }) + end + end + love.graphics.setCanvas() + + --draw render + love.graphics.translate(self._OFFSET.x, self._OFFSET.y) + local shader = shader or _render.shader + love.graphics.push() + love.graphics.scale(self._SCALE.x, self._SCALE.y) + self:applyShaders(_render.canvas, type(shader) == "table" and shader or { shader }) + love.graphics.pop() + + --clear canvas + for i = 1, #self.canvases do + love.graphics.setCanvas(self.canvases[i].canvas) + love.graphics.clear() + end + + love.graphics.setCanvas() + love.graphics.setShader() + else + love.graphics.pop() + love.graphics.setScissor() + end +end + +function push:setBorderColor(color, g, b) + self._borderColor = g and {color, g, b} or color +end + +function push:toGame(x, y) + x, y = x - self._OFFSET.x, y - self._OFFSET.y + local normalX, normalY = x / self._GWIDTH, y / self._GHEIGHT + + x = (x >= 0 and x <= self._WWIDTH * self._SCALE.x) and normalX * self._WWIDTH or nil + y = (y >= 0 and y <= self._WHEIGHT * self._SCALE.y) and normalY * self._WHEIGHT or nil + + return x, y +end + +function push:toReal(x, y) + local realX = self._OFFSET.x + (self._GWIDTH * x)/self._WWIDTH + local realY = self._OFFSET.y + (self._GHEIGHT * y)/self._WHEIGHT + return realX, realY +end + +function push:switchFullscreen(winw, winh) + self._fullscreen = not self._fullscreen + local windowWidth, windowHeight = love.window.getDesktopDimensions() + + if self._fullscreen then --save windowed dimensions for later + self._WINWIDTH, self._WINHEIGHT = self._RWIDTH, self._RHEIGHT + elseif not self._WINWIDTH or not self._WINHEIGHT then + self._WINWIDTH, self._WINHEIGHT = windowWidth * .5, windowHeight * .5 + end + + self._RWIDTH = self._fullscreen and windowWidth or winw or self._WINWIDTH + self._RHEIGHT = self._fullscreen and windowHeight or winh or self._WINHEIGHT + + self:initValues() + + love.window.setFullscreen(self._fullscreen, "desktop") + if not self._fullscreen and (winw or winh) then + windowUpdateMode(self._RWIDTH, self._RHEIGHT) --set window dimensions + end +end + +function push:resize(w, h) + if self._highdpi then w, h = w / self._PSCALE, h / self._PSCALE end + self._RWIDTH = w + self._RHEIGHT = h + self:initValues() +end + +function push:getWidth() return self._WWIDTH end +function push:getHeight() return self._WHEIGHT end +function push:getDimensions() return self._WWIDTH, self._WHEIGHT end + +return push diff --git a/lib/rect.lua b/lib/rect.lua new file mode 100644 index 0000000..74d9da0 --- /dev/null +++ b/lib/rect.lua @@ -0,0 +1,75 @@ +rectgen = {} + +function rectgen:new(x,y,w,h) + + Rect = {x,y,w,h} + + function Rect:move(x,y) + self[1] = self[1] + x + self[2] = self[2] + y + self:reAdapt() + end + + function Rect:move_ip(x,y) + self[1] = x + self[2] = y + self:reAdapt() + end + + function Rect:setSize(w,h) + self[3] = w + self[4] = h + self:reAdapt() + end + + function Rect:move_center(x,y) + self[1] = x-self.w/2 + self[2] = y-self.h/2 + self:reAdapt() + end + + function Rect:reAdapt() + self.x = self[1] + self.y = self[2] + self.w = self[3] + self.h = self[4] + self.center = {self.x+self.w/2,self.y+self.h/2} + self.center.x = self.x+self.w/2 + self.center.y = self.y+self.h/2 + self.up = self.y + self.left = self.x + self.right = self.x+self.w + self.down = self.y+self.h + end + + function Rect:colliderect(orect,xoffset,yoffset,semisolid) -- AABB collision check + local result = true + local offx = xoffset or 0 + local offy = yoffset or 0 + if self.right+offx <= orect.left or self.left+offx>=orect.right then result = false end + if self.down+offy <= orect.up or self.up+offy>=orect.down then result = false end + if semi and result then + if not self.bottom