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

Comparing libgender/material.C (file contents):
Revision 1.16 by root, Fri Oct 29 16:02:22 2004 UTC vs.
Revision 1.50 by root, Sun Nov 7 22:40:58 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_data::matmap_t &matmap = ctx.pass->matmap;
75
76 pass_data::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->l)
85 ctx.pass->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 temp_1f lz;
94
95 // TODO: negative z is not calculated in an acceptable way, clipping does horrible things(?)
96 lz = z (vout.position);
97 z (vout.position) = (ifelse (
98 lz < 0,
99 lz,
100 log (lz) * (2 / log (1e10))
101 ) - 1) * w (vout.position);
102 }
103
104 vsh_src = shader::shader_builder::stop ();
105
106 shader::shader_builder::start ();
107
108 if (ctx.pass->l)
109 {
110 ctx.pass->l->fsh ();
111
112 fsh (ctx);
113 }
114 else
115 shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.);
116
117 fsh_src = shader::shader_builder::stop ();
118
119 shader::program_object po = shader::get_program (vsh_src, fsh_src);
120 matmap.insert (pass_data::matmap_t::value_type (this, po));
121
122 po->enable ();
123 }
124 else
125 i->second->enable ();
126
127 if (ctx.pass->l)
128 ctx.pass->l->enable ();
129}
130
131void material::disable (view &ctx)
132{
133}
134
90test_material::test_material () 135test_material::test_material ()
91: tex ("textures/osama.jpg"), texvar (tex.name) 136//: tex ("textures/osama.jpg"), texvar (tex.name)
137: tex ("textures/rockwall.jpg"), texvar (tex.name)
138, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
92{ 139{
140}
141
142static shader::varying_3f normal;
143static shader::varying_2f texcoord;
144
145void test_material::vsh (view &ctx)
146{
93 using namespace shader; 147 using namespace shader::compile;
94 148
95 p.vsh->start (); 149 std_vsh ();
96 150
97 temp_4f lightpos; 151 if (ctx.pass->l)
98 temp_4f wpos; 152 {
153 texcoord = xy (vin.tex_coord[0]);
154 normal = normal_matrix * vin.normal;
155 }
156}
99 157
100 //lightpos = shader::vec4 (0, 10, 0, 1); 158void test_material::fsh (view &ctx)
101 vout.position = shader::gl.model_view_projection_matrix * vin.vertex; 159{
102 vout.tex_coord[0] = vin.tex_coord[0] + 1; 160 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 161
108 p.vsh->end (); 162 if (ctx.pass->l)
109 p.vsh->compile (); 163 {
164 temp_3f lc;
165 temp_1f fac;
110 166
111 fragment_shader fsh; 167 temp_3f rot1, rot2, rot3;
112 168
113 p.fsh->start (); 169 yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
114 170
171 //rot1 = normal_matrix * rot1;
172
173 rot2 = float3 (x(rot1), z(rot1), -y(rot1));
174 rot3 = float3 (y(rot1), -x(rot1), z(rot1));
175
176 normal = mat3 (rot1, rot2, rot3) * normal;
177
178 fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
179 fac = max (pow (max (fac, 0.0), 6), 0.3);
115 xyz(fout.frag_color) = texture_2d (texvar, fin.tex_coord[0]); 180 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
116 181 * ctx.pass->l->sh_colour;
117 p.fsh->end (); 182 //xyz (fout.frag_color) = lc * fac;
118 p.fsh->compile (); 183 }
119 p.link ();
120} 184}
121 185
122void test_material::enable () 186void test_material::enable (view &ctx)
123{ 187{
124 p.enable (); 188 material::enable (ctx);
125 texvar->enable (); 189 texvar->enable ();
190 normvar->enable ();
126} 191}
127 192
128void test_material::disable () 193void test_material::disable (view &ctx)
129{ 194{
195 normvar->disable ();
130 texvar->disable (); 196 texvar->disable ();
131 p.disable (); 197 material::disable (ctx);
132} 198}
133 199
200test_material *testmat;
201

Diff Legend

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