From c4cc0517f6775db1080274c158f9fab1d4c61570 Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 17 Apr 2014 12:22:29 +0200 Subject: [PATCH] gameover working again --- libs/gesture-v2.0.0.jar | Bin 0 -> 5697 bytes libs/sdk-v1.0.0.jar | Bin 0 -> 2008 bytes src/mangavalk/tetris/CanvasView.java | 5 ++ src/mangavalk/tetris/GameMenu.java | 6 +++ src/mangavalk/tetris/GamePlay.java | 38 ++++++++++++++- src/mangavalk/tetris/GameStateInterface.java | 2 + src/mangavalk/tetris/MainActivity.java | 46 ++++++++++++++++++- 7 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 libs/gesture-v2.0.0.jar create mode 100644 libs/sdk-v1.0.0.jar diff --git a/libs/gesture-v2.0.0.jar b/libs/gesture-v2.0.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..552f72d0b861fdbb3d8f70799fd9a77d62de4d39 GIT binary patch literal 5697 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 TVEovRdGmzdP^LVRA7B3h!i1{I literal 0 HcmV?d00001 diff --git a/libs/sdk-v1.0.0.jar b/libs/sdk-v1.0.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..070d65de6350d30ee3afd5653f06532e09aa412e GIT binary patch literal 2008 zcmWIWW@Zs#;Nak35L=<@%zy+$7+4s5T|*poJ^kGDeI5Ng-CTo1^nBg^onm14?0e?4 zkGHPgMP6@Rt#fD2Zw@lJV*KFgqo+&^0p9E!o9da~Ndt|N1mXa=1)r9oTA&M*P0r8N zFHX!YF3n5VPs~dx%Fj&EFHXtU4+aupsd*{+Ma~(i$=Q0zIf=!^y+Nn*E<1?W3ab}B zvf{tgW~Lj!wbZw(g;i(egh^AprcP2gnkn{1?c0Q1o^P^pzQ_M)&+|~75V3)!v)}1X zVUR#-v+nu1zb%U2**=!H-(SP}fyuvgiNv?L32Ci0V#og7c(hNO`TSO=@}!$vcv|1H zZK_q9)7fX@{BurxQTC~oU*5imu@H3D>q+qzny~QF&&k`AU;ca?&ZBy&e5d^W=YAsI zikyWnd~EM`#~EjQJvKq{E?>;V_Rd9pOcU>v2)2Z2e_OV$Q)m;<%&`48txq*S?Ca#& z#I-Ri$@l4*yv^lRcXIgse&_#M^<*7qtg4sndGWm!WnEL8cyAf`RpeR3PPfXwQ>Lrrg&$Ngd0pJ)}yvVNM9sSIblPC(K{`OIGr2 z*Pc^{{VTpWZVide)10@@OD#ZV_DK`z0P{$d^=-OugbvFU-q{l6A7MIqt#GU|r`#VV zP@>v-?xXrIMg|6HX5>UAyBsx9nGr}-p?Srn1qJyeipX%DLP&owaRt-?g`2&LnP6=U?l%|GshV z+QSD*+K!e<9O2{_YWELXIDt`M|61%DfOii{Y7{TQ#_pe?JZ}5Sd@uI9SRX6zeP|$ZYoWGQz=kka-t8wIvz}=SUUt%K)s9A`!;>DeE}H#oxzeVeFI#S1 z=_xp(&ew0#ncm&{q*vTnMr!)r9_6-4`j2Mx8^5f-V=(3D&yJ-VJwEwZW?Wbrvc{m- z?NO_`?Un!6A1@3!s^_cPzqW%{CqTutQhbNk4x4uEmi1>JYCSw^Su^*;C7HNo{e4=e zGg;Q0D0h5ens_sR=g$YyVY5$#uQA`QQFCs_Y>{k@fEu5?Z!2F52i11n-m+=(`@>?d zKFti=)@!{)YqRVtmEUh3y<5}oRUa9hQFrjya^sIl+bZU8h7}+3neZ^~*slN5pd^)J z^6Kn+V3P7gNmA(Lls17R<(XHKT9lTUoC--twE-Lb4jTyAPQT#L$Rw()9keOo$gPc8 zOFcw+1Z8i;{O*VmvfiY>;?ZS^9}IR}g^o;DSoyz~oPYoB-reKRZ(B3mIi%9s*r5GZ zS~67FI^6TA&xdO#GUlb8Tv*WZ&@aH$}Tr$ zg_B)>0uStPic0LznO%7}?c1h3Hx|ARIsC*2F%N{;y-uG}y{Y}H;jC1N4K|%ZO@;?qHV9=HV zaey}?lL!N%mO-u_K(!1iz*XlUn*xd=aOVF= 225 ) // Left + { + if(CanBlockGoLeft()) + { + MoveBlockLeft(); + canvasView.postInvalidate(); + } + } + else if (angle <= 135 && angle >= 45 ) // Right + { + if(CanBlockGoRight()) + { + MoveBlockRight(); + canvasView.postInvalidate(); + } + } + else if (angle <= 225 && angle >= 135 ) // Rotate Right + { + RotateBlockRight(); + canvasView.postInvalidate(); + } + else if ((angle <= 30 || angle >= 330 ) && (speed >= 80)) // go down + { + // Hard Drop + while (CanBlockGoDown()) + { + MoveBlockDown(); + } + canvasView.postInvalidate(); + } + } } diff --git a/src/mangavalk/tetris/GameStateInterface.java b/src/mangavalk/tetris/GameStateInterface.java index 76ae3d4..c5a0b56 100644 --- a/src/mangavalk/tetris/GameStateInterface.java +++ b/src/mangavalk/tetris/GameStateInterface.java @@ -122,4 +122,6 @@ public abstract class GameStateInterface return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; } + public abstract void SendMove(int angle, int speed); + } diff --git a/src/mangavalk/tetris/MainActivity.java b/src/mangavalk/tetris/MainActivity.java index 16977f0..b5569f2 100644 --- a/src/mangavalk/tetris/MainActivity.java +++ b/src/mangavalk/tetris/MainActivity.java @@ -4,12 +4,19 @@ package mangavalk.tetris; import com.google.android.gms.ads.AdRequest; import com.google.android.gms.ads.AdSize; import com.google.android.gms.ads.AdView; +import com.samsung.android.sdk.SsdkUnsupportedException; +import com.samsung.android.sdk.gesture.Sgesture; +import com.samsung.android.sdk.gesture.SgestureHand; +import com.samsung.android.sdk.gesture.SgestureHand.Info; import android.app.Activity; import android.graphics.PointF; import android.os.Bundle; +import android.os.Looper; +import android.util.Log; import android.util.SparseArray; import android.view.MotionEvent; +import android.view.WindowManager; import android.widget.FrameLayout; public class MainActivity extends Activity @@ -17,10 +24,30 @@ public class MainActivity extends Activity CanvasView canvasClass; private AdView adView; + private Sgesture mGesture; + private SgestureHand mHand; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + // Gesture. Samsung only + mGesture = new Sgesture(); + + try { + mGesture.initialize(this); + } catch (IllegalArgumentException e) { + //Error Handling + } catch (SsdkUnsupportedException e2) { + //Error Handling + } + + if(mGesture.isFeatureEnabled(Sgesture.TYPE_HAND_PRIMITIVE)){ + mHand = new SgestureHand(Looper.getMainLooper(), mGesture); + mHand.start(Sgesture.TYPE_HAND_PRIMITIVE, mChangeListener); + } + + FrameLayout ll; ll = new FrameLayout(this); @@ -37,6 +64,8 @@ public class MainActivity extends Activity .addTestDevice("2CA96A8B6B805B3323F65A934FB31DC7") // Samsung Galaxy S5 .build(); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + canvasClass = new CanvasView(this); canvasClass.PayedVersion = true; // Set payment status @@ -63,16 +92,31 @@ public class MainActivity extends Activity canvasClass.SetActivity(this); } + private final SgestureHand.ChangeListener mChangeListener = + new SgestureHand.ChangeListener() { + @Override + public void onChanged(Info info) { + Log.d("gesture", "Hand : angle = " + info.getAngle()); + // do something with data + canvasClass.sendMove(info.getAngle(), info.getSpeed()); + } + }; + @Override public void onPause() { super.onPause(); canvasClass.onPause(); } + @Override + public void onStop() { + super.onStop(); + } + + @Override public void onResume() { super.onResume(); - //canvasClass.onResume(); } @Override