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.28 by root, Mon Nov 1 22:23:38 2004 UTC vs.
Revision 1.33 by root, Wed Nov 3 03:36:16 2004 UTC

… …
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 10
11material::~material () 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{ 12{
27} 13}
28 14
29GLuint 15GLuint
30texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord) 16texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord)
… …
81 SDL_FreeSurface (image); /* No longer needed */ 67 SDL_FreeSurface (image); /* No longer needed */
82 68
83 return name; 69 return name;
84} 70}
85 71
72void material::enable (view &ctx)
73{
74 pass::matmap_t &matmap = ctx.pass_data->matmap;
75
76 pass::matmap_t::iterator i = matmap.find (this);
77 shader::program_object *p;
78
79 if (i == matmap.end ())
80 {
81 shader::program_object po;
82
83 shader::shader_builder::start ();
84 vsh (ctx);
85
86 if (ctx.pass_data->l)
87 ctx.pass_data->l->vsh ();
88
89 po->vsh->compile (shader::shader_builder::stop ());
90
91 shader::shader_builder::start ();
92 shader::compile::fout.frag_color = shader::compile::float4 (1., 1., 0., 1.);
93 fsh (ctx);
94 po->fsh->compile (shader::shader_builder::stop ());
95
96 po->link ();
97
98 matmap.insert (pass::matmap_t::value_type (this, po));
99
100 p = &po;
101 }
102 else
103 p = &i->second;
104
105 (*p)->enable ();
106}
107
108void material::disable (view &ctx)
109{
110}
111
86test_material::test_material () 112test_material::test_material ()
87//: tex ("textures/osama.jpg"), texvar (tex.name) 113//: tex ("textures/osama.jpg"), texvar (tex.name)
88: tex ("textures/rockwall.jpg"), texvar (tex.name) 114: tex ("textures/rockwall.jpg"), texvar (tex.name)
89, norm ("textures/rockwall_height.jpg"), normvar (norm.name) 115, norm ("textures/rockwall_height.jpg"), normvar (norm.name)
90{ 116{
117}
118
119static shader::varying_3f normal, lightvec;
120static shader::varying_2f texcoord;
121
122void test_material::vsh (view &ctx)
123{
91 using namespace shader::compile; 124 using namespace shader::compile;
92 125
93 p.vsh->start (); 126 std_vsh ();
94 127
95 temp_4f wpos; 128 if (ctx.pass_data->l)
96 varying_1f camdist, zpos; 129 {
97 varying_2f texcoord; 130 texcoord = xy (vin.tex_coord[0]);
98 varying_3f lightvec, normal; 131 normal = normal_matrix * vin.normal;
99 132 lightvec = xyz (ctx.pass_data->l->lightpos - model_view_matrix * vin.vertex);
100 wpos = model_view_matrix * vin.vertex; 133 }
134}
101 135
102 temp_1f wz; 136void test_material::fsh (view &ctx)
103 //wz = log2 (abs (wz)) * sign (wz); 137{
138 using namespace shader::compile;
104 139
105 vout.position = projection_matrix * wpos; 140 if (ctx.pass_data->l)
106 texcoord = xy (vin.tex_coord[0]); 141 {
107 normal = normal_matrix * vin.normal; 142 temp_3f lc;
108 lightvec = xyz (lightpos - model_view_matrix * vin.vertex); 143 temp_1f fac;
109 camdist = 1 - max (length (lightvec) / 10000., 0);
110 144
111 p.vsh->end (); 145 lc = (*ctx.pass_data->l)();
112 p.vsh->compile ();
113 146
114 p.fsh->start ();
115
116 temp_1f fac;
117 temp_2f disp;
118 temp_1f dx, dy;
119 temp_1f bumpnormal;
120 temp_1f dist;
121
122 fac = dot (normalize (normal), normalize (lightvec)); 147 fac = dot (normalize (normal), normalize (lightvec));
123 //fac = dot (shader::compile::vec3 (normalize (fin.tex_coord[1]) + normalize (fin.tex_coord[2])) * 0.5, bumpnormal);
124 //fac = dot (bumpnormal, normalize (fin.tex_coord[2]));
125 fac = pow (max (fac, 0.0), 2); 148 fac = pow (max (fac, 0.0), 2);
126 xyz (fout.frag_color) = texture_2d (texvar, texcoord) * (fac + 0.4) * camdist; 149 xyz (fout.frag_color) = texture_2d (texvar, texcoord) * lc * fac;
127 150 }
128 p.fsh->end ();
129 p.fsh->compile ();
130 p.link ();
131} 151}
132 152
133void test_material::enable (view &ctx) 153void test_material::enable (view &ctx)
134{ 154{
135 p.enable (); 155 material::enable (ctx);
136 lightpos->set (vec3 (0, 0, 0));
137 texvar->enable (); 156 texvar->enable ();
138 normvar->enable (); 157 normvar->enable ();
139} 158}
140 159
141void test_material::disable (view &ctx) 160void test_material::disable (view &ctx)
142{ 161{
143 normvar->disable (); 162 normvar->disable ();
144 texvar->disable (); 163 texvar->disable ();
145 p.disable (); 164 material::disable (ctx);
146} 165}
147 166
167test_material testmat;

Diff Legend

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