preparatif moteur jeu + patch crash + patch couleur + simplification carte

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java

@@ -9,9 +9,27 @@ import android.util.Log;
 import com.iutlaval.myapplication.Game.Board;
 import com.iutlaval.myapplication.Game.Player.Player;
 import com.iutlaval.myapplication.R;
+import com.iutlaval.myapplication.Video.DrawableCard;
 
 public abstract class Card {
     private static Bitmap frameBitmap = null;
+    private DrawableCard drawableCard = null;
+
+
+
+    public Card()
+    {
+
+    }
+    /**
+     * cree une carte est lui definit un drawable
+     * @param UID
+     * @param c
+     */
+    public Card(String UID,Context c)
+    {
+        drawableCard = new DrawableCard(this,0,0,UID,c);
+    }
 
     /**
      * *cette methode est appeler a chaque fois que la carte attaque
@@ -111,5 +129,22 @@ public abstract class Card {
      * @return
      */
     public abstract int getHealth();
+
+    /**
+     * NE PAS TOUCHER CETTE FONCTION SI VOUS N'ÊTES PAS SUR DE CE QUE VOUS FAITES
+     * cette fonction permet de redefinir le drawable de la carte
+     * @param drawableCard
+     */
+    public void setDrawableCard(DrawableCard drawableCard) {
+        this.drawableCard = drawableCard;
+    }
+
+    /**
+     * NE PAS OVERRIDE CETTE FONCTION
+     * @return
+     */
+    public DrawableCard getDrawableCard() {
+        return drawableCard;
+    }
 }
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java

@@ -1,11 +1,27 @@
 package com.iutlaval.myapplication.Game.Cards;
 
+import android.content.Context;
 import android.graphics.Color;
 
 import com.iutlaval.myapplication.R;
 
 public class DemoCard extends Card{
 
+    public DemoCard()
+    {
+        super();
+    }
+
+    /**
+     * cree une carte est lui definit un drawable
+     *
+     * @param UID
+     * @param c
+     */
+    public DemoCard(String UID, Context c) {
+        super(UID, c);
+    }
+
     @Override
     public int getCardPicture() {
         return R.drawable.guerrier_nul;
@@ -15,7 +31,7 @@ public class DemoCard extends Card{
     //#AARRGGBB
     @Override
     public String getColor() {
-        return "#70000000";
+        return "#00000000";
     }
 
     @Override

app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java

@@ -0,0 +1,72 @@
+package com.iutlaval.myapplication.Game;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.util.Log;
+
+import com.iutlaval.myapplication.Game.Cards.Card;
+import com.iutlaval.myapplication.Game.Cards.DemoCard;
+import com.iutlaval.myapplication.InvalidDataException;
+import com.iutlaval.myapplication.R;
+import com.iutlaval.myapplication.Video.Drawable;
+import com.iutlaval.myapplication.Video.DrawableCard;
+import com.iutlaval.myapplication.Video.FpsTime;
+import com.iutlaval.myapplication.Video.Rectangle;
+import com.iutlaval.myapplication.Video.Renderer;
+
+public class GameLogicThread extends Thread{
+
+    Context cont;
+    Renderer renderer;
+
+    public GameLogicThread(Context cont, Renderer renderer)
+    {
+        this.cont = cont;
+        this.renderer = renderer;
+    }
+
+    @Override
+    public void run() {
+
+        Bitmap bm = BitmapFactory.decodeResource(cont.getResources(), R.drawable.debug_card);
+
+        try {
+            renderer.addToDraw(new Drawable(new Rectangle(0,0,100,100),"background", Color.BLUE));
+            //renderer.addToDraw(new Drawable(bm,0.0F,0.0F,"running",8F,16F));
+            //renderer.addToDraw(new DrawableCard(new DemoCard(),0.0F,0.0F,"card2",cont));
+            Card card2 = new DemoCard("card3",cont);
+            if(!renderer.addToDraw(card2.getDrawableCard())) Log.e("F","WTF");
+            Card card1 = new DemoCard("card1",cont);
+            if(!renderer.addToDraw(card1.getDrawableCard())) Log.e("F","WTF");
+        } catch (InvalidDataException e) {
+            //cette erreur est lance si un carre est invalid
+            System.err.println(e.getDetail());
+            e.printStackTrace();
+        }
+
+
+        int i=0;
+        int increm = 1;
+        while(true)
+        {
+             if(i < 100)
+            {
+                i+=increm;
+            }else{
+                increm=-increm;
+                i+=increm;
+             }
+            if(i==0)increm=-increm;
+
+            //TODO get x,y coordinate form name
+            //r.moveToDraw(i,i,"card2");
+            renderer.moveToDraw(1,1,"card3");
+            renderer.moveToDraw(20,1,"card1");
+            FpsTime.waitFrameTime();
+        }
+    }
+
+    //placeOnBoard()
+}