Changeset 323 for trunk/src/gfx/mesh_creator.cc

Timestamp:

08/26/14 04:03:10 (11 years ago)

Author:

epyon

Message:

• nova now compiles again under all three compilers with -Winsane and no warnings

File:

• trunk/src/gfx/mesh_creator.cc (modified) (7 diffs)

trunk/src/gfx/mesh_creator.cc

@@ -128 +128 @@
                 const vertex_descriptor& desc   = channel->desc;
                 uint8* raw_data = channel->data;
-                int vtx_size = desc.size;
+                uint32 vtx_size = desc.size;
                 int p_offset = -1;
                 int n_offset = -1;
@@ -135 +135 @@
                         switch ( desc.slots[i].vslot )
                         {
-                                case slot::POSITION : if ( desc.slots[i].etype == FLOAT_VECTOR_3 ) p_offset = desc.slots[i].offset; break;
-                                case slot::NORMAL   : if ( desc.slots[i].etype == FLOAT_VECTOR_3 ) n_offset = desc.slots[i].offset; break;
-                                case slot::TANGENT  : if ( desc.slots[i].etype == FLOAT_VECTOR_4 ) t_offset = desc.slots[i].offset; break;
+                                case slot::POSITION : if ( desc.slots[i].etype == FLOAT_VECTOR_3 ) p_offset = (int)desc.slots[i].offset; break;
+                                case slot::NORMAL   : if ( desc.slots[i].etype == FLOAT_VECTOR_3 ) n_offset = (int)desc.slots[i].offset; break;
+                                case slot::TANGENT  : if ( desc.slots[i].etype == FLOAT_VECTOR_4 ) t_offset = (int)desc.slots[i].offset; break;
                                 default             : break;
                         }
@@ -173 +173 @@
         size_t n_offset = 0;
         if ( ch_n == -1 ) return;
-        mesh_raw_channel* channel = m_data->m_channels[ch_n];
+        mesh_raw_channel* channel = m_data->m_channels[ (unsigned) ch_n ];
         for ( uint32 i = 0; i < channel->desc.count; ++i )
                 if ( channel->desc.slots[i].vslot == slot::NORMAL )
@@ -211 +211 @@
                                 if ( desc.slots[i].etype == FLOAT_VECTOR_3 ) 
                                 {
-                                        p_offset  = desc.slots[i].offset; 
+                                        p_offset  = (int)desc.slots[i].offset; 
                                         p_channel = channel;
                                 }
@@ -217 +217 @@
                         case slot::NORMAL   : if ( desc.slots[i].etype == FLOAT_VECTOR_3 ) 
                                 {
-                                        n_offset  = desc.slots[i].offset; 
+                                        n_offset  = (int)desc.slots[i].offset; 
                                         n_channel = m_data->m_channels[ c ];
                                         n_channel_index = c;
@@ -224 +224 @@
                         case slot::TEXCOORD : if ( desc.slots[i].etype == FLOAT_VECTOR_2 ) 
                                 {
-                                        t_offset  = desc.slots[i].offset; 
+                                        t_offset  = (int)desc.slots[i].offset; 
                                         t_channel = channel;
                                 }
@@ -420 +420 @@
         int och_ti = other->get_channel_index( slot::TEXCOORD );
         if ( ch_pi == -1 || ch_ti == -1 ) return;
-        size_t size   = m_data->m_channels[ ch_ti ]->count;
-        size_t osize  =  other->m_channels[ och_ti ]->count;
-        size_t count  = m_data->m_channels[ ch_pi ]->count;
-        size_t ocount =  other->m_channels[ och_pi ]->count;
+        size_t size   = m_data->m_channels[ (unsigned)ch_ti ]->count;
+        size_t osize  =  other->m_channels[ (unsigned)och_ti ]->count;
+        size_t count  = m_data->m_channels[ (unsigned)ch_pi ]->count;
+        size_t ocount =  other->m_channels[ (unsigned)och_pi ]->count;
         if ( count % size != 0 || ocount % osize != 0 ) return;
         if ( count / size != ocount / osize ) return;