[ViewVC] Diff of: cvs/cvsroot/libgender/material.C

Comparing cvsroot/libgender/material.C (file contents):
Revision 1.17 by root, Fri Oct 29 16:05:21 2004 UTC vs.
Revision 1.58 by root, Mon Feb 7 08:51:18 2005 UTC

…		…
3		3
4	#include <algorithm>	4	#include <algorithm>
5		5
6	#include "opengl.h"	6	#include "opengl.h"
7	#include "material.h"	7	#include "material.h"
		8	#include "view.h"
8	#include "util.h"	9	#include "util.h"
9
10	material::~material ()
11	{
12	}
13
14	void
15	simple_material::enable ()
16	{
17	glMaterialfv (GL_FRONT, GL_DIFFUSE, (GLfloat *) & diffuse);
18	glMaterialfv (GL_FRONT, GL_SPECULAR, (GLfloat *) & specular);
19	glMaterialfv (GL_FRONT, GL_EMISSION, (GLfloat *) & emission);
20	glMaterialf (GL_FRONT, GL_SHININESS, shininess);
21	}
22
23	void
24	simple_material::disable ()
25	{
26	}
27		10
28	GLuint	11	GLuint
29	texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord)	12	texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord)
30	{	13	{
31	GLuint name;	14	GLuint name;
32	int w, h;
33	SDL_Surface *image;	15	SDL_Surface *image;
34	SDL_Rect area;	16	SDL_Rect area;
35	Uint32 saved_flags;	17	Uint32 saved_flags;
36	Uint8 saved_alpha;	18	Uint8 saved_alpha;
37		19
38	/* Use the surface width and height expanded to powers of 2 */	20	/* Use the surface width and height expanded to powers of 2 */
39	//w = power_of_two (surface->w);
40	//h = power_of_two (surface->h);
41	w = power_of_two (surface->w);
42	h = power_of_two (surface->h);
43	tex2oord[0] = 0.0f; /* Min X */	21	tex2oord[0] = 0.F; /* Min X */
44	tex2oord[1] = 0.0f; /* Min Y */	22	tex2oord[1] = 0.F; /* Min Y */
45	tex2oord[2] = (GLfloat) surface->w / w; /* Max X */	23	tex2oord[2] = 1.F; /* Max X */
46	tex2oord[3] = (GLfloat) surface->h / h; /* Max Y */	24	tex2oord[3] = 1.F; /* Max Y */
47		25
48	image = SDL_CreateRGBSurface (SDL_SWSURFACE, w, h, 32,	26	image = SDL_CreateRGBSurface (SDL_SWSURFACE, surface->w, surface->h, 32,
49	#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */	27	#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
50	0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000	28	0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000
51	#else	29	#else
52	0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF	30	0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF
53	#endif	31	#endif
…		…
77	glGenTextures (1, &name);	55	glGenTextures (1, &name);
78	glBindTexture (GL_TEXTURE_2D, name);	56	glBindTexture (GL_TEXTURE_2D, name);
79	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);	57	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
80	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);	58	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
81	glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);	59	glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
82	glTexImage2D (GL_TEXTURE_2D,	60	glTexImage2D (GL_TEXTURE_2D, 0,
83	0,
84	GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);	61	GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
85	SDL_FreeSurface (image); /* No longer needed */	62	SDL_FreeSurface (image); /* No longer needed */
86		63
87	return name;	64	return name;
88	}	65	}
89		66
		67	material::~material ()
		68	{
		69	}
		70
		71	void material::enable (view &ctx)
		72	{
		73	pass_data::matmap_t &matmap = ctx.pass->matmap;
		74
		75	pass_data::matmap_t::iterator i = matmap.find (this);
		76
		77	if (i == matmap.end ())
		78	{
		79	string vsh_src, fsh_src;
		80
		81	shader::shader_builder::start ();
		82
		83	if (ctx.pass->l)
		84	ctx.pass->l->vsh ();
		85
		86	vsh (ctx);
		87
		88	// compute logarithmic depth - see the frustum matrix in view.C
		89	{
		90	using namespace shader::compile;
		91
		92	temp_1f lz;
		93
		94	// TODO: negative z is not calculated in an acceptable way, clipping does horrible things(?)
		95	lz = z (vout.position);
		96	#if 0
		97	lz = (log (max (lz, 0) + 1) / log (1e30)) - 1;
		98	#else
		99	lz = ifelse (lz <= 0,
		100	0,
		101	log (lz + 1) / log (1e30)
		102	) - 1;
		103	#endif
		104	z (vout.position) = lz * w (vout.position);
		105	}
		106
		107	vsh_src = shader::shader_builder::stop ();
		108
		109	shader::shader_builder::start ();
		110
		111	if (ctx.pass->l)
		112	{
		113	ctx.pass->l->fsh ();
		114	fsh (ctx);
		115	}
		116	else
		117	// many drivers need both vertex and fragment shader, 'caboom!' otherwise
		118	shader::compile::fout.frag_color = shader::compile::float4 (0., 0., 0., 0.);
		119
		120	fsh_src = shader::shader_builder::stop ();
		121
		122	shader::program_object po = shader::get_program (vsh_src, fsh_src);
		123	matmap.insert (pass_data::matmap_t::value_type (this, po));
		124
		125	po->enable ();
		126	}
		127	else
		128	i->second->enable ();
		129
		130	if (ctx.pass->l)
		131	ctx.pass->l->enable (ctx);
		132	}
		133
		134	void material::disable (view &ctx)
		135	{
		136	}
		137
90	test_material::test_material ()	138	test_material::test_material ()
91	: tex ("textures/osama.jpg"), texvar (tex.name)	139	//: tex ("textures/osama.jpg"), texvar (tex.name)
		140	: tex ("textures/rockwall.jpg"), texvar (tex.name)
		141	, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
92	{	142	{
		143	}
		144
		145	void mat_gouraud_shaded::enable (view &ctx)
		146	{
		147	material::enable (ctx);
		148
		149	sh_colour->set (vec3 (c.r, c.g, c.b) * (1.F / 255.F));
		150	}
		151
		152	void mat_gouraud_shaded::disable (view &ctx)
		153	{
		154	material::disable (ctx);
		155	}
		156
		157	void mat_gouraud_shaded::vsh (view &ctx)
		158	{
93	using namespace shader;	159	using namespace shader::compile;
		160	std_vsh ();
94		161
95	p.vsh->start ();	162	if (ctx.pass->l)
		163	f_normal = normal_matrix * vin.normal;
		164	}
96		165
97	temp_4f lightpos;	166	void mat_gouraud_shaded::fsh (view &ctx)
98	temp_4f wpos;	167	{
		168	using namespace shader::compile;
99		169
100	//lightpos = shader::vec4 (0, 10, 0, 1);	170	if (ctx.pass->l)
101	vout.position = shader::gl.model_view_projection_matrix * vin.vertex;	171	{
		172	temp_1f fac;
		173
		174	fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec));
		175
		176	xyz (fout.frag_color) = ctx.pass->l->sh_colour * sh_colour * fac;
		177	}
		178	}
		179
		180	static shader::varying_2f texcoord;
		181	static shader::varying_3f normal;
		182
		183	void test_material::vsh (view &ctx)
		184	{
		185	using namespace shader::compile;
		186
		187	std_vsh ();
		188
		189	if (ctx.pass->l)
		190	{
102	vout.tex_coord[0] = vin.tex_coord[0];	191	texcoord = xy (vin.tex_coord[0]);
103	//vout.tex_coord[1] = normalize (lightpos - wpos);	192	normal = normal_matrix * vin.normal;
104	//vout.tex_coord[2] = normalize (wpos);	193	}
105	//vout.tex_coord[3] = normalize (xyz (gl.model_view_matrix_inverse_transpose) * vin.normal);	194	}
106	//vout.tex_coord[4] = normalize (xyz (gl.projection_matrix_inverse_transpose) - wpos);
107		195
108	p.vsh->end ();	196	void test_material::fsh (view &ctx)
109	p.vsh->compile ();	197	{
		198	using namespace shader::compile;
110		199
111	fragment_shader fsh;	200	if (ctx.pass->l)
		201	{
		202	temp_3f lc;
		203	temp_1f fac;
112		204
113	p.fsh->start ();	205	temp_3f rot1, rot2, rot3;
114		206
		207	yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
		208
		209	//rot1 = normal_matrix * rot1;
		210
		211	rot2 = float3 (x(rot1), z(rot1), -y(rot1));
		212	rot3 = float3 (y(rot1), -x(rot1), z(rot1));
		213
		214	normal = mat3 (rot1, rot2, rot3) * normal;
		215
		216	fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
		217	fac = max (pow (max (fac, 0.0), 6), 0.3);
115	xyz(fout.frag_color) = texture_2d (texvar, fin.tex_coord[0]);	218	xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
116		219	* ctx.pass->l->sh_colour;
117	p.fsh->end ();	220	//xyz (fout.frag_color) = lc * fac;
118	p.fsh->compile ();	221	}
119	p.link ();
120	}	222	}
121		223
122	void test_material::enable ()	224	void test_material::enable (view &ctx)
123	{	225	{
124	p.enable ();	226	material::enable (ctx);
125	texvar->enable ();	227	texvar->enable ();
		228	normvar->enable ();
126	}	229	}
127		230
128	void test_material::disable ()	231	void test_material::disable (view &ctx)
129	{	232	{
		233	normvar->disable ();
130	texvar->disable ();	234	texvar->disable ();
131	p.disable ();	235	material::disable (ctx);
132	}	236	}
133		237
		238	test_material *testmat;
		239	mat_gouraud_shaded *testmat2;
		240

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing cvsroot/libgender/material.C (file contents): Revision 1.17 by root, Fri Oct 29 16:05:21 2004 UTC vs. Revision 1.58 by root, Mon Feb 7 08:51:18 2005 UTC

Diff Legend

Comparing cvsroot/libgender/material.C (file contents):
Revision 1.17 by root, Fri Oct 29 16:05:21 2004 UTC vs.
Revision 1.58 by root, Mon Feb 7 08:51:18 2005 UTC