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

Diff Legend

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