From cdbfb1a53b0b503f16dae3f9315228c562654c72 Mon Sep 17 00:00:00 2001
From: marc barbier <mmarc471@gmail.com>
Date: Mon, 4 Jan 2021 17:40:05 +0100
Subject: [PATCH] patch text

---
 .../myapplication/Game/GameLogicThread.java   |  6 +--
 .../Video/Drawables/DrawableText.java         | 51 -------------------
 2 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
index 2ba7c33..2f24b7f 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
@@ -199,7 +199,7 @@ public class GameLogicThread extends Thread{
                     case Command.SETMANA:
                         renderer.removeToDrawWithoutUpdate("mana");
                         mana = coms.recieveInt();
-                        renderer.addToDraw(new DrawableText("Mana : "+mana,85F,60F,"mana",100,12, Color.WHITE));
+                        renderer.addToDraw(new DrawableText("Mana : "+mana,85F,60F,"mana",13.3F,6.65F,20, 100,30,Color.WHITE));
                         break;
 
                     case Command.ENEMYTURN:
@@ -285,13 +285,13 @@ public class GameLogicThread extends Thread{
 
                     case Command.SET_ENEMY_HP:
                         renderer.removeToDrawWithoutUpdate("advHp");
-                        renderer.addToDraw(new DrawableText(" Hp  : "+coms.recieve(),1F,10F,"advHp",100,12,Color.WHITE));
+                        renderer.addToDraw(new DrawableText(" Hp  : " + coms.recieve(),1F,10F,"advHp",13.3F,6.65F,20, 100,30,Color.WHITE));
 
                         break;
 
                     case Command.SET_HP:
                         renderer.removeToDrawWithoutUpdate("playerHp");
-                        renderer.addToDraw(new DrawableText(" Hp  : " + coms.recieve(),85F,80F,"playerHp",100,12,Color.WHITE));
+                        renderer.addToDraw(new DrawableText(" Hp  : " + coms.recieve(),85F,80F,"playerHp",13.3F,6.65F,20, 100,30,Color.WHITE));
                         break;
 
                     case "timeout":
diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableText.java b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableText.java
index af65dd2..4c4f32e 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableText.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableText.java
@@ -17,57 +17,6 @@ import java.util.List;
  */
 public class DrawableText extends Drawable{
 
-
-    public DrawableText(String text,float x_pos,float y_pos,String name,float textSize , float x_size,int color)
-    {
-        this(text,x_pos,y_pos,name,textSize,x_size,color,20);
-    }
-
-    /**
-     * ce constructeur permet de créer un text un une ligne avec moin d'argument
-     * @param text
-     * @param x_pos
-     * @param y_pos
-     * @param name
-     * @param textSize
-     */
-    public DrawableText(String text,float x_pos,float y_pos,String name,float textSize , float x_size,int color,int nbcharPerlines)
-    {
-        super(x_pos,y_pos,name);
-
-
-        TextPaint p = new TextPaint();
-        p.setAntiAlias(true);
-        p.setTextSize(textSize);
-        p.setColor(color);
-
-        int canvas_width = (int) p.measureText(text);
-        int canvas_height = (int) textSize;
-
-
-        Bitmap bitmap = Bitmap.createBitmap(canvas_width, canvas_height, Bitmap.Config.ARGB_8888);
-        setBitmap(bitmap);
-        Canvas c = new Canvas(bitmap);
-
-        //si on a une description
-        int index = 1;
-        List<String> linesOfText = cutText(nbcharPerlines,text);
-        for(String line : linesOfText)
-        {
-            //y_canvasRatio/linesOfText.size()
-            c.drawText(line ,0,index*textSize,p);
-            index++;
-        }
-
-        int scalled_x_size = (int) (GameActivity.screenWidth*x_size/100);
-
-        int y_size = (int) (x_size/(canvas_width * 1.0) * 200 * linesOfText.size());
-
-        int scalled_y_size = GameActivity.screenHeight*y_size/100;
-
-        setBitmap(Bitmap.createScaledBitmap(bitmap,scalled_x_size,scalled_y_size,GameActivity.bilinearFiltering));
-    }
-
     /**
      * ce constructeur permet de rendre du texte
      * @param text le texte a rendre