From 7beacc0385b582ba9faf260ffede21cc33d2db0b Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Tue, 14 Jan 2014 22:18:05 +0200
Subject: [PATCH] Change numeric type to float

---
 src/com/annimon/influencexxii/DrawUtils.java         |  6 +++---
 src/com/annimon/influencexxii/EnemiesController.java | 12 ++++++------
 src/com/annimon/influencexxii/Enemy.java             |  4 ++--
 src/com/annimon/influencexxii/InfluenceXXII.java     | 11 ++++++++---
 src/com/annimon/influencexxii/Pointer.java           |  8 ++++----
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/com/annimon/influencexxii/DrawUtils.java b/src/com/annimon/influencexxii/DrawUtils.java
index 04238fc..0819ea7 100644
--- a/src/com/annimon/influencexxii/DrawUtils.java
+++ b/src/com/annimon/influencexxii/DrawUtils.java
@@ -24,16 +24,16 @@ public class DrawUtils {
         return new Color(r, g, b, 1f);
     }
     
-    public static void drawPointer(ShapeRenderer renderer, int x, int y, int w, int h, int mode) {
+    public static void drawPointer(ShapeRenderer renderer, float x, float y, float w, float h, int mode) {
         renderer.begin(ShapeType.Line);
         Color col1 = pointerColorByMode[mode][0];
         Color col2 = pointerColorByMode[mode][1];
         // Vertical
-        final int h2 = h / 2;
+        final float h2 = h / 2f;
         renderer.line(x, 0, x, h2, col1, col2);
         renderer.line(x, h2, x, h, col2, col1);
         // Horizontal
-        final int w2 = w / 2;
+        final float w2 = w / 2f;
         renderer.line(0, y, w2, y, col1, col2);
         renderer.line(w2, y, w, y, col2, col1);
         renderer.end();
diff --git a/src/com/annimon/influencexxii/EnemiesController.java b/src/com/annimon/influencexxii/EnemiesController.java
index 18ef2ce..b46aadf 100644
--- a/src/com/annimon/influencexxii/EnemiesController.java
+++ b/src/com/annimon/influencexxii/EnemiesController.java
@@ -9,7 +9,7 @@ import com.badlogic.gdx.utils.Array;
 
 public class EnemiesController {
 
-    private int screenWidth, screenHeight;
+    private float screenWidth, screenHeight;
     private Array<Enemy> enemies;
     private int difficultMode;
     
@@ -17,7 +17,7 @@ public class EnemiesController {
         enemies = new Array<Enemy>();
     }
     
-    public void setScreenParameters(int width, int height) {
+    public void setScreenParameters(float width, float height) {
         screenWidth = width;
         screenHeight = height;
     }
@@ -35,10 +35,10 @@ public class EnemiesController {
     }
     
     private Enemy generateNewEnemy() {
-        int size = MathUtils.random(screenWidth / 24, screenWidth / 10);
-        int x = MathUtils.random(screenWidth - size);
-        int y = MathUtils.random(screenHeight - size);
-        Color color = DrawUtils.random2Color(0x43, 0xff);
+        float size = MathUtils.random(screenWidth / 24f, screenWidth / 10f);
+        float x = MathUtils.random(screenWidth - size);
+        float y = MathUtils.random(screenHeight - size);
+        Color color = DrawUtils.random2Color(0x43, 0xFF);
         return new Enemy(x, y, size, new Vector2(), color);
     }
 }
\ No newline at end of file
diff --git a/src/com/annimon/influencexxii/Enemy.java b/src/com/annimon/influencexxii/Enemy.java
index e6d49a3..3daea95 100644
--- a/src/com/annimon/influencexxii/Enemy.java
+++ b/src/com/annimon/influencexxii/Enemy.java
@@ -15,11 +15,11 @@ public class Enemy {
     private Vector2 dir;
     private Color color;
     
-    public Enemy(int x, int y, int size) {
+    public Enemy(float x, float y, float size) {
         this(x, y, size, new Vector2(), Color.RED);
     }
 
-    public Enemy(int x, int y, int size, Vector2 dir, Color color) {
+    public Enemy(float x, float y, float size, Vector2 dir, Color color) {
         rect = new Rectangle(x, y, size, size);
         this.dir = dir;
         this.color = color;
diff --git a/src/com/annimon/influencexxii/InfluenceXXII.java b/src/com/annimon/influencexxii/InfluenceXXII.java
index fe59f7c..6554840 100644
--- a/src/com/annimon/influencexxii/InfluenceXXII.java
+++ b/src/com/annimon/influencexxii/InfluenceXXII.java
@@ -7,6 +7,7 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 
 public class InfluenceXXII implements ApplicationListener {
     
+    private Pointer pointer;
     private EnemiesController enemies;
     private ShapeRenderer renderer;
     
@@ -17,12 +18,12 @@ public class InfluenceXXII implements ApplicationListener {
 		
 		renderer = new ShapeRenderer();
 		
+		pointer = new Pointer(width, height);
 		enemies = new EnemiesController();
-		enemies.setScreenParameters((int) width, (int) height);
+		enemies.setScreenParameters(width, height);
 		for (int i = 0; i < 5; i++) {
 		    enemies.addEnemy();
-		}
-	}
+		}}
 
 	@Override
 	public void dispose() {
@@ -37,6 +38,10 @@ public class InfluenceXXII implements ApplicationListener {
 		
 		// Draw enemies
 		enemies.draw(renderer);
+		// enemies.update(pointerX, pointerY);
+		
+		// Draw pointer
+		pointer.draw(renderer);
 	}
 
 	@Override
diff --git a/src/com/annimon/influencexxii/Pointer.java b/src/com/annimon/influencexxii/Pointer.java
index 17f850b..428733d 100644
--- a/src/com/annimon/influencexxii/Pointer.java
+++ b/src/com/annimon/influencexxii/Pointer.java
@@ -8,16 +8,16 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
  */
 public class Pointer {
 
-    private int screenWidth, screenHeight;
-    private int x, y;
+    private float screenWidth, screenHeight;
+    private float x, y;
     
-    public Pointer(int width, int height) {
+    public Pointer(float width, float height) {
         x = width / 2;
         y = height / 2;
         setScreenParameters(width, height);
     }
     
-    public void setScreenParameters(int width, int height) {
+    public void setScreenParameters(float width, float height) {
         screenWidth = width;
         screenHeight = height;
     }