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.69 by root, Thu May 25 23:06:05 2006 UTC vs.
Revision 1.138 by root, Fri Jan 5 17:37:39 2007 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFClient - undocumented utility garbage for our crossfire client 3CFPlus - undocumented utility garbage for our crossfire client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use CFClient; 7 use CFPlus;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package CFClient; 15package CFPlus;
16
17use Carp ();
16 18
17BEGIN { 19BEGIN {
18 $VERSION = '0.1'; 20 $VERSION = '0.97';
19 21
20 use XSLoader; 22 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 23 XSLoader::load "CFPlus", $VERSION;
22} 24}
23 25
24use utf8; 26use utf8;
25 27
26use Carp ();
27use AnyEvent (); 28use AnyEvent ();
28use BerkeleyDB; 29use BerkeleyDB;
30use Pod::POM ();
31use File::Path ();
32use Storable (); # finally
29 33
30use CFClient::OpenGL; 34BEGIN {
31 35 use Crossfire::Protocol::Base ();
32our %GL_EXT; 36 *to_json = \&Crossfire::Protocol::Base::to_json;
33our $GL_VERSION; 37 *from_json = \&Crossfire::Protocol::Base::from_json;
34
35our $GL_NPOT;
36our $GL_DEBUG = 1;
37
38sub gl_init {
39 $GL_VERSION = gl_version * 1;
40 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
41
42 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
43 $GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
44
45 glDisable GL_COLOR_MATERIAL;
46 glShadeModel GL_FLAT;
47 glDisable GL_DITHER;
48 glDisable GL_DEPTH_TEST;
49 glDepthMask 0;
50 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
51
52 CFClient::Texture::restore_state ();
53} 38}
54 39
55sub gl_check { 40=item guard { BLOCK }
56 return unless $GL_DEBUG;
57 41
58 if (my $error = glGetError) { 42Returns an object that executes the given block as soon as it is destroyed.
59 my ($format, @args) = @_; 43
60 Carp::cluck sprintf "opengl error %x while $format", $error, @args; 44=cut
45
46sub guard(&) {
47 bless \(my $cb = $_[0]), "CFPlus::Guard"
48}
49
50sub CFPlus::Guard::DESTROY {
51 ${$_[0]}->()
52}
53
54=item shorten $string[, $maxlength]
55
56=cut
57
58sub shorten($;$) {
59 my ($str, $len) = @_;
60 substr $str, $len, (length $str), "..." if $len + 3 <= length $str;
61 $str
62}
63
64sub asxml($) {
65 local $_ = $_[0];
66
67 s/&/&amp;/g;
68 s/>/&gt;/g;
69 s/</&lt;/g;
70
71 $_
72}
73
74sub socketpipe() {
75 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
76 or die "cannot establish bidiretcional pipe: $!\n";
77
78 ($fh1, $fh2)
79}
80
81sub background(&;&) {
82 my ($bg, $cb) = @_;
83
84 my ($fh_r, $fh_w) = CFPlus::socketpipe;
85
86 my $pid = fork;
87
88 if (defined $pid && !$pid) {
89 local $SIG{__DIE__};
90
91 open STDOUT, ">&", $fh_w;
92 open STDERR, ">&", $fh_w;
93 close $fh_r;
94 close $fh_w;
95
96 $| = 1;
97
98 eval { $bg->() };
99
100 if ($@) {
101 my $msg = $@;
102 $msg =~ s/\n+/\n/;
103 warn "FATAL: $msg";
104 CFPlus::_exit 1;
105 }
106
107 # win32 is fucked up, of course. exit will clean stuff up,
108 # which destroys our database etc. _exit will exit ALL
109 # forked processes, because of the dreaded fork emulation.
110 CFPlus::_exit 0;
61 } 111 }
112
113 close $fh_w;
114
115 my $buffer;
116
117 my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
118 unless (sysread $fh_r, $buffer, 4096, length $buffer) {
119 undef $w;
120 $cb->();
121 return;
122 }
123
124 while ($buffer =~ s/^(.*)\n//) {
125 my $line = $1;
126 $line =~ s/\s+$//;
127 utf8::decode $line;
128 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
129 $cb->(from_json $1);
130 } else {
131 ::message ({
132 markup => "background($pid): " . CFPlus::asxml $line,
133 });
134 }
135 }
136 });
62} 137}
138
139sub background_msg {
140 my ($msg) = @_;
141
142 $msg = "\x{e877}json_msg " . to_json $msg;
143 $msg =~ s/\n//g;
144 utf8::encode $msg;
145 print $msg, "\n";
146}
147
148package CFPlus::Database;
149
150our @ISA = BerkeleyDB::Btree::;
151
152sub get($$) {
153 my $data;
154
155 $_[0]->db_get ($_[1], $data) == 0
156 ? $data
157 : ()
158}
159
160my %DB_SYNC;
161
162sub put($$$) {
163 my ($db, $key, $data) = @_;
164
165 my $hkey = $db + 0;
166 CFPlus::weaken $db;
167 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 30, cb => sub {
168 delete $DB_SYNC{$hkey};
169 $db->db_sync if $db;
170 });
171
172 $db->db_put ($key => $data)
173}
174
175package CFPlus;
63 176
64sub find_rcfile($) { 177sub find_rcfile($) {
65 my $path; 178 my $path;
66 179
67 for (grep !ref, @INC) { 180 for (grep !ref, @INC) {
68 $path = "$_/CFClient/resources/$_[0]"; 181 $path = "$_/CFPlus/resources/$_[0]";
69 return $path if -r $path; 182 return $path if -r $path;
70 } 183 }
71 184
72 die "FATAL: can't find required file $_[0]\n"; 185 die "FATAL: can't find required file $_[0]\n";
73} 186}
74 187
75sub read_cfg { 188sub read_cfg {
76 my ($file) = @_; 189 my ($file) = @_;
77 190
78 open CFG, $file 191 open my $fh, $file
79 or return; 192 or return;
80 193
81 my $CFG;
82
83 local $/; 194 local $/;
84 $CFG = eval <CFG>; 195 my $CFG = <$fh>;
85 196
86 $::CFG = $CFG; 197 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
87 198 require YAML;
88 close CFG; 199 utf8::decode $CFG;
200 $::CFG = YAML::Load ($CFG);
201 } elsif ($CFG =~ /^\{/) {
202 $::CFG = from_json $CFG;
203 } else {
204 $::CFG = eval $CFG; ## todo comaptibility cruft
205 }
89} 206}
90 207
91sub write_cfg { 208sub write_cfg {
92 my ($file) = @_; 209 my ($file) = @_;
93 210
94 open CFG, ">$file" 211 $::CFG->{VERSION} = $::VERSION;
212
213 open my $fh, ">:utf8", $file
95 or return; 214 or return;
215 print $fh to_json $::CFG;
216}
96 217
97 { 218sub http_proxy {
98 require Data::Dumper; 219 my @proxy = win32_proxy_info;
99 local $Data::Dumper::Purity = 1; 220
100 $::CFG->{VERSION} = $::VERSION; 221 if (@proxy) {
101 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); 222 "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
223 } elsif (exists $ENV{http_proxy}) {
224 $ENV{http_proxy}
225 } else {
226 ()
102 } 227 }
103
104 close CFG;
105} 228}
106 229
107mkdir "$Crossfire::VARDIR/pclient", 0777; 230sub set_proxy {
231 my $proxy = http_proxy
232 or return;
108 233
109our $DB_ENV = new BerkeleyDB::Env 234 $ENV{http_proxy} = $proxy;
110 -Home => "$Crossfire::VARDIR/pclient", 235}
111 -Cachesize => 1_000_000, 236
112 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 237sub lwp_useragent {
113# -ErrPrefix => "DATABASE", 238 require LWP::UserAgent;
114 -Verbose => 1, 239
115 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 240 CFPlus::set_proxy;
116 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 241
242 my $ua = LWP::UserAgent->new (
243 agent => "cfplus $VERSION",
244 keep_alive => 1,
245 env_proxy => 1,
246 timeout => 30,
247 );
248}
249
250sub lwp_check($) {
251 my ($res) = @_;
252
253 $res->is_error
254 and die $res->status_line;
255
256 $res
257}
258
259our $DB_ENV;
260our $DB_STATE;
117 261
118sub db_table($) { 262sub db_table($) {
119 my ($table) = @_; 263 my ($table) = @_;
120 264
121 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 265 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
122 266
123 new CFClient::Database 267 new CFPlus::Database
124 -Env => $DB_ENV, 268 -Env => $DB_ENV,
125 -Filename => $table, 269 -Filename => $table,
126# -Filename => "database", 270# -Filename => "database",
127# -Subname => $table, 271# -Subname => $table,
128 -Property => DB_CHKSUM, 272 -Property => DB_CHKSUM,
129 -Flags => DB_CREATE | DB_UPGRADE, 273 -Flags => DB_CREATE | DB_UPGRADE,
130 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 274 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
131} 275}
132 276
133sub pod_to_pango($) { 277our $DB_HOME = "$Crossfire::VARDIR/cfplus";
134 my ($pom) = @_;
135 278
136 $pom->present ("CFClient::PodToPango") 279sub open_db {
137} 280 use strict;
138 281
139sub pod_to_pango_list($) { 282 mkdir $DB_HOME, 0777;
140 my ($pom) = @_; 283 my $recover = $BerkeleyDB::db_version >= 4.4
284 ? eval "DB_REGISTER | DB_RECOVER"
285 : 0;
141 286
287 $DB_ENV = new BerkeleyDB::Env
288 -Home => $DB_HOME,
289 -Cachesize => 8_000_000,
290 -ErrFile => "$DB_HOME/errorlog.txt",
291# -ErrPrefix => "DATABASE",
292 -Verbose => 1,
293 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
294 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
295 or die "unable to create/open database home $DB_HOME: $BerkeleyDB::Error";
296
297 $DB_STATE = db_table "state";
298
142 [ 299 1
143 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
144 split /\n/, $pom->present ("CFClient::PodToPango")
145 ]
146} 300}
147 301
148package CFClient::PodToPango; 302unless (eval { open_db }) {
149 303 File::Path::rmtree $DB_HOME;
150use base Pod::POM::View::Text; 304 open_db;
151
152our $indent = 0;
153
154*view_seq_code =
155*view_seq_bold = sub { "<b>$_[1]</b>" };
156*view_seq_italic = sub { "<i>$_[1]</i>" };
157*view_seq_space =
158*view_seq_link =
159*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
160
161sub view_seq_text {
162 my $text = $_[1];
163 $text =~ s/\s+/ /g;
164 CFClient::UI::Label::escape ($text)
165} 305}
166 306
167sub view_item { 307package CFPlus::Layout;
168 ("\t" x ($indent / 4))
169 . $_[1]->title->present ($_[0])
170 . "\n"
171 . $_[1]->content->present ($_[0])
172}
173 308
174sub view_verbatim { 309$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
175 (join "", 310 reset_glyph_cache;
176 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
177 split /\n/, CFClient::UI::Label::escape ($_[1]))
178 . "\n"
179}
180
181sub view_textblock {
182 ("\t" x ($indent / 2)) . "$_[1]\n\n"
183}
184
185sub view_head1 {
186 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
187 . $_[1]->content->present ($_[0])
188}; 311};
189
190sub view_head2 {
191 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
192 . $_[1]->content->present ($_[0])
193};
194
195sub view_head3 {
196 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
197 . $_[1]->content->present ($_[0])
198};
199
200sub view_over {
201 local $indent = $indent + $_[1]->indent;
202 $_[1]->content->present ($_[0])
203}
204
205package CFClient::Database;
206
207our @ISA = BerkeleyDB::Btree::;
208
209sub get($$) {
210 my $data;
211
212 $_[0]->db_get ($_[1], $data) == 0
213 ? $data
214 : ()
215}
216
217my %DB_SYNC;
218
219sub put($$$) {
220 my ($db, $key, $data) = @_;
221
222 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
223
224 $db->db_put ($key => $data)
225}
226
227package CFClient::Item;
228
229sub desc_string {
230 my ($self) = @_;
231
232 my $desc =
233 $self->{nrof} < 2
234 ? $self->{name}
235 : "$self->{nrof} × $self->{name_pl}";
236
237 $self->{flags} & Crossfire::Protocol::F_OPEN
238 and $desc .= " (open)";
239 $self->{flags} & Crossfire::Protocol::F_APPLIED
240 and $desc .= " (applied)";
241 $self->{flags} & Crossfire::Protocol::F_UNPAID
242 and $desc .= " (unpaid)";
243 $self->{flags} & Crossfire::Protocol::F_MAGIC
244 and $desc .= " (magic)";
245 $self->{flags} & Crossfire::Protocol::F_CURSED
246 and $desc .= " (cursed)";
247 $self->{flags} & Crossfire::Protocol::F_DAMNED
248 and $desc .= " (damned)";
249 $self->{flags} & Crossfire::Protocol::F_LOCKED
250 and $desc .= " *";
251
252 $desc
253}
254
255sub weight_string {
256 my ($self) = @_;
257
258 my $weight = ($self->{nrof} || 1) * $self->{weight};
259
260 $weight < 0 ? "?" : $weight * 0.001
261}
262
263sub update_widgets {
264 my ($self) = @_;
265
266 my $button_cb = sub {
267 my (undef, $ev, $x, $y) = @_;
268
269 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
270 my $targ = $::CONN->{player}{tag};
271
272 if ($self->{container} == $::CONN->{player}{tag}) {
273 $targ = $::CONN->{open_container};
274 }
275
276 $::CONN->send ("move $targ $self->{tag} 0");
277 } elsif ($ev->{button} == 1) {
278 $::CONN->send ("examine $self->{tag}");
279 } elsif ($ev->{button} == 2) {
280 $::CONN->send ("apply $self->{tag}");
281 } elsif ($ev->{button} == 3) {
282 my @menu_items = (
283 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
284 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
285 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
286 (
287 $self->{flags} & Crossfire::Protocol::F_LOCKED
288 ? (
289 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
290 )
291 : (
292 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
293 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
294 )
295 ),
296 );
297
298 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
299 }
300
301 1
302 };
303
304 my $tooltip_std = "<small>"
305 . "Left click - examine item\n"
306 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
307 . "Middle click - apply\n"
308 . "Right click - further options"
309 . "</small>\n";
310
311 $self->{face_widget} ||= new CFClient::UI::Face
312 can_events => 1,
313 can_hover => 1,
314 anim => $self->{anim},
315 animspeed => $self->{animspeed}, # TODO# must be set at creation time
316 connect_button_down => $button_cb,
317 ;
318 $self->{face_widget}{face} = $self->{face};
319 $self->{face_widget}{anim} = $self->{anim};
320 $self->{face_widget}{animspeed} = $self->{animspeed};
321 $self->{face_widget}->set_tooltip (
322 "<b>Face/Animation.</b>\n"
323 . "Item uses face #$self->{face}. "
324 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
325 . "\n\n$tooltip_std"
326 );
327
328 $self->{desc_widget} ||= new CFClient::UI::Label
329 can_events => 1,
330 can_hover => 1,
331 ellipsise => 2,
332 align => -1,
333 connect_button_down => $button_cb,
334 ;
335 my $desc = CFClient::Item::desc_string $self;
336 $self->{desc_widget}->set_text ($desc);
337 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
338
339 $self->{weight_widget} ||= new CFClient::UI::Label
340 can_events => 1,
341 can_hover => 1,
342 ellipsise => 0,
343 align => 0,
344 connect_button_down => $button_cb,
345 ;
346 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
347
348 $self->{weight_widget}->set_tooltip (
349 "<b>Weight</b>.\n"
350 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
351 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
352 . "\n\n$tooltip_std"
353 );
354}
355
356package CFClient::Texture;
357
358use strict;
359
360use Scalar::Util;
361
362use CFClient::OpenGL;
363
364my %TEXTURES;
365
366sub new {
367 my ($class, %data) = @_;
368
369 my $self = bless {
370 internalformat => GL_RGBA,
371 format => GL_RGBA,
372 type => GL_UNSIGNED_BYTE,
373 %data,
374 }, $class;
375
376 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
377
378 $self->upload;
379
380 $self
381}
382
383sub new_from_image {
384 my ($class, $image, %arg) = @_;
385
386 $class->new (image => $image, %arg)
387}
388
389sub new_from_file {
390 my ($class, $path, %arg) = @_;
391
392 open my $fh, "<:raw", $path
393 or die "$path: $!";
394
395 local $/;
396 $class->new_from_image (<$fh>, %arg)
397}
398
399#sub new_from_surface {
400# my ($class, $surface) = @_;
401#
402# $surface->rgba;
403#
404# $class->new (
405# data => $surface->pixels,
406# w => $surface->width,
407# h => $surface->height,
408# )
409#}
410
411sub new_from_layout {
412 my ($class, $layout, %arg) = @_;
413
414 my ($w, $h, $data, $format, $internalformat) = $layout->render;
415
416 $class->new (
417 w => $w,
418 h => $h,
419 data => $data,
420 format => $format,
421 internalformat => $format,
422 type => GL_UNSIGNED_BYTE,
423 %arg,
424 )
425}
426
427sub new_from_opengl {
428 my ($class, $w, $h, $cb) = @_;
429
430 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
431}
432
433sub topot {
434 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
435}
436
437sub upload {
438 my ($self) = @_;
439
440 return unless $GL_VERSION;
441
442 my $data;
443
444 if (exists $self->{data}) {
445 $data = $self->{data};
446
447 } elsif (exists $self->{render_cb}) {
448 glViewport 0, 0, $self->{w}, $self->{h};
449 glMatrixMode GL_PROJECTION;
450 glLoadIdentity;
451 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
452 glMatrixMode GL_MODELVIEW;
453 glLoadIdentity;
454 $self->{render_cb}->($self, $self->{w}, $self->{h});
455
456 } else {
457 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
458 = CFClient::load_image_inline $self->{image};
459 }
460
461 my ($tw, $th) = @$self{qw(w h)};
462
463 unless ($tw > 0 && $th > 0) {
464 $tw = $th = 1;
465 $data = "\x00" x 64;
466 }
467
468 $self->{minified} = [CFClient::average $tw, $th, $data]
469 if $self->{minify};
470
471 unless ($GL_NPOT) {
472 # TODO: does not work for zero-sized textures
473 $tw = topot $tw;
474 $th = topot $th;
475
476 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
477 my $bpp = (length $data) / ($self->{w} * $self->{h});
478 $data = pack "(a" . ($tw * $bpp) . ")*",
479 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
480 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
481 }
482 }
483
484 $self->{s} = $self->{w} / $tw;
485 $self->{t} = $self->{h} / $th;
486
487 $self->{name} ||= glGenTexture;
488
489 glBindTexture GL_TEXTURE_2D, $self->{name};
490
491 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
492 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
493
494 if ($::FAST) {
495 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
496 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
497 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
498 # alternatively check for 0x8191
499 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
500 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
501 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
502 } else {
503 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
504 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
505 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
506 }
507
508 glGetError;
509
510 if (defined $data) {
511 glTexImage2D GL_TEXTURE_2D, 0,
512 $self->{internalformat},
513 $tw, $th,
514 0,
515 $self->{format},
516 $self->{type},
517 $data;
518 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
519 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
520 } else {
521 glCopyTexImage2D GL_TEXTURE_2D, 0,
522 $self->{internalformat},
523 0, 0,
524 $tw, $th,
525 0;
526 CFClient::gl_check "copying to texture %dx%d if=%x",
527 $tw, $th, $self->{internalformat};
528 }
529
530 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
531}
532
533sub DESTROY {
534 my ($self) = @_;
535
536 delete $TEXTURES{$self+0};
537
538 glDeleteTexture delete $self->{name}
539 if $self->{name};
540}
541
542sub restore_state {
543 $_->upload
544 for values %TEXTURES;
545}
546 312
5471; 3131;
548 314
549=back 315=back
550 316

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines