#26 Finished positioning windows in 16 windows scene

core/src/cz/nic/tablexia/game/games/night_watch/NightWatchScreen.java

@@ -7,6 +7,7 @@ import com.badlogic.gdx.scenes.scene2d.Group;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
 import com.badlogic.gdx.scenes.scene2d.ui.Stack;
 
+import java.awt.Point;
 import java.util.List;
 
 import cz.nic.tablexia.TablexiaSettings;
@@ -16,6 +17,7 @@ import cz.nic.tablexia.game.games.night_watch.helper.TextureHelper;
 import cz.nic.tablexia.game.games.night_watch.subscene.Watch;
 import cz.nic.tablexia.game.games.robbery.rules.GameRule;
 import cz.nic.tablexia.screen.gamemenu.GameMenuAssets;
+import cz.nic.tablexia.screen.halloffame.helper.TrophyHelper;
 
 /**
  * Created by Václav Tarantík on 6.3.15.
@@ -35,6 +37,7 @@ public class NightWatchScreen extends AbstractTablexiaGame<GameRule> {
 
         difficulty = getGameDifficulty().ordinal();
         prepareBackground();
+        prepareWindows();
         prepareWatch();
     }
 
@@ -62,6 +65,21 @@ public class NightWatchScreen extends AbstractTablexiaGame<GameRule> {
         contentStack.add(watch);
     }
 
+    private void prepareWindows(){
+        Group imageGroup = new Group();
+        List<Point> windowPositions = TextureHelper.getWindowsPositions(difficulty);
+        List<String> windowsNamesList = TextureHelper.getWindowsNamesList(difficulty);
+        for(int i = 0;i<windowsNamesList.size();i++){
+            Image windowImage = new Image(getTexture(windowsNamesList.get(i)));
+            windowImage.setPosition(windowPositions.get(i).x,windowPositions.get(i).y);
+            imageGroup.addActor(windowImage);
+        }
+//        Image windowImage = new Image(getTexture(windowsNamesList.get(15)));
+//        windowImage.setPosition(795 ,222);
+//        imageGroup.addActor(windowImage);
+        contentStack.add(imageGroup);
+    }
+
     @Override
     protected void prepareGameTextureAssetNames(List<String> textureFileNames) {
         //background

core/src/cz/nic/tablexia/game/games/night_watch/helper/TextureHelper.java

@@ -14,23 +14,23 @@ public class TextureHelper {
     public static List<Point> twentyFourWindowsPositions = new ArrayList<Point>();
     public static List<Point> thirtyTwoWindowsPositions = new ArrayList<Point>();
 
-    {
-        sixteenWindowsPositions.add(new Point(0,0));//0
-        sixteenWindowsPositions.add(new Point(0,0));//1
-        sixteenWindowsPositions.add(new Point(0,0));//2
-        sixteenWindowsPositions.add(new Point(0,0));//3
-        sixteenWindowsPositions.add(new Point(0,0));//4
-        sixteenWindowsPositions.add(new Point(0,0));//5
-        sixteenWindowsPositions.add(new Point(0,0));//6
-        sixteenWindowsPositions.add(new Point(0,0));//7
-        sixteenWindowsPositions.add(new Point(0,0));//8
-        sixteenWindowsPositions.add(new Point(0,0));//9
-        sixteenWindowsPositions.add(new Point(0,0));//10
-        sixteenWindowsPositions.add(new Point(0,0));//11
-        sixteenWindowsPositions.add(new Point(0,0));//12
-        sixteenWindowsPositions.add(new Point(0,0));//13
-        sixteenWindowsPositions.add(new Point(0,0));//14
-        sixteenWindowsPositions.add(new Point(0,0));//15
+    static {
+        sixteenWindowsPositions.add(new Point(33,10));//0
+        sixteenWindowsPositions.add(new Point(66,280));//1
+        sixteenWindowsPositions.add(new Point(170,236));//2
+        sixteenWindowsPositions.add(new Point(248,203));//3
+        sixteenWindowsPositions.add(new Point(186,365));//4
+        sixteenWindowsPositions.add(new Point(253,324));//5
+        sixteenWindowsPositions.add(new Point(318,289));//6
+        sixteenWindowsPositions.add(new Point(343,400));//7
+        sixteenWindowsPositions.add(new Point(508,415));//8
+        sixteenWindowsPositions.add(new Point(566,430));//9
+        sixteenWindowsPositions.add(new Point(504,290));//10
+        sixteenWindowsPositions.add(new Point(628,385));//11
+        sixteenWindowsPositions.add(new Point(634,285));//12
+        sixteenWindowsPositions.add(new Point(702,368));//13
+        sixteenWindowsPositions.add(new Point(735,222));//14
+        sixteenWindowsPositions.add(new Point(795,222));//15
 
         twentyFourWindowsPositions.add(new Point(0,0));//0
         twentyFourWindowsPositions.add(new Point(0,0));//1
@@ -133,4 +133,17 @@ public class TextureHelper {
 
         return (int) angle;
     }
+
+    public static List<Point> getWindowsPositions(int difficulty){
+        switch (difficulty) {
+            case 0:
+                return sixteenWindowsPositions;
+            case 1:
+                return twentyFourWindowsPositions;
+            case 2:
+                return thirtyTwoWindowsPositions;
+            default:
+                throw new IllegalStateException("Illegal difficulty parameter value!");
+        }
+    }
 }

core/src/cz/nic/tablexia/game/games/night_watch/subscene/Watch.java

@@ -106,7 +106,7 @@ public class Watch extends Group {
 
         minuteHandImage.setPosition(SCREEN_WIDTH / 2 - scaledHourHandWidth / 2, MINUTE_HAND_Y);
 
-        hourHandImage.setOriginX(hourHandImage.getWidth() / 2);
+        hourHandImage.setOrigin(hourHandImage.getWidth() / 2,4);
 
         addActor(minuteHandImage);
         addActor(hourHandImage);