From 800df7376ccc1b88c56c286af5e7a1fe1e12c091 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 12 Apr 2012 14:26:21 +0200
Subject: [PATCH] use the cursors from morrowind.bsa and remove mwpointer.png

---
 apps/openmw/CMakeLists.txt           |   2 +-
 apps/openmw/engine.cpp               |   4 ++++
 apps/openmw/mwgui/cursorreplace.cpp  |  16 ++++++++++++++++
 apps/openmw/mwgui/cursorreplace.hpp  |  16 ++++++++++++++++
 files/mygui/CMakeLists.txt           |   1 -
 files/mygui/mwpointer.png            | Bin 4810 -> 0 bytes
 files/mygui/openmw_images.xml        |  18 +++++++++---------
 libs/openengine/ogre/imagerotate.cpp |   3 +--
 libs/openengine/ogre/imagerotate.hpp |   2 +-
 9 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 apps/openmw/mwgui/cursorreplace.cpp
 create mode 100644 apps/openmw/mwgui/cursorreplace.hpp
 delete mode 100644 files/mygui/mwpointer.png

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index a8ae0bd49..b417c764d 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -25,7 +25,7 @@ add_openmw_dir (mwinput
 add_openmw_dir (mwgui
     layouts text_input widgets race class birth review window_manager console dialogue
     dialogue_history window_base stats_window messagebox journalwindow charactercreation
-    map_window window_pinnable_base
+    map_window window_pinnable_base cursorreplace
     )
 
 add_openmw_dir (mwdialogue
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 259733600..8fe6963a9 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -28,6 +28,7 @@
 #include "mwinput/inputmanager.hpp"
 
 #include "mwgui/window_manager.hpp"
+#include "mwgui/cursorreplace.hpp"
 
 #include "mwscript/scriptmanager.hpp"
 #include "mwscript/compilercontext.hpp"
@@ -368,6 +369,9 @@ void OMW::Engine::go()
 
     loadBSA();
 
+    // cursor replacer (converts the cursor from the bsa so they can be used by mygui)
+    MWGui::CursorReplace replacer;
+
     // Create the world
     mEnvironment.mWorld = new MWWorld::World (*mOgre, mFileCollections, mMaster,
         mResDir, mNewGame, mEnvironment, mEncoding, mFallbackMap);
diff --git a/apps/openmw/mwgui/cursorreplace.cpp b/apps/openmw/mwgui/cursorreplace.cpp
new file mode 100644
index 000000000..2079538fc
--- /dev/null
+++ b/apps/openmw/mwgui/cursorreplace.cpp
@@ -0,0 +1,16 @@
+#include "cursorreplace.hpp"
+
+#include <boost/filesystem.hpp>
+#include <openengine/ogre/imagerotate.hpp>
+
+#include <OgreResourceGroupManager.h>
+#include <OgreRoot.h>
+
+using namespace MWGui;
+
+CursorReplace::CursorReplace()
+{
+    OEngine::Render::ImageRotate::rotate("textures\\tx_cursormove.dds", "mwpointer_vresize.png", 90);
+    OEngine::Render::ImageRotate::rotate("textures\\tx_cursormove.dds", "mwpointer_dresize1.png", -45);
+    OEngine::Render::ImageRotate::rotate("textures\\tx_cursormove.dds", "mwpointer_dresize2.png", 45);
+}
diff --git a/apps/openmw/mwgui/cursorreplace.hpp b/apps/openmw/mwgui/cursorreplace.hpp
new file mode 100644
index 000000000..06fe28e39
--- /dev/null
+++ b/apps/openmw/mwgui/cursorreplace.hpp
@@ -0,0 +1,16 @@
+#ifndef GAME_CURSORREPLACE_H
+#define GAME_CURSORREPLACE_H
+
+#include <string>
+
+namespace MWGui
+{
+    /// \brief MyGUI does not support rotating cursors, so we have to do it manually
+    class CursorReplace
+    {
+    public:
+        CursorReplace();
+    };
+}
+
+#endif
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index dbc20f3f8..e3a7b9999 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -8,7 +8,6 @@ configure_file("${SDIR}/bigbars.png" "${DDIR}/bigbars.png" COPYONLY)
 configure_file("${SDIR}/black.png" "${DDIR}/black.png" COPYONLY)
 configure_file("${SDIR}/core.skin" "${DDIR}/core.skin" COPYONLY)
 configure_file("${SDIR}/core.xml" "${DDIR}/core.xml" COPYONLY)
-configure_file("${SDIR}/mwpointer.png" "${DDIR}/mwpointer.png" COPYONLY)
 configure_file("${SDIR}/mwgui.png" "${DDIR}/mwgui.png" COPYONLY)
 configure_file("${SDIR}/openmw_images.xml" "${DDIR}/openmw_images.xml" COPYONLY)
 configure_file("${SDIR}/openmw_settings.xml" "${DDIR}/openmw_settings.xml" COPYONLY)
diff --git a/files/mygui/mwpointer.png b/files/mygui/mwpointer.png
deleted file mode 100644
index 90bc19b5e2c7ea4f30b895cc5b8cde00ce460e98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4810
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

diff --git a/files/mygui/openmw_images.xml b/files/mygui/openmw_images.xml
index 6487742c3..e149273e2 100644
--- a/files/mygui/openmw_images.xml
+++ b/files/mygui/openmw_images.xml
@@ -2,37 +2,37 @@
 
 <MyGUI type="Resource">
         <Resource type="ResourceImageSet" name="ArrowPointerImage">
-                <Group name="Pointer" texture="mwpointer.png" size="32 32">
+                <Group name="Pointer" texture="textures\tx_cursor.dds" size="32 32">
                         <Index name="Pointer" >
                                 <Frame point="0 0"/>
                         </Index>
                 </Group>
         </Resource>
         <Resource type="ResourceImageSet" name="HResizePointerImage">
-                <Group name="Pointer" texture="mwpointer.png" size="32 32">
+                <Group name="Pointer" texture="textures\tx_cursormove.dds" size="32 32">
                         <Index name="Pointer" >
-                                <Frame point="32 0"/>
+                                <Frame point="0 0"/>
                         </Index>
                 </Group>
         </Resource>
         <Resource type="ResourceImageSet" name="VResizePointerImage">
-                <Group name="Pointer" texture="mwpointer.png" size="32 32">
+                <Group name="Pointer" texture="mwpointer_vresize.png" size="32 32">
                         <Index name="Pointer" >
-                                <Frame point="0 32"/>
+                                <Frame point="0 0"/>
                         </Index>
                 </Group>
         </Resource>
         <Resource type="ResourceImageSet" name="DResizePointerImage">
-                <Group name="Pointer" texture="mwpointer.png" size="32 32">
+                <Group name="Pointer" texture="mwpointer_dresize1.png" size="32 32">
                         <Index name="Pointer" >
-                                <Frame point="32 32"/>
+                                <Frame point="o o"/>
                         </Index>
                 </Group>
         </Resource>
         <Resource type="ResourceImageSet" name="DResize2PointerImage">
-                <Group name="Pointer" texture="mwpointer.png" size="32 32">
+                <Group name="Pointer" texture="mwpointer_dresize2.png" size="32 32">
                         <Index name="Pointer" >
-                                <Frame point="64 32"/>
+                                <Frame point="0 0"/>
                         </Index>
                 </Group>
         </Resource>
diff --git a/libs/openengine/ogre/imagerotate.cpp b/libs/openengine/ogre/imagerotate.cpp
index 166a1d3c6..b7522c100 100644
--- a/libs/openengine/ogre/imagerotate.cpp
+++ b/libs/openengine/ogre/imagerotate.cpp
@@ -49,7 +49,7 @@ void ImageRotate::rotate(const std::string& sourceImage, const std::string& dest
     unsigned int height = sourceTexture->getHeight();
 
     TexturePtr destTexture = TextureManager::getSingleton().createManual(
-                    "ImageRotateDestTexture",
+                    destImage,
                     ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
                     TEX_TYPE_2D,
                     width, height,
@@ -69,7 +69,6 @@ void ImageRotate::rotate(const std::string& sourceImage, const std::string& dest
     rtt->writeContentsToFile(destImage);
 
     // remove all the junk we've created
-    TextureManager::getSingleton().remove("ImageRotateDestTexture");
     MaterialManager::getSingleton().remove("ImageRotateMaterial");
     root->destroySceneManager(sceneMgr);
     delete rect;
diff --git a/libs/openengine/ogre/imagerotate.hpp b/libs/openengine/ogre/imagerotate.hpp
index 85363d71f..a3f6d662f 100644
--- a/libs/openengine/ogre/imagerotate.hpp
+++ b/libs/openengine/ogre/imagerotate.hpp
@@ -15,7 +15,7 @@ namespace Render
     public:
         /**
          * @param source image (file name - has to exist in an resource group)
-         * @param destination image (absolute file path)
+         * @param name of the destination texture to save to (in memory)
          * @param angle in degrees to turn
          */
         static void rotate(const std::string& sourceImage, const std::string& destImage, const float angle);