Optimised the DrawableImage credit to Bairouk Anass

e-mobadara · Apr 21, 2019 · ef50e4c · ef50e4c
1 parent dce6f03
commit ef50e4c
Show file tree

Hide file tree

Showing 34 changed files with 183 additions and 179 deletions.
diff --git a/.gradle/4.10.1/fileHashes/fileHashes.bin b/.gradle/4.10.1/fileHashes/fileHashes.bin
diff --git a/.gradle/4.10.1/fileHashes/fileHashes.lock b/.gradle/4.10.1/fileHashes/fileHashes.lock
diff --git a/.gradle/4.10.1/fileHashes/resourceHashesCache.bin b/.gradle/4.10.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/4.10.1/javaCompile/classAnalysis.bin b/.gradle/4.10.1/javaCompile/classAnalysis.bin
diff --git a/.gradle/4.10.1/javaCompile/jarAnalysis.bin b/.gradle/4.10.1/javaCompile/jarAnalysis.bin
diff --git a/.gradle/4.10.1/javaCompile/javaCompile.lock b/.gradle/4.10.1/javaCompile/javaCompile.lock
diff --git a/.gradle/4.10.1/javaCompile/taskHistory.bin b/.gradle/4.10.1/javaCompile/taskHistory.bin
diff --git a/.gradle/4.10.1/taskHistory/taskHistory.bin b/.gradle/4.10.1/taskHistory/taskHistory.bin
diff --git a/.gradle/4.10.1/taskHistory/taskHistory.lock b/.gradle/4.10.1/taskHistory/taskHistory.lock
diff --git a/.gradle/4.6/fileChanges/last-build.bin b/.gradle/4.6/fileChanges/last-build.bin
diff --git a/.gradle/4.6/fileContent/fileContent.lock b/.gradle/4.6/fileContent/fileContent.lock
diff --git a/.gradle/4.6/fileHashes/fileHashes.bin b/.gradle/4.6/fileHashes/fileHashes.bin
diff --git a/.gradle/4.6/fileHashes/fileHashes.lock b/.gradle/4.6/fileHashes/fileHashes.lock
diff --git a/.gradle/4.6/fileHashes/resourceHashesCache.bin b/.gradle/4.6/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/4.6/javaCompile/classAnalysis.bin b/.gradle/4.6/javaCompile/classAnalysis.bin
diff --git a/.gradle/4.6/javaCompile/jarAnalysis.bin b/.gradle/4.6/javaCompile/jarAnalysis.bin
diff --git a/.gradle/4.6/javaCompile/javaCompile.lock b/.gradle/4.6/javaCompile/javaCompile.lock
diff --git a/.gradle/4.6/javaCompile/taskHistory.bin b/.gradle/4.6/javaCompile/taskHistory.bin
diff --git a/.gradle/4.6/javaCompile/taskJars.bin b/.gradle/4.6/javaCompile/taskJars.bin
diff --git a/.gradle/4.6/taskHistory/taskHistory.bin b/.gradle/4.6/taskHistory/taskHistory.bin
diff --git a/.gradle/4.6/taskHistory/taskHistory.lock b/.gradle/4.6/taskHistory/taskHistory.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/app.iml b/app/app.iml
@@ -94,6 +94,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/external_libs_dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />

diff --git a/app2/app2.iml b/app2/app2.iml
@@ -95,6 +95,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/external_libs_dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />

diff --git a/emobadaragaminglib/emobadaragaminglib.iml b/emobadaragaminglib/emobadaragaminglib.iml
@@ -90,6 +90,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compile_only_not_namespaced_r_class_jar" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/full_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />

diff --git a/emobadaragaminglib/src/main/java/com/example/emobadaragaminglib/Base/Screen.java b/emobadaragaminglib/src/main/java/com/example/emobadaragaminglib/Base/Screen.java
@@ -31,7 +31,7 @@ public Screen(Game game) {
 
     /**
      * This Method is going to dispose of all the sprites that your screen is using.
-     *Caaling the garbage collector inside the while loop actually help optimizing the memo.
+     *Calling the garbage collector inside the while loop actually help optimizing the memo.
      */
     public void dispose(){
         Iterator<Sprite> e = sprites.iterator();

diff --git a/emobadaragaminglib/src/main/java/com/example/emobadaragaminglib/Components/ButtonUI.java b/emobadaragaminglib/src/main/java/com/example/emobadaragaminglib/Components/ButtonUI.java
@@ -1,6 +1,5 @@
 package com.example.emobadaragaminglib.Components;
 
-import com.example.emobadaragaminglib.Base.Game;
 import com.example.emobadaragaminglib.Base.Image;
 
 /**

diff --git a/...adaragaminglib/src/main/java/com/example/emobadaragaminglib/Components/DrawableImage.java b/...adaragaminglib/src/main/java/com/example/emobadaragaminglib/Components/DrawableImage.java
@@ -1,5 +1,6 @@
 package com.example.emobadaragaminglib.Components;
 
+
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -9,6 +10,7 @@
 import android.graphics.PorterDuff;
 import android.util.Log;
 
+
 import com.example.emobadaragaminglib.Base.Game;
 import com.example.emobadaragaminglib.Base.Graphics;
 import com.example.emobadaragaminglib.Implementation.AndroidImage;
@@ -48,15 +50,21 @@ public class DrawableImage  {
     int colorDots=240;
     int colorDrawingArea=201;
 
-    public DrawableImage(Bitmap bitmap,DrawFinishListener mdrawFinishListener,int xImage,int yImage) {
-        this.bitmap = bitmap;
-        drawFinishListener=mdrawFinishListener;
+    public DrawableImage(Bitmap bitmap,DrawFinishListener d,int xImage,int yImage,int widthImage,int heightImage) {
+        //resize image
+        Bitmap resizedBitmap = Bitmap.createScaledBitmap(bitmap, widthImage, heightImage, true);
+        bitmap=resizedBitmap;
+        //
+        this.bitmap = resizedBitmap;
+        drawFinishListener=d;
         dotedPart(bitmap);
 
         this.xImage=xImage;
         this.yImage=yImage;
-        this.widthImage=bitmap.getWidth();
-        this.heightImage=bitmap.getHeight();
+        //this.widthImage=bitmap.getWidth();
+        //this.heightImage=bitmap.getHeight();
+        this.widthImage=widthImage;
+        this.heightImage=heightImage;
 
         mPaint = new Paint();
         mPaint.setAntiAlias(true);
@@ -152,10 +160,10 @@ private void check(int x, int y) {
         if (bitmap != null && x >= 0 && x < bitmap.getWidth() && y >= 0 && y < bitmap.getHeight()) {
             int pixel = bitmap.getPixel(x, y);
             if (Color.red(pixel) == colorDrawingArea && Color.red(pixel) == Color.blue(pixel) && Color.red(pixel) == Color.green(pixel)) {
-                Log.i("Touch ===", "You're in");
+                Log.e("Touch ===", "You're in");
                 canDraw = true;
             } else {
-                Log.i("Touch ===", "You're out");
+                Log.e("Touch ===", "You're out");
                 canDraw = false;
             }
         }
@@ -252,4 +260,4 @@ public boolean contain(int a,int b){
         if(xImage<=a && a<=(xImage+widthImage) && yImage<=b && b<=(yImage+heightImage) ) return true;
         return false;
     }
-}
+}
diff --git a/emobadaragaminglib/src/main/java/com/example/emobadaragaminglib/Components/Sprite.java b/emobadaragaminglib/src/main/java/com/example/emobadaragaminglib/Components/Sprite.java
@@ -2,7 +2,6 @@
 
 import com.example.emobadaragaminglib.Base.Game;
 import com.example.emobadaragaminglib.Base.Image;
-import com.example.emobadaragaminglib.Base.Screen;
 
 /**
  * Main component in this library. This is what the user can see and interact with

diff --git a/...ib/src/main/java/com/example/emobadaragaminglib/Implementation/AndroidFastRenderView.java b/...ib/src/main/java/com/example/emobadaragaminglib/Implementation/AndroidFastRenderView.java
@@ -68,8 +68,9 @@ public void run() {
             }
         ///////////////////////////////:
 
-            game.getCurrentScreen().render(deltaTime);
             game.getCurrentScreen().drawSprites();
+            game.getCurrentScreen().render(deltaTime);
+
 
             Canvas canvas = holder.lockCanvas();
             canvas.getClipBounds(dstRect);