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.39 by root, Fri Nov 5 19:55:15 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); 83 vsh (ctx);
85 84
86 if (ctx.pass_data->l) 85 if (ctx.pass_data->l)
87 ctx.pass_data->l->vsh (); 86 ctx.pass_data->l->vsh ();
88 87
89 po->vsh->compile (shader::shader_builder::stop ()); 88 {
89 using namespace shader::compile;
90 90
91 shader::shader_builder::start (); 91 z (vout.position) = log2 (z (vout.position) / w (vout.position)) * w (vout.position);
92 shader::compile::fout.frag_color = shader::compile::float4 (1., 1., 0., 1.); 92 }
93 fsh (ctx);
94 po->fsh->compile (shader::shader_builder::stop ());
95 93
96 po->link (); 94 vsh_src = shader::shader_builder::stop ();
97 95
96 if (ctx.pass_data->l || 1)
97 {
98 shader::shader_builder::start ();
99 shader::compile::fout.frag_color = shader::compile::float4 (1., 1., 0., 1.);
100 fsh (ctx);
101
102 fsh_src = shader::shader_builder::stop ();
103 }
104
105 shader::program_object po = shader::get_program (vsh_src, fsh_src);
98 matmap.insert (pass::matmap_t::value_type (this, po)); 106 matmap.insert (pass::matmap_t::value_type (this, po));
99 107
100 p = &po; 108 po->enable ();
101 } 109 }
102 else 110 else
103 p = &i->second; 111 i->second->enable ();
104
105 (*p)->enable ();
106} 112}
107 113
108void material::disable (view &ctx) 114void material::disable (view &ctx)
109{ 115{
110} 116}
… …
144 150
145 lc = (*ctx.pass_data->l)(); 151 lc = (*ctx.pass_data->l)();
146 152
147 temp_3f rot1, rot2, rot3; 153 temp_3f rot1, rot2, rot3;
148 154
149 rot1 = yxz (texture_2d (normvar, texcoord) * 2.F - 1.F); 155 yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
156
157 //rot1 = normal_matrix * rot1;
158
150 rot2 = float3 (x(rot1), z(rot1), -y(rot1)); 159 rot2 = float3 (x(rot1), z(rot1), -y(rot1));
151 rot3 = float3 (y(rot1), -x(rot1), z(rot1)); 160 rot3 = float3 (y(rot1), -x(rot1), z(rot1));
152 161
153 normal = mat3 (rot1, rot2, rot3) * normal; 162 normal = mat3 (rot1, rot2, rot3) * normal;
154 163
155 fac = dot (normalize (normal), normalize (lightvec)); 164 fac = dot (normalize (normal), normalize (lightvec));
156 fac = pow (max (fac, 0.0), 6); 165 fac = max (pow (max (fac, 0.0), 6), 0.3);
157 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * lc * fac; 166 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * lc * fac;
167 //xyz (fout.frag_color) = lc * fac;
158 } 168 }
159} 169}
160 170
161void test_material::enable (view &ctx) 171void test_material::enable (view &ctx)
162{ 172{

Diff Legend

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