Changeset 68 for trunk

Timestamp:

05/31/13 19:31:29 (12 years ago)

Author:

epyon

Message:

• engine support for int8 vectors (might be removed later?) - types added
• input_event -> io_event

Location:

trunk

Files:

• nv/io_event.hh (modified) (2 diffs)
• nv/types.hh (modified) (4 diffs)
• src/gl/gl_enum.cc (modified) (1 diff)

trunk/nv/io_event.hh

@@ -103 +103 @@
         NV_REGISTER_NAME( system_event );
 
-        struct input_event
+        struct io_event
         {
                 io_event_code type;
@@ -114 +114 @@
                 };
         };
-        NV_REGISTER_NAME( input_event );
+        NV_REGISTER_NAME( io_event );
 
         const char* get_key_name( key_code key );

trunk/nv/types.hh

@@ -37 +37 @@
                 INT_VECTOR_2,
                 INT_VECTOR_3,
-                INT_VECTOR_4
-        };
+                INT_VECTOR_4,
+                // unsupported gl conversion, remove?
+                BYTE_VECTOR_2, 
+                BYTE_VECTOR_3,
+                BYTE_VECTOR_4,
+        };
+
+        typedef glm::detail::tvec2<uint8> i8vec2;
+        typedef glm::detail::tvec3<uint8> i8vec3;
+        typedef glm::detail::tvec4<uint8> i8vec4;
 
         typedef glm::vec2 vec2;
@@ -70 +78 @@
         template <> struct enum_to_type< INT_VECTOR_4 > { typedef ivec4 type; };
 
+        template <> struct enum_to_type< BYTE_VECTOR_2 > { typedef i8vec2 type; };
+        template <> struct enum_to_type< BYTE_VECTOR_3 > { typedef i8vec3 type; };
+        template <> struct enum_to_type< BYTE_VECTOR_4 > { typedef i8vec4 type; };
+
         template <> struct enum_to_type< FLOAT_MATRIX_2 > { typedef mat2 type; };
         template <> struct enum_to_type< FLOAT_MATRIX_3 > { typedef mat3 type; };
@@ -92 +104 @@
         template <> struct type_to_enum< ivec4 > { static const etype type = INT_VECTOR_4; };
 
+        template <> struct type_to_enum< i8vec2 > { static const etype type = BYTE_VECTOR_2; };
+        template <> struct type_to_enum< i8vec3 > { static const etype type = BYTE_VECTOR_3; };
+        template <> struct type_to_enum< i8vec4 > { static const etype type = BYTE_VECTOR_4; };
+
         template <> struct type_to_enum< mat2 > { static const etype type = FLOAT_MATRIX_2; };
         template <> struct type_to_enum< mat3 > { static const etype type = FLOAT_MATRIX_3; };
@@ -125 +141 @@
         template <> inline const char* get_type_name< ivec3 > () { return "ivec3"; }
         template <> inline const char* get_type_name< ivec4 > () { return "ivec4"; }
+
+        template <> inline const char* get_type_name< i8vec2 > () { return "i8vec2"; }
+        template <> inline const char* get_type_name< i8vec3 > () { return "i8vec3"; }
+        template <> inline const char* get_type_name< i8vec4 > () { return "i8vec4"; }
 
         template <> inline const char* get_type_name< mat2 > () { return "mat2"; }

trunk/src/gl/gl_enum.cc

@@ -205 +205 @@
         case INT_VECTOR_3   : return GL_INT_VEC3;
         case INT_VECTOR_4   : return GL_INT_VEC4;
+        // remove, error or ?
+        case BYTE_VECTOR_2  : return GL_INT_VEC2;
+        case BYTE_VECTOR_3  : return GL_INT_VEC3;
+        case BYTE_VECTOR_4  : return GL_INT_VEC4;
         default : return 0; // TODO: throw!
         }