Subversion Repositories gelsvn

Rev

Rev 132 | Rev 178 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 132 Rev 136
Line 14... Line 14...
14 
 
 14 
 
15 
namespace Geometry
15 
namespace Geometry
16 
{
 16 
{
17 
	int TriMesh::find_material(const string& name) const
 17 
	int TriMesh::find_material(const string& name) const
18 
	{
 18 
	{
19 
		for(int i=0;i<materials.size(); ++i)
 19 
		for(size_t i=0;i<materials.size(); ++i)
20 
			{
 20 
			{
21 
				if(materials[i].name == name)
 21 
				if(materials[i].name == name)
22 
					return i;
 22 
					return i;
23 
			}
 23 
			}
24 
		return 0;
 24 
		return 0;
25 
	}
 25 
	}
26 
 
 26 
 
27 
	int TriMesh::find_texmap(const string& name) const
 27 
	int TriMesh::find_texmap(const string& name) const
28 
	{
 28 
	{
29 
		for(int i=0;i<texmaps.size(); ++i)
 29 
		for(size_t i=0;i<texmaps.size(); ++i)
30 
			{
 30 
			{
31 
				if(texmaps[i].get_name() == name)
 31 
				if(texmaps[i].get_name() == name)
32 
					return i;
 32 
					return i;
33 
			}
 33 
			}
34 
		return -1;
 34 
		return -1;
Line 79... Line 79...
79 
			}
 79 
			}
80 
	}
 80 
	}
81 
 
 81 
 
82 
	void TriMesh::gl_init_textures()
 82 
	void TriMesh::gl_init_textures()
83 
	{
 83 
	{
84 
		for(int i=0;i<texmaps.size();++i)
 84 
		for(size_t i=0;i<texmaps.size();++i)
85 
			texmaps[i].gl_init();
 85 
			texmaps[i].gl_init();
86 
	}
 86 
	}
87 
 
 87 
 
88 
 
 88 
 
89 
	void TriMesh::gl_set_material(int idx)
 89 
	void TriMesh::gl_set_material(size_t idx)
90 
	{
 90 
	{
91 
		assert(idx<materials.size());
 91 
			assert(idx<materials.size());
92 
		Material& material = materials[idx];
 92 
		Material& material = materials[idx];
93 
		if(material.tex_id >=0)
 93 
		if(material.tex_id >=0)
94 
			{
 94 
			{
95 
				glEnable(GL_TEXTURE_2D);
 95 
				glEnable(GL_TEXTURE_2D);
96 
				texmaps[material.tex_id].gl_bind();
 96 
				texmaps[material.tex_id].gl_bind();