From 45a5fa6f59c46716cfe2a134104b17ace54c4be9 Mon Sep 17 00:00:00 2001 From: andreas Date: Tue, 4 Nov 2014 12:14:31 +0100 Subject: [PATCH] Anpassung an Grafik --- HeatUp/src/de/heatup/objects/ImageLoader.java | 8 ++++---- HeatUp/src/de/heatup/objects/StaticObject.java | 12 +----------- HeatUp/src/de/heatup/objects/logic.java | 2 +- .../images/little_green_guy_verysmall.png | Bin 0 -> 774 bytes 4 files changed, 6 insertions(+), 16 deletions(-) create mode 100644 HeatUp/src/de/heatup/resources/images/little_green_guy_verysmall.png diff --git a/HeatUp/src/de/heatup/objects/ImageLoader.java b/HeatUp/src/de/heatup/objects/ImageLoader.java index b63576d..730b13d 100644 --- a/HeatUp/src/de/heatup/objects/ImageLoader.java +++ b/HeatUp/src/de/heatup/objects/ImageLoader.java @@ -27,16 +27,16 @@ public class ImageLoader { imageFileName="src/de/heatup/resources/images/25x25_wall_orange_2.png"; break; case 'u': - imageFileName="src/de/heatup/resources/images/little_green_guy_up.png"; + imageFileName="src/de/heatup/resources/images/little_green_guy_verysmall.png"; break; case 'd': - imageFileName="src/de/heatup/resources/images/little_green_guy.png"; + imageFileName="src/de/heatup/resources/images/little_green_guy_verysmall.png"; break; case 'l': - imageFileName="src/de/heatup/resources/images/little_green_guy_left.png"; + imageFileName="src/de/heatup/resources/images/little_green_guy_verysmall.png"; break; case 'r': - imageFileName="src/de/heatup/resources/images/little_green_guy_right.png"; + imageFileName="src/de/heatup/resources/images/little_green_guy_verysmall.png"; break; default: imageFileName="src/de/heatup/resources/images/dummy_image.png"; diff --git a/HeatUp/src/de/heatup/objects/StaticObject.java b/HeatUp/src/de/heatup/objects/StaticObject.java index af63843..496f76c 100644 --- a/HeatUp/src/de/heatup/objects/StaticObject.java +++ b/HeatUp/src/de/heatup/objects/StaticObject.java @@ -90,17 +90,7 @@ public class StaticObject extends JComponent { } -// public void setRescale(double rescaleFactorX, double rescaleFactorY) { -// this.rescaleFactorX = rescaleFactorX; -// this.rescaleFactorY = rescaleFactorY; -// this.doRescale = true; -// } - -// public void unsetRescale() { -// this.rescaleFactorX = 0.0; -// this.rescaleFactorY = 0.0; -// this.doRescale = false; -// } + // TODO: getter für höhe breite position public void setAutoBounds(int x, int y) { this.setBounds(x, y, this.bf1.getWidth(), this.bf1.getHeight()); diff --git a/HeatUp/src/de/heatup/objects/logic.java b/HeatUp/src/de/heatup/objects/logic.java index 66921cf..a9e2a04 100644 --- a/HeatUp/src/de/heatup/objects/logic.java +++ b/HeatUp/src/de/heatup/objects/logic.java @@ -84,7 +84,7 @@ public class logic { //System.out.println("x: " + dynObj.getX() + " y: " + dynObj.getY()); //System.out.println("h: " + dynObj.getHeight() + " w: " + dynObj.getWidth()); try { - Thread.sleep(10); + Thread.sleep(40); } catch (InterruptedException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/HeatUp/src/de/heatup/resources/images/little_green_guy_verysmall.png b/HeatUp/src/de/heatup/resources/images/little_green_guy_verysmall.png new file mode 100644 index 0000000000000000000000000000000000000000..19ad9fec7b059520a398010c860b79a6a1cda669 GIT binary patch literal 774 zcmV+h1Nr=kP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U|c^3pm^H{|x{D02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00M4FL_t(Y$L&-*YgADX{?23X z?%unb?2D|?L^sjGLT!9BR{jK$RH+oKq96z<1S=bhq!LuHv$N4Z5G;cvsS=`%ih;0U z!)_jTANO_68H)}0ShHDngM~OSaG04hAIyB;0RM`yBP;Hoix(*M5M=Il{^qZ$tTB&g zpM!2KL|1^Rv1C4xeiT2Gz8#+&F2zQj%+JnZ{H(QOhP?^v13tRyur{(AMt&qWV~wSz zWzjClY`h~+ib^t*n9lQ@Tf^quVSRYlSu#EoE83He)<|yEf5|1c>PR*N2uDsbV5VCi z-pk^$YZVlh%7CGEzz_;cWn|a3ds;mI8|;$36zyItf=3$Q2V~?7)oUjaH5K5Q;{gc@ zc1O$`O+)Vnz-D7G5XNaiyWtd*e3->LCu>>?CeZstY@u(EFfz0B#TB|5+!8~vq2Ke` zja;?ozg0xDeTy+z+4kj?+&b4RW9rdm<3=#`18+nyp?)2z=&Ac+y*!ZOQ?`B28c*Gn zMLWX;1G6QBBOyl}@Px?IUc`=4d{>bCjnV^aJbfp2!kG}cICw%r3|Vc@#Q}p11!g=U zE#@s(76(#1i*b;rA#!o>tOb@7FpUV%rYFVsL}68K!uT4A3ps!Yy6Pj`Y=8+4o)iO8 zn2`@nAVWV+3IHMingB-aH!;8Ovtks@1{?KdRq_6q*UboeKUk(gDC{|vuL&pLf-)oA z5~sN(pte0gQ=7t`UNoV3Ui-BA4jVB2QFsH!TdAztSBvMta9y{QA65PLFm#GSBPr5v zYA@I3x&idOcp~hWmih)yttv8)5$Go%Tq3X<{@ZcecdvUJ-35D&S^xk507*qoM6N<$ Eg4{w%1ONa4 literal 0 HcmV?d00001