Thread: [Gridarta-commit] SF.net SVN: gridarta:[9435] trunk/src (Page 6)

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

Revision: 9435
          http://sourceforge.net/p/gridarta/code/9435
Author:   akirschbaum
Date:     2013-10-15 18:31:19 +0000 (Tue, 15 Oct 2013)
Log Message:
-----------
Move code from GameObject to MapRenderer implementations. Removes dependency GameObject -> MapViewSettings.

Modified Paths:
--------------
    trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
    trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/model/gameobject/GameObject.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
    trunk/src/model/src/main/java/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java
    trunk/src/model/src/main/java/net/sf/gridarta/model/gameobject/GameObject.java
    trunk/src/model/src/test/java/net/sf/gridarta/model/gameobject/TestGameObject.java

Modified: trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
===================================================================

--- trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java	2013-10-15 18:12:21 UTC (rev 9434)
+++ trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java	2013-10-15 18:31:19 UTC (rev 9435)
@@ -343,7 +343,7 @@
      * @param node the game object to paint
      */
     private void paintGameObject(@NotNull final Graphics g, final int x, final int y, @NotNull final net.sf.gridarta.model.gameobject.GameObject<GameObject, MapArchObject, Archetype> node) {
-        final ImageIcon img = node.getImage(mapViewSettings);
+        final ImageIcon img = node.getNormalImage();
         if (!node.isMulti() || (img.getIconWidth() == IGUIConstants.SQUARE_WIDTH && img.getIconHeight() == IGUIConstants.SQUARE_HEIGHT)) {
             offset.x = 0;
             offset.y = 0;

Modified: trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/model/gameobject/GameObject.java
===================================================================
--- trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/model/gameobject/GameObject.java	2013-10-15 18:12:21 UTC (rev 9434)
+++ trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/model/gameobject/GameObject.java	2013-10-15 18:31:19 UTC (rev 9435)
@@ -19,12 +19,10 @@
 
 package net.sf.gridarta.var.crossfire.model.gameobject;
 
-import javax.swing.ImageIcon;
 import net.sf.gridarta.model.anim.AnimationObjects;
 import net.sf.gridarta.model.baseobject.BaseObject;
 import net.sf.gridarta.model.face.FaceObjectProviders;
 import net.sf.gridarta.model.gameobject.AbstractGameObject;
-import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
 import net.sf.gridarta.var.crossfire.model.archetype.Archetype;
 import net.sf.gridarta.var.crossfire.model.maparchobject.MapArchObject;
 import org.jetbrains.annotations.NotNull;
@@ -155,16 +153,7 @@
     /**
      * {@inheritDoc}
      */
-    @NotNull
     @Override
-    public ImageIcon getImage(@NotNull final MapViewSettings mapViewSettings) {
-        return getNormalImage();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
     public int getLightRadius() {
         return getAttributeInt(GLOW_RADIUS);
     }

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java	2013-10-15 18:12:21 UTC (rev 9434)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java	2013-10-15 18:31:19 UTC (rev 9435)
@@ -497,7 +497,25 @@
      */
     private void paintGameObject(@NotNull final Graphics2D g, final int xStart, final int yStart, @NotNull final G gameObject, final boolean inSpawnPoint) {
         final G head = gameObject.getHead();
-        final Icon icon = "trans.101".equals(head.getFaceObjName()) ? unknownSquareIcon : head.getImage(mapViewSettings);
+        final Icon icon;
+        if ("trans.101".equals(head.getFaceObjName())) {
+            icon = unknownSquareIcon;
+        } else {
+            final boolean drawDouble = head.isDrawDouble(mapViewSettings.isDoubleFaces());
+            if (mapViewSettings.isAlphaType(head.getEditType())) {
+                if (drawDouble) {
+                    icon = head.getTransparentDoubleImage();
+                } else {
+                    icon = head.getTransparentImage();
+                }
+            } else {
+                if (drawDouble) {
+                    icon = head.getDoubleImage();
+                } else {
+                    icon = head.getNormalImage();
+                }
+            }
+        }
         final int xOffset = head.getAttributeInt(DefaultIsoGameObject.ALIGN);
         final int zoom = head.getAttributeInt(DefaultIsoGameObject.ZOOM);
         final double rotate = getRotate(head);

Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java	2013-10-15 18:12:21 UTC (rev 9434)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java	2013-10-15 18:31:19 UTC (rev 9435)
@@ -25,7 +25,6 @@
 import net.sf.gridarta.model.baseobject.BaseObject;
 import net.sf.gridarta.model.face.FaceObjectProviders;
 import net.sf.gridarta.model.maparchobject.MapArchObject;
-import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -163,7 +162,7 @@
      * @return the transparent face for this game object
      */
     @NotNull
-    protected ImageIcon getTransparentImage() {
+    public ImageIcon getTransparentImage() {
         if (transFace == null) {
             transFace = faceObjectProviders.getTrans(this);
         }
@@ -175,7 +174,7 @@
      * @return the double face for this game object
      */
     @NotNull
-    protected ImageIcon getDoubleImage() {
+    public ImageIcon getDoubleImage() {
         if (doubleFace == null) {
             doubleFace = faceObjectProviders.getDouble(this);
         }
@@ -187,7 +186,7 @@
      * @return the transparent face for this game object
      */
     @NotNull
-    protected ImageIcon getTransparentDoubleImage() {
+    public ImageIcon getTransparentDoubleImage() {
         if (transDoubleFace == null) {
             transDoubleFace = faceObjectProviders.getTransDouble(this);
         }
@@ -207,28 +206,6 @@
      */
     @NotNull
     @Override
-    public ImageIcon getImage(@NotNull final MapViewSettings mapViewSettings) {
-        final boolean drawDouble = isDrawDouble(mapViewSettings.isDoubleFaces());
-        if (mapViewSettings.isAlphaType(getEditType())) {
-            if (drawDouble) {
-                return getTransparentDoubleImage();
-            } else {
-                return getTransparentImage();
-            }
-        } else {
-            if (drawDouble) {
-                return getDoubleImage();
-            } else {
-                return getNormalImage();
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @NotNull
-    @Override
     @SuppressWarnings("unchecked")
     public G clone() {
         //noinspection OverriddenMethodCallDuringObjectConstruction

Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/gameobject/GameObject.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/gameobject/GameObject.java	2013-10-15 18:12:21 UTC (rev 9434)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/gameobject/GameObject.java	2013-10-15 18:31:19 UTC (rev 9435)
@@ -20,13 +20,11 @@
 package net.sf.gridarta.model.gameobject;
 
 import java.util.Iterator;
-import javax.swing.ImageIcon;
 import net.sf.gridarta.model.archetype.Archetype;
 import net.sf.gridarta.model.baseobject.BaseObject;
 import net.sf.gridarta.model.baseobject.GameObjectContainer;
 import net.sf.gridarta.model.maparchobject.MapArchObject;
 import net.sf.gridarta.model.mapmodel.MapSquare;
-import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -130,15 +128,6 @@
     boolean isEmpty();
 
     /**
-     * Returns the face for this game object according to the settings of a
-     * {@link MapViewSettings} instance.
-     * @param mapViewSettings the map view settings instance
-     * @return the face
-     */
-    @NotNull
-    ImageIcon getImage(@NotNull MapViewSettings mapViewSettings);
-
-    /**
      * Remove this GameObject from its container. Does nothing if the object has
      * no container. This method also takes perfectly well care of multi-part
      * GameObjects.

Modified: trunk/src/model/src/test/java/net/sf/gridarta/model/gameobject/TestGameObject.java
===================================================================
--- trunk/src/model/src/test/java/net/sf/gridarta/model/gameobject/TestGameObject.java	2013-10-15 18:12:21 UTC (rev 9434)
+++ trunk/src/model/src/test/java/net/sf/gridarta/model/gameobject/TestGameObject.java	2013-10-15 18:31:19 UTC (rev 9435)
@@ -19,13 +19,11 @@
 
 package net.sf.gridarta.model.gameobject;
 
-import javax.swing.ImageIcon;
 import net.sf.gridarta.model.anim.AnimationObjects;
 import net.sf.gridarta.model.archetype.TestArchetype;
 import net.sf.gridarta.model.baseobject.BaseObject;
 import net.sf.gridarta.model.face.FaceObjectProviders;
 import net.sf.gridarta.model.maparchobject.TestMapArchObject;
-import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -69,16 +67,7 @@
     /**
      * {@inheritDoc}
      */
-    @NotNull
     @Override
-    public ImageIcon getImage(@NotNull final MapViewSettings mapViewSettings) {
-        return getNormalImage();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
     public int getLightRadius() {
         return 0;
     }

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:[9435] trunk/src (Page 6)

gridarta-commit