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

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

Diff Legend

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