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

Comparing libgender/material.C (file contents):
Revision 1.31 by root, Wed Nov 3 01:37:23 2004 UTC vs.
Revision 1.32 by root, Wed Nov 3 03:35:13 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 fsh (ctx);
93 po->fsh->compile (shader::shader_builder::stop ());
94
95 po->link ();
96
97 matmap.insert (pass::matmap_t::value_type (this, po));
98
99 p = &po;
100 }
101 else
102 p = &i->second;
103
104 (*p)->enable ();
105}
106
107void material::disable (view &ctx)
108{
109}
110
86test_material::test_material () 111test_material::test_material ()
87//: tex ("textures/osama.jpg"), texvar (tex.name) 112//: tex ("textures/osama.jpg"), texvar (tex.name)
88: tex ("textures/rockwall.jpg"), texvar (tex.name) 113: tex ("textures/rockwall.jpg"), texvar (tex.name)
89, norm ("textures/rockwall_height.jpg"), normvar (norm.name) 114, norm ("textures/rockwall_height.jpg"), normvar (norm.name)
90{ 115{
116}
117
118static shader::varying_3f normal, lightvec;
119static shader::varying_2f texcoord;
120
121void test_material::vsh (view &ctx)
122{
91 using namespace shader::compile; 123 using namespace shader::compile;
92 124
93 shader_builder::start (); 125 std_vsh ();
94 126
95 temp_4f wpos; 127 if (ctx.pass_data->l)
96 varying_1f camdist, zpos; 128 {
97 varying_2f texcoord; 129 texcoord = xy (vin.tex_coord[0]);
98 varying_3f lightvec, normal; 130 normal = normal_matrix * vin.normal;
99 131 lightvec = xyz (ctx.pass_data->l->lightpos - model_view_matrix * vin.vertex);
100 wpos = model_view_matrix * vin.vertex; 132 }
133}
101 134
102 temp_1f wz; 135void test_material::fsh (view &ctx)
103 //wz = log2 (abs (wz)) * sign (wz); 136{
137 using namespace shader::compile;
104 138
105 vout.position = projection_matrix * wpos; 139 if (ctx.pass_data->l)
106 texcoord = xy (vin.tex_coord[0]); 140 {
107 normal = normal_matrix * vin.normal; 141 temp_3f lc;
108 lightvec = xyz (lightpos - model_view_matrix * vin.vertex); 142 temp_1f fac;
109 camdist = 1 - max (length (lightvec) / 10000., 0);
110 143
111 p->vsh->compile (shader_builder::stop ()); 144 lc = (*ctx.pass_data->l)();
112 145
113 shader_builder::start ();
114
115 temp_1f fac;
116 temp_2f disp;
117 temp_1f dx, dy;
118 temp_1f bumpnormal;
119 temp_1f dist;
120
121 fac = dot (normalize (normal), normalize (lightvec)); 146 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); 147 fac = pow (max (fac, 0.0), 2);
125 xyz (fout.frag_color) = texture_2d (texvar, texcoord) * (fac + 0.4) * camdist; 148 xyz (fout.frag_color) = texture_2d (texvar, texcoord) * lc * fac;
126 149 }
127 p->fsh->compile (shader_builder::stop ()); 150 else
128 p->link (); 151 fout.frag_color = float4(1,1,1,1);
129} 152}
130 153
131void test_material::enable (view &ctx) 154void test_material::enable (view &ctx)
132{ 155{
133 p->enable (); 156 material::enable (ctx);
134 lightpos->set (vec3 (0, 0, 0));
135 texvar->enable (); 157 texvar->enable ();
136 normvar->enable (); 158 normvar->enable ();
137} 159}
138 160
139void test_material::disable (view &ctx) 161void test_material::disable (view &ctx)
140{ 162{
141 normvar->disable (); 163 normvar->disable ();
142 texvar->disable (); 164 texvar->disable ();
143 p->disable (); 165 material::disable (ctx);
144} 166}
145 167
168test_material testmat;

Diff Legend

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