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.14 by root, Sat Oct 23 21:43:27 2004 UTC vs.
Revision 1.24 by root, Sun Oct 31 22:55:23 2004 UTC

… …
3 3
4#include <algorithm> 4#include <algorithm>
5 5
6#include "opengl.h" 6#include "opengl.h"
7#include "material.h" 7#include "material.h"
8#include "view.h"
8#include "util.h" 9#include "util.h"
9 10
10material::~material () 11material::~material ()
11{ 12{
12} 13}
13 14
14void 15void
15simple_material::begin () 16simple_material::enable (view &ctx)
16{ 17{
17 glMaterialfv (GL_FRONT, GL_DIFFUSE, (GLfloat *) & diffuse); 18 glMaterialfv (GL_FRONT, GL_DIFFUSE, (GLfloat *) & diffuse);
18 glMaterialfv (GL_FRONT, GL_SPECULAR, (GLfloat *) & specular); 19 glMaterialfv (GL_FRONT, GL_SPECULAR, (GLfloat *) & specular);
19 glMaterialfv (GL_FRONT, GL_EMISSION, (GLfloat *) & emission); 20 glMaterialfv (GL_FRONT, GL_EMISSION, (GLfloat *) & emission);
20 glMaterialf (GL_FRONT, GL_SHININESS, shininess); 21 glMaterialf (GL_FRONT, GL_SHININESS, shininess);
21} 22}
22 23
23void 24void
24simple_material::end () 25simple_material::disable (view &ctx)
25{ 26{
26}
27
28void
29osama_material::begin ()
30{
31 cgGLEnableProfile (vsh_profile);
32 cgGLEnableProfile (fsh_profile);
33 cgGLEnableTextureParameter (g_Texture);
34}
35
36void
37osama_material::end ()
38{
39 cgGLDisableTextureParameter (g_Texture);
40 // cgGLUnbindProgram (vsh_profile);
41 // cgGLUnbindProgram (fsh_profile);
42 cgGLDisableProfile (vsh_profile);
43 cgGLDisableProfile (fsh_profile);
44} 27}
45 28
46GLuint 29GLuint
47texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord) 30texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord)
48{ 31{
49 GLuint textur; 32 GLuint name;
50 int w, h;
51 SDL_Surface *image; 33 SDL_Surface *image;
52 SDL_Rect area; 34 SDL_Rect area;
53 Uint32 saved_flags; 35 Uint32 saved_flags;
54 Uint8 saved_alpha; 36 Uint8 saved_alpha;
55 37
56 /* Use the surface width and height expanded to powers of 2 */ 38 /* Use the surface width and height expanded to powers of 2 */
57 //w = power_of_two (surface->w);
58 //h = power_of_two (surface->h);
59 w = power_of_two (surface->w);
60 h = power_of_two (surface->h);
61 tex2oord[0] = 0.0f; /* Min X */ 39 tex2oord[0] = 0.F; /* Min X */
62 tex2oord[1] = 0.0f; /* Min Y */ 40 tex2oord[1] = 0.F; /* Min Y */
63 tex2oord[2] = (GLfloat) surface->w / w; /* Max X */ 41 tex2oord[2] = 1.F; /* Max X */
64 tex2oord[3] = (GLfloat) surface->h / h; /* Max Y */ 42 tex2oord[3] = 1.F; /* Max Y */
65 43
66 image = SDL_CreateRGBSurface (SDL_SWSURFACE, w, h, 32, 44 image = SDL_CreateRGBSurface (SDL_SWSURFACE, surface->w, surface->h, 32,
67#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */ 45#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
68 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 46 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000
69#else 47#else
70 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF 48 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF
71#endif 49#endif
… …
90 /* Restore the alpha blending attributes */ 68 /* Restore the alpha blending attributes */
91 if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA) 69 if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA)
92 SDL_SetAlpha (surface, saved_flags, saved_alpha); 70 SDL_SetAlpha (surface, saved_flags, saved_alpha);
93 71
94 /* Create an OpenGL texture for the image */ 72 /* Create an OpenGL texture for the image */
95 glGenTextures (1, &textur); 73 glGenTextures (1, &name);
96 glBindTexture (GL_TEXTURE_2D, textur); 74 glBindTexture (GL_TEXTURE_2D, name);
97 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); 75 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
98 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); 76 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
99 glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, GL_TRUE); // GENERATE_MIPMAP_SGIS 77 glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
100 glTexImage2D (GL_TEXTURE_2D, 78 glTexImage2D (GL_TEXTURE_2D,
101 0, 79 0,
102 GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels); 80 GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
103 SDL_FreeSurface (image); /* No longer needed */ 81 SDL_FreeSurface (image); /* No longer needed */
104 82
105 return textur; 83 return name;
106} 84}
107 85
108CGcontext cgc; 86test_material::test_material ()
87//: tex ("textures/osama.jpg"), texvar (tex.name)
88: tex ("textures/rockwall.jpg"), texvar (tex.name)
89, norm ("textures/rockwall_height.jpg"), normvar (norm.name)
90{
91 using namespace shader::compile;
109 92
110void 93 p.vsh->start ();
111init_shaders () 94
112{ 95 temp_4f wpos;
113 cgc = cgCreateContext (); 96
97 wpos = model_view_projection_matrix * vin.vertex;
98
99 //wpos = wpos / abs (w (wpos));
100
101 vout.position = wpos;
102 vout.tex_coord[0] = vin.tex_coord[0];
103 vout.tex_coord[1] = model_view_matrix * shader::compile::vec4 (x(vin.normal), y(vin.normal), z(vin.normal), 0);
104 vout.tex_coord[2] = lightpos - model_view_matrix * vin.vertex;
105
106 p.vsh->end ();
107 p.vsh->compile ();
108
109 p.fsh->start ();
110
111 temp_1f fac;
112
113 temp_2f disp;
114
115 temp_1f dx, dy;
116
117 temp_1f bumpnormal;
118 dx = dFdx (texture_2d (normvar, fin.tex_coord[0]));
119 dy = dFdy (texture_2d (normvar, fin.tex_coord[0]));
120
121 disp = shader::compile::vec2 (dx, dy) * 0.1;
122
123 fac = dot (normalize (fin.tex_coord[1]), normalize (fin.tex_coord[2]));
124 //fac = dot (shader::compile::vec3 (normalize (fin.tex_coord[1]) + normalize (fin.tex_coord[2])) * 0.5, bumpnormal);
125 //fac = dot (bumpnormal, normalize (fin.tex_coord[2]));
126 //fac = pow (max (fac, 0.0), 8);
127 xyz (fout.frag_color) = (texture_2d (texvar, fin.tex_coord[0] - disp) + 0.1) * max (fac, 0.0);
128
129 p.fsh->end ();
130 p.fsh->compile ();
131 p.link ();
114} 132}
115 133
134void test_material::enable (view &ctx)
135{
136 p.enable ();
137 lightpos->set (vec3 (0, 0, 0));
138 texvar->enable ();
139 normvar->enable ();
140}
141
142void test_material::disable (view &ctx)
143{
144 normvar->disable ();
145 texvar->disable ();
146 p.disable ();
147}
148

Diff Legend

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