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

Comparing libgender/material.C (file contents):
Revision 1.22 by root, Sat Oct 30 16:40:02 2004 UTC vs.
Revision 1.23 by root, Sun Oct 31 22:54:49 2004 UTC

… …
82 82
83 return name; 83 return name;
84} 84}
85 85
86test_material::test_material () 86test_material::test_material ()
87: tex ("textures/osama.jpg"), texvar (tex.name) 87//: tex ("textures/osama.jpg"), texvar (tex.name)
88: tex ("textures/rockwall.tga"), texvar (tex.name)
89, norm ("textures/rockwall_height.tga"), normvar (norm.name)
88{ 90{
89 using namespace shader::compile; 91 using namespace shader::compile;
90 92
91 p.vsh->start (); 93 p.vsh->start ();
92 94
93 temp_4f wpos; 95 temp_4f wpos;
94 96
95 wpos = model_view_projection_matrix * vin.vertex; 97 wpos = model_view_projection_matrix * vin.vertex;
96 98
97 wpos = wpos / abs (w (wpos)); 99 //wpos = wpos / abs (w (wpos));
98 100
99 vout.position = wpos; 101 vout.position = wpos;
100 vout.tex_coord[0] = vin.tex_coord[0]; 102 vout.tex_coord[0] = vin.tex_coord[0];
101 vout.tex_coord[1] = model_view_matrix * shader::compile::vec4 (x(vin.normal), y(vin.normal), z(vin.normal), 0); 103 vout.tex_coord[1] = model_view_matrix * shader::compile::vec4 (x(vin.normal), y(vin.normal), z(vin.normal), 0);
102 vout.tex_coord[2] = lightpos - model_view_matrix * vin.vertex; 104 vout.tex_coord[2] = lightpos - model_view_matrix * vin.vertex;
… …
105 p.vsh->compile (); 107 p.vsh->compile ();
106 108
107 p.fsh->start (); 109 p.fsh->start ();
108 110
109 temp_1f fac; 111 temp_1f fac;
110 112
113 temp_2f disp;
114
115 temp_1f dx, dy;
116
117 temp_1f bumpnormal;
118 dx = dFdx (texture_2d (normvar, fin.tex_coord[0]));
119 dy = dFdy (texture_2d (normvar, fin.tex_coord[0]));
120
121 disp = shader::compile::vec2 (dx, dy) * 0.1;
122
111 fac = max (dot (normalize (fin.tex_coord[1]), normalize (fin.tex_coord[2])), 0.0); 123 fac = dot (normalize (fin.tex_coord[1]), normalize (fin.tex_coord[2]));
124 //fac = dot (shader::compile::vec3 (normalize (fin.tex_coord[1]) + normalize (fin.tex_coord[2])) * 0.5, bumpnormal);
125 //fac = dot (bumpnormal, normalize (fin.tex_coord[2]));
112 fac = pow (fac, 0.7); 126 //fac = pow (max (fac, 0.0), 8);
113 xyz (fout.frag_color) = texture_2d (texvar, fin.tex_coord[0]) * max (fac, 0.4); 127 xyz (fout.frag_color) = (texture_2d (texvar, fin.tex_coord[0] - disp) + 0.1) * max (fac, 0.0);
114 128
115 p.fsh->end (); 129 p.fsh->end ();
116 p.fsh->compile (); 130 p.fsh->compile ();
117 p.link (); 131 p.link ();
118} 132}
… …
120void test_material::enable (view &ctx) 134void test_material::enable (view &ctx)
121{ 135{
122 p.enable (); 136 p.enable ();
123 lightpos->set (vec3 (0, 0, 0)); 137 lightpos->set (vec3 (0, 0, 0));
124 texvar->enable (); 138 texvar->enable ();
139 normvar->enable ();
125} 140}
126 141
127void test_material::disable (view &ctx) 142void test_material::disable (view &ctx)
128{ 143{
144 normvar->disable ();
129 texvar->disable (); 145 texvar->disable ();
130 p.disable (); 146 p.disable ();
131} 147}
132 148

Diff Legend

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