From 2892570539aa902806659871afc9553ca23472b8 Mon Sep 17 00:00:00 2001 From: Solargale Date: Mon, 20 Apr 2020 14:56:39 -0600 Subject: [PATCH] Started to import assets from old project --- Collector.sln.DotSettings.user | 4 + Collector/Collector.csproj | 2 +- Collector/Content/Content.mgcb | 156 ++++++++++++++++++ Collector/Content/air.png | Bin 0 -> 1450 bytes Collector/Content/crosshair.png | Bin 0 -> 1435 bytes Collector/Content/grass.png | Bin 0 -> 2268 bytes Collector/Content/jungleGrass.png | Bin 0 -> 1163 bytes Collector/Content/man.png | Bin 0 -> 1626 bytes Collector/Content/roof.png | Bin 0 -> 2960 bytes Collector/Content/sand.png | Bin 0 -> 2156 bytes Collector/Content/snow.png | Bin 0 -> 2155 bytes Collector/Content/stone.png | Bin 0 -> 2230 bytes Collector/Content/tree.png | Bin 0 -> 2440 bytes Collector/Content/wall.png | Bin 0 -> 1380 bytes Collector/Content/water.png | Bin 0 -> 1139 bytes Collector/Content/wood.png | Bin 0 -> 3006 bytes Collector/Main.cs | 40 ++--- Collector/OLD/Assets/air.png | Bin 0 -> 1450 bytes Collector/OLD/Assets/crosshair.png | Bin 0 -> 1435 bytes Collector/OLD/Assets/grass.png | Bin 0 -> 2268 bytes Collector/OLD/Assets/jungleGrass.png | Bin 0 -> 1163 bytes Collector/OLD/Assets/man.png | Bin 0 -> 1626 bytes Collector/OLD/Assets/roof.png | Bin 0 -> 2960 bytes Collector/OLD/Assets/sand.png | Bin 0 -> 2156 bytes Collector/OLD/Assets/snow.png | Bin 0 -> 2155 bytes Collector/OLD/Assets/stone.png | Bin 0 -> 2230 bytes Collector/OLD/Assets/tree.png | Bin 0 -> 2440 bytes Collector/OLD/Assets/wall.png | Bin 0 -> 1380 bytes Collector/OLD/Assets/water.png | Bin 0 -> 1139 bytes Collector/OLD/Assets/wood.png | Bin 0 -> 3006 bytes Collector/src/Character/InputController.cs | 142 ++++++++++++++++ Collector/src/Character/InputController.java | 113 ------------- .../src/Character/{Mouse.java => Mouse.cs} | 0 Collector/src/Character/Player.cs | 12 +- Collector/src/Dimension/BlockMaterials.cs | 23 ++- Collector/src/Dimension/WorldRenderer.cs | 2 +- 36 files changed, 345 insertions(+), 149 deletions(-) create mode 100644 Collector.sln.DotSettings.user create mode 100644 Collector/Content/air.png create mode 100644 Collector/Content/crosshair.png create mode 100644 Collector/Content/grass.png create mode 100644 Collector/Content/jungleGrass.png create mode 100644 Collector/Content/man.png create mode 100644 Collector/Content/roof.png create mode 100644 Collector/Content/sand.png create mode 100644 Collector/Content/snow.png create mode 100644 Collector/Content/stone.png create mode 100644 Collector/Content/tree.png create mode 100644 Collector/Content/wall.png create mode 100644 Collector/Content/water.png create mode 100644 Collector/Content/wood.png create mode 100644 Collector/OLD/Assets/air.png create mode 100644 Collector/OLD/Assets/crosshair.png create mode 100644 Collector/OLD/Assets/grass.png create mode 100644 Collector/OLD/Assets/jungleGrass.png create mode 100644 Collector/OLD/Assets/man.png create mode 100644 Collector/OLD/Assets/roof.png create mode 100644 Collector/OLD/Assets/sand.png create mode 100644 Collector/OLD/Assets/snow.png create mode 100644 Collector/OLD/Assets/stone.png create mode 100644 Collector/OLD/Assets/tree.png create mode 100644 Collector/OLD/Assets/wall.png create mode 100644 Collector/OLD/Assets/water.png create mode 100644 Collector/OLD/Assets/wood.png create mode 100644 Collector/src/Character/InputController.cs delete mode 100644 Collector/src/Character/InputController.java rename Collector/src/Character/{Mouse.java => Mouse.cs} (100%) diff --git a/Collector.sln.DotSettings.user b/Collector.sln.DotSettings.user new file mode 100644 index 0000000..5af94cd --- /dev/null +++ b/Collector.sln.DotSettings.user @@ -0,0 +1,4 @@ + + True + True + True \ No newline at end of file diff --git a/Collector/Collector.csproj b/Collector/Collector.csproj index a68146c..49d6549 100644 --- a/Collector/Collector.csproj +++ b/Collector/Collector.csproj @@ -2,7 +2,7 @@ WinExe - netcoreapp2.2 + netcoreapp3.1 latest diff --git a/Collector/Content/Content.mgcb b/Collector/Content/Content.mgcb index ddc4c36..62e11c6 100644 --- a/Collector/Content/Content.mgcb +++ b/Collector/Content/Content.mgcb @@ -13,3 +13,159 @@ #---------------------------------- Content ---------------------------------# +#begin air.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:air.png + +#begin crosshair.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:crosshair.png + +#begin grass.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:grass.png + +#begin jungleGrass.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:jungleGrass.png + +#begin man.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man.png + +#begin roof.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:roof.png + +#begin sand.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:sand.png + +#begin snow.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:snow.png + +#begin stone.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:stone.png + +#begin tree.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:tree.png + +#begin wall.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:wall.png + +#begin water.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:water.png + +#begin wood.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:wood.png + diff --git a/Collector/Content/air.png b/Collector/Content/air.png new file mode 100644 index 0000000000000000000000000000000000000000..22d5f8a3ef41351e3b32db68b3f562a379c10793 GIT binary patch literal 1450 zcmV;b1y%ZqP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=HGcH}4whTmDmECES?#Bwl~b7lv#{Q1GyNhO`` zBvTLb5K{&$WJ%})T(1A~_i%sVVlU=GR7*J}k1OPmxu9eIyvnM{hgI(fe{~+@?jB%> z1g)HpmbSb@&d}#AuiH+6JiaoN`yMzR2g)|YwjEp^wZ?BJ{cdx_W*dMUoJ^DbtX}gO;;yoa5D5bmo zrJUkr=ndAz?v>|cx911B+3n&?_JwcWV>BD1pR+3=VajPw>YB>xLGPH^T5ly3^~qro z8alIN6vMWtSWC@Uf1p&##6UABP@_VF`f4jxgc!K9qGhg*WeE*1GFO>!!z?sdB})?n z?208Jkn$Z1Ew_2Ot7N`8-w3KqFgDl6w~PC%;#hlv$lIMO#Km*fAqr2xKO3ll2#uZ8 zxDtGox7XwaHokQ(#ztK1zMmO(Vm-_v~2@O5nM+ELjnRmkwi*}NST!g zi8KHz2%RPH0Rj{wHw4K+BmoZgFnr@3rKQS|PcaTd2~MIUY(E2`0$3qLtRD@AHB_R+ z5MxYHqs1Ick~DW%N}A@WT2wS>)TFBBG;1-jV9}DPnPn@Pv*6T?8T&C?&bbsgEwEhh zc7Z}E2On~TBOd9{!;b8ZQn7q$sIjK1)oQM#ag&C9+)~qKEw|FCV=48}V^3YX_1w$A zQX4YDh$9Vk!$uzErna%ZD_@{Sn;I`tQ&Defkg8rLXdWkVG6OLV1mFs4AcloKnR%lS zc#@mUd}i#5$Otk{IE^MT5Dc9-4!YTGat>L13OA>=xbc4_=O(&Ol6%kXSJc}4Jl93+ z+=er$Ua3i?zM7A%^cRu)KzuYcD*{7gLgbM%ck-nQ-;`FZ~9Dn_Cq^uLvTH2u3k2F;kxt#S}cp*FAiEy^HfK z?{j~S9wl!wz$XyTGTpF!Lh4`F!#GnfjKXP4m`HgeYVL#7|8kzJw zagga5(rZq35PxSJG709`M({V@cDc7bNy zw!e>UyLkcxo`EZ^?XNa~nNQN|Z7p^L^lk$e*KJMS11@)f{wG~BBu5I+^cM=i`x$*x z4(PiDy4T#^TKhPC05a57>IOJC1cr;0z3%buaA$A-o@w>>1EK_Sy6vv;UH||924YJ` zL;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm0^5)lezC#P-z z000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0000jNklG7tlh^`LS{1poj4XJBF&1*2eifC0}7jFe_)0B?*J_4J1DZvX%Q07*qoM6N<$ Eg7vnNE&u=k literal 0 HcmV?d00001 diff --git a/Collector/Content/crosshair.png b/Collector/Content/crosshair.png new file mode 100644 index 0000000000000000000000000000000000000000..5635c25430c9af46a27007242fdb968d604e82c3 GIT binary patch literal 1435 zcmV;M1!Ve(P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=HGcH}4whTmDmECES?#Bwl~b7lv#{Q1GyNhO`` zBvTLb5K{&$Koa`6lByBioH zK`G~_r7iD}Gy3zE*R7{O9$zWSeK#DB4P`50+XgO++mO&{z_+caY(>J`ayY+_Z8>Gr z*HhTz{MhX)40zqlf+(k$NCWb~UNvRZjeStWt;IEv^BfnCOVQ)EySgIs%w0(Q%K7wC z&bQzdUqbO{coR-ymznN-`F3p-ZlC_zG=IQLgL*ZZz!d^ z{H2`YrRWXT#qO2mWVhu9x!G;v4EBX@zGE~Sqo1=YAz{jCPwJY=s-fR8qqRmQB=yN* z5gIBpWhBG4s8~zQSAQT?%EUl9C{Uw9gZe5fRk#?qv!Z0Kj%5iAFfvz}aKlVASS3pn z1N4d|A&~Oz3oWyGnX6>JIo}9fnV<}-=ljWhw&PfPg2>w)EBM88)xir-z&{Ig0}&cK zsBs1ON^hUZRX{MVFdHUV{NYX&N2Hg zA_UR^sK9lWzy}CWjNITP2ayCg*k-VeF-of|M?S?k3?(>;*nA2$Sqfl<5V3wV7}ijU z5<`qJMU577EJ@PbVJT^vr)p8rpiz^mn$xVs#DYajre>C{WX^(9H)ia|Y&qvrV6;GU z!RUexr5t?75srAILk~N$J4(g!siDT2s#dGHmc~sQ_Hj#1o3-3Zr;er6LytXm?bdTI z150hl2qTU()D0VXl$+Yd`YwHe8f|L4NX?FVQ-f6XQbF@LiIW+KaUcL!Py;b6?8(d< zg}{^CWacwtS44)Bal&adiGg6~#BtEgZj*C};#0UewZ)D9D>*mOeUjXJZoi_|=Ji|` zv2z>FpnAdX8#)Rbez-LsOX)8n_d%bpmg4#tf9lgeqs~3WpIec<_v>?hyp--4@tJP8 z@7aG}x@W}aN70X>A4NZk{uhe&G3}mnK7RdP`|z50@^$nLKi-z^8S#00ul>fZ4E)W= z?q9In#7958eQ5vy0fcEoLr_UWLm+T+Z)Rz1WdHyuk$sUpNW(xJ#a~mUDisksh;+!% zI$01Eanvdlp+cw?T6HkF^b49aBq=VAf@{ISkHxBki?gl{u7V)=0pjH7r060g{x2!C zi1pyOAMfrx?%n}Hz05SLYaGyY+e{_mVkWyP243Mu7`+%oRA!bjCrL?k9AEeF@%1jo zvpS#qbM&h@ivd27c$OKaO}s%oy=fbq_lZNSD67Qh#A7C1kob}7ipOu93oZ*hGi0Vy z^TZ)yvCzg!8?&OR5l<0ER86ORA>*;id5g1FuCnGm`3r+NePx;JG{Z<>5lfIDLO~TJ zlwl)At4@lA6z#`5_(xp7L@tF~B`|Uj(dX-`!gI$q6qh7zesv9Ookn1a^T& z&2heu9j9>u_@99*z2&deftgRzYb`Bu1Pp8g7uPLK*#jS%3kmA?weSad^gZEa<4bO1wg zWnpw>WFU8GbZ8()Nlj2!fese{001vZL_t(I%VYfi|NnmmC}3n{WMm)$AnQTpkO=<& p|NozfVHAvl;Q zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bx609f;{bv=k1PHIN90aYJ9nA9Q013ACy|?Z> zv{b~9*U1Up=KSl=%lv_Z90e0%=2TL$I6?`9Dh6!VQRm&+Fz@nWb?}%s`vYOhZ=$DSK7J@Fr+he`AF3!K76WQg40*Q<*e;5yDDoth!+Jl&aw?oZLy&d$ zlJ7GOxXic(pDD%Ua=<;1%{di}nQX|&TaR-gm9Z`!s_6M{RFvQoo!)sn@3g%1>#DfI zyl2Q+?=g;$su+p429Uu8jEm%!>@Sa>d2c@57uX-L?veY+yr69qg+%hfzfem1`NMe^ zRnZI9iQR|g#M|;?zMtE~O18o`uIuW2UFV9fhJ=ul1f`+O5#)}Mt+^`U%r+SmA!9Jk zf|EguhFa>j*#l>D#Sx&qTyWi0ce!&un`>|}&`H3Nh?*fkCmCQAYJk=OXq@h%?2GT7 zQ2-4k0iZo?U)(fXrn%xbvQ}E`vh>nVc5o+?4~G1TGMETJ{XWM`3!7|uK+8Ai2BKa zQA0KQ7-Ebm=E$+cntU1zODU((RcrP+=nN2Ravgg2&6K7^FTniPCt{V&ZSh$o@ zD~wiXu2@|mQ0qa5Kf)1@bmW7NVvgESJ}tD^Qp=57X|+@L9X#%-=gz(Kdb$&(bcQpY z>C7je<*XM|E8>@bL)-~4Xgp?IarDKgcXT-9%yK-ewlPo6rbeAc;CSb6VS(JD(k?mcE z~HDWVqlX}$%D17ZkHmyg}cE_9WfLSQA+e5UMcvhs9GP_q~yQL0} ziQ9_WhfD6&G18{n9g=F)@F^toq7$6n8-^qu-Au~HqDcve{mJPR&Aa4p28CBYx=~aH zkTxHbzWK_n7Oi;pxuuk6jcR|J!5iu1S%cmEp}dN8w~(8Wr}zV0f{_xD0P$}?#kG}F zTB@nN+P&QkAwGB7q8syWb@)O1%3Hd(rOoW56xk)+wYT}bpXf&C-c57=hEO7y+Z`=C zCC!Hay`9{C*_&VHGnP&J81|0y)lPQv*NJ@LM^Q0<1EX`$^{K$3L|nWrS; zby?xO#aXS?SnHnrg`vE*vdndwLr7o|OGrV4j2g+gyEO}w6K+x{4s^ZP_Qx;~+y$C-+x|Yb?dA#Ke+I6!w!hi{W_CX>@2HM@dakSAh-}0003uNklU$5}-}h!VR-N**9i5)_4iYUA7I zG=O(}XN&!|kI+ literal 0 HcmV?d00001 diff --git a/Collector/Content/jungleGrass.png b/Collector/Content/jungleGrass.png new file mode 100644 index 0000000000000000000000000000000000000000..ecff7a219dcc0af21f626653c45e901bcf4bac10 GIT binary patch literal 1163 zcmV;61a$j}P)EX>4Tx04R}tkv&MmKpe$i(`rRp9PA+CkfAzR5f#x*t5Adrp;l+0Yt2!bCVPL58BE>hzEl0u6Z503ls?%w0>9U#<8OtS)`fTmZ> zR3a{BvMXZn6#;Z2jA@L>%ra&rDGAThj* ziotoGIKqmuN_UyKw^epMfjASU6!LlC{fxdT3-sOs-K%bI&3&9c0BPzfc>^3A z0z(DLUh{Z&S9@>&o@w^?1Eh~~yWu%=F8}}l32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rf1O^TO0qk=Zv;Y7A8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b z0(414K~yNu1;NQq69F8+;onSKx&oD=bZDiUMWjU(+%bZp2N$Boc<^MxoA@HWf$`u? zW8xB*h(?2mQKQzdYRh!*(AoZeAKs3SHQ0vVP-9URsKYYUIVIzipaMF_7w zc2;6N{oktV8%9Na>b#?eZMz20VvWC;JgL5KW8l!i=sMQP*r8EIC_w{yjUbz_#$`E4 zTj4D;Qk;}*pAkYQX$?|gR*o#n!nmYp0y?vDgb$?cp$W;P?4gJeM28LLWt#7tkTG;F z%5>gMu!S<}CJRdTVf6)o%Xlo+adv&GcT7n?D!pQ#is_;=o1F~ccW{(jGWTHn87_MV z`^&3!5}<+ysvw|nE;AV-puo%BWm6o5b+8ysCBsUfV%OK|Wy(yBWv40JUw`C@c^%8n zgyV+WJ>W~a2(;iURG~sa(waHICe+|Fx8*!la*j4GDL#;~P51|G zl`UYIt8%(18Metf@d?S$f-+;WpA9m0oPW&Ably!2b@yD5DTd8h&e2$5MvAnd#)M?3 z5a{@Gjz%5YD&M#%=kCfCHu0*8(xdtq!Jtc-OQ~Z|mfjO(SGt8@uHtVT@F%QM`+4`H dZZ~JN;(u=xA?l4CsXPDx002ovPDHLkV1fiJ7IXjr literal 0 HcmV?d00001 diff --git a/Collector/Content/man.png b/Collector/Content/man.png new file mode 100644 index 0000000000000000000000000000000000000000..aa2beb9f6e9c326b2a8d806264060f4ffb224ea3 GIT binary patch literal 1626 zcmdUvYgZFj6ow}ft`!1O5D^GyUA3ZupjNp@!9b-_EEShP1BfCZMpmpK6(#~o#VF8v zsUQR!7GkXgM8H%bRD=XAM4%WEg+MR^Bqow@Ny22N6R=;}U(oYm*531;ea@QwytB`L zwTEnOW^V=nfO$x8;9da0VIe>_F~Xi>4NZChN83x@0n~ImOaOq<$032Fh>RQW-t?TT zTxS{3Gh3rUDcxCbRqf zN7^Z#b_=jp@@wRFgti$t5)XPDhIyjGDdA?|mX1L(6ot)F2WQ(FQV02RH_#aD3#|A& z%!M40i`~Mf_*#uirBdO(#5slUg;s%pILl?A_oy!WW75GwVKxQflUkYEdpeM*lTakz5O(BaU83h%PaK*FG$vYMokJ z8ama^24D?%&Q5(0zDdM$l3n@!JVe8rFSVyW{~%p(^IZMa z!%re2uov6Fes_^~k4yE&HfQYSI;13@KA6Vi-Vbye#OqnfxbS4F0TdtBR6M!yo#dBT)QU`U(a^sC#$QjPZl}uZY2K01PJiEYrVX?V)W%7VybRP@5A45{QV}ypcA@cAZ@BiGXv1i_5i>~EF554 zbsMJ^XS3!r)`A7-32v?&)Of2)CAil~StqiQE4qFaAaC^Z@<*Q{B^Rlj#i-Yu`fxFt z%%`VE5zCn1A#PkiY+S)|BaT!%4#TeV7rqD5V-^&!zc)5L`a`I1E zaw>-AwC@g=t{2I>;#7iQB!`^Ngb(nj{B zRH`T)T}0Wxy?l(b%L|=8hU`JAuAMRS3w~~cv9|+fq^-FxNMhz+;I5O=a4J%zz{#RY z83d2_kT&s$GyWY!Eve{EV-8G{F~LWu`0XE_1&^6hri&3)Oe2WYr$$M4SV~CKlscGw zM!C1}|fhE`fI8`k@j4c6D$YecZfdk^h}B1f0Ohi;-!k l_Z`&aZc^+1zjSiwQ`EhQe=EKInUx+*NYI|ZnjNt@e*+y;VpsqG literal 0 HcmV?d00001 diff --git a/Collector/Content/roof.png b/Collector/Content/roof.png new file mode 100644 index 0000000000000000000000000000000000000000..21534abea4aead6a410e68ee1f69f90702cabe93 GIT binary patch literal 2960 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 literal 0 HcmV?d00001 diff --git a/Collector/Content/water.png b/Collector/Content/water.png new file mode 100644 index 0000000000000000000000000000000000000000..8a0445194d021426c51e1d30892dfcc308ca5b37 GIT binary patch literal 1139 zcmV-(1dRKMP)EX>4Tx04R}tkv&MmKpe$i)0V1K9PA+K5TQC*5EXIMDionYs1;guFuC+YXws0h zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi%KKJM7R&y2ud?N7-Gt3I{I`PzI z#o)Y89AQOSB|aw}HR*!Hk6c$=e&bwlSm2ovGo6|vju4B5Hdfl06-|wJk~perI^_!) zmsQSNoV8MwHSft^7|!X-OI)Wphy)g}2niw-RIz~)Du~gllVTx7`*9C{zvGw4rI2d_ zj2!bQLxb%2!T;cQw^n{)+)WC{f#8d6e+&bmU7%63?eAmTZkz!AXW&Y2`O9@+`jhlp zON$->J=?&=bxTwBfXf}A@5zu&*^&G-g?t`(KcjET0=>6D*Q(oFb04P_CX>@2HM@dakSAh-}0006?NklN);;0$$Dj4A3zWiB+j233;mYypfL7)Hm?jWG zVnjlqs6vd$Sr_^kp;iWW0J{AnZ_CW&4rY9mLTnmBj5yFsq|F&ZKw=17#}QJZ)Jh*C zlNp3S3<0QoYg_(5jR^BRLn(+&6Vf!`&Q2oNQeeD+Dh?2Ye};jVuA>tHV6Xx?uaRh5 zd|AK@r$PuE_K$Fn5MzX#`D?f`-y?oa6RikcN(g2gwp(8Idv2-#e45erd!AFmmSyEO z=a@66+(1gqwKA!ap4*o9Qg~k$2mw@i-ac^F1vlfc+2FM@#mJ9&Ua>{)@dEN?&LJgU zw%ZjqCC<9=y=l=>cvt1-j@An9;Evxn?xaQnU+(<8-4KzLqBABs0D-AiyjCvL#33d6+@S6(=DhShY_{;QLl9Z}u9X1PTA>td zp7}A)JhUw_1g>se&1gjURHaV|+>w3GXepc?cH|JijNkiybt9}imr?+5RbIy%mr}Tn zBj39Y`BVie=kdm!p1-FFH{;Ya zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bvvg9fb{bv=u1SByohcV*qpqJkV5Zt`=s@~Xk zq>VAwbdDs_jQ{>N&3|yP*kGKGDdZ3=4wqf#fiZoA{LH#Ii5z^O=x}vxV+IjB?Dl|90`x}vqe3OFND1SCut ztTW?GNQ(w8b=z#k*(ehO%1Mqo6`C~my-|aSjt58FnVVtRlL=sCZnD62>!isMFn38H zKm#QNv;1tKtu}9UjgsxgcEVC72m?$0`Dy;@!nt#T$fg%7*u{%=u)-4HUpFiRA~ZFq zeh2uTKOPHL0fK&qIl;kVt2rX7r!R8J23oMt<9?EuVpjnO5mb8^LjnYBAn_DnQDlxp z2xJ041*Wq&u0Vji=ME#;i3EUy9ENUu6KOAH&u1FNP@EAjK_ak0A_6SuJopn`0*8th z@4WZHN1uH5B}iBq7D5cGs+K6xMIS?qF`1ZSNs?UhDWsTE%Bf_|f~xB?@-e5Jb16_- zAi3b{f(4~iu2Nm~HPl#B&8C(H`ZU*k3oW+Pax0y?bmValJ@(XdFM|fCG~Dnbj5yNB zqfAh3%5>AuFr%4i=2;$U3hVFAzkwPlYP^wJ3*$o#voT%~w91KJm;o_%1i&Lu17aZd z!ptUeju&zZGn*M%;TcBy1x}}h7!Y)W*iU-cDRKr;{J-F4V%oUzzeUb0=>8&dzsK!o zsP)yJ+eYl9;R>o1WFOv-R5+E@Ex+G~zL{jrjER4->~G!8lB-iQv}xU+efD9+hY`b+ zGYrC|lk?;OY4U628VdJ*yOMoPfN$&O;dVFzoG*Jxb*r!e#`S;>sq3kokslpU#uqUN>%b%IqJY8brah@rAp5B zk!LDJ!wncJIQX_x1U@CDWrZ3wR#HDeo^>$TE#r6~kJGTyw4~^|_s3r4ZOZ zm^9U4K>3NG=F3ug&{B=}o8(VDK}^#vX3AC@VwR(a!!SWz!OH3Rl8&e?YPr}ZeW z%_KkOD}30DY7N82@@Bu5fxwV?#IgACazf5){2ifrJv+f(#YS2Vst`_UdZs+my!q1O zHI0VWJFqDz0SqJfs{b0i7UY|rH?io18r@C_vjV8_FrYBBI+x7G~Dy5gxj$&Eoo=} zs&rke4LIOXH{9jUP|3~p%cGU_Cp6I^3H@P5F-Qthn)0RTjUlFQ8$bdd3s!})<2Jo^ za==$IKsaiY)5^fpyt1^;7g_AP<83DXgrR0T5ax?5lLp&{n`hv?a?p|7jC+>Kqk!C^ zfBUNWY^+Mz(Xe;yN`NVs=-4s58bMV>>b4>{6Pkvr5=z-s0flKpLr_UW zLm+T+Z)Rz1WdHyuk$sUpNW)MRg-_E;MOqx}P{biab+RBTqMKHs2o*xD(5i#UOaGur zL(<~nD7Y3J{8_9zxH#+T;3^1$KOjzyPKqv4;(bY>MT{37@8i6C4)5Iu2+a!9tiTwc z=`}N*Oo-Xssu+Al0ActL#f;1>V@{G%@T{+U>ZH1h^DOVaKP#-}Ee7~R;#p>xHR288 zsm+?fd7n7KO0r6PPCRPT1&JTIuDJZhx#+OKGb3guJx?4V7K>f1bTKQL8u27?Ox1MC z7qTv^oVPe@l{#zRlfN*O*H@OgPHPBBEMf@~L@21Ej0$Rq)2@?ZAx-BA5C5R!m&m1% zs|-et1yrFycKqOf@O!paVPf1(3MGJ^7u)_A275YySI|BN*fs5;ortATiJ3#cwkWJZ<{IrBZ0eC;7Z^{7!w?N;TJGb^ZP9J~_%_?;R z92^28Mao|Hcz192-2Uxp&+i9e7;>N?xOV3N000JJOGiWi{{a60|De66lK=n!32;bR za{vG?BLDy{BLR4&KXw2B00(qQO+^Rf1PuWmETOQpA^-pY8FWQhbVF}#ZDnqB07G(R zVRU6=Aa`kWXdp*PO;A^X4i^9b0^dnQK~y-)eUnL#RAm@O&v)msDeJaX-KEvgfIZM1 zfr!B&Va>*cdsqGd_PBE84-yz?uF|=Cy3A9cWK3x zm*0Mu&2wkTrQ&gK$RwR|!gm08Hc9avi$*kuscZbQ^^kk_@3P<_G(c+vCTpvw$fcq; zoPdD!<~)sRK%*M4-khgYlHPDaE)}aQ%S0pxabBXeV&vxKE2w0|&FwvW$L8d#6*|M1 zTRTVG+Bu>-N;z471>do`xxI&$$Gmyv>e4V5rBU|;OU(xNcb^c=d4#UXU>vjibB`lA?_^~e1Y z>0rbgjfn0jMVXeZEVwW-x>9JB}IvZNY% z>~{uOh7Le3OPWzgE)`i;P_G62wSPo62i>)dPlM4RD;pb3vV#6Np^%Ex^$JnwQw=@l zLx=7#p+8QrOdZ$M`2L%(xjk?&CWR7@TElYb_kGq+)kuqyN9~xrkfgZ;z%g~6#ThF# z4_yeh9`3Q*hN(bkt`0}a7eD>*EmF5JOqcV^3;2#nqZ-nvhWL)j`Q-%++aoJ=zWee= zx?UhcT_LWX@sO&-QwfU><)ybSk&iooK>cHrHnRyUh`4k24uAF$BJ?l>h!0kL(p;es zY#Ip&O3j)LrJC8MX*0>y6p9k@YvJPwiEZlq4Pg{CzY1Eyxc~qF07*qoM6N<$f_iVO AQ~&?~ literal 0 HcmV?d00001 diff --git a/Collector/Main.cs b/Collector/Main.cs index 6669b6e..58938b2 100644 --- a/Collector/Main.cs +++ b/Collector/Main.cs @@ -1,4 +1,5 @@ -using Microsoft.Xna.Framework; +using Collector.Dimension; +using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; @@ -6,48 +7,47 @@ namespace Collector { public class Main : Game { - GraphicsDeviceManager graphics; - SpriteBatch spriteBatch; - + private GraphicsDeviceManager _graphics; + private SpriteBatch _spriteBatch; + private InputController _inputController; + public Main() { - graphics = new GraphicsDeviceManager(this); + _graphics = new GraphicsDeviceManager(this); Content.RootDirectory = "Content"; IsMouseVisible = true; } protected override void Initialize() - { - // TODO: Add your initialization logic here + {// TODO: Add your initialization logic here + base.Initialize(); } protected override void LoadContent() - { - spriteBatch = new SpriteBatch(GraphicsDevice); - - // TODO: use this.Content to load your game content here + {// TODO: use this.Content to load your game content here + _spriteBatch = new SpriteBatch(GraphicsDevice); + BlockMaterials.LoadContent(Content); } - + protected override void Update(GameTime gameTime) - { - if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed || - Keyboard.GetState().IsKeyDown(Keys.Escape)) - Exit(); - - // TODO: Add your update logic here - + {// TODO: Add your update logic here/* + _inputController.PlayerInput(); base.Update(gameTime); } + + protected override void Draw(GameTime gameTime) { GraphicsDevice.Clear(Color.CornflowerBlue); // TODO: Add your drawing code here - base.Draw(gameTime); + _spriteBatch.Begin(); + BlockMaterials.Draw("grass",_spriteBatch,0,0); + _spriteBatch.End(); } } } \ No newline at end of file diff --git a/Collector/OLD/Assets/air.png b/Collector/OLD/Assets/air.png new file mode 100644 index 0000000000000000000000000000000000000000..22d5f8a3ef41351e3b32db68b3f562a379c10793 GIT binary patch literal 1450 zcmV;b1y%ZqP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=HGcH}4whTmDmECES?#Bwl~b7lv#{Q1GyNhO`` zBvTLb5K{&$WJ%})T(1A~_i%sVVlU=GR7*J}k1OPmxu9eIyvnM{hgI(fe{~+@?jB%> z1g)HpmbSb@&d}#AuiH+6JiaoN`yMzR2g)|YwjEp^wZ?BJ{cdx_W*dMUoJ^DbtX}gO;;yoa5D5bmo zrJUkr=ndAz?v>|cx911B+3n&?_JwcWV>BD1pR+3=VajPw>YB>xLGPH^T5ly3^~qro z8alIN6vMWtSWC@Uf1p&##6UABP@_VF`f4jxgc!K9qGhg*WeE*1GFO>!!z?sdB})?n z?208Jkn$Z1Ew_2Ot7N`8-w3KqFgDl6w~PC%;#hlv$lIMO#Km*fAqr2xKO3ll2#uZ8 zxDtGox7XwaHokQ(#ztK1zMmO(Vm-_v~2@O5nM+ELjnRmkwi*}NST!g zi8KHz2%RPH0Rj{wHw4K+BmoZgFnr@3rKQS|PcaTd2~MIUY(E2`0$3qLtRD@AHB_R+ z5MxYHqs1Ick~DW%N}A@WT2wS>)TFBBG;1-jV9}DPnPn@Pv*6T?8T&C?&bbsgEwEhh zc7Z}E2On~TBOd9{!;b8ZQn7q$sIjK1)oQM#ag&C9+)~qKEw|FCV=48}V^3YX_1w$A zQX4YDh$9Vk!$uzErna%ZD_@{Sn;I`tQ&Defkg8rLXdWkVG6OLV1mFs4AcloKnR%lS zc#@mUd}i#5$Otk{IE^MT5Dc9-4!YTGat>L13OA>=xbc4_=O(&Ol6%kXSJc}4Jl93+ z+=er$Ua3i?zM7A%^cRu)KzuYcD*{7gLgbM%ck-nQ-;`FZ~9Dn_Cq^uLvTH2u3k2F;kxt#S}cp*FAiEy^HfK z?{j~S9wl!wz$XyTGTpF!Lh4`F!#GnfjKXP4m`HgeYVL#7|8kzJw zagga5(rZq35PxSJG709`M({V@cDc7bNy zw!e>UyLkcxo`EZ^?XNa~nNQN|Z7p^L^lk$e*KJMS11@)f{wG~BBu5I+^cM=i`x$*x z4(PiDy4T#^TKhPC05a57>IOJC1cr;0z3%buaA$A-o@w>>1EK_Sy6vv;UH||924YJ` zL;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm0^5)lezC#P-z z000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0000jNklG7tlh^`LS{1poj4XJBF&1*2eifC0}7jFe_)0B?*J_4J1DZvX%Q07*qoM6N<$ Eg7vnNE&u=k literal 0 HcmV?d00001 diff --git a/Collector/OLD/Assets/crosshair.png b/Collector/OLD/Assets/crosshair.png new file mode 100644 index 0000000000000000000000000000000000000000..5635c25430c9af46a27007242fdb968d604e82c3 GIT binary patch literal 1435 zcmV;M1!Ve(P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=HGcH}4whTmDmECES?#Bwl~b7lv#{Q1GyNhO`` zBvTLb5K{&$Koa`6lByBioH zK`G~_r7iD}Gy3zE*R7{O9$zWSeK#DB4P`50+XgO++mO&{z_+caY(>J`ayY+_Z8>Gr z*HhTz{MhX)40zqlf+(k$NCWb~UNvRZjeStWt;IEv^BfnCOVQ)EySgIs%w0(Q%K7wC z&bQzdUqbO{coR-ymznN-`F3p-ZlC_zG=IQLgL*ZZz!d^ z{H2`YrRWXT#qO2mWVhu9x!G;v4EBX@zGE~Sqo1=YAz{jCPwJY=s-fR8qqRmQB=yN* z5gIBpWhBG4s8~zQSAQT?%EUl9C{Uw9gZe5fRk#?qv!Z0Kj%5iAFfvz}aKlVASS3pn z1N4d|A&~Oz3oWyGnX6>JIo}9fnV<}-=ljWhw&PfPg2>w)EBM88)xir-z&{Ig0}&cK zsBs1ON^hUZRX{MVFdHUV{NYX&N2Hg zA_UR^sK9lWzy}CWjNITP2ayCg*k-VeF-of|M?S?k3?(>;*nA2$Sqfl<5V3wV7}ijU z5<`qJMU577EJ@PbVJT^vr)p8rpiz^mn$xVs#DYajre>C{WX^(9H)ia|Y&qvrV6;GU z!RUexr5t?75srAILk~N$J4(g!siDT2s#dGHmc~sQ_Hj#1o3-3Zr;er6LytXm?bdTI z150hl2qTU()D0VXl$+Yd`YwHe8f|L4NX?FVQ-f6XQbF@LiIW+KaUcL!Py;b6?8(d< zg}{^CWacwtS44)Bal&adiGg6~#BtEgZj*C};#0UewZ)D9D>*mOeUjXJZoi_|=Ji|` zv2z>FpnAdX8#)Rbez-LsOX)8n_d%bpmg4#tf9lgeqs~3WpIec<_v>?hyp--4@tJP8 z@7aG}x@W}aN70X>A4NZk{uhe&G3}mnK7RdP`|z50@^$nLKi-z^8S#00ul>fZ4E)W= z?q9In#7958eQ5vy0fcEoLr_UWLm+T+Z)Rz1WdHyuk$sUpNW(xJ#a~mUDisksh;+!% zI$01Eanvdlp+cw?T6HkF^b49aBq=VAf@{ISkHxBki?gl{u7V)=0pjH7r060g{x2!C zi1pyOAMfrx?%n}Hz05SLYaGyY+e{_mVkWyP243Mu7`+%oRA!bjCrL?k9AEeF@%1jo zvpS#qbM&h@ivd27c$OKaO}s%oy=fbq_lZNSD67Qh#A7C1kob}7ipOu93oZ*hGi0Vy z^TZ)yvCzg!8?&OR5l<0ER86ORA>*;id5g1FuCnGm`3r+NePx;JG{Z<>5lfIDLO~TJ zlwl)At4@lA6z#`5_(xp7L@tF~B`|Uj(dX-`!gI$q6qh7zesv9Ookn1a^T& z&2heu9j9>u_@99*z2&deftgRzYb`Bu1Pp8g7uPLK*#jS%3kmA?weSad^gZEa<4bO1wg zWnpw>WFU8GbZ8()Nlj2!fese{001vZL_t(I%VYfi|NnmmC}3n{WMm)$AnQTpkO=<& p|NozfVHAvl;Q zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bx609f;{bv=k1PHIN90aYJ9nA9Q013ACy|?Z> zv{b~9*U1Up=KSl=%lv_Z90e0%=2TL$I6?`9Dh6!VQRm&+Fz@nWb?}%s`vYOhZ=$DSK7J@Fr+he`AF3!K76WQg40*Q<*e;5yDDoth!+Jl&aw?oZLy&d$ zlJ7GOxXic(pDD%Ua=<;1%{di}nQX|&TaR-gm9Z`!s_6M{RFvQoo!)sn@3g%1>#DfI zyl2Q+?=g;$su+p429Uu8jEm%!>@Sa>d2c@57uX-L?veY+yr69qg+%hfzfem1`NMe^ zRnZI9iQR|g#M|;?zMtE~O18o`uIuW2UFV9fhJ=ul1f`+O5#)}Mt+^`U%r+SmA!9Jk zf|EguhFa>j*#l>D#Sx&qTyWi0ce!&un`>|}&`H3Nh?*fkCmCQAYJk=OXq@h%?2GT7 zQ2-4k0iZo?U)(fXrn%xbvQ}E`vh>nVc5o+?4~G1TGMETJ{XWM`3!7|uK+8Ai2BKa zQA0KQ7-Ebm=E$+cntU1zODU((RcrP+=nN2Ravgg2&6K7^FTniPCt{V&ZSh$o@ zD~wiXu2@|mQ0qa5Kf)1@bmW7NVvgESJ}tD^Qp=57X|+@L9X#%-=gz(Kdb$&(bcQpY z>C7je<*XM|E8>@bL)-~4Xgp?IarDKgcXT-9%yK-ewlPo6rbeAc;CSb6VS(JD(k?mcE z~HDWVqlX}$%D17ZkHmyg}cE_9WfLSQA+e5UMcvhs9GP_q~yQL0} ziQ9_WhfD6&G18{n9g=F)@F^toq7$6n8-^qu-Au~HqDcve{mJPR&Aa4p28CBYx=~aH zkTxHbzWK_n7Oi;pxuuk6jcR|J!5iu1S%cmEp}dN8w~(8Wr}zV0f{_xD0P$}?#kG}F zTB@nN+P&QkAwGB7q8syWb@)O1%3Hd(rOoW56xk)+wYT}bpXf&C-c57=hEO7y+Z`=C zCC!Hay`9{C*_&VHGnP&J81|0y)lPQv*NJ@LM^Q0<1EX`$^{K$3L|nWrS; zby?xO#aXS?SnHnrg`vE*vdndwLr7o|OGrV4j2g+gyEO}w6K+x{4s^ZP_Qx;~+y$C-+x|Yb?dA#Ke+I6!w!hi{W_CX>@2HM@dakSAh-}0003uNklU$5}-}h!VR-N**9i5)_4iYUA7I zG=O(}XN&!|kI+ literal 0 HcmV?d00001 diff --git a/Collector/OLD/Assets/jungleGrass.png b/Collector/OLD/Assets/jungleGrass.png new file mode 100644 index 0000000000000000000000000000000000000000..ecff7a219dcc0af21f626653c45e901bcf4bac10 GIT binary patch literal 1163 zcmV;61a$j}P)EX>4Tx04R}tkv&MmKpe$i(`rRp9PA+CkfAzR5f#x*t5Adrp;l+0Yt2!bCVPL58BE>hzEl0u6Z503ls?%w0>9U#<8OtS)`fTmZ> zR3a{BvMXZn6#;Z2jA@L>%ra&rDGAThj* ziotoGIKqmuN_UyKw^epMfjASU6!LlC{fxdT3-sOs-K%bI&3&9c0BPzfc>^3A z0z(DLUh{Z&S9@>&o@w^?1Eh~~yWu%=F8}}l32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rf1O^TO0qk=Zv;Y7A8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b z0(414K~yNu1;NQq69F8+;onSKx&oD=bZDiUMWjU(+%bZp2N$Boc<^MxoA@HWf$`u? zW8xB*h(?2mQKQzdYRh!*(AoZeAKs3SHQ0vVP-9URsKYYUIVIzipaMF_7w zc2;6N{oktV8%9Na>b#?eZMz20VvWC;JgL5KW8l!i=sMQP*r8EIC_w{yjUbz_#$`E4 zTj4D;Qk;}*pAkYQX$?|gR*o#n!nmYp0y?vDgb$?cp$W;P?4gJeM28LLWt#7tkTG;F z%5>gMu!S<}CJRdTVf6)o%Xlo+adv&GcT7n?D!pQ#is_;=o1F~ccW{(jGWTHn87_MV z`^&3!5}<+ysvw|nE;AV-puo%BWm6o5b+8ysCBsUfV%OK|Wy(yBWv40JUw`C@c^%8n zgyV+WJ>W~a2(;iURG~sa(waHICe+|Fx8*!la*j4GDL#;~P51|G zl`UYIt8%(18Metf@d?S$f-+;WpA9m0oPW&Ably!2b@yD5DTd8h&e2$5MvAnd#)M?3 z5a{@Gjz%5YD&M#%=kCfCHu0*8(xdtq!Jtc-OQ~Z|mfjO(SGt8@uHtVT@F%QM`+4`H dZZ~JN;(u=xA?l4CsXPDx002ovPDHLkV1fiJ7IXjr literal 0 HcmV?d00001 diff --git a/Collector/OLD/Assets/man.png b/Collector/OLD/Assets/man.png new file mode 100644 index 0000000000000000000000000000000000000000..aa2beb9f6e9c326b2a8d806264060f4ffb224ea3 GIT binary patch literal 1626 zcmdUvYgZFj6ow}ft`!1O5D^GyUA3ZupjNp@!9b-_EEShP1BfCZMpmpK6(#~o#VF8v zsUQR!7GkXgM8H%bRD=XAM4%WEg+MR^Bqow@Ny22N6R=;}U(oYm*531;ea@QwytB`L zwTEnOW^V=nfO$x8;9da0VIe>_F~Xi>4NZChN83x@0n~ImOaOq<$032Fh>RQW-t?TT zTxS{3Gh3rUDcxCbRqf zN7^Z#b_=jp@@wRFgti$t5)XPDhIyjGDdA?|mX1L(6ot)F2WQ(FQV02RH_#aD3#|A& z%!M40i`~Mf_*#uirBdO(#5slUg;s%pILl?A_oy!WW75GwVKxQflUkYEdpeM*lTakz5O(BaU83h%PaK*FG$vYMokJ z8ama^24D?%&Q5(0zDdM$l3n@!JVe8rFSVyW{~%p(^IZMa z!%re2uov6Fes_^~k4yE&HfQYSI;13@KA6Vi-Vbye#OqnfxbS4F0TdtBR6M!yo#dBT)QU`U(a^sC#$QjPZl}uZY2K01PJiEYrVX?V)W%7VybRP@5A45{QV}ypcA@cAZ@BiGXv1i_5i>~EF554 zbsMJ^XS3!r)`A7-32v?&)Of2)CAil~StqiQE4qFaAaC^Z@<*Q{B^Rlj#i-Yu`fxFt z%%`VE5zCn1A#PkiY+S)|BaT!%4#TeV7rqD5V-^&!zc)5L`a`I1E zaw>-AwC@g=t{2I>;#7iQB!`^Ngb(nj{B zRH`T)T}0Wxy?l(b%L|=8hU`JAuAMRS3w~~cv9|+fq^-FxNMhz+;I5O=a4J%zz{#RY z83d2_kT&s$GyWY!Eve{EV-8G{F~LWu`0XE_1&^6hri&3)Oe2WYr$$M4SV~CKlscGw zM!C1}|fhE`fI8`k@j4c6D$YecZfdk^h}B1f0Ohi;-!k l_Z`&aZc^+1zjSiwQ`EhQe=EKInUx+*NYI|ZnjNt@e*+y;VpsqG literal 0 HcmV?d00001 diff --git a/Collector/OLD/Assets/roof.png b/Collector/OLD/Assets/roof.png new file mode 100644 index 0000000000000000000000000000000000000000..21534abea4aead6a410e68ee1f69f90702cabe93 GIT binary patch literal 2960 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 literal 0 HcmV?d00001 diff --git a/Collector/OLD/Assets/water.png b/Collector/OLD/Assets/water.png new file mode 100644 index 0000000000000000000000000000000000000000..8a0445194d021426c51e1d30892dfcc308ca5b37 GIT binary patch literal 1139 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 AQ~&?~ literal 0 HcmV?d00001 diff --git a/Collector/src/Character/InputController.cs b/Collector/src/Character/InputController.cs new file mode 100644 index 0000000..1c45df1 --- /dev/null +++ b/Collector/src/Character/InputController.cs @@ -0,0 +1,142 @@ +using System.Collections.Generic; +using Collector; +using Collector.Dimension; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Input; + +public class InputController : IRestrictions { + + private Player player; + private Mouse mouse; + //private Dictionary> animations; + int i = 0; + + public InputController(Player player, Mouse mouse) + { + this.player = player; + this.mouse = mouse; + } + + public InputController() { + + /* + animations = new HashMap<>(); + animations.put("Up", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "Up"))); + animations.put("UpRight", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "UpRight"))); + animations.put("UpLeft", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "UpLeft"))); + animations.put("Down", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "Down"))); + animations.put("DownRight", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "DownRight"))); + animations.put("DownLeft", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "DownLeft"))); + animations.put("Left", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "Left"))); + animations.put("Right", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "Right"))); + */ + } + + private void PlayerInput() + { + if (Keyboard.GetState().IsKeyDown(Keys.Escape)) + { + Exit(); + } + else if(Keyboard.GetState().IsKeyDown(Keys.W)) + { + + } + else if(Keyboard.GetState().IsKeyDown(Keys.A)) + { + + } + else if(Keyboard.GetState().IsKeyDown(Keys.S)) + { + + } + else if(Keyboard.GetState().IsKeyDown(Keys.D)) + { + + } + } + + /* + +public void handleInput() { + i++; + if (Gdx.input.isKeyPressed(Input.Keys.Q)) { + Main.cam.zoom += 5; + } + if (Gdx.input.isKeyPressed(Input.Keys.E)) { + Main.cam.zoom -= 5; + } + if ((Gdx.input.isButtonJustPressed(Input.Buttons.LEFT) || Gdx.input.isButtonJustPressed(Input.Buttons.RIGHT) )&& i > KEY_DELAY) { + Vector3 mousePos = new Vector3(Gdx.input.getX(), Gdx.input.getY(), 0); + Main.cam.unproject(mousePos); + int x = mouse.getSelectedX(mousePos) >> TILE_SHIFT; + int y = mouse.getSelectedY(mousePos) >> TILE_SHIFT; + if(Gdx.input.isButtonJustPressed(Input.Buttons.LEFT)) { + i = 0; + Chunks.placeBlock(x, y, "wood"); + } + if (Gdx.input.isButtonJustPressed(Input.Buttons.RIGHT)) { + i = 0; + Chunks.removeBlock(x,y); + } + } + + if (Gdx.input.isKeyPressed(Input.Keys.W) && Gdx.input.isKeyPressed(Input.Keys.A) && i > KEY_DELAY) { + i = 0; + player.setAnimation(animations.get("UpLeft")); + Player.addX(-MOVEMENT_SPEED); + Player.addY(MOVEMENT_SPEED); + Main.cam.translate(-MOVEMENT_SPEED, MOVEMENT_SPEED); + } + else if (Gdx.input.isKeyPressed(Input.Keys.W) && Gdx.input.isKeyPressed(Input.Keys.D) && i > KEY_DELAY) { + i = 0; + player.setAnimation(animations.get("UpRight")); + Player.addX(MOVEMENT_SPEED); + Player.addY(MOVEMENT_SPEED); + Main.cam.translate(MOVEMENT_SPEED, MOVEMENT_SPEED); + } + else if (Gdx.input.isKeyPressed(Input.Keys.S) && Gdx.input.isKeyPressed(Input.Keys.A) && i > KEY_DELAY) { + i = 0; + player.setAnimation(animations.get("DownLeft")); + Player.addX(-MOVEMENT_SPEED); + Player.addY(-MOVEMENT_SPEED); + Main.cam.translate(-MOVEMENT_SPEED, -MOVEMENT_SPEED); + } + else if (Gdx.input.isKeyPressed(Input.Keys.S) && Gdx.input.isKeyPressed(Input.Keys.D) && i > KEY_DELAY) { + i = 0; + player.setAnimation(animations.get("DownRight")); + Player.addX(MOVEMENT_SPEED); + Player.addY(-MOVEMENT_SPEED); + + Main.cam.translate(MOVEMENT_SPEED, -MOVEMENT_SPEED); + } + else if (Gdx.input.isKeyPressed(Input.Keys.A) && i > KEY_DELAY) { + i = 0; + player.setAnimation(animations.get("Left")); + Player.addX(-MOVEMENT_SPEED); + Main.cam.translate(-MOVEMENT_SPEED, 0); + } + else if (Gdx.input.isKeyPressed(Input.Keys.D) && i > KEY_DELAY) { + i = 0; + player.setAnimation(animations.get("Right")); + Player.addX(MOVEMENT_SPEED); + Main.cam.translate(MOVEMENT_SPEED, 0); + } + else if (Gdx.input.isKeyPressed(Input.Keys.S) && i > KEY_DELAY) { + i = 0; + player.setAnimation(animations.get("Down")); + Player.addY(-MOVEMENT_SPEED); + Main.cam.translate(0, -MOVEMENT_SPEED); + } + if (Gdx.input.isKeyPressed(Input.Keys.W) && i > KEY_DELAY) { + i = 0; + player.setAnimation(animations.get("Up")); + Player.addY(MOVEMENT_SPEED); + Main.cam.translate(0, MOVEMENT_SPEED); + } + Main.cam.update(); + + } + */ + +} diff --git a/Collector/src/Character/InputController.java b/Collector/src/Character/InputController.java deleted file mode 100644 index 7e5d613..0000000 --- a/Collector/src/Character/InputController.java +++ /dev/null @@ -1,113 +0,0 @@ -package Collector.Character; - -import Collector.Main; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.Input; -import com.badlogic.gdx.graphics.g2d.Animation; -import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import com.badlogic.gdx.math.Vector3; -import Collector.Dimension.Chunks; -import Collector.Restrictions; - -import java.util.HashMap; - -public class InputController implements Restrictions { - - private Player player; - private HashMap> animations; - private Mouse mouse; - int i = 0; - - public InputController(Player player, Mouse mouse) { - this.player = player; - this.mouse = mouse; - animations = new HashMap<>(); - animations.put("Up", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "Up"))); - animations.put("UpRight", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "UpRight"))); - animations.put("UpLeft", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "UpLeft"))); - animations.put("Down", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "Down"))); - animations.put("DownRight", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "DownRight"))); - animations.put("DownLeft", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "DownLeft"))); - animations.put("Left", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "Left"))); - animations.put("Right", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "Right"))); - } - - public void handleInput() { - i++; - if (Gdx.input.isKeyPressed(Input.Keys.Q)) { - Main.cam.zoom += 5; - } - if (Gdx.input.isKeyPressed(Input.Keys.E)) { - Main.cam.zoom -= 5; - } - if ((Gdx.input.isButtonJustPressed(Input.Buttons.LEFT) || Gdx.input.isButtonJustPressed(Input.Buttons.RIGHT) )&& i > KEY_DELAY) { - Vector3 mousePos = new Vector3(Gdx.input.getX(), Gdx.input.getY(), 0); - Main.cam.unproject(mousePos); - int x = mouse.getSelectedX(mousePos) >> TILE_SHIFT; - int y = mouse.getSelectedY(mousePos) >> TILE_SHIFT; - if(Gdx.input.isButtonJustPressed(Input.Buttons.LEFT)) { - i = 0; - Chunks.placeBlock(x, y, "wood"); - } - if (Gdx.input.isButtonJustPressed(Input.Buttons.RIGHT)) { - i = 0; - Chunks.removeBlock(x,y); - } - } - - if (Gdx.input.isKeyPressed(Input.Keys.W) && Gdx.input.isKeyPressed(Input.Keys.A) && i > KEY_DELAY) { - i = 0; - player.setAnimation(animations.get("UpLeft")); - Player.addX(-MOVEMENT_SPEED); - Player.addY(MOVEMENT_SPEED); - Main.cam.translate(-MOVEMENT_SPEED, MOVEMENT_SPEED); - } - else if (Gdx.input.isKeyPressed(Input.Keys.W) && Gdx.input.isKeyPressed(Input.Keys.D) && i > KEY_DELAY) { - i = 0; - player.setAnimation(animations.get("UpRight")); - Player.addX(MOVEMENT_SPEED); - Player.addY(MOVEMENT_SPEED); - Main.cam.translate(MOVEMENT_SPEED, MOVEMENT_SPEED); - } - else if (Gdx.input.isKeyPressed(Input.Keys.S) && Gdx.input.isKeyPressed(Input.Keys.A) && i > KEY_DELAY) { - i = 0; - player.setAnimation(animations.get("DownLeft")); - Player.addX(-MOVEMENT_SPEED); - Player.addY(-MOVEMENT_SPEED); - Main.cam.translate(-MOVEMENT_SPEED, -MOVEMENT_SPEED); - } - else if (Gdx.input.isKeyPressed(Input.Keys.S) && Gdx.input.isKeyPressed(Input.Keys.D) && i > KEY_DELAY) { - i = 0; - player.setAnimation(animations.get("DownRight")); - Player.addX(MOVEMENT_SPEED); - Player.addY(-MOVEMENT_SPEED); - - Main.cam.translate(MOVEMENT_SPEED, -MOVEMENT_SPEED); - } - else if (Gdx.input.isKeyPressed(Input.Keys.A) && i > KEY_DELAY) { - i = 0; - player.setAnimation(animations.get("Left")); - Player.addX(-MOVEMENT_SPEED); - Main.cam.translate(-MOVEMENT_SPEED, 0); - } - else if (Gdx.input.isKeyPressed(Input.Keys.D) && i > KEY_DELAY) { - i = 0; - player.setAnimation(animations.get("Right")); - Player.addX(MOVEMENT_SPEED); - Main.cam.translate(MOVEMENT_SPEED, 0); - } - else if (Gdx.input.isKeyPressed(Input.Keys.S) && i > KEY_DELAY) { - i = 0; - player.setAnimation(animations.get("Down")); - Player.addY(-MOVEMENT_SPEED); - Main.cam.translate(0, -MOVEMENT_SPEED); - } - if (Gdx.input.isKeyPressed(Input.Keys.W) && i > KEY_DELAY) { - i = 0; - player.setAnimation(animations.get("Up")); - Player.addY(MOVEMENT_SPEED); - Main.cam.translate(0, MOVEMENT_SPEED); - } - Main.cam.update(); - } -} diff --git a/Collector/src/Character/Mouse.java b/Collector/src/Character/Mouse.cs similarity index 100% rename from Collector/src/Character/Mouse.java rename to Collector/src/Character/Mouse.cs diff --git a/Collector/src/Character/Player.cs b/Collector/src/Character/Player.cs index e8daa86..eb04caa 100644 --- a/Collector/src/Character/Player.cs +++ b/Collector/src/Character/Player.cs @@ -3,15 +3,13 @@ using Collector; public class Player : IRestrictions { private static int X; private static int Y; - //private string SpriteName; - //private TextureAtlas textureAtlas; - //private Animation animation; + private string SpriteName; private Inventory playerInventory; public Player(int x, int y) { //Player location - Player.X = x< Materials = new Dictionary(); - //public static Dictionary Textures = new Dictionary<>(); + public static Dictionary Textures = new Dictionary(); //Private so the singleton can't be instantiated - private BlockMaterials() {} + internal BlockMaterials() {} - public static void create(){ + public static void LoadContent(ContentManager content){ Materials.Add("grass",new Block("grass")); Materials.Add("wood",new Block("wood")); Materials.Add("water",new Block("water")); @@ -18,11 +22,16 @@ namespace Collector.Dimension Materials.Add("air",new Block("air")); Materials.Add("roof",new Block("roof")); Materials.Add("wall",new Block("wall")); - /* - for (String s:BlockMaterials.Materials.keySet()) { - Textures.Add(s,new Texture("assets/" + s + ".png")); + + foreach (var name in Materials.Keys) + { + Textures.Add(name,content.Load(name)); + } } - */ + + public static void Draw(string name,SpriteBatch _spriteBatch,int x, int y) + { + _spriteBatch.Draw(Textures[name],new Vector2(x, y),Color.Aqua); } } } diff --git a/Collector/src/Dimension/WorldRenderer.cs b/Collector/src/Dimension/WorldRenderer.cs index b0b191d..2690a5a 100644 --- a/Collector/src/Dimension/WorldRenderer.cs +++ b/Collector/src/Dimension/WorldRenderer.cs @@ -5,7 +5,7 @@ namespace Collector.Dimension public class WorldRenderer : IRestrictions { //private Mouse mouse; //private InputController inputController; - private Player _player; + //private Player _player; /* public WorldRenderer(InputController inputController, Mouse mouse, Player player) {