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

Comparing cvsroot/libgender/material.C (file contents):
Revision 1.39 by root, Fri Nov 5 19:55:15 2004 UTC vs.
Revision 1.63 by root, Mon Jul 18 01:40:01 2005 UTC

…		…
55	glGenTextures (1, &name);	55	glGenTextures (1, &name);
56	glBindTexture (GL_TEXTURE_2D, name);	56	glBindTexture (GL_TEXTURE_2D, name);
57	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);	57	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
58	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);
59	glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);	59	glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
60	glTexImage2D (GL_TEXTURE_2D,	60	glTexImage2D (GL_TEXTURE_2D, 0,
61	0,
62	GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);	61	GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
63	SDL_FreeSurface (image); /* No longer needed */	62	SDL_FreeSurface (image); /* No longer needed */
64		63
65	return name;	64	return name;
66	}	65	}
…		…
69	{	68	{
70	}	69	}
71		70
72	void material::enable (view &ctx)	71	void material::enable (view &ctx)
73	{	72	{
74	pass::matmap_t &matmap = ctx.pass_data->matmap;	73	pass_data::matmap_t &matmap = ctx.pass->matmap;
75		74
76	pass::matmap_t::iterator i = matmap.find (this);	75	pass_data::matmap_t::iterator i = matmap.find (this);
77		76
78	if (i == matmap.end ())	77	if (i == matmap.end ())
79	{	78	{
80	string vsh_src, fsh_src;	79	string vsh_src, fsh_src;
81		80
82	shader::shader_builder::start ();	81	shader::shader_builder::start ();
		82
		83	if (ctx.pass->l)
		84	ctx.pass->l->vsh ();
		85
83	vsh (ctx);	86	vsh (ctx);
84		87
85	if (ctx.pass_data->l)	88	// compute logarithmic depth - see the frustum matrix in view.C
86	ctx.pass_data->l->vsh ();
87
88	{	89	{
89	using namespace shader::compile;	90	using namespace shader::compile;
90		91
91	z (vout.position) = log2 (z (vout.position) / w (vout.position)) * w (vout.position);	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);
92	}	105	}
93		106
94	vsh_src = shader::shader_builder::stop ();	107	vsh_src = shader::shader_builder::stop ();
95		108
		109	shader::shader_builder::start ();
		110
96	if (ctx.pass_data->l \|\| 1)	111	if (ctx.pass->l)
97	{	112	{
98	shader::shader_builder::start ();	113	ctx.pass->l->fsh ();
99	shader::compile::fout.frag_color = shader::compile::float4 (1., 1., 0., 1.);
100	fsh (ctx);	114	fsh (ctx);
101
102	fsh_src = shader::shader_builder::stop ();
103	}	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 ();
104		121
105	shader::program_object po = shader::get_program (vsh_src, fsh_src);	122	shader::program_object po = shader::get_program (vsh_src, fsh_src);
106	matmap.insert (pass::matmap_t::value_type (this, po));	123	matmap.insert (pass_data::matmap_t::value_type (this, po));
107		124
108	po->enable ();	125	po->enable ();
109	}	126	}
110	else	127	else
111	i->second->enable ();	128	i->second->enable ();
		129
		130	if (ctx.pass->l)
		131	ctx.pass->l->enable (ctx);
112	}	132	}
113		133
114	void material::disable (view &ctx)	134	void material::disable (view &ctx)
115	{	135	{
116	}	136	}
…		…
120	: tex ("textures/rockwall.jpg"), texvar (tex.name)	140	: tex ("textures/rockwall.jpg"), texvar (tex.name)
121	, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)	141	, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
122	{	142	{
123	}	143	}
124		144
		145	void mat_timed::enable (view &ctx)
		146	{
		147	material::enable (ctx);
		148
		149	time->set (timer::now);
		150	sh_colour->set (vec3 (255, 0, 0) * (1.F / 255.F));
		151	}
		152
		153	void mat_timed::disable (view &ctx)
		154	{
		155	material::disable (ctx);
		156	}
		157
		158	void mat_timed::vsh (view &ctx)
		159	{
		160	using namespace shader::compile;
		161	std_vsh ();
		162
		163	if (ctx.pass->l)
		164	f_normal = normal_matrix * vin.normal;
		165	}
		166
		167	void mat_timed::fsh (view &ctx)
		168	{
		169	using namespace shader::compile;
		170
		171	if (ctx.pass->l)
		172	{
		173	temp_1f fac;
		174	temp_3f normal;
		175
		176	normal = f_normal + 0.3 * pow (sin (f_normal * 3.14159 + time), 3);
		177
		178	fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
		179
		180	xyz (fout.frag_color) = fac * float3 (0.1,0.5,1);//ctx.pass->l->sh_colour * sh_colour * fac;
		181	}
		182	}
		183
		184	void mat_gouraud_shaded::enable (view &ctx)
		185	{
		186	material::enable (ctx);
		187
		188	sh_colour->set (vec3 (c.r, c.g, c.b) * (1.F / 255.F));
		189	}
		190
		191	void mat_gouraud_shaded::disable (view &ctx)
		192	{
		193	material::disable (ctx);
		194	}
		195
		196	void mat_gouraud_shaded::vsh (view &ctx)
		197	{
		198	using namespace shader::compile;
		199	std_vsh ();
		200
		201	if (ctx.pass->l)
		202	f_normal = normal_matrix * vin.normal;
		203	}
		204
		205	void mat_gouraud_shaded::fsh (view &ctx)
		206	{
		207	using namespace shader::compile;
		208
		209	if (ctx.pass->l)
		210	{
		211	temp_1f fac;
		212
		213	fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec));
		214
		215	xyz (fout.frag_color) = ctx.pass->l->sh_colour * sh_colour * fac;
		216	}
		217	}
		218
125	static shader::varying_3f normal, lightvec;	219	static shader::varying_3f f_normal;
		220
		221	void mat_debug::enable (view &ctx)
		222	{
		223	material::enable (ctx);
		224
		225	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		226	glEnable (GL_BLEND);
		227	glDepthMask (1);
		228	}
		229
		230	void mat_debug::disable (view &ctx)
		231	{
		232	material::disable (ctx);
		233
		234	glDisable (GL_BLEND);
		235	glDepthMask (0);
		236	}
		237
		238	void mat_debug::vsh (view &ctx)
		239	{
		240	using namespace shader::compile;
		241	std_vsh ();
		242
		243	if (ctx.pass->l)
		244	f_normal = normal_matrix * vin.normal;
		245	}
		246
		247	void mat_debug::fsh (view &ctx)
		248	{
		249	using namespace shader::compile;
		250
		251	if (ctx.pass->l)
		252	{
		253	temp_1f fac;
		254
		255	fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec));
		256
		257	xyz (fout.frag_color) = float3 (1.,0.,0.);
		258	w (fout.frag_color) = 0.1;
		259	}
		260	}
		261
126	static shader::varying_2f texcoord;	262	static shader::varying_2f texcoord;
		263	static shader::varying_3f normal;
127		264
128	void test_material::vsh (view &ctx)	265	void test_material::vsh (view &ctx)
129	{	266	{
130	using namespace shader::compile;	267	using namespace shader::compile;
131		268
132	std_vsh ();	269	std_vsh ();
133		270
134	if (ctx.pass_data->l)	271	if (ctx.pass->l)
135	{	272	{
136	texcoord = xy (vin.tex_coord[0]);	273	texcoord = xy (vin.tex_coord[0]);
137	normal = normal_matrix * vin.normal;	274	normal = normal_matrix * vin.normal;
138	lightvec = xyz (ctx.pass_data->l->lightpos - model_view_matrix * vin.vertex);
139	}	275	}
140	}	276	}
141		277
142	void test_material::fsh (view &ctx)	278	void test_material::fsh (view &ctx)
143	{	279	{
144	using namespace shader::compile;	280	using namespace shader::compile;
145		281
146	if (ctx.pass_data->l)	282	if (ctx.pass->l)
147	{	283	{
148	temp_3f lc;	284	temp_3f lc;
149	temp_1f fac;	285	temp_1f fac;
150		286
151	lc = (*ctx.pass_data->l)();
152
153	temp_3f rot1, rot2, rot3;	287	temp_3f rot1, rot2, rot3;
154		288
155	yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);	289	yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
156		290
157	//rot1 = normal_matrix * rot1;	291	//rot1 = normal_matrix * rot1;
…		…
159	rot2 = float3 (x(rot1), z(rot1), -y(rot1));	293	rot2 = float3 (x(rot1), z(rot1), -y(rot1));
160	rot3 = float3 (y(rot1), -x(rot1), z(rot1));	294	rot3 = float3 (y(rot1), -x(rot1), z(rot1));
161		295
162	normal = mat3 (rot1, rot2, rot3) * normal;	296	normal = mat3 (rot1, rot2, rot3) * normal;
163		297
164	fac = dot (normalize (normal), normalize (lightvec));	298	fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
165	fac = max (pow (max (fac, 0.0), 6), 0.3);	299	fac = max (pow (max (fac, 0.0), 6), 0.3);
166	xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * lc * fac;	300	xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
		301	* ctx.pass->l->sh_colour;
167	//xyz (fout.frag_color) = lc * fac;	302	//xyz (fout.frag_color) = lc * fac;
168	}	303	}
169	}	304	}
170		305
171	void test_material::enable (view &ctx)	306	void test_material::enable (view &ctx)
…		…
181	texvar->disable ();	316	texvar->disable ();
182	material::disable (ctx);	317	material::disable (ctx);
183	}	318	}
184		319
185	test_material *testmat;	320	test_material *testmat;
		321	mat_gouraud_shaded *testmat2;
		322	mat_timed *testmat3;
		323	mat_debug *debugmat;
186		324

Diff Legend

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

Comparing cvsroot/libgender/material.C (file contents): Revision 1.39 by root, Fri Nov 5 19:55:15 2004 UTC vs. Revision 1.63 by root, Mon Jul 18 01:40:01 2005 UTC

Diff Legend

Comparing cvsroot/libgender/material.C (file contents):
Revision 1.39 by root, Fri Nov 5 19:55:15 2004 UTC vs.
Revision 1.63 by root, Mon Jul 18 01:40:01 2005 UTC