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.32 by root, Wed Nov 3 03:35:13 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 10
15GLuint 11GLuint
16texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord) 12texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord)
17{ 13{
18 GLuint name; 14 GLuint name;
… …
67 SDL_FreeSurface (image); /* No longer needed */ 63 SDL_FreeSurface (image); /* No longer needed */
68 64
69 return name; 65 return name;
70} 66}
71 67
68material::~material ()
69{
70}
71
72void material::enable (view &ctx) 72void material::enable (view &ctx)
73{ 73{
74 static shader::compile::varying_1f Z;//D
75
74 pass::matmap_t &matmap = ctx.pass_data->matmap; 76 pass::matmap_t &matmap = ctx.pass_data->matmap;
75 77
76 pass::matmap_t::iterator i = matmap.find (this); 78 pass::matmap_t::iterator i = matmap.find (this);
77 shader::program_object *p;
78 79
79 if (i == matmap.end ()) 80 if (i == matmap.end ())
80 { 81 {
81 shader::program_object po; 82 string vsh_src, fsh_src;
82 83
83 shader::shader_builder::start (); 84 shader::shader_builder::start ();
84 vsh (ctx);
85 85
86 if (ctx.pass_data->l) 86 if (ctx.pass_data->l)
87 ctx.pass_data->l->vsh (); 87 ctx.pass_data->l->vsh ();
88 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
89 po->vsh->compile (shader::shader_builder::stop ()); 99 vsh_src = shader::shader_builder::stop ();
90 100
91 shader::shader_builder::start (); 101 shader::shader_builder::start ();
102
103 if (ctx.pass_data->l)
104 {
105 ctx.pass_data->l->fsh ();
106
92 fsh (ctx); 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
93 po->fsh->compile (shader::shader_builder::stop ()); 119 fsh_src = shader::shader_builder::stop ();
94 120
95 po->link (); 121 shader::program_object po = shader::get_program (vsh_src, fsh_src);
96
97 matmap.insert (pass::matmap_t::value_type (this, po)); 122 matmap.insert (pass::matmap_t::value_type (this, po));
98 123
99 p = &po; 124 po->enable ();
100 } 125 }
101 else 126 else
102 p = &i->second; 127 i->second->enable ();
103
104 (*p)->enable ();
105} 128}
106 129
107void material::disable (view &ctx) 130void material::disable (view &ctx)
108{ 131{
109} 132}
110 133
111test_material::test_material () 134test_material::test_material ()
112//: tex ("textures/osama.jpg"), texvar (tex.name) 135//: tex ("textures/osama.jpg"), texvar (tex.name)
113: tex ("textures/rockwall.jpg"), texvar (tex.name) 136: tex ("textures/rockwall.jpg"), texvar (tex.name)
114, norm ("textures/rockwall_height.jpg"), normvar (norm.name) 137, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
115{ 138{
116} 139}
117 140
118static shader::varying_3f normal, lightvec; 141static shader::varying_3f normal;
119static shader::varying_2f texcoord; 142static shader::varying_2f texcoord;
120 143
121void test_material::vsh (view &ctx) 144void test_material::vsh (view &ctx)
122{ 145{
123 using namespace shader::compile; 146 using namespace shader::compile;
… …
126 149
127 if (ctx.pass_data->l) 150 if (ctx.pass_data->l)
128 { 151 {
129 texcoord = xy (vin.tex_coord[0]); 152 texcoord = xy (vin.tex_coord[0]);
130 normal = normal_matrix * vin.normal; 153 normal = normal_matrix * vin.normal;
131 lightvec = xyz (ctx.pass_data->l->lightpos - model_view_matrix * vin.vertex);
132 } 154 }
133} 155}
134 156
135void test_material::fsh (view &ctx) 157void test_material::fsh (view &ctx)
136{ 158{
… …
139 if (ctx.pass_data->l) 161 if (ctx.pass_data->l)
140 { 162 {
141 temp_3f lc; 163 temp_3f lc;
142 temp_1f fac; 164 temp_1f fac;
143 165
144 lc = (*ctx.pass_data->l)(); 166 temp_3f rot1, rot2, rot3;
145 167
168 yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
169
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
146 fac = dot (normalize (normal), normalize (lightvec)); 177 fac = dot (normalize (normal), normalize (ctx.pass_data->l->sh_lightvec));
147 fac = pow (max (fac, 0.0), 2); 178 fac = max (pow (max (fac, 0.0), 6), 0.3);
148 xyz (fout.frag_color) = texture_2d (texvar, texcoord) * lc * fac; 179 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
180 * ctx.pass_data->l->sh_colour;
181 //xyz (fout.frag_color) = lc * fac;
149 } 182 }
150 else
151 fout.frag_color = float4(1,1,1,1);
152} 183}
153 184
154void test_material::enable (view &ctx) 185void test_material::enable (view &ctx)
155{ 186{
156 material::enable (ctx); 187 material::enable (ctx);
… …
163 normvar->disable (); 194 normvar->disable ();
164 texvar->disable (); 195 texvar->disable ();
165 material::disable (ctx); 196 material::disable (ctx);
166} 197}
167 198
168test_material testmat; 199test_material *testmat;
200

Diff Legend

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