From d0cc44798d18db246d3c5795043a72a61535769d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 15 Mar 2011 14:55:03 +0200
Subject: Remove outdated files.
---
src/CMakeLists.txt | 2 -
src/Makefile.am | 2 -
src/resources/ambientoverlay.cpp | 127 ---------------------------------------
src/resources/ambientoverlay.h | 61 -------------------
4 files changed, 192 deletions(-)
delete mode 100644 src/resources/ambientoverlay.cpp
delete mode 100644 src/resources/ambientoverlay.h
(limited to 'src')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4534457ba..262475989 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -385,8 +385,6 @@ SET(SRCS
resources/action.h
resources/ambientlayer.cpp
resources/ambientlayer.h
- resources/ambientoverlay.cpp
- resources/ambientoverlay.h
resources/animation.cpp
resources/animation.h
resources/beinginfo.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index a51cdd64a..ac89d665f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -276,8 +276,6 @@ manaplus_SOURCES = gui/widgets/avatarlistbox.cpp \
resources/action.h \
resources/ambientlayer.cpp \
resources/ambientlayer.h \
- resources/ambientoverlay.cpp \
- resources/ambientoverlay.h \
resources/animation.cpp \
resources/animation.h \
resources/beinginfo.cpp \
diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp
deleted file mode 100644
index 88f79560e..000000000
--- a/src/resources/ambientoverlay.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2004-2009 The Mana World Development Team
- * Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "resources/ambientoverlay.h"
-
-#include "graphics.h"
-
-#include "resources/image.h"
-#include "resources/resourcemanager.h"
-
-AmbientOverlay::AmbientOverlay(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 (!mImage)
- return;
-
- if (mImage && keepRatio && !mImage->useOpenGL()
- /*&& 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(
- static_cast<int>(mImage->getWidth()) / defaultScreenWidth
- * graphics->getWidth(), static_cast<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();
- }
-}
-
-AmbientOverlay::~AmbientOverlay()
-{
- if (mImage)
- mImage->decRef();
-}
-
-void AmbientOverlay::update(int timePassed, float dx, float dy)
-{
- if (!mImage)
- return;
-
- // Self scrolling of the overlay
- mPosX -= mSpeedX * static_cast<float>(timePassed) / 10;
- mPosY -= mSpeedY * static_cast<float>(timePassed) / 10;
-
- // Parallax scrolling
- mPosX += dx * mParallax;
- mPosY += dy * mParallax;
-
- int imgW = mImage->getWidth();
- int imgH = mImage->getHeight();
-
- // Wrap values
- while (mPosX > imgW)
- mPosX -= static_cast<float>(imgW);
- while (mPosX < 0)
- mPosX += static_cast<float>(imgW);
-
- while (mPosY > imgH)
- mPosY -= static_cast<float>(imgH);
- while (mPosY < 0)
- mPosY += static_cast<float>(imgH);
-}
-
-void AmbientOverlay::draw(Graphics *graphics, int x, int y)
-{
- if (!mImage)
- return;
-
- if (!mImage->useOpenGL() || !mKeepRatio)
- {
- graphics->drawImagePattern(mImage, static_cast<int>(-mPosX),
- static_cast<int>(-mPosY), x + static_cast<int>(mPosX),
- y + static_cast<int>(mPosY));
- }
- else
- {
- graphics->drawRescaledImagePattern(mImage, static_cast<int>(-mPosX),
- static_cast<int>(-mPosY), x + static_cast<int>(mPosX),
- y + static_cast<int>(mPosY),
- static_cast<int>(mImage->getWidth()) / defaultScreenWidth
- * graphics->getWidth(),
- static_cast<int>(mImage->getHeight()) / defaultScreenHeight
- * graphics->getHeight());
- }
-}
diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h
deleted file mode 100644
index 25fcb72d7..000000000
--- a/src/resources/ambientoverlay.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2004-2009 The Mana World Development Team
- * Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RESOURCES_AMBIENTOVERLAY_H
-#define RESOURCES_AMBIENTOVERLAY_H
-
-class Graphics;
-class Image;
-
-class AmbientOverlay
-{
- 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.
- */
- AmbientOverlay(Image *img, float parallax,
- float speedX, float speedY, bool keepRatio = false);
-
- ~AmbientOverlay();
-
- 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
--
cgit v1.2.3-70-g09d2