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.22 by root, Sat Oct 30 16:40:02 2004 UTC vs.
Revision 1.29 by root, Tue Nov 2 02:59:33 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.jpg"), texvar (tex.name)
89, norm ("textures/rockwall_height.jpg"), 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;
96 varying_1f camdist, zpos;
97 varying_2f texcoord;
98 varying_3f lightvec, normal;
94 99
95 wpos = model_view_projection_matrix * vin.vertex; 100 wpos = model_view_matrix * vin.vertex;
96 101
97 wpos = wpos / abs (w (wpos)); 102 temp_1f wz;
103 //wz = log2 (abs (wz)) * sign (wz);
98 104
99 vout.position = wpos; 105 vout.position = projection_matrix * wpos;
100 vout.tex_coord[0] = vin.tex_coord[0]; 106 texcoord = xy (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); 107 normal = normal_matrix * vin.normal;
102 vout.tex_coord[2] = lightpos - model_view_matrix * vin.vertex; 108 lightvec = xyz (lightpos - model_view_matrix * vin.vertex);
109 camdist = 1 - max (length (lightvec) / 10000., 0);
103 110
104 p.vsh->end ();
105 p.vsh->compile (); 111 p.vsh->stop ();
106 112
107 p.fsh->start (); 113 p.fsh->start ();
108 114
109 temp_1f fac; 115 temp_1f fac;
110 116 temp_2f disp;
111 fac = max (dot (normalize (fin.tex_coord[1]), normalize (fin.tex_coord[2])), 0.0); 117 temp_1f dx, dy;
112 fac = pow (fac, 0.7); 118 temp_1f bumpnormal;
113 xyz (fout.frag_color) = texture_2d (texvar, fin.tex_coord[0]) * max (fac, 0.4); 119 temp_1f dist;
114 120
115 p.fsh->end (); 121 fac = dot (normalize (normal), normalize (lightvec));
122 //fac = dot (shader::compile::vec3 (normalize (fin.tex_coord[1]) + normalize (fin.tex_coord[2])) * 0.5, bumpnormal);
123 //fac = dot (bumpnormal, normalize (fin.tex_coord[2]));
124 fac = pow (max (fac, 0.0), 2);
125 xyz (fout.frag_color) = texture_2d (texvar, texcoord) * (fac + 0.4) * camdist;
126
116 p.fsh->compile (); 127 p.fsh->stop ();
117 p.link (); 128 p.link ();
118} 129}
119 130
120void test_material::enable (view &ctx) 131void test_material::enable (view &ctx)
121{ 132{
122 p.enable (); 133 p.enable ();
123 lightpos->set (vec3 (0, 0, 0)); 134 lightpos->set (vec3 (0, 0, 0));
124 texvar->enable (); 135 texvar->enable ();
136 normvar->enable ();
125} 137}
126 138
127void test_material::disable (view &ctx) 139void test_material::disable (view &ctx)
128{ 140{
141 normvar->disable ();
129 texvar->disable (); 142 texvar->disable ();
130 p.disable (); 143 p.disable ();
131} 144}
132 145

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines