[Pingus-CVS] r4072 - in trunk/pingus/src: editor engine/display pingus util

[grumbel at BerliOS]

Author: grumbel
Date: 2009-11-07 18:32:02 +0100 (Sat, 07 Nov 2009)
New Revision: 4072

Modified:
   trunk/pingus/src/editor/level_objs.cpp
   trunk/pingus/src/editor/level_objs.hpp
   trunk/pingus/src/editor/object_properties.cpp
   trunk/pingus/src/editor/viewport.cpp
   trunk/pingus/src/engine/display/sprite.cpp
   trunk/pingus/src/engine/display/sprite.hpp
   trunk/pingus/src/engine/display/sprite_impl.cpp
   trunk/pingus/src/engine/display/sprite_impl.hpp
   trunk/pingus/src/engine/display/surface.cpp
   trunk/pingus/src/engine/display/surface.hpp
   trunk/pingus/src/pingus/res_descriptor.cpp
   trunk/pingus/src/pingus/res_descriptor.hpp
   trunk/pingus/src/pingus/resource.cpp
   trunk/pingus/src/pingus/resource_modifier.cpp
   trunk/pingus/src/pingus/resource_modifier.hpp
   trunk/pingus/src/util/sexpr_file_reader.cpp
Log:
Renamed ResourceModifierNS::ResourceModifier to ResourceModifier::Enum


Modified: trunk/pingus/src/editor/level_objs.cpp
===================================================================
--- trunk/pingus/src/editor/level_objs.cpp      2009-11-07 11:36:34 UTC (rev 
4071)
+++ trunk/pingus/src/editor/level_objs.cpp      2009-11-07 17:32:02 UTC (rev 
4072)
@@ -220,13 +220,13 @@
 {
   // Set modifier
   if (attribs & CAN_ROTATE)
-    desc.modifier = ResourceModifierNS::rs_from_string(m);
+    desc.modifier = ResourceModifier::from_string(m);
   refresh_sprite();
 }
 
 /** Set the object's modifier */
 void
-LevelObj::set_modifier(ResourceModifierNS::ResourceModifier modifier)
+LevelObj::set_modifier(ResourceModifier::Enum modifier)
 {
   // Set modifier
   if (attribs & CAN_ROTATE)
@@ -235,7 +235,7 @@
   refresh_sprite();  
 }
 
-ResourceModifierNS::ResourceModifier
+ResourceModifier::Enum
 LevelObj::get_modifier() const
 {
   return desc.modifier;
@@ -259,7 +259,7 @@
   {
     fw.begin_section("surface");
     fw.write_string("image", desc.res_name);
-    fw.write_string("modifier", 
ResourceModifierNS::rs_to_string(desc.modifier));
+    fw.write_string("modifier", ResourceModifier::to_string(desc.modifier));
     fw.end_section();   // surface
   }
 
@@ -315,19 +315,19 @@
   if (section_name == "entrance")
   {
     desc.res_name = "entrances/generic";
-    desc.modifier = ResourceModifierNS::ROT0;
+    desc.modifier = ResourceModifier::ROT0;
     sprite = Sprite(desc);
   }
   else if (section_name == "solidcolor-background")
   {
     desc.res_name = "core/editor/solidcolorbackground";
-    desc.modifier = ResourceModifierNS::ROT0;
+    desc.modifier = ResourceModifier::ROT0;
     sprite = Sprite(desc);
   }
   else if (section_name == "starfield-background")
   {
     desc.res_name = "core/editor/starfield";
-    desc.modifier = ResourceModifierNS::ROT0;
+    desc.modifier = ResourceModifier::ROT0;
     sprite = Sprite(desc);
   }
 }

Modified: trunk/pingus/src/editor/level_objs.hpp
===================================================================
--- trunk/pingus/src/editor/level_objs.hpp      2009-11-07 11:36:34 UTC (rev 
4071)
+++ trunk/pingus/src/editor/level_objs.hpp      2009-11-07 17:32:02 UTC (rev 
4072)
@@ -225,9 +225,9 @@
   void set_modifier(const std::string m);
 
   /** Set the object's modifier */
-  void set_modifier(ResourceModifierNS::ResourceModifier modifier);
+  void set_modifier(ResourceModifier::Enum modifier);
 
-  ResourceModifierNS::ResourceModifier get_modifier() const;
+  ResourceModifier::Enum get_modifier() const;
 
   /** Set the object's section header name */
   void set_section_name(const std::string sn) { section_name = sn; }

Modified: trunk/pingus/src/editor/object_properties.cpp
===================================================================
--- trunk/pingus/src/editor/object_properties.cpp       2009-11-07 11:36:34 UTC 
(rev 4071)
+++ trunk/pingus/src/editor/object_properties.cpp       2009-11-07 17:32:02 UTC 
(rev 4072)
@@ -645,28 +645,28 @@
 ObjectProperties::on_flip_horizontal()
 {
   for(Objects::iterator i = objects.begin(); i != objects.end(); ++i)
-    
(*i)->set_modifier(ResourceModifierNS::horizontal_flip((*i)->get_modifier()));
+    
(*i)->set_modifier(ResourceModifier::horizontal_flip((*i)->get_modifier()));
 }
 
 void
 ObjectProperties::on_flip_vertical()
 {
   for(Objects::iterator i = objects.begin(); i != objects.end(); ++i)
-    
(*i)->set_modifier(ResourceModifierNS::vertical_flip((*i)->get_modifier()));
+    (*i)->set_modifier(ResourceModifier::vertical_flip((*i)->get_modifier()));
 }
 
 void
 ObjectProperties::on_rotate_90()
 {
   for(Objects::iterator i = objects.begin(); i != objects.end(); ++i)
-    (*i)->set_modifier(ResourceModifierNS::rotate_90((*i)->get_modifier()));
+    (*i)->set_modifier(ResourceModifier::rotate_90((*i)->get_modifier()));
 }
 
 void
 ObjectProperties::on_rotate_270()
 {
   for(Objects::iterator i = objects.begin(); i != objects.end(); ++i)
-    (*i)->set_modifier(ResourceModifierNS::rotate_270((*i)->get_modifier()));
+    (*i)->set_modifier(ResourceModifier::rotate_270((*i)->get_modifier()));
 }
 
 void

Modified: trunk/pingus/src/editor/viewport.cpp
===================================================================
--- trunk/pingus/src/editor/viewport.cpp        2009-11-07 11:36:34 UTC (rev 
4071)
+++ trunk/pingus/src/editor/viewport.cpp        2009-11-07 17:32:02 UTC (rev 
4072)
@@ -414,7 +414,7 @@
 {
   for(std::vector<LevelObj*>::iterator i = selected_objs.begin(); i != 
selected_objs.end(); ++i)
   {
-    
(*i)->set_modifier(ResourceModifierNS::horizontal_flip((*i)->get_modifier()));
+    
(*i)->set_modifier(ResourceModifier::horizontal_flip((*i)->get_modifier()));
   }  
 }
 
@@ -423,7 +423,7 @@
 {
   for(std::vector<LevelObj*>::iterator i = selected_objs.begin(); i != 
selected_objs.end(); ++i)
   {
-    
(*i)->set_modifier(ResourceModifierNS::vertical_flip((*i)->get_modifier()));
+    (*i)->set_modifier(ResourceModifier::vertical_flip((*i)->get_modifier()));
   }
 }
 
@@ -432,7 +432,7 @@
 {
   for(std::vector<LevelObj*>::iterator i = selected_objs.begin(); i != 
selected_objs.end(); ++i)
   {
-    (*i)->set_modifier(ResourceModifierNS::rotate_90((*i)->get_modifier()));
+    (*i)->set_modifier(ResourceModifier::rotate_90((*i)->get_modifier()));
   }
 }
 
@@ -441,7 +441,7 @@
 {
   for(std::vector<LevelObj*>::iterator i = selected_objs.begin(); i != 
selected_objs.end(); ++i)
   {
-    (*i)->set_modifier(ResourceModifierNS::rotate_270((*i)->get_modifier()));
+    (*i)->set_modifier(ResourceModifier::rotate_270((*i)->get_modifier()));
   }
 }
 

Modified: trunk/pingus/src/engine/display/sprite.cpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.cpp  2009-11-07 11:36:34 UTC (rev 
4071)
+++ trunk/pingus/src/engine/display/sprite.cpp  2009-11-07 17:32:02 UTC (rev 
4072)
@@ -70,7 +70,7 @@
 {  
 }
 
-Sprite::Sprite(const SpriteDescription& desc, 
ResourceModifierNS::ResourceModifier mod)
+Sprite::Sprite(const SpriteDescription& desc, ResourceModifier::Enum mod)
   : impl(new SpriteImpl(desc, mod))
 {
 }

Modified: trunk/pingus/src/engine/display/sprite.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.hpp  2009-11-07 11:36:34 UTC (rev 
4071)
+++ trunk/pingus/src/engine/display/sprite.hpp  2009-11-07 17:32:02 UTC (rev 
4072)
@@ -38,7 +38,7 @@
   Sprite(const std::string& name);
   Sprite(const ResDescriptor& desc);
   Sprite(const Pathname& name);
-  Sprite(const SpriteDescription& desc, ResourceModifierNS::ResourceModifier 
mod = ResourceModifierNS::ROT0);
+  Sprite(const SpriteDescription& desc, ResourceModifier::Enum mod = 
ResourceModifier::ROT0);
   Sprite(const Surface& surface);
   ~Sprite();
 

Modified: trunk/pingus/src/engine/display/sprite_impl.cpp
===================================================================
--- trunk/pingus/src/engine/display/sprite_impl.cpp     2009-11-07 11:36:34 UTC 
(rev 4071)
+++ trunk/pingus/src/engine/display/sprite_impl.cpp     2009-11-07 17:32:02 UTC 
(rev 4072)
@@ -25,7 +25,7 @@
 typedef std::map<std::string, FramebufferSurface> SurfaceCache;
 SurfaceCache surface_cache;
 
-FramebufferSurface load_framebuffer_surface(const Pathname& filename, 
ResourceModifierNS::ResourceModifier mod)
+FramebufferSurface load_framebuffer_surface(const Pathname& filename, 
ResourceModifier::Enum mod)
 {
   SurfaceCache::iterator i = surface_cache.find(filename.get_sys_path());
   
@@ -33,7 +33,7 @@
   {
 
     Surface surface(filename);
-    if (mod != ResourceModifierNS::ROT0)
+    if (mod != ResourceModifier::ROT0)
       surface = surface.mod(mod);
 
     if (!surface)
@@ -85,7 +85,7 @@
 {
 }
 
-SpriteImpl::SpriteImpl(const SpriteDescription& desc, 
ResourceModifierNS::ResourceModifier mod) :
+SpriteImpl::SpriteImpl(const SpriteDescription& desc, ResourceModifier::Enum 
mod) :
   filename(desc.filename),
   framebuffer_surface(),
   offset(),

Modified: trunk/pingus/src/engine/display/sprite_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite_impl.hpp     2009-11-07 11:36:34 UTC 
(rev 4071)
+++ trunk/pingus/src/engine/display/sprite_impl.hpp     2009-11-07 17:32:02 UTC 
(rev 4072)
@@ -49,7 +49,7 @@
 
 public:
   SpriteImpl();
-  SpriteImpl(const SpriteDescription& desc, 
ResourceModifierNS::ResourceModifier mod = ResourceModifierNS::ROT0);
+  SpriteImpl(const SpriteDescription& desc, ResourceModifier::Enum mod = 
ResourceModifier::ROT0);
   SpriteImpl(const Surface& surface_);
   ~SpriteImpl();
 

Modified: trunk/pingus/src/engine/display/surface.cpp
===================================================================
--- trunk/pingus/src/engine/display/surface.cpp 2009-11-07 11:36:34 UTC (rev 
4071)
+++ trunk/pingus/src/engine/display/surface.cpp 2009-11-07 17:32:02 UTC (rev 
4072)
@@ -221,32 +221,32 @@
 }
 
 Surface
-Surface::mod(ResourceModifierNS::ResourceModifier modifier)
+Surface::mod(ResourceModifier::Enum modifier)
 {
   switch(modifier)
   {
-    case ResourceModifierNS::ROT0:
+    case ResourceModifier::ROT0:
       return this->clone();
 
-    case ResourceModifierNS::ROT90:
+    case ResourceModifier::ROT90:
       return Blitter::rotate_90(*this);
 
-    case ResourceModifierNS::ROT180:
+    case ResourceModifier::ROT180:
       return Blitter::rotate_180(*this);
 
-    case ResourceModifierNS::ROT270:
+    case ResourceModifier::ROT270:
       return Blitter::rotate_270(*this);
 
-    case ResourceModifierNS::ROT0FLIP:
+    case ResourceModifier::ROT0FLIP:
       return Blitter::flip_horizontal(*this);
 
-    case ResourceModifierNS::ROT90FLIP:
+    case ResourceModifier::ROT90FLIP:
       return Blitter::rotate_90_flip(*this);
 
-    case ResourceModifierNS::ROT180FLIP:
+    case ResourceModifier::ROT180FLIP:
       return Blitter::rotate_180_flip(*this);
 
-    case ResourceModifierNS::ROT270FLIP:
+    case ResourceModifier::ROT270FLIP:
       return Blitter::rotate_270_flip(*this);
 
     default:

Modified: trunk/pingus/src/engine/display/surface.hpp
===================================================================
--- trunk/pingus/src/engine/display/surface.hpp 2009-11-07 11:36:34 UTC (rev 
4071)
+++ trunk/pingus/src/engine/display/surface.hpp 2009-11-07 17:32:02 UTC (rev 
4072)
@@ -64,7 +64,7 @@
   void fill(const Color& color);
 
   Surface scale(int w, int h);
-  Surface mod(ResourceModifierNS::ResourceModifier mod);
+  Surface mod(ResourceModifier::Enum mod);
   Surface clone() const;
   Surface subsection(const Rect& rect) const;
 

Modified: trunk/pingus/src/pingus/res_descriptor.cpp
===================================================================
--- trunk/pingus/src/pingus/res_descriptor.cpp  2009-11-07 11:36:34 UTC (rev 
4071)
+++ trunk/pingus/src/pingus/res_descriptor.cpp  2009-11-07 17:32:02 UTC (rev 
4072)
@@ -27,18 +27,18 @@
 
 ResDescriptor::ResDescriptor() :
   res_name(),
-  modifier(ResourceModifierNS::ROT0)
+  modifier(ResourceModifier::ROT0)
 {
 }
 
 ResDescriptor::ResDescriptor(const std::string& res_name_)
   : res_name(res_name_),
-    modifier(ResourceModifierNS::ROT0)
+    modifier(ResourceModifier::ROT0)
 {
 }
 
 ResDescriptor::ResDescriptor(const std::string& arg_res_name,
-                             ResourceModifierNS::ResourceModifier arg_modifier)
+                             ResourceModifier::Enum arg_modifier)
   : res_name(arg_res_name),
     modifier(arg_modifier)
 {
@@ -53,7 +53,7 @@
 std::ostream& operator<<(std::ostream& s, const ResDescriptor& desc)
 {
   return s << "[" << desc.res_name << ", "
-           << ResourceModifierNS::rs_to_string(desc.modifier) << "]";
+           << ResourceModifier::to_string(desc.modifier) << "]";
 }
 
 /* EOF */

Modified: trunk/pingus/src/pingus/res_descriptor.hpp
===================================================================
--- trunk/pingus/src/pingus/res_descriptor.hpp  2009-11-07 11:36:34 UTC (rev 
4071)
+++ trunk/pingus/src/pingus/res_descriptor.hpp  2009-11-07 17:32:02 UTC (rev 
4072)
@@ -26,12 +26,12 @@
   /// The name of the data, filename or resourcename ("textures/desert")
   std::string res_name;
 
-  ResourceModifierNS::ResourceModifier modifier;
+  ResourceModifier::Enum modifier;
 
   ResDescriptor ();
   ResDescriptor (const std::string& res_name);
   ResDescriptor (const std::string& res_name, 
-                 ResourceModifierNS::ResourceModifier modifier);
+                 ResourceModifier::Enum modifier);
 
   bool operator< (const ResDescriptor&) const;
 };

Modified: trunk/pingus/src/pingus/resource.cpp
===================================================================
--- trunk/pingus/src/pingus/resource.cpp        2009-11-07 11:36:34 UTC (rev 
4071)
+++ trunk/pingus/src/pingus/resource.cpp        2009-11-07 17:32:02 UTC (rev 
4072)
@@ -70,7 +70,7 @@
   SpriteDescription* desc = resmgr.get_sprite_description(desc_.res_name);
   if (desc)
   {
-    if (desc_.modifier == ResourceModifierNS::ROT0)
+    if (desc_.modifier == ResourceModifier::ROT0)
       return Surface(desc->filename);
     else
       return Surface(desc->filename).mod(desc_.modifier);

Modified: trunk/pingus/src/pingus/resource_modifier.cpp
===================================================================
--- trunk/pingus/src/pingus/resource_modifier.cpp       2009-11-07 11:36:34 UTC 
(rev 4071)
+++ trunk/pingus/src/pingus/resource_modifier.cpp       2009-11-07 17:32:02 UTC 
(rev 4072)
@@ -18,9 +18,9 @@
 
 #include <assert.h>
 
-namespace ResourceModifierNS {
+namespace ResourceModifier {
 
-ResourceModifier horizontal_flip (ResourceModifier modifier)
+ResourceModifier::Enum horizontal_flip (ResourceModifier::Enum modifier)
 {
   switch (modifier)
   {
@@ -46,7 +46,7 @@
   }
 }
 
-ResourceModifier vertical_flip (ResourceModifier modifier)
+ResourceModifier::Enum vertical_flip (ResourceModifier::Enum modifier)
 {
   switch (modifier)
   {
@@ -72,7 +72,7 @@
   }
 }
 
-ResourceModifier rotate_90 (ResourceModifier modifier)
+ResourceModifier::Enum rotate_90 (ResourceModifier::Enum modifier)
 {
   switch (modifier)
   {
@@ -98,7 +98,7 @@
   }
 }
 
-ResourceModifier rotate_270 (ResourceModifier modifier)
+ResourceModifier::Enum rotate_270 (ResourceModifier::Enum modifier)
 {
   switch (modifier)
   {
@@ -124,7 +124,7 @@
   }
 }
 
-std::string rs_to_string(ResourceModifier modifier)
+std::string to_string(ResourceModifier::Enum modifier)
 {
   switch (modifier)
   {
@@ -150,7 +150,7 @@
   }
 }
 
-ResourceModifier rs_from_string (const std::string& modifier)
+ResourceModifier::Enum from_string (const std::string& modifier)
 {
   if (modifier == "ROT0")
     return ROT0;
@@ -175,6 +175,6 @@
   }
 }
 
-} // namespace ResourceModifierNS
+} // namespace ResourceModifier
 
 /* EOF */

Modified: trunk/pingus/src/pingus/resource_modifier.hpp
===================================================================
--- trunk/pingus/src/pingus/resource_modifier.hpp       2009-11-07 11:36:34 UTC 
(rev 4071)
+++ trunk/pingus/src/pingus/resource_modifier.hpp       2009-11-07 17:32:02 UTC 
(rev 4072)
@@ -19,10 +19,11 @@
 
 #include <string>
 
-namespace ResourceModifierNS {
+namespace ResourceModifier {
 
 /** This array contains possible modifications of a surface */
-typedef enum {
+enum Enum 
+{
   ROT0,
   ROT90,
   ROT180,
@@ -31,17 +32,17 @@
   ROT90FLIP,
   ROT180FLIP,
   ROT270FLIP
-} ResourceModifier;
+};
 
-ResourceModifier horizontal_flip (ResourceModifier);
-ResourceModifier vertical_flip (ResourceModifier);
-ResourceModifier rotate_90 (ResourceModifier);
-ResourceModifier rotate_270 (ResourceModifier);
+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 rs_to_string (ResourceModifier);
-ResourceModifier rs_from_string (const std::string&);
+std::string to_string(ResourceModifier::Enum modifier);
+ResourceModifier::Enum from_string(const std::string& name);
 
-} // namespace ResourceModifierNS
+} // namespace ResourceModifier
 
 #endif
 

Modified: trunk/pingus/src/util/sexpr_file_reader.cpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_reader.cpp 2009-11-07 11:36:34 UTC (rev 
4071)
+++ trunk/pingus/src/util/sexpr_file_reader.cpp 2009-11-07 17:32:02 UTC (rev 
4072)
@@ -194,7 +194,7 @@
     {
       SExprFileReader reader(sub);
       reader.read_string("image",  v.res_name);
-      reader.read_enum("modifier", v.modifier, 
ResourceModifierNS::rs_from_string);
+      reader.read_enum("modifier", v.modifier, &ResourceModifier::from_string);
       return true;
     }
     return false;