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.16 by root, Fri Oct 29 16:02:22 2004 UTC vs.
Revision 1.45 by root, Sun Nov 7 02:28:18 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
10material::~material ()
11{
12}
13
14void
15simple_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
23void
24simple_material::disable ()
25{
26}
27 10
28GLuint 11GLuint
29texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord) 12texture::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
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 // compute logarithmic depth - see the frustum matrix in view.C
90 {
91 using namespace shader::compile;
92
93 z (vout.position) = (log2 (max (z (vout.position), 0)) * (2 / log2 (1e10)) - 1) * w (vout.position);
94 }
95
96 vsh_src = shader::shader_builder::stop ();
97
98 shader::shader_builder::start ();
99
100 if (ctx.pass_data->l)
101 {
102 ctx.pass_data->l->fsh ();
103
104 fsh (ctx);
105 }
106 else
107 shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.);
108
109 {
110 using namespace shader::compile;
111 //x (fout.frag_color) = Z;//D
112 //y (fout.frag_color) = Z;//D
113 //z (fout.frag_color) = Z;//D
114 }
115
116 fsh_src = shader::shader_builder::stop ();
117
118 shader::program_object po = shader::get_program (vsh_src, fsh_src);
119 matmap.insert (pass::matmap_t::value_type (this, po));
120
121 po->enable ();
122 }
123 else
124 i->second->enable ();
125
126 if (ctx.pass_data->l)
127 ctx.pass_data->l->enable ();
128}
129
130void material::disable (view &ctx)
131{
132}
133
90test_material::test_material () 134test_material::test_material ()
91: tex ("textures/osama.jpg"), texvar (tex.name) 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)
92{ 138{
139}
140
141static shader::varying_3f normal;
142static shader::varying_2f texcoord;
143
144void test_material::vsh (view &ctx)
145{
93 using namespace shader; 146 using namespace shader::compile;
94 147
95 p.vsh->start (); 148 std_vsh ();
96 149
97 temp_4f lightpos; 150 if (ctx.pass_data->l)
98 temp_4f wpos; 151 {
152 texcoord = xy (vin.tex_coord[0]);
153 normal = normal_matrix * vin.normal;
154 }
155}
99 156
100 //lightpos = shader::vec4 (0, 10, 0, 1); 157void test_material::fsh (view &ctx)
101 vout.position = shader::gl.model_view_projection_matrix * vin.vertex; 158{
102 vout.tex_coord[0] = vin.tex_coord[0] + 1; 159 using namespace shader::compile;
103 //vout.tex_coord[1] = normalize (lightpos - wpos);
104 //vout.tex_coord[2] = normalize (wpos);
105 //vout.tex_coord[3] = normalize (xyz (gl.model_view_matrix_inverse_transpose) * vin.normal);
106 //vout.tex_coord[4] = normalize (xyz (gl.projection_matrix_inverse_transpose) - wpos);
107 160
108 p.vsh->end (); 161 if (ctx.pass_data->l)
109 p.vsh->compile (); 162 {
163 temp_3f lc;
164 temp_1f fac;
110 165
111 fragment_shader fsh; 166 temp_3f rot1, rot2, rot3;
112 167
113 p.fsh->start (); 168 yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
114 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);
115 xyz(fout.frag_color) = texture_2d (texvar, fin.tex_coord[0]); 179 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
116 180 * ctx.pass_data->l->sh_colour;
117 p.fsh->end (); 181 //xyz (fout.frag_color) = lc * fac;
118 p.fsh->compile (); 182 }
119 p.link ();
120} 183}
121 184
122void test_material::enable () 185void test_material::enable (view &ctx)
123{ 186{
124 p.enable (); 187 material::enable (ctx);
125 texvar->enable (); 188 texvar->enable ();
189 normvar->enable ();
126} 190}
127 191
128void test_material::disable () 192void test_material::disable (view &ctx)
129{ 193{
194 normvar->disable ();
130 texvar->disable (); 195 texvar->disable ();
131 p.disable (); 196 material::disable (ctx);
132} 197}
133 198
199test_material *testmat;
200

Diff Legend

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