aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2011-12-25 16:18:49 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2013-01-05 17:17:50 +0100
commit2636e834c25a42bb2dd01c3c61d075b666dee3bf (patch)
treec4dde3e6751393aeb3bbf5f48e0dc345ee2da997
parent6b6a6f4331631bb4ef92a23c80e982f2a6b76109 (diff)
downloadusdx-2636e834c25a42bb2dd01c3c61d075b666dee3bf.tar.gz
usdx-2636e834c25a42bb2dd01c3c61d075b666dee3bf.tar.xz
usdx-2636e834c25a42bb2dd01c3c61d075b666dee3bf.zip
base: moved Image and Texture to more appropriate locations
-rw-r--r--src/menu/texture.cpp (renamed from src/base/texture.cpp)0
-rw-r--r--src/menu/texture.hpp (renamed from src/base/texture.hpp)4
-rw-r--r--src/menu/texture_colorized.cpp (renamed from src/base/texture_colorized.cpp)0
-rw-r--r--src/menu/texture_colorized.hpp (renamed from src/base/texture_colorized.hpp)0
-rw-r--r--src/menu/texture_transparent.cpp (renamed from src/base/texture_transparent.cpp)0
-rw-r--r--src/menu/texture_transparent.hpp (renamed from src/base/texture_transparent.hpp)0
-rw-r--r--src/utils/image.cpp (renamed from src/base/image.cpp)0
-rw-r--r--src/utils/image.hpp (renamed from src/base/image.hpp)0
-rw-r--r--test/utils/image.cpp (renamed from test/base/image.cpp)0
9 files changed, 2 insertions, 2 deletions
diff --git a/src/base/texture.cpp b/src/menu/texture.cpp
index cf24b9ce..cf24b9ce 100644
--- a/src/base/texture.cpp
+++ b/src/menu/texture.cpp
diff --git a/src/base/texture.hpp b/src/menu/texture.hpp
index 29e3afeb..6e1ea640 100644
--- a/src/base/texture.hpp
+++ b/src/menu/texture.hpp
@@ -34,8 +34,8 @@
#include "utils/point_3d.hpp"
#include "utils/dimension.hpp"
#include "utils/rectangle.hpp"
-#include "image.hpp"
-#include "menu/drawable.hpp"
+#include "utils/image.hpp"
+#include "drawable.hpp"
namespace usdx
{
diff --git a/src/base/texture_colorized.cpp b/src/menu/texture_colorized.cpp
index 89e3ae54..89e3ae54 100644
--- a/src/base/texture_colorized.cpp
+++ b/src/menu/texture_colorized.cpp
diff --git a/src/base/texture_colorized.hpp b/src/menu/texture_colorized.hpp
index 56b06112..56b06112 100644
--- a/src/base/texture_colorized.hpp
+++ b/src/menu/texture_colorized.hpp
diff --git a/src/base/texture_transparent.cpp b/src/menu/texture_transparent.cpp
index 77aa8a14..77aa8a14 100644
--- a/src/base/texture_transparent.cpp
+++ b/src/menu/texture_transparent.cpp
diff --git a/src/base/texture_transparent.hpp b/src/menu/texture_transparent.hpp
index dae69d44..dae69d44 100644
--- a/src/base/texture_transparent.hpp
+++ b/src/menu/texture_transparent.hpp
diff --git a/src/base/image.cpp b/src/utils/image.cpp
index 1eb09ac1..1eb09ac1 100644
--- a/src/base/image.cpp
+++ b/src/utils/image.cpp
diff --git a/src/base/image.hpp b/src/utils/image.hpp
index 4c9d911e..4c9d911e 100644
--- a/src/base/image.hpp
+++ b/src/utils/image.hpp
diff --git a/test/base/image.cpp b/test/utils/image.cpp
index d91d553c..d91d553c 100644
--- a/test/base/image.cpp
+++ b/test/utils/image.cpp