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

Comparing libgender/material.C (file contents):
Revision 1.34 by root, Thu Nov 4 03:58:32 2004 UTC vs.
Revision 1.48 by root, Sun Nov 7 03:28:20 2004 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
96 lz = z (vout.position);
97 z (vout.position) = (log2 (lz) * (2 / log2 (1e10)) - 1) * w (vout.position);
98#if 0
99 z (vout.position) =
100 ifelse (
101 z < 0,
102 -1,
103 log2 (lz) * (2 / log2 (1e10)) - 1
104 ) * w (vout.position);
105#endif
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 ();
111
112 if (ctx.pass->l)
113 {
114 ctx.pass->l->fsh ();
115
116 fsh (ctx);
117 }
118 else
92 shader::compile::fout.frag_color = shader::compile::float4 (1., 1., 0., 1.); 119 shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.);
93 fsh (ctx); 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}
111 138
112test_material::test_material () 139test_material::test_material ()
113//: tex ("textures/osama.jpg"), texvar (tex.name) 140//: tex ("textures/osama.jpg"), texvar (tex.name)
114: tex ("textures/rockwall.jpg"), texvar (tex.name) 141: tex ("textures/rockwall.jpg"), texvar (tex.name)
115, norm ("textures/rockwall_height.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
122void test_material::vsh (view &ctx) 149void test_material::vsh (view &ctx)
123{ 150{
124 using namespace shader::compile; 151 using namespace shader::compile;
125 152
126 std_vsh (); 153 std_vsh ();
127 154
128 if (ctx.pass_data->l) 155 if (ctx.pass->l)
129 { 156 {
130 texcoord = xy (vin.tex_coord[0]); 157 texcoord = xy (vin.tex_coord[0]);
131 normal = normal_matrix * vin.normal; 158 normal = normal_matrix * vin.normal;
132 lightvec = xyz (ctx.pass_data->l->lightpos - model_view_matrix * vin.vertex);
133 } 159 }
134} 160}
135 161
136void test_material::fsh (view &ctx) 162void test_material::fsh (view &ctx)
137{ 163{
138 using namespace shader::compile; 164 using namespace shader::compile;
139 165
140 if (ctx.pass_data->l) 166 if (ctx.pass->l)
141 { 167 {
142 temp_3f lc; 168 temp_3f lc;
143 temp_1f fac; 169 temp_1f fac;
144 170
145 lc = (*ctx.pass_data->l)(); 171 temp_3f rot1, rot2, rot3;
146 172
173 yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
174
175 //rot1 = normal_matrix * rot1;
176
177 rot2 = float3 (x(rot1), z(rot1), -y(rot1));
178 rot3 = float3 (y(rot1), -x(rot1), z(rot1));
179
180 normal = mat3 (rot1, rot2, rot3) * normal;
181
147 fac = dot (normalize (normal), normalize (lightvec)); 182 fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
148 fac = pow (max (fac, 0.0), 2); 183 fac = max (pow (max (fac, 0.0), 6), 0.3);
149 xyz (fout.frag_color) = texture_2d (texvar, texcoord) * lc * fac; 184 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
185 * ctx.pass->l->sh_colour;
186 //xyz (fout.frag_color) = lc * fac;
150 } 187 }
151} 188}
152 189
153void test_material::enable (view &ctx) 190void test_material::enable (view &ctx)
154{ 191{

Diff Legend

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