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

Comparing cvsroot/libgender/material.C (file contents):
Revision 1.18 by root, Fri Oct 29 17:21:54 2004 UTC vs.
Revision 1.41 by root, Sat Nov 6 01:56:20 2004 UTC

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

Diff Legend

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