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.24 by root, Sun Oct 31 22:55: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 p.vsh->start (); 125 std_vsh ();
94 126
95 temp_4f wpos; 127 if (ctx.pass_data->l)
96 128 {
97 wpos = model_view_projection_matrix * vin.vertex; 129 texcoord = xy (vin.tex_coord[0]);
130 normal = normal_matrix * vin.normal;
131 lightvec = xyz (ctx.pass_data->l->lightpos - model_view_matrix * vin.vertex);
132 }
133}
98 134
99 //wpos = wpos / abs (w (wpos)); 135void test_material::fsh (view &ctx)
136{
137 using namespace shader::compile;
100 138
101 vout.position = wpos; 139 if (ctx.pass_data->l)
102 vout.tex_coord[0] = vin.tex_coord[0]; 140 {
103 vout.tex_coord[1] = model_view_matrix * shader::compile::vec4 (x(vin.normal), y(vin.normal), z(vin.normal), 0); 141 temp_3f lc;
104 vout.tex_coord[2] = lightpos - model_view_matrix * vin.vertex; 142 temp_1f fac;
105 143
106 p.vsh->end (); 144 lc = (*ctx.pass_data->l)();
107 p.vsh->compile ();
108 145
109 p.fsh->start (); 146 fac = dot (normalize (normal), normalize (lightvec));
110
111 temp_1f fac;
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
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]));
126 //fac = pow (max (fac, 0.0), 8); 147 fac = pow (max (fac, 0.0), 2);
127 xyz (fout.frag_color) = (texture_2d (texvar, fin.tex_coord[0] - disp) + 0.1) * max (fac, 0.0); 148 xyz (fout.frag_color) = texture_2d (texvar, texcoord) * lc * fac;
128 149 }
129 p.fsh->end (); 150 else
130 p.fsh->compile (); 151 fout.frag_color = float4(1,1,1,1);
131 p.link ();
132} 152}
133 153
134void test_material::enable (view &ctx) 154void test_material::enable (view &ctx)
135{ 155{
136 p.enable (); 156 material::enable (ctx);
137 lightpos->set (vec3 (0, 0, 0));
138 texvar->enable (); 157 texvar->enable ();
139 normvar->enable (); 158 normvar->enable ();
140} 159}
141 160
142void test_material::disable (view &ctx) 161void test_material::disable (view &ctx)
143{ 162{
144 normvar->disable (); 163 normvar->disable ();
145 texvar->disable (); 164 texvar->disable ();
146 p.disable (); 165 material::disable (ctx);
147} 166}
148 167
168test_material testmat;

Diff Legend

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