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

Diff Legend

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