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.25 by root, Mon Nov 1 01:57:03 2004 UTC vs.
Revision 1.44 by root, Sat Nov 6 14:49:03 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
15void
16simple_material::enable (view &ctx)
17{
18 glMaterialfv (GL_FRONT, GL_DIFFUSE, (GLfloat *) & diffuse);
19 glMaterialfv (GL_FRONT, GL_SPECULAR, (GLfloat *) & specular);
20 glMaterialfv (GL_FRONT, GL_EMISSION, (GLfloat *) & emission);
21 glMaterialf (GL_FRONT, GL_SHININESS, shininess);
22}
23
24void
25simple_material::disable (view &ctx)
26{
27}
28 10
29GLuint 11GLuint
30texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord) 12texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord)
31{ 13{
32 GLuint name; 14 GLuint name;
… …
81 SDL_FreeSurface (image); /* No longer needed */ 63 SDL_FreeSurface (image); /* No longer needed */
82 64
83 return name; 65 return name;
84} 66}
85 67
68material::~material ()
69{
70}
71
72void material::enable (view &ctx)
73{
74 static shader::compile::varying_1f Z;//D
75
76 pass::matmap_t &matmap = ctx.pass_data->matmap;
77
78 pass::matmap_t::iterator i = matmap.find (this);
79
80 if (i == matmap.end ())
81 {
82 string vsh_src, fsh_src;
83
84 shader::shader_builder::start ();
85
86 if (ctx.pass_data->l)
87 ctx.pass_data->l->vsh ();
88
89 vsh (ctx);
90
91 {
92 using namespace shader::compile;
93
94 Z = pow (z (vout.position) / 2.F, 0.2);
95 z (vout.position) = (Z * 2 - 1) * w (vout.position);
96 //z (vout.position) = z (vout.position) - 1;
97 }
98
99 vsh_src = shader::shader_builder::stop ();
100
101 shader::shader_builder::start ();
102
103 if (ctx.pass_data->l)
104 {
105 ctx.pass_data->l->fsh ();
106
107 fsh (ctx);
108 }
109 else
110 shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.);
111
112 {
113 using namespace shader::compile;
114 //x (fout.frag_color) = Z;//D
115 //y (fout.frag_color) = Z;//D
116 //z (fout.frag_color) = Z;//D
117 }
118
119 fsh_src = shader::shader_builder::stop ();
120
121 shader::program_object po = shader::get_program (vsh_src, fsh_src);
122 matmap.insert (pass::matmap_t::value_type (this, po));
123
124 po->enable ();
125 }
126 else
127 i->second->enable ();
128}
129
130void material::disable (view &ctx)
131{
132}
133
86test_material::test_material () 134test_material::test_material ()
87//: tex ("textures/osama.jpg"), texvar (tex.name) 135//: tex ("textures/osama.jpg"), texvar (tex.name)
88: tex ("textures/rockwall.jpg"), texvar (tex.name) 136: tex ("textures/rockwall.jpg"), texvar (tex.name)
89, norm ("textures/rockwall_height.jpg"), normvar (norm.name) 137, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
138{
139}
140
141static shader::varying_3f normal;
142static shader::varying_2f texcoord;
143
144void test_material::vsh (view &ctx)
90{ 145{
91 using namespace shader::compile; 146 using namespace shader::compile;
92 147
93 p.vsh->start (); 148 std_vsh ();
94 149
95 temp_4f wpos; 150 if (ctx.pass_data->l)
96 151 {
97 wpos = model_view_projection_matrix * vin.vertex;
98
99 //wpos = wpos / abs (w (wpos));
100
101 vout.position = wpos;
102 vout.tex_coord[0] = vin.tex_coord[0]; 152 texcoord = xy (vin.tex_coord[0]);
103 xyz (vout.tex_coord[1]) = normal_matrix * vin.normal; 153 normal = normal_matrix * vin.normal;
104 xyz (vout.tex_coord[2]) = xyz (lightpos - model_view_matrix * vin.vertex); 154 }
105 w (vout.tex_coord[2]) = 1.; 155}
106 xw (vout.tex_coord[3]) = shader::compile::vec2 (length (xyz (vout.tex_coord[2])), 1.);
107 156
108 p.vsh->end (); 157void test_material::fsh (view &ctx)
109 p.vsh->compile (); 158{
159 using namespace shader::compile;
110 160
111 p.fsh->start (); 161 if (ctx.pass_data->l)
112 162 {
163 temp_3f lc;
113 temp_1f fac; 164 temp_1f fac;
114 temp_2f disp;
115 temp_1f dx, dy;
116 temp_1f bumpnormal;
117 temp_1f dist;
118 165
119 dist = min (x(fin.tex_coord[3]), 100.); 166 temp_3f rot1, rot2, rot3;
120 167
121 fac = dot (normalize (xyz (fin.tex_coord[1])), xyz (normalize (fin.tex_coord[2]))); 168 yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
122 //fac = dot (shader::compile::vec3 (normalize (fin.tex_coord[1]) + normalize (fin.tex_coord[2])) * 0.5, bumpnormal); 169
123 //fac = dot (bumpnormal, normalize (fin.tex_coord[2])); 170 //rot1 = normal_matrix * rot1;
171
172 rot2 = float3 (x(rot1), z(rot1), -y(rot1));
173 rot3 = float3 (y(rot1), -x(rot1), z(rot1));
174
175 normal = mat3 (rot1, rot2, rot3) * normal;
176
177 fac = dot (normalize (normal), normalize (ctx.pass_data->l->sh_lightvec));
124 //fac = pow (max (fac, 0.0), 8); 178 fac = max (pow (max (fac, 0.0), 6), 0.3);
125 xyz (fout.frag_color) = (texture_2d (texvar, fin.tex_coord[0] - disp)) * max (fac, 1.2 * (1 - dist / 100.)); 179 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
126 180 * ctx.pass_data->l->sh_colour;
127 p.fsh->end (); 181 //xyz (fout.frag_color) = lc * fac;
128 p.fsh->compile (); 182 }
129 p.link ();
130} 183}
131 184
132void test_material::enable (view &ctx) 185void test_material::enable (view &ctx)
133{ 186{
134 p.enable (); 187 material::enable (ctx);
135 lightpos->set (vec3 (0, 0, 0));
136 texvar->enable (); 188 texvar->enable ();
137 normvar->enable (); 189 normvar->enable ();
138} 190}
139 191
140void test_material::disable (view &ctx) 192void test_material::disable (view &ctx)
141{ 193{
142 normvar->disable (); 194 normvar->disable ();
143 texvar->disable (); 195 texvar->disable ();
144 p.disable (); 196 material::disable (ctx);
145} 197}
146 198
199test_material *testmat;
200

Diff Legend

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