Changeset 121 for trunk/nv/types.hh

Timestamp:

06/15/13 17:47:57 (12 years ago)

Author:

epyon

Message:

• Nova builds with -Weverything/-Wall/-pedantic/etc on: on MSVC 2012 on GCC 4.6.3 on clang 3.2
• ... without a single fucking warning.

File:

• trunk/nv/types.hh (modified) (8 diffs)

trunk/nv/types.hh

@@ -6 +6 @@
 #define NV_TYPES_HH
 
-#include <glm/glm.hpp>
 #include <nv/common.hh>
+#include <nv/math.hh>
 #include <nv/object.hh>
 #include <type_traits>
@@ -44 +44 @@
         };
 
-        template <typename T> 
-        struct datatype_traits 
-        {
-                typedef T type;
-                typedef T base_type;
-                static const size_t size = 1;
-        };
-
-        template <typename T> 
-        struct datatype_traits< glm::detail::tvec2<T> > 
-        {
-                typedef glm::detail::tvec2<T> type;
-                typedef typename type::value_type base_type;
-                static const size_t size = 2;
-        };
-
-        template <typename T> 
-        struct datatype_traits< glm::detail::tvec3<T> > 
-        {
-                typedef glm::detail::tvec3<T> type;
-                typedef typename type::value_type base_type;
-                static const size_t size = 3;
-        };
-
-        template <typename T> 
-        struct datatype_traits< glm::detail::tvec4<T> > 
-        {
-                typedef glm::detail::tvec4<T> type;
-                typedef typename type::value_type base_type;
-                static const size_t size = 4;
-        };
-
-        typedef glm::detail::tvec2<sint8> i8vec2;
-        typedef glm::detail::tvec3<sint8> i8vec3;
-        typedef glm::detail::tvec4<sint8> i8vec4;
-
-        typedef glm::vec2 vec2;
-        typedef glm::vec3 vec3;
-        typedef glm::vec4 vec4;
-
-        typedef glm::ivec2 ivec2;
-        typedef glm::ivec3 ivec3;
-        typedef glm::ivec4 ivec4;
-
-        typedef glm::mat2 mat2;
-        typedef glm::mat3 mat3;
-        typedef glm::mat4 mat4;
-
         template < datatype EnumType > struct enum_to_type {};
 
@@ -177 +129 @@
         enum type_flag
         {
-                TF_POINTER      = 0x01, //< field is a pointer
-                TF_NOSERIALIZE  = 0x02, //< ignore during serialization
-                TF_INVISIBLE    = 0x04, //< field invisible to API
-                TF_READONLY     = 0x08, //< read only field
-                TF_SIMPLETYPE   = 0x10, //< raw binary I/O possible
+                TF_POINTER      = 0x01, //!< field is a pointer
+                TF_NOSERIALIZE  = 0x02, //!< ignore during serialization
+                TF_INVISIBLE    = 0x04, //!< field invisible to API
+                TF_READONLY     = 0x08, //!< read only field
+                TF_SIMPLETYPE   = 0x10, //!< raw binary I/O possible
                 TF_OWNED        = 0x20,
-                TF_CONTAINER    = 0x40, //< is a container
+                TF_CONTAINER    = 0x40, //!< is a container
         };
 
         struct type_field
         {
-                std::string      name;      //< name of the field
-                std::string      type_name; //< name of the type of the field
-                const std::type_info* type_inf;  //< typeinfo for later retrieval of type
-                type_entry*      type;      //< pointer to field type
-                unsigned int     flags;     //< flags 
+                std::string      name;          //!< name of the field
+                std::string      type_name;     //!< name of the type of the field
+                const std::type_info* type_inf; //!< typeinfo for later retrieval of type
+                type_entry*      type;          //!< pointer to field type
+                unsigned int     flags;         //!< flags 
                 size_t           offset;
 
                 template< typename TOBJECT, typename TFIELD >
-                type_field( const char* name, TFIELD TOBJECT::*field, typename std::enable_if< is_container<TFIELD>::value, void* >::type = nullptr )
-                : name(name)
+                type_field( const char* aname, TFIELD TOBJECT::*field, typename std::enable_if< is_container<TFIELD>::value, void* >::type = nullptr )
+                : name(aname)
                         , type_name()
                         , type_inf( &typeid( typename std::remove_pointer<typename TFIELD::value_type>::type ) )
@@ -204 +156 @@
                         , offset( offset_of( field ) ) 
                 {
-                        NV_LOG( LOG_INFO, name << "-" << offset);
+                        NV_LOG( LOG_INFO, aname << "-" << offset);
                         flags = TF_CONTAINER |
                                 ( std::is_pointer<typename TFIELD::value_type>::value ? TF_POINTER : 0 ) |
@@ -211 +163 @@
 
                 template< typename TOBJECT, typename TFIELD >
-                type_field( const char* name, TFIELD TOBJECT::*field, typename std::enable_if< !is_container<TFIELD>::value, void* >::type = nullptr )
-                : name(name)
+                type_field( const char* aname, TFIELD TOBJECT::*field, typename std::enable_if< !is_container<TFIELD>::value, void* >::type = nullptr )
+                : name(aname)
                         , type_name()
                         , type_inf( &typeid( typename std::remove_pointer<TFIELD>::type ) )
@@ -219 +171 @@
                         , offset( offset_of( field ) )
                 {
-                        NV_LOG( LOG_INFO, name << "-" << offset);
+                        NV_LOG( LOG_INFO, aname << "-" << offset);
                         flags = 
                                 ( std::is_pointer<TFIELD>::value ? TF_POINTER : 0 ) |
@@ -236 +188 @@
                 std::string name;
                 int         value;
-                type_enum( const char* name, int value ) : name(name), value(value) {}
+                type_enum( const char* aname, int avalue ) : name(aname), value(avalue) {}
         };
 
@@ -345 +297 @@
     {
         base_type = type_db->get_type( typeid(TYPE) );
+                return *this;
     }