Support different data types in Batch

[libs/gl.git] / mesh2c.cpp

diff --git a/mesh2c.cpp b/mesh2c.cpp
index be72fd4c0eac74c5b9838b7effa187352da8e314..c15b829e1b5d361c3462b06b076a2d6256d6f57d 100644 (file)
--- a/mesh2c.cpp
+++ b/mesh2c.cpp
@@ -65,12 +65,12 @@ int main(int argc, char **argv)
        IO::print("%s %sindices[] =\n{", type[0], prefix);
        for(list<GL::Batch>::const_iterator i=mesh.get_batches().begin(); i!=mesh.get_batches().end(); ++i)
        {
-               const vector<unsigned> &indices = i->get_indices();
-               for(unsigned j=0; j<indices.size(); ++j)
+               unsigned count = i->size();
+               for(unsigned j=0; j<count; ++j)
                {
                        if(j%16==0)
                                IO::print("\n\t");
-                       IO::print("%d, ", indices[j]);
+                       IO::print("%d, ", i->get_index(j));
                }
        }
        IO::print("\n};\n\n");
@@ -124,8 +124,8 @@ int main(int argc, char **argv)
                case GL_TRIANGLES: mode = "GL_TRIANGLES"; break;
                default: mode = format("%d", i->get_type()); break;
                }
-               IO::print("\tglDrawElements(%s, %d, %s, %sindices+%d);\n", mode, i->get_indices().size(), type[1], prefix, offset);
-               offset += i->get_indices().size();
+               IO::print("\tglDrawElements(%s, %d, %s, %sindices+%d);\n", mode, i->size(), type[1], prefix, offset);
+               offset += i->size();
        }
        if(render_func)
        {