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.27 by root, Mon Nov 1 20:20:22 2004 UTC vs.
Revision 1.43 by root, Sat Nov 6 04:31:01 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 pass::matmap_t &matmap = ctx.pass_data->matmap;
75
76 pass::matmap_t::iterator i = matmap.find (this);
77
78 if (i == matmap.end ())
79 {
80 string vsh_src, fsh_src;
81
82 shader::shader_builder::start ();
83
84 if (ctx.pass_data->l)
85 ctx.pass_data->l->vsh ();
86
87 vsh (ctx);
88
89 {
90 using namespace shader::compile;
91
92 z (vout.position) = (log2 (z (vout.position) + 1.F) * 1.82F - 1);
93 //z (vout.position) = z (vout.position) - 1;
94 }
95
96 vsh_src = shader::shader_builder::stop ();
97
98 shader::shader_builder::start ();
99
100 if (ctx.pass_data->l)
101 {
102 ctx.pass_data->l->fsh ();
103
104 fsh (ctx);
105 }
106 else
107 shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.);
108
109 fsh_src = shader::shader_builder::stop ();
110
111 shader::program_object po = shader::get_program (vsh_src, fsh_src);
112 matmap.insert (pass::matmap_t::value_type (this, po));
113
114 po->enable ();
115 }
116 else
117 i->second->enable ();
118}
119
120void material::disable (view &ctx)
121{
122}
123
86test_material::test_material () 124test_material::test_material ()
87//: tex ("textures/osama.jpg"), texvar (tex.name) 125//: tex ("textures/osama.jpg"), texvar (tex.name)
88: tex ("textures/rockwall.jpg"), texvar (tex.name) 126: tex ("textures/rockwall.jpg"), texvar (tex.name)
89, norm ("textures/rockwall_height.jpg"), normvar (norm.name) 127, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
128{
129}
130
131static shader::varying_3f normal;
132static shader::varying_2f texcoord;
133
134void test_material::vsh (view &ctx)
90{ 135{
91 using namespace shader::compile; 136 using namespace shader::compile;
92 137
93 p.vsh->start (); 138 std_vsh ();
94 139
95 temp_4f wpos; 140 if (ctx.pass_data->l)
96 varying_1f camdist; 141 {
97 varying_3f lightvec; 142 texcoord = xy (vin.tex_coord[0]);
98 143 normal = normal_matrix * vin.normal;
99 wpos = model_view_projection_matrix * vin.vertex; 144 }
145}
100 146
101 //wpos = wpos / abs (w (wpos)); 147void test_material::fsh (view &ctx)
148{
149 using namespace shader::compile;
102 150
103 vout.position = wpos; 151 if (ctx.pass_data->l)
104 vout.tex_coord[0] = vin.tex_coord[0]; 152 {
105 xyz (vout.tex_coord[1]) = normal_matrix * vin.normal; 153 temp_3f lc;
106 lightvec = xyz (lightpos - model_view_matrix * vin.vertex); 154 temp_1f fac;
107 camdist = 1 - max (length (xyz (vout.tex_coord[2])) / 10000., 0);
108 155
109 p.vsh->end (); 156 temp_3f rot1, rot2, rot3;
110 p.vsh->compile ();
111 157
112 p.fsh->start (); 158 yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
113 159
114 temp_1f fac; 160 //rot1 = normal_matrix * rot1;
115 temp_2f disp;
116 temp_1f dx, dy;
117 temp_1f bumpnormal;
118 temp_1f dist;
119 161
120 fac = dot (normalize (xyz (fin.tex_coord[1])), normalize (lightvec)); 162 rot2 = float3 (x(rot1), z(rot1), -y(rot1));
121 //fac = dot (shader::compile::vec3 (normalize (fin.tex_coord[1]) + normalize (fin.tex_coord[2])) * 0.5, bumpnormal); 163 rot3 = float3 (y(rot1), -x(rot1), z(rot1));
122 //fac = dot (bumpnormal, normalize (fin.tex_coord[2]));
123 //fac = pow (max (fac, 0.0), 8);
124 xyz (fout.frag_color) = (texture_2d (texvar, fin.tex_coord[0] - disp)) * max (fac * (0.4 + 1.F * camdist), 0);
125 164
126 p.fsh->end (); 165 normal = mat3 (rot1, rot2, rot3) * normal;
127 p.fsh->compile (); 166
128 p.link (); 167 fac = dot (normalize (normal), normalize (ctx.pass_data->l->sh_lightvec));
168 fac = max (pow (max (fac, 0.0), 6), 0.3);
169 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
170 * ctx.pass_data->l->sh_colour;
171 //xyz (fout.frag_color) = lc * fac;
172 }
129} 173}
130 174
131void test_material::enable (view &ctx) 175void test_material::enable (view &ctx)
132{ 176{
133 p.enable (); 177 material::enable (ctx);
134 lightpos->set (vec3 (0, 0, 0));
135 texvar->enable (); 178 texvar->enable ();
136 normvar->enable (); 179 normvar->enable ();
137} 180}
138 181
139void test_material::disable (view &ctx) 182void test_material::disable (view &ctx)
140{ 183{
141 normvar->disable (); 184 normvar->disable ();
142 texvar->disable (); 185 texvar->disable ();
143 p.disable (); 186 material::disable (ctx);
144} 187}
145 188
189test_material *testmat;
190

Diff Legend

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