From 5eeccfa5d6a74c8804dcae4e6d7c4e7858aae821 Mon Sep 17 00:00:00 2001
From: BuildTools <haydenv06@gmail.com>
Date: Mon, 27 May 2019 19:52:41 +1000
Subject: [PATCH] cleaned up a bit remind me to clean up camera

---
 .../renderers/ParticleRenderer.java           |  11 +++++++----
 .../renderers/ParticleRenderer.class          | Bin 4604 -> 5997 bytes
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.java
index 6012cef..af92c80 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.java
@@ -37,9 +37,7 @@ public class ParticleRenderer {
 		Matrix4f viewMatrix = Maths.createViewMatrix(camera);
 		prepare();
 		for(ParticleTexture texture : particles.keySet()) {
-			GL13.glActiveTexture(GL13.GL_TEXTURE0);
-			GL11.glBindTexture(GL11.GL_TEXTURE_2D, texture.getTextureID());
-			shader.loadNumberOfRows(texture.getNumberOfRows());
+			bindTexture(texture);
 			for(Particle particle : particles.get(texture)) {
 				updateModelViewMatrix(particle.getPosition(), particle.getRotation(), particle.getScale().x, viewMatrix);
 			}
@@ -53,6 +51,12 @@ public class ParticleRenderer {
 		shader.cleanUp();
 	}
 	
+	private void bindTexture(ParticleTexture texture) {
+		GL13.glActiveTexture(GL13.GL_TEXTURE0);
+		GL11.glBindTexture(GL11.GL_TEXTURE_2D, texture.getTextureID());
+		shader.loadNumberOfRows(texture.getNumberOfRows());
+	}
+	
 	private void updateModelViewMatrix(Vector3f position, float rotation, float scale, Matrix4f viewMatrix) {
 		Matrix4f modelMatrix = new Matrix4f();
 		Matrix4f.translate(position, modelMatrix, modelMatrix);
@@ -68,7 +72,6 @@ public class ParticleRenderer {
 		Matrix4f.rotate((float)Math.toRadians(rotation), new Vector3f(0,0,1), modelMatrix, modelMatrix);
 		Matrix4f.scale(new Vector3f(scale,scale,scale), modelMatrix, modelMatrix);
 		Matrix4f modelViewMatrix = Matrix4f.mul(viewMatrix, modelMatrix, null);
-		shader.loadModelViewMatrix(modelViewMatrix);
 	}
 	
 	private void prepare(){
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class
index d00a04639abfeb3344f34ddf693f00576c27de6a..a36334819e3267096c164a8417d3b4f852e2cb78 100644
GIT binary patch
delta 2099
zcmaJ?2~<>782;{TZ<x6#V*w2!We5$R4u~fecLRbXR8(-wdccTd!wk+0qDj$WR;Fpb
zG?f;~%ofX31_mk9w9OV<ZPQZAHnY<9vgp6>4Z`VkIvno(@4wyqeeaul&nBN57<1t7
zUAqAc#$OV240+0FUEcPo!%c}6Fihc?ic$t^x!YSg#kDY4>vu5>cPKV%rjlte^R!Yc
z#$X!9bj(l|Nm+enG4z-xFOZ$JLAS?Q<PHR_n27=jS2H*jW^h_8m<^eu92Kk06GzO3
zi(?L|Xpbsau*4UXgKnRfLGMV*7nyF3d8lA8Q*?5L>~TfG1FwW?hGEKlmZpp}$Ha5^
zP{Y6$(mz!(_&EXyDu>ODNeejYKmlp494ICPYU>#y={k<ZJJ&?*V}?5zhElU6Wq>h3
zFX2w5iT71jvc$erR^f5U-l;VfT!gzgmV@hoC3`Hm8;XS0iZeP+%F5=r2WymFraq>7
zIo4sla>NvGYQ+5#?h_eGjAUqd01q-mS9!*Dr_$&sEKDo4U=o@*9>RKto&>bGwz}Nq
zpD?GyR~HZ)Kg_Wik1)h|d~#*?AcMh?FY1>eUJQ?MJdP(AqJn<e8}P_M`dX(QMQ)$7
zN{O>35GE@TW~0w{A=!N*b5iHJA&PoD$?=q6Q(v8#Db`POY}eLV>Ut+fb0nT6;w>Dl
z+Io;0Z{ye%i4PL-XE>gX)T{Z=aqNlYtLx`E_C?~=YQYN}FGdmuS@1FrNO+}FRUX+}
z<-Af3&gFO&uL+>O61mb%U<DPqX}K1X#~U2y;~;~{k)I!7=Pi!6@eaBCLSe+p8ApBu
z_5U)GDp-Aw<B(w07!U#!o)0)a#7BaoT94?}N#MWcbHw%_0oV8fZcW?6yYHM$A@xwI
z?5)+lN|%QK`rV}2p6aU9?W)r}797K85{{ETN5_3G)FOTsrLwP(aDRcXBz!64mYki*
z@io>k*fhD7y8J=c!m)n8yvTx+I3?j*%1h9HN1`o?P8#2cA2?2n0&|ro&nuS;l#Te2
z<0m0nD|PX>yp{R2-U{LWh2vL|998AXbqBQUllYzE59$|+b}{p&-aS}DIgBvV)l%O-
zj7y8tTQMS|4Wk*_kjIc?+=4Q@u?^!H$zf8CA>D3h#pDdTp$%m^a?NbRRg@-eL8@Jf
zq|MGTrQ1y{xJC?>Vwl^EYX`JqzDTKM*wArE^i-{e&9vpB?Q{SGdeN8;3ympss8mGZ
z60#h~KpKiDQbBVy`RXtbi{Zq1lsO6}8tcj9q*++?xSp;JVcmcR=%`a2ZbTOJ)T;nD
z;bz*Y2=TZDOQ_a;E2Z*CK|Pj|bsKq#Vd#JzCJ9W!7zwvaq$i2$&_M??cXvyeBm!#i
z;to3We-u&I<w{e`1#v3`Qk{y_LNky}g@cuYF|iGFg;QEI`DRf>#1eb03}clo`dCH_
z)`qbmy&1`5Zd}@eO<jF@5guR&;T(#d7>3@+QJIO;dYoe>QN_;4OP8*;6B|toNL1a_
zj)rB^Td^g_m|-{CjbS`WpWSX~#?}zFYSy+8c4$^8gs^7q2w|IMwTIBIS-V5nt6AX?
zLYlQVgx#98KZO1LR)q1=s&;s$TdlkmuT#VrZor#m!j+Pe(&@sxWp;zz$ijF($J7OQ
z6u|^W64RrI$k9low=ET8k%@5x{W9dzUorA94f*tbT~1d`0e$L1ti=`Bi18{p1sd#g
z<TPQ($2d%^5EnRt8kM^yx=?CJH^L_rWS}kA;S;iq)QI6zvP?>{ExF`q7$@{$d}Fg7
z5952AUT4$O@=Vv66I7WN)2<U>!$ic=ThbdP=!ePbc{By4M9!nbVr88zvHuCR-_O+Q
hx2{%kv^z*E63SpDkT!bNW9eN#YKxWrq=*h@{{d06){6iD

delta 1378
zcmZuxTTmNi6#o7s<WDvWvb2PzwVjOE8lVzU>;s)*rvl1wDKwBuz0f6DlC8@wZZ<%@
zVHK<OLM!XFwOU23^;WTzORFtfFEhT_C*Sqa8E5p}5zj6R@ZiIq|Lp&t^PTTI|JnVs
z`k(URpZ~pd1wbu+;_xsu+JAc*r@D9g3%$VDf`D%9=SbR;6y`N|h`0|u_Oa0B^7}<R
zfCm}GjAC^uBUav2nj09rv5IB^y^uK$Iyq`hjfg&^7z#7m9#u~-$1)Venwu+<0y?3H
z=y#xQAgK2IK%Zjn?cZk%=LAHN6`|q~L$PMa>9vOpzF1R5GKAgGL<~T;|MJ&t9%Lvw
zBoE2)yrpXKRyAjZVBlVk97Eh@zPKR3L|()YhV5bA5ioIB#G`o3{)LA(nRr6PlNe?Q
z5S2tq)|4Qg!qXf_CIa=P&tQy!jnLC1fZ?c!=kUCp2%OsTf`}LK5(Cf5xpr!X+lK>A
z(71@>7sTK-#!lPUg<b4jyC~E$`o4%W5IH^|(Joz0)-&-&(=^NgK4P%CbyLY1+K`ft
zri_6>Rg*2%(4&K<(WfZ`bx|SMl~tkxij_6eQKvO+Mq1I5sxsUrTc$b^TUu)SE23&H
zn%C1xzp4{hzhOqL?A=P#Iy|UEJ7m*RQ<{><%4x-<)=c7K5$kb|p)}UIN-RN;dS<6{
zTc6@{j?WnCXiTc?KZ>RB7tYl={YuJ4bAx~{@fF7u-Tg-I1)7y=DeS+9S&kWJ9PERV
z&pSuk8EH#PFD{9=j2<UlYt&_u=8VoaBCa?C6QY696g}OP*Hg~^f{1UO;9y2;P;*Ps
z7jaF*_k?#{QW&4yQNn^pP=Ejpv~AzDZo{Y^DVRqK!vZ?%d?krFbV-H3MSL?jFo%aK
zr%~?s>7z5qR7HIAc-TXc#ylP&h5RhGMfh^IS?8~e_-9}_X2da%Ph<4fSv>269Ah}S
z_^VUO^~Nh_@$wXL@QtE`mfInc-Acr^A&6VZi=h$~xRdN2R3U}!G=o(bqqA|`h6&VQ
z9c9$RPu4~?;<P&63A{o><#-eHcnEPEuTr#^FnjSDUWbp+%J2r>q};cV0hL}#IDwPo
zoucG+_!bd?pM!Di=6IXq9dNV)i`a$0+HH<b=fFL@X_3hPPZFV?u}`nxF#4V&+2bk}
zXa(ux*x@Q!A`w_t;&DD4N-Lz8TH;<nt8f{UJtZH`;_THG6u(RTo;3)<3PQar%t1&|
zEmz{XaM8X`=5U?{Y+4HaK8Jb9>yf<l`t>Tajc!j{TuBnzP)hCCguS>K9c$`rU8!^2
p4wl`x{k)5Jm7u;`g$ldG69m<T5d9}5BnfW6-C0)3e{e<o_#ZvaE(ibs