ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libgender/material.C
(Generate patch)

Comparing libgender/material.C (file contents):
Revision 1.18 by root, Fri Oct 29 17:21:54 2004 UTC vs.
Revision 1.35 by root, Thu Nov 4 04:46:58 2004 UTC

… …
10 10
11material::~material () 11material::~material ()
12{ 12{
13} 13}
14 14
15void
16simple_material::enable (view &ctx)
17{
18 glMaterialfv (GL_FRONT, GL_DIFFUSE, (GLfloat *) & diffuse);
19 glMaterialfv (GL_FRONT, GL_SPECULAR, (GLfloat *) & specular);
20 glMaterialfv (GL_FRONT, GL_EMISSION, (GLfloat *) & emission);
21 glMaterialf (GL_FRONT, GL_SHININESS, shininess);
22}
23
24void
25simple_material::disable (view &ctx)
26{
27}
28
29GLuint 15GLuint
30texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord) 16texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord)
31{ 17{
32 GLuint name; 18 GLuint name;
33 int w, h;
34 SDL_Surface *image; 19 SDL_Surface *image;
35 SDL_Rect area; 20 SDL_Rect area;
36 Uint32 saved_flags; 21 Uint32 saved_flags;
37 Uint8 saved_alpha; 22 Uint8 saved_alpha;
38 23
39 /* Use the surface width and height expanded to powers of 2 */ 24 /* Use the surface width and height expanded to powers of 2 */
40 //w = power_of_two (surface->w);
41 //h = power_of_two (surface->h);
42 w = power_of_two (surface->w);
43 h = power_of_two (surface->h);
44 tex2oord[0] = 0.0f; /* Min X */ 25 tex2oord[0] = 0.F; /* Min X */
45 tex2oord[1] = 0.0f; /* Min Y */ 26 tex2oord[1] = 0.F; /* Min Y */
46 tex2oord[2] = (GLfloat) surface->w / w; /* Max X */ 27 tex2oord[2] = 1.F; /* Max X */
47 tex2oord[3] = (GLfloat) surface->h / h; /* Max Y */ 28 tex2oord[3] = 1.F; /* Max Y */
48 29
49 image = SDL_CreateRGBSurface (SDL_SWSURFACE, w, h, 32, 30 image = SDL_CreateRGBSurface (SDL_SWSURFACE, surface->w, surface->h, 32,
50#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */ 31#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
51 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 32 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000
52#else 33#else
53 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF 34 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF
54#endif 35#endif
… …
80 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); 61 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
81 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); 62 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
82 glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); 63 glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
83 glTexImage2D (GL_TEXTURE_2D, 64 glTexImage2D (GL_TEXTURE_2D,
84 0, 65 0,
85 GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels); 66 GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
86 SDL_FreeSurface (image); /* No longer needed */ 67 SDL_FreeSurface (image); /* No longer needed */
87 68
88 return name; 69 return name;
89} 70}
90 71
72void material::enable (view &ctx)
73{
74 pass::matmap_t &matmap = ctx.pass_data->matmap;
75
76 pass::matmap_t::iterator i = matmap.find (this);
77 shader::program_object *p;
78
79 if (i == matmap.end ())
80 {
81 shader::program_object po;
82
83 shader::shader_builder::start ();
84 vsh (ctx);
85
86 if (ctx.pass_data->l)
87 ctx.pass_data->l->vsh ();
88
89 po->vsh->compile (shader::shader_builder::stop ());
90
91 shader::shader_builder::start ();
92 shader::compile::fout.frag_color = shader::compile::float4 (1., 1., 0., 1.);
93 fsh (ctx);
94 po->fsh->compile (shader::shader_builder::stop ());
95
96 po->link ();
97
98 matmap.insert (pass::matmap_t::value_type (this, po));
99
100 p = &po;
101 }
102 else
103 p = &i->second;
104
105 (*p)->enable ();
106}
107
108void material::disable (view &ctx)
109{
110}
111
91test_material::test_material () 112test_material::test_material ()
92: tex ("textures/osama.jpg"), texvar (tex.name) 113//: tex ("textures/osama.jpg"), texvar (tex.name)
114: tex ("textures/rockwall.jpg"), texvar (tex.name)
115, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
93{ 116{
94 using namespace shader; 117}
95 118
96 p.vsh->start (); 119static shader::varying_3f normal, lightvec;
120static shader::varying_2f texcoord;
97 121
98 temp_4f wpos; 122void test_material::vsh (view &ctx)
99 123{
100 wpos = shader::gl.model_view_projection_matrix * vin.vertex; 124 using namespace shader::compile;
101 125
102 vout.position = wpos; 126 std_vsh ();
103 vout.tex_coord[0] = vin.tex_coord[0];
104 vout.tex_coord[1] = shader::gl.model_view_matrix * shader::vec4 (x (vin.normal), y(vin.normal), z(vin.normal), 0);
105 127
106 p.vsh->end (); 128 if (ctx.pass_data->l)
107 p.vsh->compile (); 129 {
130 texcoord = xy (vin.tex_coord[0]);
131 normal = normal_matrix * vin.normal;
132 lightvec = xyz (ctx.pass_data->l->lightpos - model_view_matrix * vin.vertex);
133 }
134}
108 135
109 p.fsh->start (); 136void test_material::fsh (view &ctx)
137{
138 using namespace shader::compile;
110 139
140 if (ctx.pass_data->l)
141 {
142 temp_3f lc;
111 temp_1f fac; 143 temp_1f fac;
112
113 fac = max (dot (fin.tex_coord[1], lightpos), 0.0);
114 fac = pow (fac, 3);
115 xyz(fout.frag_color) = texture_2d (texvar, fin.tex_coord[0]) * (fac + 0.3);
116 144
117 p.fsh->end (); 145 lc = (*ctx.pass_data->l)();
118 p.fsh->compile (); 146
119 p.link (); 147 temp_3f rot1, rot2, rot3;
148
149 rot1 = yxz (texture_2d (normvar, texcoord) * 2.F - 1.F);
150 rot2 = float3 (x(rot1), -z(rot1), y(rot1));
151 rot3 = float3 (-y(rot1), x(rot1), z(rot1));
152
153 normal = mat3 (rot1, rot2, rot3) * normal;
154
155 fac = dot (normalize (normal), normalize (lightvec));
156 fac = pow (max (fac, 0.0), 6);
157 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * lc * fac;
158 }
120} 159}
121 160
122void test_material::enable (view &ctx) 161void test_material::enable (view &ctx)
123{ 162{
124 p.enable (); 163 material::enable (ctx);
125 lightpos->set (-ctx.d);
126 texvar->enable (); 164 texvar->enable ();
165 normvar->enable ();
127} 166}
128 167
129void test_material::disable (view &ctx) 168void test_material::disable (view &ctx)
130{ 169{
170 normvar->disable ();
131 texvar->disable (); 171 texvar->disable ();
132 p.disable (); 172 material::disable (ctx);
133} 173}
134 174
175test_material *testmat;
176

Diff Legend

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