initial commit engine begining

2020-09-06 13:50:01 +02:00
commit d095a3418f
38 changed files with 1075 additions and 0 deletions
@@ -0,0 +1,167 @@
+package com.iutlaval.myapplication;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+
+import androidx.annotation.NonNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CanevasView extends SurfaceView implements SurfaceHolder.Callback {
+
+    private SurfaceHolder holder;
+    private Paint p;
+    private DrawingThread drawingThread;
+
+
+    private List<Drawable> toDraw;
+    private Rect fullscreen;
+
+    public CanevasView(Context context) {
+        super(context);
+        holder = getHolder();
+        holder.addCallback(this);
+
+        drawingThread = new DrawingThread();
+
+        p = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
+        p.setColor(Color.RED);
+        p.setStyle(Paint.Style.FILL_AND_STROKE);
+
+        toDraw = new ArrayList<>();
+    }
+
+    @Override
+    public void surfaceCreated(@NonNull SurfaceHolder holder) {
+        fullscreen = holder.getSurfaceFrame();
+        drawingThread.start();
+    }
+
+    @Override
+    public void surfaceChanged(@NonNull SurfaceHolder surfaceHolder, int i, int i1, int i2) {
+
+    }
+
+    @Override
+    public void surfaceDestroyed(@NonNull SurfaceHolder surfaceHolder) {
+        drawingThread.keepDrawing = false;
+        try {
+            drawingThread.join();
+        } catch (InterruptedException e) {}
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        for(Drawable d : toDraw)
+        {
+            d.drawOn(canvas,p);
+        }
+    }
+
+    private class DrawingThread extends Thread {
+
+        public boolean keepDrawing = true;
+
+        @SuppressLint("WrongCall")
+        @Override
+        public void run() {
+            while (keepDrawing) {
+                Canvas canvas = null;
+
+                try {
+                    // On récupère le canvas pour dessiner dessus
+                    canvas = holder.lockCanvas();
+                    // On s'assure qu'aucun autre thread n'accède au holder
+                    synchronized (holder) {
+                        // Et on dessine
+                        onDraw(canvas);
+                    }
+                } finally {
+                    // Notre dessin fini, on relâche le Canvas pour que le dessin s'affiche
+                    if (canvas != null)
+                        holder.unlockCanvasAndPost(canvas);
+                }
+
+                //empecher d'aller plus vite que le taux de rafraichissement de l'ecran
+                //sauve de la betterie
+                try {
+                    float fps = getDisplay().getRefreshRate();
+                    Thread.sleep((long)(1.0/fps*1000));
+                } catch (InterruptedException e) {}
+            }
+        }
+    }
+
+    /**
+     * permet d'ajouter un element a afficher
+     * @return retourne faux si l'element existe deja
+     */
+    public boolean addToDraw(Drawable newElement){
+        for(Drawable d : toDraw)
+        {
+            if(d.equals(newElement))
+            {
+                return false;
+            }
+        }
+        toDraw.add(newElement);
+        return true;
+    }
+
+    /**
+     * permet de changer les coordoné d'un objet a l'ecran
+     * @param x coordonné en x (-1.0 a 1.0)
+     * @param y coodonné en y (-1.0 a 1.0)
+     * @param name nom de l'element a modifier
+     */
+    public void ChangeToDraw(float x,float y,String name) throws DrawableNotFoundException {
+        for(Drawable d : toDraw)
+        {
+            if(d.getName().equals(name))
+            {
+                d.setCoordinates(x,y);
+                return;
+            }
+        }
+        throw new DrawableNotFoundException();
+    }
+
+    /**
+     * remove the element from the draw list
+     * @param name the element name
+     */
+    public void removeToDraw(String name){
+        Drawable toRemove = null;
+        for(Drawable d : toDraw)
+        {
+            if(d.getName().equals(name))
+            {
+                toRemove=d;
+                break;
+            }
+        }
+        if(toRemove != null)
+        {
+            toDraw.remove(toRemove);
+        }
+    }
+
+    /**
+     * remove the element from the draw list
+     * @param toRemove the element toRemove
+     */
+    public void removeToDraw(Drawable toRemove){
+        toDraw.remove(toRemove);
+    }
+
+    public Rect getFullscreen() {
+        return fullscreen;
+    }
+}
@@ -0,0 +1,135 @@
+package com.iutlaval.myapplication;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+
+import java.util.Objects;
+
+public class Drawable {
+
+    private float x,y;
+    private String name;
+    private Bitmap bitmap;
+
+    /**
+     * cree un drawable a partir de coordonné est d'un nom
+     * @param x coordoné x compris entre 0 et 100
+     * @param y coordoné y comrpis entre 0 et 100
+     * @param name nom du drawable agit comme un identifiant mais doit être unique
+     */
+    private Drawable(float x,float y,String name)
+    {
+        this.x=x;
+        this.y=y;
+        this.name=name;
+    }
+
+    /**
+     * cree un drawable depuis une bitmap est des coordonnés
+     * @param bitmap bitmap
+     * @param x coordoné x compris entre 0 et 100
+     * @param y coordoné y comrpis entre 0 et 100
+     * @param name nom du drawable agit comme un identifiant mais doit être unique
+     *
+     * deprecier car non adapter a la resolution de l'ecran
+     */
+    @Deprecated
+    public Drawable(Bitmap bitmap,float x,float y,String name){
+        this(x,y,name);
+        this.bitmap=bitmap;
+    }
+
+    /**
+     * cree un drawable depuis une bitmap est des coordonnés
+     * @param bitmap bitmap
+     * @param x_pos coordoné x compris entre 0 et 100
+     * @param y_pos coordoné y comrpis entre 0 et 100
+     * @param name nom du drawable agit comme un identifiant mais doit être unique
+     * deprecier car non adapter a la resolution de l'ecran
+     *
+     *  TODO : echelle dynamique avec l'ecran
+     */
+    public Drawable(Bitmap bitmap,float x_pos,float y_pos,String name,float x_size,float y_size) throws InvalidDataException {
+        this(x_pos,y_pos,name);
+
+        float x_scaled_size = x_size*bitmap.getWidth()/100;
+        float y_scaled_size = y_size*bitmap.getHeight()/100;
+
+        if(x_scaled_size <=0 || y_scaled_size <=0)
+        {
+            throw new InvalidDataException(name,x_scaled_size,y_scaled_size);
+        }
+
+        Bitmap scaledBitmap = Bitmap.createScaledBitmap(bitmap, (int)x_scaled_size, (int)y_scaled_size,true);
+        this.bitmap=scaledBitmap;
+    }
+
+    /**
+     * ce constructeur n'est pas rapide essayer de l'utiliser le moin possible
+     * TODO : optimize it and remove the deprecated flag
+     *
+     * this contructor create a Drawable object from a rectangle and a color
+     * @param rectangle recange cooresspondant a la surface a dessiner
+     * @param name nom du drawable agit comme un identifiant mais doit être unique
+     * @param color couleur du rectangle
+     */
+    @Deprecated
+    public Drawable(Rect rectangle, String name, int color) throws InvalidDataException {
+        if(rectangle.height() <= 0 || rectangle.width() <=0)throw new InvalidDataException(name,rectangle);
+
+        Bitmap bitmap = Bitmap.createBitmap(rectangle.width(),rectangle.height(), Bitmap.Config.ARGB_8888);
+
+        //on crée un canevas pour interagir avec la bitmap
+        Canvas c = new Canvas(bitmap);
+        Paint p = new Paint();
+
+        p.setColor(color);
+        p.setStyle(Paint.Style.FILL_AND_STROKE);
+
+        c.drawRect(rectangle,p);
+
+        this.bitmap=bitmap;
+        this.name=name;
+        this.x=rectangle.left;
+        this.y=rectangle.top;
+    }
+
+    public void drawOn(Canvas c, Paint p)
+    {
+        //drawings
+        c.drawBitmap(bitmap,x*MainActivity.screenWidth/100,y*MainActivity.screenHeight/100,p);
+    }
+
+    public Bitmap getBitmap() {
+        return bitmap;
+    }
+
+    public float getX() {
+        return x;
+    }
+
+    public float getY() {
+        return y;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if(o instanceof Drawable)
+        {
+            return ((Drawable)o).getName().equals(name);
+        }
+        return false;
+    }
+
+    public void setCoordinates(float x, float y) {
+        this.x=x;
+        this.y=y;
+    }
+}
@@ -0,0 +1,4 @@
+package com.iutlaval.myapplication;
+
+public class DrawableNotFoundException extends Exception{
+}
@@ -0,0 +1,25 @@
+package com.iutlaval.myapplication;
+
+import android.graphics.Rect;
+
+public class InvalidDataException extends Throwable {
+    private String name;
+    private float x;
+    private float y;
+
+    public InvalidDataException(String name, Rect rectangle)
+    {
+        x = rectangle.width();
+        y = rectangle.height();
+        this.name=name;
+    }
+    public InvalidDataException(String name,float x,float y)
+    {
+        this.y=y;
+        this.x=x;
+    }
+
+    public String getDetail() {
+        return "name " + name + " x:" + x +" y:"+ y;
+    }
+}
@@ -0,0 +1,56 @@
+package com.iutlaval.myapplication;
+
+//N'oubliez pas de déclarer le bon package dans lequel se trouve le fichier !
+
+import android.app.Activity;
+import android.content.pm.ActivityInfo;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.view.Display;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.Window;
+import android.widget.TextView;
+
+public class MainActivity extends Activity {
+
+    public static int screenWidth=0;
+    public static int screenHeight=0;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        Display display = getWindowManager().getDefaultDisplay();
+
+
+        CanevasView v = new CanevasView(getBaseContext());
+
+        //return portrait mode resolution so we need to flip them
+        Point size = new Point();
+        display.getSize(size);
+        screenWidth = size.y;
+        screenHeight = size.x;
+
+        Bitmap bm = BitmapFactory.decodeResource(getResources(), R.drawable.debug_card);
+
+        try {
+            //v.addToDraw(new Drawable(new Rect(0,0,screenHeight,screenWidth),"background",Color.BLUE));
+            v.addToDraw(new Drawable(bm,0.0F,00.0F,"Card1",50F,50F));
+        } catch (InvalidDataException e) {
+            //cette erreur est lance si un carre est invalid
+            System.err.println(e.getDetail());
+            e.printStackTrace();
+        }
+
+        setContentView(v);
+    }
+}