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

Comparing cvsroot/libgender/material.C (file contents):
Revision 1.14 by root, Sat Oct 23 21:43:27 2004 UTC vs.
Revision 1.44 by root, Sat Nov 6 14:49:03 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::begin ()
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::end ()
25	{
26	}
27
28	void
29	osama_material::begin ()
30	{
31	cgGLEnableProfile (vsh_profile);
32	cgGLEnableProfile (fsh_profile);
33	cgGLEnableTextureParameter (g_Texture);
34	}
35
36	void
37	osama_material::end ()
38	{
39	cgGLDisableTextureParameter (g_Texture);
40	// cgGLUnbindProgram (vsh_profile);
41	// cgGLUnbindProgram (fsh_profile);
42	cgGLDisableProfile (vsh_profile);
43	cgGLDisableProfile (fsh_profile);
44	}
45		10
46	GLuint	11	GLuint
47	texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord)	12	texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord)
48	{	13	{
49	GLuint textur;	14	GLuint name;
50	int w, h;
51	SDL_Surface *image;	15	SDL_Surface *image;
52	SDL_Rect area;	16	SDL_Rect area;
53	Uint32 saved_flags;	17	Uint32 saved_flags;
54	Uint8 saved_alpha;	18	Uint8 saved_alpha;
55		19
56	/* Use the surface width and height expanded to powers of 2 */	20	/* Use the surface width and height expanded to powers of 2 */
57	//w = power_of_two (surface->w);
58	//h = power_of_two (surface->h);
59	w = power_of_two (surface->w);
60	h = power_of_two (surface->h);
61	tex2oord[0] = 0.0f; /* Min X */	21	tex2oord[0] = 0.F; /* Min X */
62	tex2oord[1] = 0.0f; /* Min Y */	22	tex2oord[1] = 0.F; /* Min Y */
63	tex2oord[2] = (GLfloat) surface->w / w; /* Max X */	23	tex2oord[2] = 1.F; /* Max X */
64	tex2oord[3] = (GLfloat) surface->h / h; /* Max Y */	24	tex2oord[3] = 1.F; /* Max Y */
65		25
66	image = SDL_CreateRGBSurface (SDL_SWSURFACE, w, h, 32,	26	image = SDL_CreateRGBSurface (SDL_SWSURFACE, surface->w, surface->h, 32,
67	#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */	27	#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
68	0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000	28	0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000
69	#else	29	#else
70	0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF	30	0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF
71	#endif	31	#endif
…		…
90	/* Restore the alpha blending attributes */	50	/* Restore the alpha blending attributes */
91	if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA)	51	if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA)
92	SDL_SetAlpha (surface, saved_flags, saved_alpha);	52	SDL_SetAlpha (surface, saved_flags, saved_alpha);
93		53
94	/* Create an OpenGL texture for the image */	54	/* Create an OpenGL texture for the image */
95	glGenTextures (1, &textur);	55	glGenTextures (1, &name);
96	glBindTexture (GL_TEXTURE_2D, textur);	56	glBindTexture (GL_TEXTURE_2D, name);
97	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);	57	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
98	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);
99	glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, GL_TRUE); // GENERATE_MIPMAP_SGIS	59	glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
100	glTexImage2D (GL_TEXTURE_2D,	60	glTexImage2D (GL_TEXTURE_2D,
101	0,	61	0,
102	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);
103	SDL_FreeSurface (image); /* No longer needed */	63	SDL_FreeSurface (image); /* No longer needed */
104		64
105	return textur;	65	return name;
106	}	66	}
107		67
108	CGcontext cgc;	68	material::~material ()
109
110	void
111	init_shaders ()
112	{	69	{
113	cgc = cgCreateContext ();
114	}	70	}
115		71
		72	void material::enable (view &ctx)
		73	{
		74	static shader::compile::varying_1f Z;//D
		75
		76	pass::matmap_t &matmap = ctx.pass_data->matmap;
		77
		78	pass::matmap_t::iterator i = matmap.find (this);
		79
		80	if (i == matmap.end ())
		81	{
		82	string vsh_src, fsh_src;
		83
		84	shader::shader_builder::start ();
		85
		86	if (ctx.pass_data->l)
		87	ctx.pass_data->l->vsh ();
		88
		89	vsh (ctx);
		90
		91	{
		92	using namespace shader::compile;
		93
		94	Z = pow (z (vout.position) / 2.F, 0.2);
		95	z (vout.position) = (Z * 2 - 1) * w (vout.position);
		96	//z (vout.position) = z (vout.position) - 1;
		97	}
		98
		99	vsh_src = shader::shader_builder::stop ();
		100
		101	shader::shader_builder::start ();
		102
		103	if (ctx.pass_data->l)
		104	{
		105	ctx.pass_data->l->fsh ();
		106
		107	fsh (ctx);
		108	}
		109	else
		110	shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.);
		111
		112	{
		113	using namespace shader::compile;
		114	//x (fout.frag_color) = Z;//D
		115	//y (fout.frag_color) = Z;//D
		116	//z (fout.frag_color) = Z;//D
		117	}
		118
		119	fsh_src = shader::shader_builder::stop ();
		120
		121	shader::program_object po = shader::get_program (vsh_src, fsh_src);
		122	matmap.insert (pass::matmap_t::value_type (this, po));
		123
		124	po->enable ();
		125	}
		126	else
		127	i->second->enable ();
		128	}
		129
		130	void material::disable (view &ctx)
		131	{
		132	}
		133
		134	test_material::test_material ()
		135	//: tex ("textures/osama.jpg"), texvar (tex.name)
		136	: tex ("textures/rockwall.jpg"), texvar (tex.name)
		137	, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
		138	{
		139	}
		140
		141	static shader::varying_3f normal;
		142	static shader::varying_2f texcoord;
		143
		144	void test_material::vsh (view &ctx)
		145	{
		146	using namespace shader::compile;
		147
		148	std_vsh ();
		149
		150	if (ctx.pass_data->l)
		151	{
		152	texcoord = xy (vin.tex_coord[0]);
		153	normal = normal_matrix * vin.normal;
		154	}
		155	}
		156
		157	void test_material::fsh (view &ctx)
		158	{
		159	using namespace shader::compile;
		160
		161	if (ctx.pass_data->l)
		162	{
		163	temp_3f lc;
		164	temp_1f fac;
		165
		166	temp_3f rot1, rot2, rot3;
		167
		168	yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
		169
		170	//rot1 = normal_matrix * rot1;
		171
		172	rot2 = float3 (x(rot1), z(rot1), -y(rot1));
		173	rot3 = float3 (y(rot1), -x(rot1), z(rot1));
		174
		175	normal = mat3 (rot1, rot2, rot3) * normal;
		176
		177	fac = dot (normalize (normal), normalize (ctx.pass_data->l->sh_lightvec));
		178	fac = max (pow (max (fac, 0.0), 6), 0.3);
		179	xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
		180	* ctx.pass_data->l->sh_colour;
		181	//xyz (fout.frag_color) = lc * fac;
		182	}
		183	}
		184
		185	void test_material::enable (view &ctx)
		186	{
		187	material::enable (ctx);
		188	texvar->enable ();
		189	normvar->enable ();
		190	}
		191
		192	void test_material::disable (view &ctx)
		193	{
		194	normvar->disable ();
		195	texvar->disable ();
		196	material::disable (ctx);
		197	}
		198
		199	test_material *testmat;
		200

Diff Legend

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

Comparing cvsroot/libgender/material.C (file contents): Revision 1.14 by root, Sat Oct 23 21:43:27 2004 UTC vs. Revision 1.44 by root, Sat Nov 6 14:49:03 2004 UTC

Diff Legend

Comparing cvsroot/libgender/material.C (file contents):
Revision 1.14 by root, Sat Oct 23 21:43:27 2004 UTC vs.
Revision 1.44 by root, Sat Nov 6 14:49:03 2004 UTC