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.32 by root, Wed Nov 3 03:35:13 2004 UTC vs.
Revision 1.57 by root, Mon Feb 7 08:16:31 2005 UTC

… …
5 5
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
11material::~material ()
12{
13}
14 10
15GLuint 11GLuint
16texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord) 12texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord)
17{ 13{
18 GLuint name; 14 GLuint name;
… …
59 glGenTextures (1, &name); 55 glGenTextures (1, &name);
60 glBindTexture (GL_TEXTURE_2D, name); 56 glBindTexture (GL_TEXTURE_2D, name);
61 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); 57 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
62 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);
63 glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); 59 glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
64 glTexImage2D (GL_TEXTURE_2D, 60 glTexImage2D (GL_TEXTURE_2D, 0,
65 0,
66 GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels); 61 GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
67 SDL_FreeSurface (image); /* No longer needed */ 62 SDL_FreeSurface (image); /* No longer needed */
68 63
69 return name; 64 return name;
70} 65}
71 66
67material::~material ()
68{
69}
70
72void material::enable (view &ctx) 71void material::enable (view &ctx)
73{ 72{
74 pass::matmap_t &matmap = ctx.pass_data->matmap; 73 pass_data::matmap_t &matmap = ctx.pass->matmap;
75 74
76 pass::matmap_t::iterator i = matmap.find (this); 75 pass_data::matmap_t::iterator i = matmap.find (this);
77 shader::program_object *p;
78 76
79 if (i == matmap.end ()) 77 if (i == matmap.end ())
80 { 78 {
81 shader::program_object po; 79 string vsh_src, fsh_src;
82 80
83 shader::shader_builder::start (); 81 shader::shader_builder::start ();
82
83 if (ctx.pass->l)
84 ctx.pass->l->vsh ();
85
84 vsh (ctx); 86 vsh (ctx);
85 87
86 if (ctx.pass_data->l) 88 // compute logarithmic depth - see the frustum matrix in view.C
87 ctx.pass_data->l->vsh (); 89 {
90 using namespace shader::compile;
88 91
92 temp_1f lz;
93
94 // TODO: negative z is not calculated in an acceptable way, clipping does horrible things(?)
95 lz = z (vout.position);
96#if 0
97 lz = (log (max (lz, 0) + 1) / log (1e30)) - 1;
98#else
99 lz = ifelse (lz <= 0,
100 0,
101 log (lz + 1) / log (1e30)
102 ) - 1;
103#endif
104 z (vout.position) = lz * w (vout.position);
105 }
106
89 po->vsh->compile (shader::shader_builder::stop ()); 107 vsh_src = shader::shader_builder::stop ();
90 108
91 shader::shader_builder::start (); 109 shader::shader_builder::start ();
110
111 if (ctx.pass->l)
112 {
113 ctx.pass->l->fsh ();
92 fsh (ctx); 114 fsh (ctx);
115 }
116 else
117 // many drivers need both vertex and fragment shader, 'caboom!' otherwise
118 shader::compile::fout.frag_color = shader::compile::float4 (0., 0., 0., 0.);
119
93 po->fsh->compile (shader::shader_builder::stop ()); 120 fsh_src = shader::shader_builder::stop ();
94 121
95 po->link (); 122 shader::program_object po = shader::get_program (vsh_src, fsh_src);
96
97 matmap.insert (pass::matmap_t::value_type (this, po)); 123 matmap.insert (pass_data::matmap_t::value_type (this, po));
98 124
99 p = &po; 125 po->enable ();
100 } 126 }
101 else 127 else
102 p = &i->second; 128 i->second->enable ();
103 129
104 (*p)->enable (); 130 if (ctx.pass->l)
131 ctx.pass->l->enable (ctx);
105} 132}
106 133
107void material::disable (view &ctx) 134void material::disable (view &ctx)
108{ 135{
109} 136}
110 137
111test_material::test_material () 138test_material::test_material ()
112//: tex ("textures/osama.jpg"), texvar (tex.name) 139//: tex ("textures/osama.jpg"), texvar (tex.name)
113: tex ("textures/rockwall.jpg"), texvar (tex.name) 140: tex ("textures/rockwall.jpg"), texvar (tex.name)
114, norm ("textures/rockwall_height.jpg"), normvar (norm.name) 141, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
115{ 142{
116} 143}
117 144
118static shader::varying_3f normal, lightvec; 145static shader::varying_3f normal;
119static shader::varying_2f texcoord; 146static shader::varying_2f texcoord;
120 147
148void test_material2::vsh (view &ctx)
149{
150 using namespace shader::compile;
151 std_vsh ();
152
153 if (ctx.pass->l)
154 {
155 normal = normal_matrix * vin.normal;
156 }
157}
158
159void test_material2::fsh (view &ctx)
160{
161 using namespace shader::compile;
162
163 if (ctx.pass->l)
164 {
165 temp_1f fac;
166 fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
167 xyz (fout.frag_color) = ctx.pass->l->sh_colour * fac;//normalize (ctx.pass->l->sh_lightvec);
168 }
169}
170
121void test_material::vsh (view &ctx) 171void test_material::vsh (view &ctx)
122{ 172{
123 using namespace shader::compile; 173 using namespace shader::compile;
124 174
125 std_vsh (); 175 std_vsh ();
126 176
127 if (ctx.pass_data->l) 177 if (ctx.pass->l)
128 { 178 {
129 texcoord = xy (vin.tex_coord[0]); 179 texcoord = xy (vin.tex_coord[0]);
130 normal = normal_matrix * vin.normal; 180 normal = normal_matrix * vin.normal;
131 lightvec = xyz (ctx.pass_data->l->lightpos - model_view_matrix * vin.vertex);
132 } 181 }
133} 182}
134 183
135void test_material::fsh (view &ctx) 184void test_material::fsh (view &ctx)
136{ 185{
137 using namespace shader::compile; 186 using namespace shader::compile;
138 187
139 if (ctx.pass_data->l) 188 if (ctx.pass->l)
140 { 189 {
141 temp_3f lc; 190 temp_3f lc;
142 temp_1f fac; 191 temp_1f fac;
143 192
144 lc = (*ctx.pass_data->l)(); 193 temp_3f rot1, rot2, rot3;
145 194
195 yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
196
197 //rot1 = normal_matrix * rot1;
198
199 rot2 = float3 (x(rot1), z(rot1), -y(rot1));
200 rot3 = float3 (y(rot1), -x(rot1), z(rot1));
201
202 normal = mat3 (rot1, rot2, rot3) * normal;
203
146 fac = dot (normalize (normal), normalize (lightvec)); 204 fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
147 fac = pow (max (fac, 0.0), 2); 205 fac = max (pow (max (fac, 0.0), 6), 0.3);
148 xyz (fout.frag_color) = texture_2d (texvar, texcoord) * lc * fac; 206 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
207 * ctx.pass->l->sh_colour;
208 //xyz (fout.frag_color) = lc * fac;
149 } 209 }
150 else
151 fout.frag_color = float4(1,1,1,1);
152} 210}
153 211
154void test_material::enable (view &ctx) 212void test_material::enable (view &ctx)
155{ 213{
156 material::enable (ctx); 214 material::enable (ctx);
… …
163 normvar->disable (); 221 normvar->disable ();
164 texvar->disable (); 222 texvar->disable ();
165 material::disable (ctx); 223 material::disable (ctx);
166} 224}
167 225
168test_material testmat; 226test_material *testmat;
227test_material2 *testmat2;
228

Diff Legend

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