#278 Images resized. Deleted unused asset.

core/src/cz/nic/tablexia/screen/createuser/PanoramaScreen.java

@@ -62,6 +62,10 @@ import cz.nic.tablexia.util.ui.dialog.components.ViewportMaximumSizeComponent;
  */
 public class PanoramaScreen extends AbstractTablexiaScreen<int[][]> {
 
+    private static Vector2 SIGN_POSITION = new Vector2(0.30f, 0.285f);
+    private static Vector2 PLATE_TITLE_POSITION = new Vector2(0.368f, 0.638f);
+    private static Vector2 DOOR_SIGN_POSITION = new Vector2(0.575f, 0f);
+    
     public static final String GFX_PATH = "gfx/";
     public static final String SFX_PATH = "sfx/";
     public static final String MFX_PATH = "mfx/";
@@ -738,37 +742,43 @@ public class PanoramaScreen extends AbstractTablexiaScreen<int[][]> {
 
         group.add(tile00).height(tile00.getHeight()).width(tile00.getWidth());
         group.add(tile01).height(tile01.getHeight()).width(tile01.getWidth());
-
         //tile2
-        Stack tile2 = new Stack();
-            TablexiaNoBlendingImage tile02 = new TablexiaNoBlendingImage(getScreenTextureRegion(GFX_PATH + "swipe/tile2"));
-            tile02.setSize((int) (panel.getHeight() * (tile02.getWidth() / tile02.getHeight())), panel.getHeight());
-            tile2.add(tile02);
-
-            Image tile02_title = new Image(getScreenTextureRegion(GFX_PATH + "swipe/tile2_title"));
-            tile02_title.setSize((int) (panel.getHeight() * (tile02_title.getWidth() / tile02_title.getHeight())), panel.getHeight());
-            tile2.add(tile02_title);
+        Group tile2 = new Group();
+        TablexiaNoBlendingImage tile02 = new TablexiaNoBlendingImage(getScreenTextureRegion(GFX_PATH + "swipe/tile2"));
+        tile02.setSize((int) (panel.getHeight() * (tile02.getWidth() / tile02.getHeight())), panel.getHeight());
+        tile2.addActor(tile02);
+        Image tile02_title = ScaleUtil.createImageWidthPosition(
+                getScreenTextureRegion(GFX_PATH + "swipe/tile2_title"), 
+                tile02.getWidth() * PanoramaActorsLayout.STREET_TILE2_TITLE_IMAGE_WIDTH,
+                SIGN_POSITION.x*tile02.getWidth(),
+                SIGN_POSITION.y*tile02.getHeight());
+
+        tile2.addActor(tile02_title);
         group.add(tile2).width(tile02.getWidth()).height(tile02.getHeight());
-
         //tile3
         final TablexiaNoBlendingImage tile3Background = new TablexiaNoBlendingImage(getScreenTextureRegion(GFX_PATH + "swipe/tile3"));
-        final Image tile3Title = new Image(getScreenTextureRegion(GFX_PATH + "swipe/tile3_title"));
-
         tile3Background.setSize((int) (panel.getHeight() * (tile3Background.getWidth() / tile3Background.getHeight())), panel.getHeight());
-        tile3Title.setSize((int) (panel.getHeight() * (tile3Title.getWidth() / tile3Title.getHeight())), panel.getHeight());
-
+        final Image tile3DoorSign = ScaleUtil.createImageHeightPosition(getScreenTextureRegion(GFX_PATH + "swipe/tile3_door_sign"),
+                tile3Background.getHeight() * PanoramaActorsLayout.STREET_TILE3_DOOR_SIGN_IMAGE_HEIGHT,
+                DOOR_SIGN_POSITION.x * tile3Background.getWidth(),
+                DOOR_SIGN_POSITION.y * tile3Background.getHeight());
+        Image tile3PlateTitle = ScaleUtil.createImageWidthPosition(
+                getScreenTextureRegion(GFX_PATH + "swipe/tile3_plate_title"),
+                tile3Background.getWidth() * PanoramaActorsLayout.STREET_TILE3_PLATE_TITLE_IMAGE_WIDTH,
+                PLATE_TITLE_POSITION.x * tile3Background.getWidth(),
+                PLATE_TITLE_POSITION.y * tile3Background.getHeight());
         //Detective door group
         final Group detectiveDoor = new Group();
 
-        tile3Title.addListener(new ClickListener() {
+        tile3DoorSign.addListener(new ClickListener() {
             private int knockCount = 0;
 
             @Override
             public void clicked(InputEvent event, float x, float y) {
                 super.clicked(event, x, y);
-                if (x > tile3Background.getWidth() * PanoramaActorsLayout.STREET_DOOR_KNOCK_X && knockCount < NUMBER_OF_OFFICE_KNOCKS) {
+                if (knockCount < NUMBER_OF_OFFICE_KNOCKS) {
                     knockCount++;
-                    Image knock = ScaleUtil.createImageWidthPosition(getScreenTextureRegion(GFX_PATH + "swipe/knock"), getStage().getWidth() * PanoramaActorsLayout.STREET_KNOCK_IMAGE_WIDTH, x, y);
+                    Image knock = ScaleUtil.createImageWidthPosition(getScreenTextureRegion(GFX_PATH + "swipe/knock"), getStage().getWidth() * PanoramaActorsLayout.STREET_KNOCK_IMAGE_WIDTH, tile3DoorSign.getX() + x, tile3DoorSign.getY() + y);
                     detectiveDoor.addActor(knock);
 
                     RunnableAction moveToOffice = new RunnableAction();
@@ -805,7 +815,8 @@ public class PanoramaScreen extends AbstractTablexiaScreen<int[][]> {
         });
 
         detectiveDoor.addActor(tile3Background);
-        detectiveDoor.addActor(tile3Title);
+        detectiveDoor.addActor(tile3DoorSign);
+        detectiveDoor.addActor(tile3PlateTitle);
         detectiveDoor.setSize(tile3Background.getWidth(), tile3Background.getHeight());
         group.add(detectiveDoor);
 

core/src/cz/nic/tablexia/screen/createuser/panorama/PanoramaActorsLayout.java

@@ -63,9 +63,12 @@ public class PanoramaActorsLayout {
     public static final float OFFICE_DIALOG_WIDTH                   = 0.3f;
     public static final float OFFICE_DIALOG_HEIGHT                  = 0.085f;
 
-    public static final float STREET_DOOR_KNOCK_X                   = 0.3f;
     public static final float STREET_KNOCK_IMAGE_WIDTH              = 0.2f;
-
+   
+    public static final float STREET_TILE2_TITLE_IMAGE_WIDTH        = 0.15f;
+    public static final float STREET_TILE3_PLATE_TITLE_IMAGE_WIDTH  = 0.13f;
+    public static final float STREET_TILE3_DOOR_SIGN_IMAGE_HEIGHT   = 0.8f;
+    
     public static final float STREET_OFFICE_TRANSITION_DURATION     = 0.5f;
     public static final float OFFICE_FIRST_DIALOG_DELAY             = 0.25f;