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

Comparing cvsroot/libgender/material.C (file contents):
Revision 1.15 by root, Fri Oct 29 15:58:50 2004 UTC vs.
Revision 1.48 by root, Sun Nov 7 03:28:20 2004 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
…		…
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,
83	0,	61	0,
84	GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);	62	GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
85	SDL_FreeSurface (image); /* No longer needed */	63	SDL_FreeSurface (image); /* No longer needed */
86		64
87	return name;	65	return name;
88	}	66	}
89		67
		68	material::~material ()
		69	{
		70	}
		71
		72	void material::enable (view &ctx)
		73	{
		74	pass_data::matmap_t &matmap = ctx.pass->matmap;
		75
		76	pass_data::matmap_t::iterator i = matmap.find (this);
		77
		78	if (i == matmap.end ())
		79	{
		80	string vsh_src, fsh_src;
		81
		82	shader::shader_builder::start ();
		83
		84	if (ctx.pass->l)
		85	ctx.pass->l->vsh ();
		86
		87	vsh (ctx);
		88
		89	// compute logarithmic depth - see the frustum matrix in view.C
		90	{
		91	using namespace shader::compile;
		92
		93	temp_1f lz;
		94
		95	// TODO: negative z is not calculated in an acceptable way
		96	lz = z (vout.position);
		97	z (vout.position) = (log2 (lz) * (2 / log2 (1e10)) - 1) * w (vout.position);
		98	#if 0
		99	z (vout.position) =
		100	ifelse (
		101	z < 0,
		102	-1,
		103	log2 (lz) * (2 / log2 (1e10)) - 1
		104	) * w (vout.position);
		105	#endif
		106	}
		107
		108	vsh_src = shader::shader_builder::stop ();
		109
		110	shader::shader_builder::start ();
		111
		112	if (ctx.pass->l)
		113	{
		114	ctx.pass->l->fsh ();
		115
		116	fsh (ctx);
		117	}
		118	else
		119	shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.);
		120
		121	fsh_src = shader::shader_builder::stop ();
		122
		123	shader::program_object po = shader::get_program (vsh_src, fsh_src);
		124	matmap.insert (pass_data::matmap_t::value_type (this, po));
		125
		126	po->enable ();
		127	}
		128	else
		129	i->second->enable ();
		130
		131	if (ctx.pass->l)
		132	ctx.pass->l->enable ();
		133	}
		134
		135	void material::disable (view &ctx)
		136	{
		137	}
		138
90	test_material::test_material ()	139	test_material::test_material ()
91	: tex ("textures/osama.jpg"), texvar (tex.name)	140	//: tex ("textures/osama.jpg"), texvar (tex.name)
		141	: tex ("textures/rockwall.jpg"), texvar (tex.name)
		142	, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
92	{	143	{
		144	}
		145
		146	static shader::varying_3f normal;
		147	static shader::varying_2f texcoord;
		148
		149	void test_material::vsh (view &ctx)
		150	{
93	using namespace shader;	151	using namespace shader::compile;
94		152
95	p.vsh->start ();	153	std_vsh ();
96		154
97	temp_4f lightpos;	155	if (ctx.pass->l)
98	temp_4f wpos;	156	{
99
100	//lightpos = shader::vec4 (0, 10, 0, 1);
101	vout.position = shader::gl.model_view_projection_matrix * vin.vertex;
102	vout.tex_coord[0] = vin.tex_coord[0];	157	texcoord = xy (vin.tex_coord[0]);
103	//vout.tex_coord[1] = normalize (lightpos - wpos);	158	normal = normal_matrix * vin.normal;
104	//vout.tex_coord[2] = normalize (wpos);	159	}
105	//vout.tex_coord[3] = normalize (xyz (gl.model_view_matrix_inverse_transpose) * vin.normal);	160	}
106	//vout.tex_coord[4] = normalize (xyz (gl.projection_matrix_inverse_transpose) - wpos);
107		161
108	p.vsh->end ();	162	void test_material::fsh (view &ctx)
109	p.vsh->compile ();	163	{
		164	using namespace shader::compile;
110		165
111	fragment_shader fsh;	166	if (ctx.pass->l)
		167	{
		168	temp_3f lc;
		169	temp_1f fac;
112		170
113	p.fsh->start ();	171	temp_3f rot1, rot2, rot3;
114		172
		173	yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
		174
		175	//rot1 = normal_matrix * rot1;
		176
		177	rot2 = float3 (x(rot1), z(rot1), -y(rot1));
		178	rot3 = float3 (y(rot1), -x(rot1), z(rot1));
		179
		180	normal = mat3 (rot1, rot2, rot3) * normal;
		181
		182	fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
		183	fac = max (pow (max (fac, 0.0), 6), 0.3);
115	xyz(fout.frag_color) = texture_2d (texvar, fin.tex_coord[0]);	184	xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
116		185	* ctx.pass->l->sh_colour;
117	p.fsh->end ();	186	//xyz (fout.frag_color) = lc * fac;
118	p.fsh->compile ();	187	}
119	p.link ();
120	}	188	}
121		189
122	void test_material::enable ()	190	void test_material::enable (view &ctx)
123	{	191	{
124	p.enable ();	192	material::enable (ctx);
125	texvar->enable ();	193	texvar->enable ();
		194	normvar->enable ();
126	}	195	}
127		196
128	void test_material::disable ()	197	void test_material::disable (view &ctx)
129	{	198	{
		199	normvar->disable ();
130	texvar->disable ();	200	texvar->disable ();
131	p.disable ();	201	material::disable (ctx);
132	}	202	}
133		203
		204	test_material *testmat;
		205

Diff Legend

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

Comparing cvsroot/libgender/material.C (file contents): Revision 1.15 by root, Fri Oct 29 15:58:50 2004 UTC vs. Revision 1.48 by root, Sun Nov 7 03:28:20 2004 UTC

Diff Legend

Comparing cvsroot/libgender/material.C (file contents):
Revision 1.15 by root, Fri Oct 29 15:58:50 2004 UTC vs.
Revision 1.48 by root, Sun Nov 7 03:28:20 2004 UTC