[Pingus-CVS] r4078 - in trunk/pingus/src: engine/display pingus

[grumbel at BerliOS]

Author: grumbel
Date: 2009-11-08 14:45:53 +0100 (Sun, 08 Nov 2009)
New Revision: 4078

Added:
   trunk/pingus/src/engine/display/resource_modifier.cpp
   trunk/pingus/src/engine/display/resource_modifier.hpp
Removed:
   trunk/pingus/src/pingus/resource_modifier.cpp
   trunk/pingus/src/pingus/resource_modifier.hpp
Modified:
   trunk/pingus/src/engine/display/sprite.hpp
   trunk/pingus/src/engine/display/surface.hpp
   trunk/pingus/src/pingus/res_descriptor.hpp
Log:
Moved ResourceModifier to engine/display/


Copied: trunk/pingus/src/engine/display/resource_modifier.cpp (from rev 4072, 
trunk/pingus/src/pingus/resource_modifier.cpp)
===================================================================
--- trunk/pingus/src/pingus/resource_modifier.cpp       2009-11-07 17:32:02 UTC 
(rev 4072)
+++ trunk/pingus/src/engine/display/resource_modifier.cpp       2009-11-08 
13:45:53 UTC (rev 4078)
@@ -0,0 +1,180 @@
+//  Pingus - A free Lemmings clone
+//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
+//
+//  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 3 of the License, or
+//  (at your option) 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 "engine/display/resource_modifier.hpp"
+
+#include <assert.h>
+
+namespace ResourceModifier {
+
+ResourceModifier::Enum horizontal_flip (ResourceModifier::Enum modifier)
+{
+  switch (modifier)
+  {
+    case ROT0:
+      return ROT0FLIP;
+    case ROT90:
+      return ROT90FLIP;
+    case ROT180:
+      return ROT180FLIP;
+    case ROT270:
+      return ROT270FLIP;
+    case ROT0FLIP:
+      return ROT0;
+    case ROT90FLIP:
+      return ROT90;
+    case ROT180FLIP:
+      return ROT180;
+    case ROT270FLIP:
+      return ROT270;
+    default:
+      assert (0);
+      return ROT0;
+  }
+}
+
+ResourceModifier::Enum vertical_flip (ResourceModifier::Enum modifier)
+{
+  switch (modifier)
+  {
+    case ROT0:
+      return ROT180FLIP;
+    case ROT90:
+      return ROT270FLIP;
+    case ROT180:
+      return ROT0FLIP;
+    case ROT270:
+      return ROT90FLIP;
+    case ROT0FLIP:
+      return ROT180;
+    case ROT90FLIP:
+      return ROT270;
+    case ROT180FLIP:
+      return ROT0;
+    case ROT270FLIP:
+      return ROT90;
+    default:
+      assert (0);
+      return ROT0;
+  }
+}
+
+ResourceModifier::Enum rotate_90 (ResourceModifier::Enum modifier)
+{
+  switch (modifier)
+  {
+    case ROT0:
+      return ROT90;
+    case ROT90:
+      return ROT180;
+    case ROT180:
+      return ROT270;
+    case ROT270:
+      return ROT0;
+    case ROT0FLIP:
+      return ROT270FLIP;
+    case ROT90FLIP:
+      return ROT0FLIP;
+    case ROT180FLIP:
+      return ROT90FLIP;
+    case ROT270FLIP:
+      return ROT180FLIP;
+    default:
+      assert (0);
+      return ROT0;
+  }
+}
+
+ResourceModifier::Enum rotate_270 (ResourceModifier::Enum modifier)
+{
+  switch (modifier)
+  {
+    case ROT0:
+      return ROT270;
+    case ROT90:
+      return ROT0;
+    case ROT180:
+      return ROT90;
+    case ROT270:
+      return ROT180;
+    case ROT0FLIP:
+      return ROT90FLIP;
+    case ROT90FLIP:
+      return ROT180FLIP;
+    case ROT180FLIP:
+      return ROT270FLIP;
+    case ROT270FLIP:
+      return ROT0FLIP;
+    default:
+      assert (0);
+      return ROT0;
+  }
+}
+
+std::string to_string(ResourceModifier::Enum modifier)
+{
+  switch (modifier)
+  {
+    case ROT0:
+      return "ROT0";
+    case ROT90:
+      return "ROT90";
+    case ROT180:
+      return "ROT180";
+    case ROT270:
+      return "ROT270";
+    case ROT0FLIP:
+      return "ROT0FLIP";
+    case ROT90FLIP:
+      return "ROT90FLIP";
+    case ROT180FLIP:
+      return "ROT180FLIP";
+    case ROT270FLIP:
+      return "ROT270FLIP";
+    default:
+      assert (0);
+      return "--Error--";
+  }
+}
+
+ResourceModifier::Enum from_string (const std::string& modifier)
+{
+  if (modifier == "ROT0")
+    return ROT0;
+  else if (modifier == "ROT90")
+    return ROT90;
+  else if (modifier == "ROT180")
+    return ROT180;
+  else if (modifier == "ROT270")
+    return ROT270;
+  else if (modifier == "ROT0FLIP")
+    return ROT0FLIP;
+  else if (modifier == "ROT90FLIP")
+    return ROT90FLIP;
+  else if (modifier == "ROT180FLIP")
+    return ROT180FLIP;
+  else if (modifier == "ROT270FLIP")
+    return ROT270FLIP;
+  else
+  {
+    assert (0);
+    return ROT0;
+  }
+}
+
+} // namespace ResourceModifier
+
+/* EOF */

Copied: trunk/pingus/src/engine/display/resource_modifier.hpp (from rev 4072, 
trunk/pingus/src/pingus/resource_modifier.hpp)

Modified: trunk/pingus/src/engine/display/sprite.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.hpp  2009-11-08 00:37:04 UTC (rev 
4077)
+++ trunk/pingus/src/engine/display/sprite.hpp  2009-11-08 13:45:53 UTC (rev 
4078)
@@ -21,7 +21,7 @@
 #include <string>
 
 #include "math/origin.hpp"
-#include "pingus/resource_modifier.hpp"
+#include "engine/display/resource_modifier.hpp"
 
 class Color;
 class Surface;

Modified: trunk/pingus/src/engine/display/surface.hpp
===================================================================
--- trunk/pingus/src/engine/display/surface.hpp 2009-11-08 00:37:04 UTC (rev 
4077)
+++ trunk/pingus/src/engine/display/surface.hpp 2009-11-08 13:45:53 UTC (rev 
4078)
@@ -19,9 +19,9 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include "engine/display/resource_modifier.hpp"
 #include "math/color.hpp"
 #include "math/size.hpp"
-#include "pingus/resource_modifier.hpp"
 #include "util/pathname.hpp"
 
 class Rect;

Modified: trunk/pingus/src/pingus/res_descriptor.hpp
===================================================================
--- trunk/pingus/src/pingus/res_descriptor.hpp  2009-11-08 00:37:04 UTC (rev 
4077)
+++ trunk/pingus/src/pingus/res_descriptor.hpp  2009-11-08 13:45:53 UTC (rev 
4078)
@@ -17,7 +17,7 @@
 #ifndef HEADER_PINGUS_PINGUS_RES_DESCRIPTOR_HPP
 #define HEADER_PINGUS_PINGUS_RES_DESCRIPTOR_HPP
 
-#include "pingus/resource_modifier.hpp"
+#include "engine/display/resource_modifier.hpp"
 
 /// Resource descriptor, tells were to find a resource.
 class ResDescriptor

Deleted: trunk/pingus/src/pingus/resource_modifier.cpp
===================================================================
--- trunk/pingus/src/pingus/resource_modifier.cpp       2009-11-08 00:37:04 UTC 
(rev 4077)
+++ trunk/pingus/src/pingus/resource_modifier.cpp       2009-11-08 13:45:53 UTC 
(rev 4078)
@@ -1,180 +0,0 @@
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-//  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 3 of the License, or
-//  (at your option) 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 "pingus/resource_modifier.hpp"
-
-#include <assert.h>
-
-namespace ResourceModifier {
-
-ResourceModifier::Enum horizontal_flip (ResourceModifier::Enum modifier)
-{
-  switch (modifier)
-  {
-    case ROT0:
-      return ROT0FLIP;
-    case ROT90:
-      return ROT90FLIP;
-    case ROT180:
-      return ROT180FLIP;
-    case ROT270:
-      return ROT270FLIP;
-    case ROT0FLIP:
-      return ROT0;
-    case ROT90FLIP:
-      return ROT90;
-    case ROT180FLIP:
-      return ROT180;
-    case ROT270FLIP:
-      return ROT270;
-    default:
-      assert (0);
-      return ROT0;
-  }
-}
-
-ResourceModifier::Enum vertical_flip (ResourceModifier::Enum modifier)
-{
-  switch (modifier)
-  {
-    case ROT0:
-      return ROT180FLIP;
-    case ROT90:
-      return ROT270FLIP;
-    case ROT180:
-      return ROT0FLIP;
-    case ROT270:
-      return ROT90FLIP;
-    case ROT0FLIP:
-      return ROT180;
-    case ROT90FLIP:
-      return ROT270;
-    case ROT180FLIP:
-      return ROT0;
-    case ROT270FLIP:
-      return ROT90;
-    default:
-      assert (0);
-      return ROT0;
-  }
-}
-
-ResourceModifier::Enum rotate_90 (ResourceModifier::Enum modifier)
-{
-  switch (modifier)
-  {
-    case ROT0:
-      return ROT90;
-    case ROT90:
-      return ROT180;
-    case ROT180:
-      return ROT270;
-    case ROT270:
-      return ROT0;
-    case ROT0FLIP:
-      return ROT270FLIP;
-    case ROT90FLIP:
-      return ROT0FLIP;
-    case ROT180FLIP:
-      return ROT90FLIP;
-    case ROT270FLIP:
-      return ROT180FLIP;
-    default:
-      assert (0);
-      return ROT0;
-  }
-}
-
-ResourceModifier::Enum rotate_270 (ResourceModifier::Enum modifier)
-{
-  switch (modifier)
-  {
-    case ROT0:
-      return ROT270;
-    case ROT90:
-      return ROT0;
-    case ROT180:
-      return ROT90;
-    case ROT270:
-      return ROT180;
-    case ROT0FLIP:
-      return ROT90FLIP;
-    case ROT90FLIP:
-      return ROT180FLIP;
-    case ROT180FLIP:
-      return ROT270FLIP;
-    case ROT270FLIP:
-      return ROT0FLIP;
-    default:
-      assert (0);
-      return ROT0;
-  }
-}
-
-std::string to_string(ResourceModifier::Enum modifier)
-{
-  switch (modifier)
-  {
-    case ROT0:
-      return "ROT0";
-    case ROT90:
-      return "ROT90";
-    case ROT180:
-      return "ROT180";
-    case ROT270:
-      return "ROT270";
-    case ROT0FLIP:
-      return "ROT0FLIP";
-    case ROT90FLIP:
-      return "ROT90FLIP";
-    case ROT180FLIP:
-      return "ROT180FLIP";
-    case ROT270FLIP:
-      return "ROT270FLIP";
-    default:
-      assert (0);
-      return "--Error--";
-  }
-}
-
-ResourceModifier::Enum from_string (const std::string& modifier)
-{
-  if (modifier == "ROT0")
-    return ROT0;
-  else if (modifier == "ROT90")
-    return ROT90;
-  else if (modifier == "ROT180")
-    return ROT180;
-  else if (modifier == "ROT270")
-    return ROT270;
-  else if (modifier == "ROT0FLIP")
-    return ROT0FLIP;
-  else if (modifier == "ROT90FLIP")
-    return ROT90FLIP;
-  else if (modifier == "ROT180FLIP")
-    return ROT180FLIP;
-  else if (modifier == "ROT270FLIP")
-    return ROT270FLIP;
-  else
-  {
-    assert (0);
-    return ROT0;
-  }
-}
-
-} // namespace ResourceModifier
-
-/* EOF */

Deleted: trunk/pingus/src/pingus/resource_modifier.hpp
===================================================================
--- trunk/pingus/src/pingus/resource_modifier.hpp       2009-11-08 00:37:04 UTC 
(rev 4077)
+++ trunk/pingus/src/pingus/resource_modifier.hpp       2009-11-08 13:45:53 UTC 
(rev 4078)
@@ -1,49 +0,0 @@
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-//  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 3 of the License, or
-//  (at your option) 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 HEADER_PINGUS_PINGUS_RESOURCE_MODIFIER_HPP
-#define HEADER_PINGUS_PINGUS_RESOURCE_MODIFIER_HPP
-
-#include <string>
-
-namespace ResourceModifier {
-
-/** This array contains possible modifications of a surface */
-enum Enum 
-{
-  ROT0,
-  ROT90,
-  ROT180,
-  ROT270,
-  ROT0FLIP,
-  ROT90FLIP,
-  ROT180FLIP,
-  ROT270FLIP
-};
-
-ResourceModifier::Enum horizontal_flip(ResourceModifier::Enum modifier);
-ResourceModifier::Enum vertical_flip(ResourceModifier::Enum modifier);
-ResourceModifier::Enum rotate_90(ResourceModifier::Enum modifier);
-ResourceModifier::Enum rotate_270(ResourceModifier::Enum modifier);
-
-std::string to_string(ResourceModifier::Enum modifier);
-ResourceModifier::Enum from_string(const std::string& name);
-
-} // namespace ResourceModifier
-
-#endif
-
-/* EOF */