Added support for map background images which work exactly like overlays, just that they are drawn before the tiles instead of afterwards. Renamed overlays to foregrounds (but kept backward compatibility intact)

3 files changed, 164 insertions, 1 deletions

diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp
new file mode 100644
index 00000000..92895bc2
--- /dev/null
+++ b/src/resources/ambientlayer.cpp
@@ -0,0 +1,103 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2004  The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "resources/ambientlayer.h"
+
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
+#include "graphics.h"
+
+AmbientLayer::AmbientLayer(Image *img, float parallax,
+                               float speedX, float speedY, bool keepRatio):
+    mImage(img), mParallax(parallax),
+    mPosX(0), mPosY(0),
+    mSpeedX(speedX), mSpeedY(speedY),
+    mKeepRatio(keepRatio)
+{
+
+    if (keepRatio && !mImage->isAnOpenGLOne()
+        && defaultScreenWidth != 0
+        && defaultScreenHeight != 0
+        && graphics->getWidth() != defaultScreenWidth
+        && graphics->getHeight() != defaultScreenHeight)
+    {
+        // Rescale the overlay to keep the ratio as if we were on
+        // the default resolution...
+        Image *rescaledOverlay = mImage->SDLgetScaledImage(
+         (int) mImage->getWidth() / defaultScreenWidth * graphics->getWidth(),
+     (int) mImage->getHeight() / defaultScreenHeight * graphics->getHeight());
+
+        if (rescaledOverlay)
+        {
+            // Replace the resource with the new one...
+            std::string idPath = mImage->getIdPath() + "_rescaled";
+            ResourceManager::getInstance()->addResource(idPath, rescaledOverlay);
+            mImage = rescaledOverlay;
+        }
+        else
+            mImage->incRef();
+    }
+    else
+        mImage->incRef();
+}
+
+AmbientLayer::~AmbientLayer()
+{
+    mImage->decRef();
+}
+
+void AmbientLayer::update(int timePassed, float dx, float dy)
+{
+    // Self scrolling of the overlay
+    mPosX -= mSpeedX * timePassed / 10;
+    mPosY -= mSpeedY * timePassed / 10;
+
+    // Parallax scrolling
+    mPosX += dx * mParallax;
+    mPosY += dy * mParallax;
+
+    int imgW = mImage->getWidth();
+    int imgH = mImage->getHeight();
+
+    // Wrap values
+    while (mPosX > imgW)
+        mPosX -= imgW;
+    while (mPosX < 0)
+        mPosX += imgW;
+
+    while (mPosY > imgH)
+        mPosY -= imgH;
+    while (mPosY < 0)
+        mPosY += imgH;
+}
+
+void AmbientLayer::draw(Graphics *graphics, int x, int y)
+{
+    if (!mImage->isAnOpenGLOne() || !mKeepRatio)
+        graphics->drawImagePattern(mImage,
+            (int) -mPosX, (int) -mPosY, x + (int) mPosX, y + (int) mPosY);
+    else
+        graphics->drawRescaledImagePattern(mImage,
+              (int) -mPosX, (int) -mPosY, x + (int) mPosX, y + (int) mPosY,
+         (int) mImage->getWidth() / defaultScreenWidth * graphics->getWidth(),
+     (int) mImage->getHeight() / defaultScreenHeight * graphics->getHeight());
+
+}
diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h
new file mode 100644
index 00000000..43801bdb
--- /dev/null
+++ b/src/resources/ambientlayer.h
@@ -0,0 +1,60 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2004  The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef RESOURCES_AMBIENTOVERLAY_H
+#define RESOURCES_AMBIENTOVERLAY_H
+
+class Graphics;
+class Image;
+
+class AmbientLayer
+{
+    public:
+        /**
+         * Constructor.
+         *
+         * @param img       the image this overlay displays
+         * @param parallax  scroll factor based on camera position
+         * @param speedX    scrolling speed in x-direction
+         * @param speedY    scrolling speed in y-direction
+         * @param keepRatio  rescale the image to keep
+         * the same ratio than in 800x600 resolution mode.
+         */
+        AmbientLayer(Image *img, float parallax,
+                       float speedX, float speedY, bool keepRatio = false);
+
+        ~AmbientLayer();
+
+        void update(int timePassed, float dx, float dy);
+
+        void draw(Graphics *graphics, int x, int y);
+
+    private:
+        Image *mImage;
+        float mParallax;
+        float mPosX;              /**< Current layer X position. */
+        float mPosY;              /**< Current layer Y position. */
+        float mSpeedX;            /**< Scrolling speed in X direction. */
+        float mSpeedY;            /**< Scrolling speed in Y direction. */
+        bool mKeepRatio;          /**< Keep overlay ratio on every resolution */
+};
+
+#endif
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 1e0eee50..291dd732 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -280,7 +280,7 @@ Map *MapReader::readMap(xmlNodePtr node, const std::string &path)
         }
     }
 
-    map->initializeOverlays();
+    map->initializeAmbientLayers();
 
     return map;
 }