ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.12 by root, Sat Apr 8 18:48:34 2006 UTC vs.
Revision 1.19 by root, Mon Apr 10 19:34:03 2006 UTC

… …
17BEGIN { 17BEGIN {
18 $VERSION = '0.1'; 18 $VERSION = '0.1';
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "Crossfire::Client", $VERSION; 21 XSLoader::load "Crossfire::Client", $VERSION;
22}
23
24our %GL_EXT;
25our $GL_VERSION;
26
27our $GL_NPOT;
28
29sub gl_init {
30 $GL_VERSION = gl_version * 1;
31 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
32
33 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
34
35 Crossfire::Client::Texture::restore_state ();
36
37# $GL_NPOT=0;#d#
22} 38}
23 39
24sub find_rcfile($) { 40sub find_rcfile($) {
25 my $path; 41 my $path;
26 42
… …
70 86
71use SDL::OpenGL; 87use SDL::OpenGL;
72 88
73my @textures; 89my @textures;
74 90
75sub _new { 91sub new {
76 my ($class, %data) = @_; 92 my ($class, %data) = @_;
77 93
78 my $self = bless \%data, $class; 94 my $self = bless {
95 internalformat => GL_RGBA,
96 format => GL_RGBA,
97 %data,
98 }, $class;
79 99
80 push @textures, $self; 100 push @textures, $self;
81 Scalar::Util::weaken $textures[-1]; 101 Scalar::Util::weaken $textures[-1];
82 102
83 $self->upload; 103 $self->upload;
… …
86} 106}
87 107
88sub new_from_image { 108sub new_from_image {
89 my ($class, $image) = @_; 109 my ($class, $image) = @_;
90 110
91 $class->_new (image => $image) 111 $class->new (image => $image)
92} 112}
93 113
94sub new_from_file { 114sub new_from_file {
95 my ($class, $path) = @_; 115 my ($class, $path) = @_;
96 116
… …
99 119
100 local $/; 120 local $/;
101 $class->new_from_image (<$fh>) 121 $class->new_from_image (<$fh>)
102} 122}
103 123
104sub new_from_surface { 124#sub new_from_surface {
105 my ($class, $surface) = @_; 125# my ($class, $surface) = @_;
106 126#
107 $surface->rgba; 127# $surface->rgba;
108 128#
109 $class->_new ( 129# $class->new (
110 data => $surface->pixels, 130# data => $surface->pixels,
111 width => $surface->width, 131# width => $surface->width,
112 height => $surface->height, 132# height => $surface->height,
133# )
134#}
135
136sub new_from_text {
137 my ($class, $text, $height) = @_;
138
139 my ($w, $h, $data) = Crossfire::Client::font_render $text, $height;
140
141 $class->new (
142 width => $w,
143 height => $h,
144 data => $data,
145 internalformat => GL_ALPHA4,
146 format => GL_ALPHA,
113 ) 147 )
114}
115
116sub new_from_ttf {
117 my ($class, $ttf, $text) = @_;
118
119 utf8::encode $text;
120
121 my $surface = SDL::TTFRenderUTF8Blended $ttf, $text,
122 (new SDL::Color -r => 255, -g => 255, -b => 255);
123
124 $class->new_from_surface (bless \$surface, SDL::Surface::)
125} 148}
126 149
127sub new_from_opengl { 150sub new_from_opengl {
128 my ($class, $w, $h, $cb) = @_; 151 my ($class, $w, $h, $cb) = @_;
129 152
130 $class->_new (width => $w, height => $h, rendercb => $cb) 153 $class->new (width => $w, height => $h, rendercb => $cb)
154}
155
156sub topot {
157 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
131} 158}
132 159
133sub upload { 160sub upload {
134 my ($self) = @_; 161 my ($self) = @_;
135 162
… …
141 $data = $self->{data}; 168 $data = $self->{data};
142 } elsif (exists $self->{rendercb}) { 169 } elsif (exists $self->{rendercb}) {
143 glViewport 0, 0, $self->{width}, $self->{height}; 170 glViewport 0, 0, $self->{width}, $self->{height};
144 glMatrixMode GL_PROJECTION; 171 glMatrixMode GL_PROJECTION;
145 glLoadIdentity; 172 glLoadIdentity;
146 glOrtho 0, $self->{width}, $self->{height}, 0, -100, 100; 173 glOrtho 0, $self->{width}, 0, $self->{height}, -10000, 10000;
147 glMatrixMode GL_MODELVIEW; 174 glMatrixMode GL_MODELVIEW;
148 glPushmatrix; 175 glPushmatrix;
149 glLoadIdentity; 176 glLoadIdentity;
150 glClear GL_COLOR_BUFFER_BIT; 177 glClear GL_COLOR_BUFFER_BIT;
151 178
… …
162 $self->{height} = $pb->get_height; 189 $self->{height} = $pb->get_height;
163 190
164 $data = $pb->get_pixels; 191 $data = $pb->get_pixels;
165 } 192 }
166 193
194 my ($tw, $th) = @$self{qw(width height)};
195
196 unless ($NPOT) {
197 $tw = topot $tw;
198 $th = topot $th;
199
200 if (defined $data) {
201 $data = pack "(a$tw)*", (unpack "(a$self->{width})*", $data);
202 $data .= ("\x00" x $tw) x ($th - $self->{height});
203 }
204 }
205
206 $self->{u} = $self->{width} / $tw;
207 $self->{v} = $self->{height} / $th;
208
167 ($self->{name}) = @{glGenTextures 1}; 209 $self->{name} ||= (glGenTextures 1)->[0];
168 210
169 glBindTexture GL_TEXTURE_2D, $self->{name}; 211 glBindTexture GL_TEXTURE_2D, $self->{name};
170 212
171 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 213 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
172 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 214 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;#_MIPMAP_LINEAR;
173 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 215 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
174 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 216 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
175 217
218 glGetError;
176 if (defined $data) { 219 if (defined $data) {
177 glTexImage2D GL_TEXTURE_2D, 0, 220 glTexImage2D GL_TEXTURE_2D, 0,
178 GL_RGBA8, 221 $self->{internalformat},
179 $self->{width}, $self->{height}, 222 $tw, $th, # need to pad texture first
180 0, 223 0,
181 GL_RGBA, 224 $self->{format},
182 GL_UNSIGNED_BYTE, 225 GL_UNSIGNED_BYTE,
183 $data; 226 $data;
227 glGetError and die;
184 } else { 228 } else {
185 warn "I{DTEDRAW TEX: $self->{width} $self->{height} \n";
186 warn "ERR: ". (glGetError). "\n";
187 my ($bd, $br) = (glGet (GL_DRAW_BUFFER), glGet (GL_READ_BUFFER));
188 warn "BUF:[$bd $br]\n";
189
190 glCopyTexImage2D GL_TEXTURE_2D, 0, 229 glCopyTexImage2D GL_TEXTURE_2D, 0,
191 GL_RGBA8, 230 $self->{internalformat},
192 0, 0, 231 0, 0,
193 $self->{width}, $self->{height}, 232 $tw, $th,
194 0; 233 0;
195 glPopmatrix; 234 glPopmatrix;
196 warn "ERR: ". (glGetError). "\n";
197 sleep 1;
198 } 235 }
199} 236}
200 237
201sub DESTROY { 238sub DESTROY {
202 my ($self) = @_; 239 my ($self) = @_;
… …
204 return unless exists $self->{name}; 241 return unless exists $self->{name};
205 242
206 glDeleteTextures delete $self->{name}; 243 glDeleteTextures delete $self->{name};
207} 244}
208 245
209push @::GLINIT, sub { 246sub restore_state{
210 $_->upload 247 $_->upload
211 for grep $_, @textures; 248 for grep $_, @textures;
212}; 249};
213 250
2141; 2511;

Diff Legend

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