Thread: [Gridarta-commit] SF.net SVN: gridarta: [766] trunk/crossfire/src/cfeditor/gui/map/ DefaultLevelRen

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 766
          http://svn.sourceforge.net/gridarta/?rev=766&view=rev
Author:   akirschbaum
Date:     2006-12-01 14:05:22 -0800 (Fri, 01 Dec 2006)

Log Message:
-----------
Rename variable name.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java

Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
===================================================================

--- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-01 22:00:38 UTC (rev 765)
+++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-01 22:05:22 UTC (rev 766)
@@ -81,7 +81,7 @@
     private final boolean isPickmap;
 
     /** offset to map borders (32 for std. rect. maps, 0 for pickmaps). */
-    private int bOffset;
+    private int borderOffset;
 
     private final CMainControl mainControl;
 
@@ -115,8 +115,8 @@
         }
         tmpIcon = new ImageIcon();
 
-        bOffset = !pickmap ? 32 : 0;
-        renderTransform = new AffineTransform(1f, 0f, 0f, 1f, (float) bOffset, (float) bOffset);
+        borderOffset = !pickmap ? 32 : 0;
+        renderTransform = new AffineTransform(1f, 0f, 0f, 1f, (float) borderOffset, (float) borderOffset);
         highLightMask = new Color[]{
                 new Color(1.0f, 0.0f, 0.0f, 0.33f),
                 new Color(0.0f, 1.0f, 0.0f, 0.33f),
@@ -165,10 +165,10 @@
         bufGrfx.fillRect(0, 0, mapWidth, mapHeight);
 
         // paint the mapview into the image
-        storeOffset = bOffset;
-        bOffset = 0;
+        storeOffset = borderOffset;
+        borderOffset = 0;
         paintComponent((Graphics2D) bufGrfx, true);
-        bOffset = storeOffset;
+        borderOffset = storeOffset;
         return bufImage;
     }
 
@@ -187,10 +187,10 @@
             repaint();
         } else {
             log.debug("modelChanged(), we are in a backbuffered behaviour.");
-            final int storeOffset = bOffset;
-            bOffset = 0;
+            final int storeOffset = borderOffset;
+            borderOffset = 0;
             paintComponent((Graphics2D) backBuffer.getGraphics(), false);
-            bOffset = storeOffset;
+            borderOffset = storeOffset;
             repaint();
         }
     }
@@ -221,9 +221,9 @@
                 if (!mapControl.getMapModel().containsArchObject(x, y)) {
                     // empty square
                     if (isPickmap) {
-                        grfx.fillRect(x * 32 + bOffset, y * 32 + bOffset, 32, 32);
+                        grfx.fillRect(x * 32 + borderOffset, y * 32 + borderOffset, 32, 32);
                     } else {
-                        mainControl.getUnknownTileIconX().paintIcon(this, grfx, x * 32 + bOffset, y * 32 + bOffset);
+                        mainControl.getUnknownTileIconX().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                     }
                 } else {
                     for (final GameObject node : mapControl.getMapModel().getMapSquare(new Point(x, y))) {
@@ -233,17 +233,17 @@
                         }
                         if (mainControl.isTileEdit(node.getEditType()) || mainControl.getTileEdit() == 0 || isPickmap) {
                             if (node.getArchetypeName() == null) {
-                                mainControl.getNoarchTileIconX().paintIcon(this, grfx, x * 32 + bOffset, y * 32 + bOffset);
+                                mainControl.getNoarchTileIconX().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                             } else if (node.getFaceFlag()) {
-                                mainControl.getNofaceTileIconX().paintIcon(this, grfx, x * 32 + bOffset, y * 32 + bOffset);
+                                mainControl.getNofaceTileIconX().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                             } else {
                                 if (node.getFaceNr() == -1) {
-                                    mainControl.getUnknownTileIconX().paintIcon(this, grfx, x * 32 + bOffset, y * 32 + bOffset);
+                                    mainControl.getUnknownTileIconX().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                                 } else {
                                     // draw object face
                                     final ImageIcon img = archlist.getFace(node.getFaceNr());
                                     if (!node.isMulti() || (img.getIconWidth() == 32 && img.getIconHeight() == 32)) {
-                                        archlist.getFace(node.getFaceNr()).paintIcon(this, grfx, x * 32 + bOffset, y * 32 + bOffset);
+                                        archlist.getFace(node.getFaceNr()).paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                                     } else if (node.isHead()) {
                                         oversizedMultiHeads.addElement(node); // store oversized arches for later
                                     }
@@ -259,7 +259,7 @@
                     final Color alpha = highLightMask[i];
                     final Color c = grfx.getColor();
                     grfx.setColor(alpha);
-                    grfx.fillRect(x * 32 + bOffset, y * 32 + bOffset, 32, 32);
+                    grfx.fillRect(x * 32 + borderOffset, y * 32 + borderOffset, 32, 32);
                     grfx.setColor(c);
                 }
             }
@@ -267,24 +267,24 @@
         // at the end, we have to draw the oversized multipart images on top of the rest
         for (int i = 0; i < oversizedMultiHeads.size(); i++) {
             final GameObject node = oversizedMultiHeads.elementAt(i);
-            archlist.getFace(node.getFaceNr()).paintIcon(this, grfx, node.getMapX() * 32 + bOffset, node.getMapY() * 32 + bOffset);
+            archlist.getFace(node.getFaceNr()).paintIcon(this, grfx, node.getMapX() * 32 + borderOffset, node.getMapY() * 32 + borderOffset);
         }
 
         // grid lines
         if (mapViewBasic.isGridVisible() && !isSnapshot) {
             for (int x = 0; x <= mapViewBasic.getMapSize().getWidth(); x++) {
                 grfx.drawLine(
-                        x * 32 + bOffset,
-                        0 + bOffset,
-                        x * 32 + bOffset,
-                        mapViewBasic.getMapSize().getHeight() * 32 + bOffset);
+                        x * 32 + borderOffset,
+                        0 + borderOffset,
+                        x * 32 + borderOffset,
+                        mapViewBasic.getMapSize().getHeight() * 32 + borderOffset);
             }
             for (int y = 0; y <= mapViewBasic.getMapSize().getHeight(); y++) {
                 grfx.drawLine(
-                        0 + bOffset,
-                        y * 32 + bOffset,
-                        mapViewBasic.getMapSize().getWidth() * 32 + bOffset,
-                        y * 32 + bOffset);
+                        0 + borderOffset,
+                        y * 32 + borderOffset,
+                        mapViewBasic.getMapSize().getWidth() * 32 + borderOffset,
+                        y * 32 + borderOffset);
             }
         }
         if (mapViewBasic.isHighlight() && mapViewBasic.getMapMouseRightPos().y != -1 && mapViewBasic.getMapMouseRightPos().x != -1 && !isSnapshot) {
@@ -322,7 +322,7 @@
             // draw the empty-tile icon (direcly to the mapview)
             if (isPickmap) {
                 grfx.setColor(IGUIConstants.BG_COLOR);
-                grfx.fillRect(x * 32 + bOffset, y * 32 + bOffset, 32, 32);
+                grfx.fillRect(x * 32 + borderOffset, y * 32 + borderOffset, 32, 32);
             } else {
                 mainControl.getUnknownTileIconX().paintIcon(this, grfx, x * 32, y * 32);
             }
@@ -449,7 +449,7 @@
                 // Draw the Icon:
 
                 // Rectangular view
-                mainControl.getMapSelIconX().paintIcon(this, grfx, posx * 32 + bOffset, posy * 32 + bOffset);
+                mainControl.getMapSelIconX().paintIcon(this, grfx, posx * 32 + borderOffset, posy * 32 + borderOffset);
 
                 if (signY == 0) {
                     break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Gridarta-commit] SF.net SVN: gridarta: [766] trunk/crossfire/src/cfeditor/gui/map/ DefaultLevelRen

gridarta-commit