From c1c1eece3904d21749dc50aa546d65fb258a312f Mon Sep 17 00:00:00 2001
From: serxoz <serxoz@xinu.me>
Date: Mon, 30 May 2022 20:34:58 +0200
Subject: [PATCH] =?UTF-8?q?comprobaci=C3=B3n=20simple=20de=20colisi=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entidades/cercado.lua |  16 ++++++++++++++++
 entidades/ovella.lua  |   7 ++++++-
 img/pastor.png        | Bin 920 -> 2146 bytes
 img/pastor2.png       | Bin 0 -> 920 bytes
 lib/helpers.lua       |  10 ++++++++++
 main.lua              |  11 ++++-------
 6 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 entidades/cercado.lua
 create mode 100644 img/pastor2.png
 create mode 100644 lib/helpers.lua

diff --git a/entidades/cercado.lua b/entidades/cercado.lua
new file mode 100644
index 0000000..96f6eb5
--- /dev/null
+++ b/entidades/cercado.lua
@@ -0,0 +1,16 @@
+Cercado = {}
+
+function Cercado:new(x, y)
+    self.sprite = love.graphics.newImage("img/cercado.png")
+    self.width = self.sprite:getWidth()
+    self.height = self.sprite:getHeight()
+    self.x = x-self.width/2
+    self.y = y-self.height/2
+    self.speed = 2
+
+    return self
+end
+
+function Cercado:draw()
+    love.graphics.draw(self.sprite, self.x, self.y)
+end
diff --git a/entidades/ovella.lua b/entidades/ovella.lua
index 27c0e2f..ce0d8b4 100644
--- a/entidades/ovella.lua
+++ b/entidades/ovella.lua
@@ -1,3 +1,5 @@
+require("../lib/helpers")
+
 Ovella = {}
 local OvellaMT = {__index = Ovella}
 
@@ -14,7 +16,7 @@ function Ovella:new(id, x, y)
     return setmetatable(instance, OvellaMT)
 end
 
-function Ovella:update(pastor)
+function Ovella:update(pastor, cercado)
     -- vector 
     local X = pastor.x - self.x;
     local Y = pastor.y - self.y;
@@ -43,6 +45,9 @@ function Ovella:update(pastor)
     if distancia < DISTANCIA then
         -- movemento
         -- FIXME comprobar que non se vai de marxenes e non choca con muros
+        print(Helpers:CheckCollision(self, cercado))
+
+        -- Establece a nova posición
         self.x = self.x - dX;
         self.y = self.y - dY;
     end
diff --git a/img/pastor.png b/img/pastor.png
index c11246aac3935d9c26bf54236fcd21516327e0f9..6bf4d646a6207e2025f69595ba96a8a1e1a8b388 100644
GIT binary patch
delta 2077
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
Hu0mjfsKWqu

delta 842
zcmV-Q1GW6(5SRxciBL{Q4GJ0x0000DNk~Le0000^0000x2nGNE0M$jjZ;>G*f2x9J
z5OD}noh*ooIBFG&P$AR`tvZ;GenFFlB*n#1a4k6au~>C*an{wrRS*O}KpdT%6kVjm
z|0RVMF&-TE<K4Z--8+D*mle(G7zZ@nHdBeXkjbtJ;a7yvhaL=rmlVsG6U8Ka$Jadq
zY`u%IEdO(Vj&3z)DL_CVo>dIfe<t1_p5C+##{0y)Qj}EUbK)_RE=c^yblKxK#s!x-
zmdTsx)I2dyEEL*UZeyirYQ$5-QB~6^pUZfxGTvgWm8(kgp6rE@oW8Qmbecm*U=d3Y
zAwWhIC6r+!MypPWg%s__ef)#2UnG}It`Zb-ET94nlIsWigWug+`N;_{Zz&Q7LNAW<
zF#?2lfkw@7zK<QJaRLONfh)b`uhfB=Ptt2GEqVm>ZUYzBElu77E_Z-|CqptNR|?YP
z@_FF>jJ_!g^xpzqYhG{7eVjf3Y3eF@0~{OzqXo)d_jz|`dvE`qY4-O6Qmk^CjQ5OO
zld%CD9xfvQ04^f|c%?sf00007bV*G`2j&G54l5te-=EEs>j5W!0dPq~K~#9!?VGV`
z!ax9qy^;={N(L8~jt<=%3O<30I7{gh_y&cvf+^%xT-(hj5F7$Nf{ROW>Edt&JJqHo
z=UwhDsR`ddg(Hdh@qgZ3Fs&A`ifH;59Nk<UzK`EFdtrOd-(1igy8sSwfCC)h2;cz6
z0=V299y`aytw^?i+3|cJnR8C@p>e2+s$TU}<$3Y0y-%D<B{v#}s;K&}dYU9oC90w-
zs+Om!i?(qp1&u>hR5i|1?=n}(*`RF?A=wHVhpMRRRY{W+)fQDz_52gmK|LA=I1>2K
zZN2-s&Fg*WWpC&!AGed-@#}|3&^T1Bp{lCKGA4@s{xe>GsNGBY($?fBg2th0gZHW?
zPg7O<yVbbZLic59zXp%`pSk1R;Z%Dqvnr}KKvkC%Rn<k?tg2P$N#g)lb5&htQqwnC
zbf0@Sm)_o*p>e2s#(UMW<Fe4DaeyP<{ZY?uK`FBvjRPFu2;cw*IKTmpkP7kz+68Qw
U;6b~W0000907*qoM6N<$g3lI!`Tzg`

diff --git a/img/pastor2.png b/img/pastor2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c11246aac3935d9c26bf54236fcd21516327e0f9
GIT binary patch
literal 920
zcmV;J184k+P)<h;3K|Lk000e1NJLTq002$^0027(1^@s6)kVB-0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ%gmvf@TnL2vVIah>AFB6^c+H)C#RSn2&xzlZGV4
z#ZhoAIQX$xb#QUk)xlK|1V2C=otzY1q{ROvg%&X$9QWhhy~o`<fUB1k&FUBjG~G5+
ziMWu-t_tB-gwTf`41<>x%a{|zBz(u$JpydKi?J;KbAOI*HD@V6Kp>t~4AUmwAfDc|
z4aWP#yi$}@;&b9LlP*a7$aLA`H^v2*IhM(r>C`+iPb?JLSZ-sbXlle$#8Fk#DWA)D
ztTNtWtd*-u^PcR5k(|D=%ygPVNMI355FtQD6(y8mBSx!EiiH&I$9?>Ru3sdVOs*0X
zax9<%4U+2z`-9)zTKUNdFDViSLNAW<F#?2lfkw@7zK<QJaRLONfh)b`uhfB=Ptt2G
zEqVm>ZUYzBElu77E_Z-|CqptNR|?YP@_FF>jJ_!g^xpzqYhG{7eVjf3Y3eF@0~{Oz
zqXo)d_jz|`dvE`qY4-O6Qmk^CjQ5OO00006VoOIv00000008+zyMF)x010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru<^>WCD<99_pUnUO02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00D4GL_t(|+U=XMYQjJOhP{#wok|85myQnI911>xi#SW^
z6Zi&&w1O$*Rb1Q6ClDM0K7xx&ap~f41v}NICFfo4E~yFMKZPTS`0;<<T`;W{v5IK=
z7aZMO9lnp>HhW=v&fi?n9lHPyaDW3G;0WLV#{#(A93DHz#jQxT+3|cJnR8C@p>e2+
zs$TU}<$3Y0y-%D<B{v#}s;K&}dYU9oC90w-s+Om!i?(qp1&u>hR5i|1?=n}(*`RF?
zA=wHVhpMRRRY{W+)fQDz_52gmK|LA=I1>2KZN2-s&Fg*WWpC&!AGed-@#}|3&^T1B
zp{lCKGA4@s{xe>v-Anq?*5oIG#-VD1_o^mOQ&s!B)wtL~_ho6n29Nrmx#Qj8RC_J6
zDylX>RhJZ1)kWK^s#WMo;{aE4Rb6IM(>GakpL;i#-rky_aj1I6d)2bzve2b*fFs`h
uQO|BcDYF}m103K8-~b0WzyXes3i1Wo1#Fn$LA#d#0000<MNUMnLSTYThLiyS

literal 0
HcmV?d00001

diff --git a/lib/helpers.lua b/lib/helpers.lua
new file mode 100644
index 0000000..f34dad9
--- /dev/null
+++ b/lib/helpers.lua
@@ -0,0 +1,10 @@
+Helpers = {}
+
+function Helpers:CheckCollision(entidade1, entidade2)
+    return entidade1.x < entidade2.x+entidade2.width and
+        entidade2.x < entidade1.x+entidade1.width and
+        entidade1.y < entidade2.y+entidade2.height and
+        entidade2.y < entidade1.y+entidade1.height
+end
+
+return Helpers
diff --git a/main.lua b/main.lua
index ae35f3d..1fbe913 100644
--- a/main.lua
+++ b/main.lua
@@ -1,6 +1,7 @@
 require "socket" -- para o tempo en milisengundos
 require("entidades/pastor")
 require("entidades/ovella")
+require("entidades/cercado")
 inspect = require 'lib.inspect'
 
 -- configuracion
@@ -21,16 +22,14 @@ function love.load()
 
    -- imaxes
     background = love.graphics.newImage("img/fondo.png")
-    cercado = love.graphics.newImage("img/cercado.png")
 
     -- fonte
     local f = love.graphics.newFont(12)
     love.graphics.setFont(f)
 
     -- entidades
+    cercado = Cercado:new(width/2, height/2)
     player = Pastor:new(width/2, height/2)
-
-    -- ovellas con posicios aleatorias
     for i=1,OVELLAS do
         -- print(i)
         math.randomseed(os.time()+i)
@@ -55,9 +54,7 @@ function love.draw()
     end
 
     -- cercado
-    cercadoX = (love.graphics.getWidth() - cercado:getWidth()) / 2
-    cercadoY = (love.graphics.getHeight() - cercado:getHeight()) / 2
-    love.graphics.draw(cercado, cercadoX, cercadoY)
+    cercado:draw()
 
     -- pastor
     player:draw()
@@ -76,7 +73,7 @@ function love.update(dt)
     player:update(dt) 
     -- update ovella object
     for i = 1, #ovellas,1 do --itera sobre cada ovella na tabla
-        ovellas[i]:update(player)
+        ovellas[i]:update(player, cercado)
     end
 
 end