Marc/PTS3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Marc-Pierre-Barbier/PTS3 into master

Browse Source 
local merge
This commit is contained in:
mmarc471@gmail.com
2020-09-11 18:35:49 +02:00
parent 7341f0e249 e0e44eece0
commit c30d600785
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
+10 -13
View File
@@ -32,19 +32,16 @@ public class GameLogicThread extends Thread{
@Override @Override
public void run() { public void run() {
try { //renderer.addToDraw(new Drawable(new Rectangle(0,0,100,100),"background", Color.BLUE));
renderer.addToDraw(new Drawable(new Rectangle(0,0,100,100),"background", Color.BLUE)); Bitmap bitmap=BitmapFactory.decodeResource(cont.getResources(), R.drawable.background);
//renderer.addToDraw(new Drawable(bm,0.0F,0.0F,"running",8F,16F)); renderer.addToDraw(new Drawable(bitmap, 0,0, "background", 100, 100 ));
//renderer.addToDraw(new DrawableCard(new DemoCard(),0.0F,0.0F,"card2",cont)); //renderer.addToDraw(new Drawable(bm,0.0F,0.0F,"running",8F,16F));
Card card2 = new DemoCard("card3",cont); //renderer.addToDraw(new DrawableCard(new DemoCard(),0.0F,0.0F,"card2",cont));
renderer.addToDraw(card2.getDrawableCard()); Card card2 = new DemoCard("card3",cont);
Card card1 = new DemoCard("card1",cont); renderer.addToDraw(card2.getDrawableCard());
renderer.addToDraw(card1.getDrawableCard()); Card card1 = new DemoCard("card1",cont);
} catch (InvalidDataException e) { renderer.addToDraw(card1.getDrawableCard());
//cette erreur est lance si un carre est invalid
System.err.println(e.getDetail());
e.printStackTrace();
}
ready=true; ready=true;
app/src/main/res/drawable-v24/background.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB