… | |
… | |
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 | |
|
|
11 | material::~material () |
|
|
12 | { |
|
|
13 | } |
|
|
14 | |
10 | |
15 | GLuint |
11 | GLuint |
16 | texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord) |
12 | texture::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 | |
|
|
68 | material::~material () |
|
|
69 | { |
|
|
70 | } |
|
|
71 | |
72 | void material::enable (view &ctx) |
72 | void 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) + 1.F) - 1); |
|
|
93 | z (vout.position) = z (vout.position) - 1; |
|
|
94 | } |
|
|
95 | |
89 | po->vsh->compile (shader::shader_builder::stop ()); |
96 | vsh_src = shader::shader_builder::stop (); |
90 | |
97 | |
91 | shader::shader_builder::start (); |
98 | 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 | |
99 | |
96 | po->link (); |
100 | if (ctx.pass_data->l) |
|
|
101 | { |
|
|
102 | ctx.pass_data->l->fsh (); |
97 | |
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); |
98 | matmap.insert (pass::matmap_t::value_type (this, po)); |
112 | matmap.insert (pass::matmap_t::value_type (this, po)); |
99 | |
113 | |
100 | p = &po; |
114 | po->enable (); |
101 | } |
115 | } |
102 | else |
116 | else |
103 | p = &i->second; |
117 | i->second->enable (); |
104 | |
|
|
105 | (*p)->enable (); |
|
|
106 | } |
118 | } |
107 | |
119 | |
108 | void material::disable (view &ctx) |
120 | void material::disable (view &ctx) |
109 | { |
121 | { |
110 | } |
122 | } |
… | |
… | |
114 | : tex ("textures/rockwall.jpg"), texvar (tex.name) |
126 | : tex ("textures/rockwall.jpg"), texvar (tex.name) |
115 | , norm ("textures/rockwall_normal.jpg"), normvar (norm.name) |
127 | , norm ("textures/rockwall_normal.jpg"), normvar (norm.name) |
116 | { |
128 | { |
117 | } |
129 | } |
118 | |
130 | |
119 | static shader::varying_3f normal, lightvec; |
131 | static shader::varying_3f normal; |
120 | static shader::varying_2f texcoord; |
132 | static shader::varying_2f texcoord; |
121 | |
133 | |
122 | void test_material::vsh (view &ctx) |
134 | void test_material::vsh (view &ctx) |
123 | { |
135 | { |
124 | using namespace shader::compile; |
136 | using namespace shader::compile; |
… | |
… | |
127 | |
139 | |
128 | if (ctx.pass_data->l) |
140 | if (ctx.pass_data->l) |
129 | { |
141 | { |
130 | texcoord = xy (vin.tex_coord[0]); |
142 | texcoord = xy (vin.tex_coord[0]); |
131 | normal = normal_matrix * vin.normal; |
143 | normal = normal_matrix * vin.normal; |
132 | lightvec = xyz (ctx.pass_data->l->lightpos - model_view_matrix * vin.vertex); |
|
|
133 | } |
144 | } |
134 | } |
145 | } |
135 | |
146 | |
136 | void test_material::fsh (view &ctx) |
147 | void test_material::fsh (view &ctx) |
137 | { |
148 | { |
… | |
… | |
140 | if (ctx.pass_data->l) |
151 | if (ctx.pass_data->l) |
141 | { |
152 | { |
142 | temp_3f lc; |
153 | temp_3f lc; |
143 | temp_1f fac; |
154 | temp_1f fac; |
144 | |
155 | |
145 | lc = (*ctx.pass_data->l)(); |
|
|
146 | |
|
|
147 | temp_3f rot1, rot2, rot3; |
156 | temp_3f rot1, rot2, rot3; |
148 | |
157 | |
149 | rot1 = yxz (texture_2d (normvar, texcoord) * 2.F - 1.F); |
158 | yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F); |
|
|
159 | |
|
|
160 | //rot1 = normal_matrix * rot1; |
|
|
161 | |
150 | rot2 = float3 (x(rot1), z(rot1), -y(rot1)); |
162 | rot2 = float3 (x(rot1), z(rot1), -y(rot1)); |
151 | rot3 = float3 (y(rot1), -x(rot1), z(rot1)); |
163 | rot3 = float3 (y(rot1), -x(rot1), z(rot1)); |
152 | |
164 | |
153 | normal = mat3 (rot1, rot2, rot3) * normal; |
165 | normal = mat3 (rot1, rot2, rot3) * normal; |
154 | |
166 | |
155 | fac = dot (normalize (normal), normalize (lightvec)); |
167 | fac = dot (normalize (normal), normalize (ctx.pass_data->l->sh_lightvec)); |
156 | fac = pow (max (fac, 0.0), 6); |
168 | fac = max (pow (max (fac, 0.0), 6), 0.3); |
157 | xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * lc * fac; |
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; |
158 | } |
172 | } |
159 | } |
173 | } |
160 | |
174 | |
161 | void test_material::enable (view &ctx) |
175 | void test_material::enable (view &ctx) |
162 | { |
176 | { |