From 1da6cd5ea918bc35e78cb24e3287384279142cb7 Mon Sep 17 00:00:00 2001 From: Sebastian Cabrera Date: Thu, 29 Aug 2019 02:55:00 -0400 Subject: [PATCH] image drawing done.......... for now --- pixels/.classpath | 1 + .../bronze/pixels/engine/GameContainer.class | Bin 2983 -> 2984 bytes .../bz/bronze/pixels/engine/Renderer.class | Bin 1500 -> 1690 bytes .../bin/bz/bronze/pixels/engine/Window.class | Bin 2181 -> 2189 bytes .../bz/bronze/pixels/engine/gfx/Image.class | Bin 0 -> 1556 bytes .../bz/bronze/pixels/game/GameManager.class | Bin 1232 -> 1400 bytes pixels/bin/test.png | Bin 0 -> 1161 bytes pixels/res/test.png | Bin 0 -> 1161 bytes .../bronze/pixels/engine/GameContainer.java | 4 ++-- .../src/bz/bronze/pixels/engine/Renderer.java | 4 +++- .../src/bz/bronze/pixels/engine/Window.java | 2 +- .../bz/bronze/pixels/game/GameManager.java | 11 ++++++----- 12 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 pixels/bin/bz/bronze/pixels/engine/gfx/Image.class create mode 100644 pixels/bin/test.png create mode 100644 pixels/res/test.png diff --git a/pixels/.classpath b/pixels/.classpath index dfa42f8..a8fcd25 100644 --- a/pixels/.classpath +++ b/pixels/.classpath @@ -2,5 +2,6 @@ + diff --git a/pixels/bin/bz/bronze/pixels/engine/GameContainer.class b/pixels/bin/bz/bronze/pixels/engine/GameContainer.class index ea03637d7c30b4381775badabdac5f2df9e59c7c..1a733a753334049fbe1857bf6e98e9b43a87ba2a 100644 GIT binary patch delta 25 hcmZ23zCwHhGaDOga!zVu(Pj>|#Vm~elh<(l1^{F$2t@z@ delta 24 gcmZ1>zFd3*GaD;QNosM)W=^)nER24W*K+*^09_mh{Qv*} diff --git a/pixels/bin/bz/bronze/pixels/engine/Renderer.class b/pixels/bin/bz/bronze/pixels/engine/Renderer.class index 0497ca37c9986487ecc804e5b0b49cddb4fa5a7a..b7e4630b945c9dc7e068d19676412808c196b377 100644 GIT binary patch delta 540 zcmYLEyG{a85IvWB7Xq$E4V!?l7$pIOh#D1R@UgyGL_zV{VF752v9YitCRWDA*lD9S z)cRmw(uvgST4=-DbUI7Z2LTkHS==q2mNAc7d9dbGI}<490O`!NGM372S=kj+9y zg&@ZyB?7hpXkZTWbLZDgwF(eUxiO-xU<_Vm;YV`p$-WZ=(AEKAhSNz6;v zcP%Q)FXCWuV`Oj*%_~YR&d(`JO;JeB&n?KzNi50C&r>KU%1_Ek&9zeC;shI`kery8 zmtUfgl&Sz%Uy`qos8CW_kjlly;LPB`!@$Mh$;cq8;RCct0BTckNl|8Ay0vE58|e z1A`n8$^)Syg9(tQ1yRXh%3ucM0rfE0F|aW(f?4)J788gyc^#{)rwLFu$W*S~49<~4 nuG<;h_XBxMV3Q#_l))zQfOT_0O=M#50;}?7@B`8;Ksg@(3gAj6 diff --git a/pixels/bin/bz/bronze/pixels/engine/Window.class b/pixels/bin/bz/bronze/pixels/engine/Window.class index eb8b60f13b824589f196ece0387f021123eb25c7..86bfce7262bce049e02ae62f4f478fb3ee9b5a90 100644 GIT binary patch delta 137 zcmXAhy$XVG97T^pISbJup=L!HsSrrHxwiEPO*XYPvEhc#oh>;#3Ie`_ Yv_!e|{U0MYfVk6`nk^_nlWME*JnLlq_ z8=owSebrR)Dz!@OQt~dM;!xKSOM-Vz^(^&m3~UYUjO>jaO`Jk|Hj|mVNaYq*0oVLP Rt;0)Lr*7^lL64BDoQFc3{O zAuqj(Tg*?#)&+v|rA--zfs+=(=n*iYvGp)cq0dA_pr;9%FF4hzg?0vJNhh6Mfmpj3ept6;CyV8p=etgaaT;e$oMB!nz@F`@%9N9`$&7__7-Dkd-4wXp z;B6s^`P9x^&xhM{wXH2#k(-)?F@|x`#06%ni%{sy;$BXcJ-1Y}a7k6$Q>GHk%E`T6 zt2j9-aT!-kj0&9Bpkv4_jNz(4CuMl$ZhBOlvL(A95Vg>OkfMoO7*|eRbXt*ae%n*` z6BbPW-nMWZH`pSj6;1ND!4=!kTsJLrqDyhzws1$K+p$%sRT-@(#gSO8?Pg_V z&B+#|KqOVlIfZqn;;Mb)Fz9W&Re{mee}`(CVwW9NNaXK1VO-rGfeZhZoP)dgS%TIRG<*4deu|6`2(nPeJDQ{Sxk<~dE2lF(HByJ%96E_cd>hAth^4SgDZsi$(u zRjP#bC`_tWVub1&d}#&(szv+?s8(o8nQ2XWgmHrZ7I)ux7NlK_e?+%PN5ps?y`M0c zeuvK0i8{{56LpLn;hM6sBP8Mp!-yYpe~5(8Uv*3#VT#wc4oDh8FZwu?1|K^RXDBdG z5Z(Hwmv62g5uCvQM{^KSK9MIliv>P~d)i+ogZp^E9n-=z9%|MZJi=oZ(@(A$Vhqgk zeh`5l3}>(?6LThqh;}$g!~(81O0;POeLGaz@A(nXsfG06unuea4vnyaVcUTdt>BTi z;3X`RPKo<_rN9v7(G)KmR*-yk&7soa*=J(t~W$2Ua$xh3qQo5jlZVtxUOlp&33DVw^ETN zlK22Vl<}KwONn+9(`2?YbIx};-}SXfo(NR(=p&C9~t zre%-2+!me+g<!wxad7OTXFld%9YJRfn+Bya? zD*2Zg#?0(T{)t;9?%LLY?>VlWiXUoV7&oAzpJ6CVh40tPdEve0`4Uwg%~lG$bjUqN z?pue7|G}ws?dorBWmolTk^2-%F}Gw}k)qGQw&=nWZc%s)OJ=A%uL1~Z*{pNkKri|< zEaJL~C1U>9APg+Sl*4eVb;>;(nk^#%DGdqSP_e==9Tq+S8n}rhwNb9rYvL{Sl#ycJ zGH@Grs9Rh3Z-P-~WWaj{Ry*jNM6MZl&_?d)c!YHoq}ND~K&e8glr;%S}ojdZvz~cdNym{FoO6oLbXeA3`j#gQeO$Eyk)=J_8V_y+F!NLjRa&ro+w^VE& z-EAJ-r=wFm>?G6!`V^8>m#ns#)H+XU;VGU`G7TGe-b%XLQeyH9i@7tfTm$I_HoqZ8 g*-o+DiQd#>hLo7a1Qp%UV-mY~DSJnj)(H0g0Ck8!YybcN literal 1232 zcma)5>rN9v6#hkUzhD3V~%VvIE;sDGyIWLa%@H@jOE-o(cc z4J4BI06vuQ%(jt6+UTE|Gc(`$zH^(OzrOzfu!6@LVub1Pfm!xl=RlgC{YlmW(-L)Q zKH+6sIKq;?hB#sF3`{zf?MQRI9E858gvx;svnqszVmGh?ZMaS-*wZf%lB>33hiinM zTz-cT-*Br^M-Tc8Xy_#j78&@wQ7=pXl_=L(AYF7TqP8P^Tb)~%@o>)$2(xE(|IS5e zHoU3`nJS*!%ih7|J3!J0pdRfbrK{niz*^g2LvZf=CD;gI0wS%95tGGtcJVjM=m_65| zZ>ooUZ5344VpW!=O+tSu6qWbe!fUl9=}V_7eJ*IOYjIvi5FQ4_M2wyJHDr=Y z5-h=F;_HzYW!Sudn=PefzEnzd8fKE8fblji`ol$>+wI788FyL~PowOCu@j8!o`80b nv2u*NUy0004nX+uL$Nkc;* zaB^>EX>4Tx04R}tkv&MmKpe$iQ?*4Z4t5Yx$WWbHkSgM+RVYG*P%E_RU~=h)(4-+r zad8w}3l4rPRvlcNb#-tR1i=pw7gr}m7b)?7Nufoo2gm(*ckglc4iM^PrdeI%fTr7K zI++l&xfL<+iXcYNgDB!Mvy53uN}=QUx`&UicQKyT`P`qQPt98l@QK7T%rI@@b>gW_ z+u*!U9A+h1B|ayPnsh*nMuzPhl#~v8!K(hN~T6UNgPo%o$`gO z$13M7&RV(3n)l={4CVFZC9cyPMiL8Hgai=^s@OmoHe$5uq*zGPexiea$n{I)QpmLd zMvi$@ph0&1;D7MDTdOb;_mV;hp!>yfK1PASF3_ks&iAq7G)@5jGjOH1{FOQ|{YiSQ zrA3Z_{%zpmx}_<5z~v4w_+-eY>`H!`LZJY>pV2qvfPq_}ch&2yxsTHaAVXcHZh(VB zV5~^lYaQMlZ13&gGtK^f0KMCC#X?wU+W-In32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Re2ptA4Eb~{NrlZe>@ZXkKU z45a&d=sP_bXoFw%l^ee4sKD*?G{Y;87(b0G@Chul>~ef0KjUJQa{OWxR&*kQ^kjAK^ld* z%2d*`3C%|7EaM8UT9?zAj}}j8&aM`pDvGCwf$RjRq4pkZ7}bjZPW{8r1Llr4YymiL z8qM{BZk>sZBDu*SU+g#loM|nJ1y$U+YyCgCtU`)v08|`yH&}cvX b+#CG_g@@U5zG!d600000NkvXXu0mjfdgun6 literal 0 HcmV?d00001 diff --git a/pixels/res/test.png b/pixels/res/test.png new file mode 100644 index 0000000000000000000000000000000000000000..e053c5bba19933acaefe341a959f98a61f228810 GIT binary patch literal 1161 zcmV;41a|w0P)0004nX+uL$Nkc;* zaB^>EX>4Tx04R}tkv&MmKpe$iQ?*4Z4t5Yx$WWbHkSgM+RVYG*P%E_RU~=h)(4-+r zad8w}3l4rPRvlcNb#-tR1i=pw7gr}m7b)?7Nufoo2gm(*ckglc4iM^PrdeI%fTr7K zI++l&xfL<+iXcYNgDB!Mvy53uN}=QUx`&UicQKyT`P`qQPt98l@QK7T%rI@@b>gW_ z+u*!U9A+h1B|ayPnsh*nMuzPhl#~v8!K(hN~T6UNgPo%o$`gO z$13M7&RV(3n)l={4CVFZC9cyPMiL8Hgai=^s@OmoHe$5uq*zGPexiea$n{I)QpmLd zMvi$@ph0&1;D7MDTdOb;_mV;hp!>yfK1PASF3_ks&iAq7G)@5jGjOH1{FOQ|{YiSQ zrA3Z_{%zpmx}_<5z~v4w_+-eY>`H!`LZJY>pV2qvfPq_}ch&2yxsTHaAVXcHZh(VB zV5~^lYaQMlZ13&gGtK^f0KMCC#X?wU+W-In32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Re2ptA4Eb~{NrlZe>@ZXkKU z45a&d=sP_bXoFw%l^ee4sKD*?G{Y;87(b0G@Chul>~ef0KjUJQa{OWxR&*kQ^kjAK^ld* z%2d*`3C%|7EaM8UT9?zAj}}j8&aM`pDvGCwf$RjRq4pkZ7}bjZPW{8r1Llr4YymiL z8qM{BZk>sZBDu*SU+g#loM|nJ1y$U+YyCgCtU`)v08|`yH&}cvX b+#CG_g@@U5zG!d600000NkvXXu0mjfdgun6 literal 0 HcmV?d00001 diff --git a/pixels/src/bz/bronze/pixels/engine/GameContainer.java b/pixels/src/bz/bronze/pixels/engine/GameContainer.java index b98fb3c..803cdb8 100644 --- a/pixels/src/bz/bronze/pixels/engine/GameContainer.java +++ b/pixels/src/bz/bronze/pixels/engine/GameContainer.java @@ -75,8 +75,8 @@ public class GameContainer implements Runnable { } if (render) { - renderer.test(); - //renderer.clear(); + //renderer.test(); + renderer.clear(); game.render(renderer); Window.update(); diff --git a/pixels/src/bz/bronze/pixels/engine/Renderer.java b/pixels/src/bz/bronze/pixels/engine/Renderer.java index f4a47b8..acbfa5b 100644 --- a/pixels/src/bz/bronze/pixels/engine/Renderer.java +++ b/pixels/src/bz/bronze/pixels/engine/Renderer.java @@ -30,12 +30,14 @@ public class Renderer { if ((x < 0 || x >= pW || y < 0 || y >= pH) || value == 0xffff00ff) { return; } + + p[x + y * pW] = value; } public void drawImage(Image image, int offX, int offY) { for (int y = 0; y < image.getH(); y++) { for (int x = 0; x < image.getW(); x++) { - + setPixel(x + offX, y + offY, image.getP()[x + y * image.getW()]); } } } diff --git a/pixels/src/bz/bronze/pixels/engine/Window.java b/pixels/src/bz/bronze/pixels/engine/Window.java index d60086d..2d19e40 100644 --- a/pixels/src/bz/bronze/pixels/engine/Window.java +++ b/pixels/src/bz/bronze/pixels/engine/Window.java @@ -28,7 +28,7 @@ public class Window { } public void create() { - window.setSize(width, height); + window.setSize(width * scale, height * scale); window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); window.setLayout(new BorderLayout()); window.add(viewport, BorderLayout.CENTER); diff --git a/pixels/src/bz/bronze/pixels/game/GameManager.java b/pixels/src/bz/bronze/pixels/game/GameManager.java index d69aec3..60b6c41 100644 --- a/pixels/src/bz/bronze/pixels/game/GameManager.java +++ b/pixels/src/bz/bronze/pixels/game/GameManager.java @@ -5,24 +5,25 @@ import java.awt.event.KeyEvent; import bz.bronze.pixels.engine.AbstractGame; import bz.bronze.pixels.engine.GameContainer; import bz.bronze.pixels.engine.Renderer; +import bz.bronze.pixels.engine.gfx.Image; public class GameManager extends AbstractGame { static GameContainer gc; + + private Image image; public GameManager() { - + image = new Image("/test.png"); } @Override public void update(float dt) { - if (gc.input.isKey(KeyEvent.VK_SPACE)) { - System.out.println("pop goes the weasel"); - } + } @Override public void render(Renderer r) { - + r.drawImage(image, gc.input.mouseX - image.getW() / 2, gc.input.mouseY - image.getH() / 2); } public static void main(String[] args) {