Changeset 3507

Timestamp:

11/12/10 03:10:46 (3 years ago)

Author:

prock

Message:

• Modified a calculation in PointType2D to use the FIFE math function
• Replaced a #define with an enum for the resource location type
• Exposed ResourceLocation::getType() to python

Location:

trunk/engine/core/util

Files:

• resource/resource.i (modified) (4 diffs)
• resource/resource_location.h (modified) (2 diffs)
• structures/point.h (modified) (1 diff)

trunk/engine/core/util/resource/resource.i

@@ -1 +1 @@
 /***************************************************************************
- *   Copyright (C) 2005-2008 by the FIFE team                              *
- *   http://www.fifengine.de                                               *
+ *   Copyright (C) 2005-2010 by the FIFE team                              *
+ *   http://www.fifengine.net                                              *
  *   This file is part of FIFE.                                            *
  *                                                                         *
@@ -30 +30 @@
 namespace FIFE {
 
+        enum ResourceLocationType {
+                RES_TYPE_FILE = 0,
+                RES_TYPE_IMAGE = 1
+        };
+        
+        
         class ResourceLocation {
         public:
@@ -38 +44 @@
                 virtual bool operator <(const ResourceLocation& loc) const;
                 virtual ResourceLocation* clone() const;
-
-        private:
-                ResourceLocation(const std::string& filename);
+                
+                ResourceLocationType getType() const;
         };
 
@@ -78 +83 @@
         };
 
-
-        enum { RES_LOADED = 0x01, RES_NON_LOADED  = 0x02};
-
         class Pool {
         public:

trunk/engine/core/util/resource/resource_location.h

@@ -35 +35 @@
 namespace FIFE {
 
-#define RES_TYPE_FILE 0
-#define RES_TYPE_IMAGE 1
+        enum ResourceLocationType {
+                RES_TYPE_FILE = 0,
+                RES_TYPE_IMAGE = 1
+        };
 
         /** Contains information about the Location of a Resource
@@ -98 +100 @@
                 }
 
-                int getType() const { return m_type; }
+                ResourceLocationType getType() const { return m_type; }
 
         protected:
                 std::string m_filename;
-                int m_type;
+                ResourceLocationType m_type;
         };
 } //FIFE

trunk/engine/core/util/structures/point.h

@@ -123 +123 @@
                         double sq;
                         sq = x*x + y*y;
-                        return static_cast<T>(sqrt(sq));
+                        return static_cast<T>(Mathd::Sqrt(sq));
                 }