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.62 by root, Thu May 25 16:24:43 2006 UTC vs.
Revision 1.80 by elmex, Tue May 30 08:12:50 2006 UTC

… …
24use utf8; 24use utf8;
25 25
26use Carp (); 26use Carp ();
27use AnyEvent (); 27use AnyEvent ();
28use BerkeleyDB; 28use BerkeleyDB;
29
30use CFClient::OpenGL;
31
32our %GL_EXT;
33our $GL_VERSION;
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}
54
55sub gl_check {
56 return unless $GL_DEBUG;
57
58 if (my $error = glGetError) {
59 my ($format, @args) = @_;
60 Carp::cluck sprintf "opengl error %x while $format", $error, @args;
61 }
62}
63 29
64sub find_rcfile($) { 30sub find_rcfile($) {
65 my $path; 31 my $path;
66 32
67 for (grep !ref, @INC) { 33 for (grep !ref, @INC) {
… …
102 } 68 }
103 69
104 close CFG; 70 close CFG;
105} 71}
106 72
107mkdir "$Crossfire::VARDIR/pclient", 0777; 73mkdir "$Crossfire::VARDIR/cfplus", 0777;
108 74
75our $DB_ENV;
76
77{
78 use strict;
79
80 my $recover = $BerkeleyDB::db_version >= 4.4
81 ? eval "DB_REGISTER | DB_RECOVER"
82 : 0;
83
109our $DB_ENV = new BerkeleyDB::Env 84 $DB_ENV = new BerkeleyDB::Env
110 -Home => "$Crossfire::VARDIR/pclient", 85 -Home => "$Crossfire::VARDIR/cfplus",
111 -Cachesize => 1_000_000, 86 -Cachesize => 1_000_000,
112 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 87 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
113# -ErrPrefix => "DATABASE", 88# -ErrPrefix => "DATABASE",
114 -Verbose => 1, 89 -Verbose => 1,
115 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 90 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
91 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
116 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 92 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
93}
117 94
118sub db_table($) { 95sub db_table($) {
119 my ($table) = @_; 96 my ($table) = @_;
120 97
121 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 98 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
122 99
123 new CFClient::Database 100 new CFClient::Database
124 -Env => $DB_ENV, 101 -Env => $DB_ENV,
125 -Filename => $table, 102 -Filename => $table,
126# -Filename => "database", 103# -Filename => "database",
127# -Subname => $table, 104# -Subname => $table,
128 -Property => DB_CHKSUM, 105 -Property => DB_CHKSUM,
129 -Flags => DB_CREATE | DB_UPGRADE, 106 -Flags => DB_CREATE | DB_UPGRADE,
130 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 107 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
131} 108}
132 109
133sub pod_to_pango($) { 110sub pod_to_pango($) {
134 my ($pom) = @_; 111 my ($pom) = @_;
135 112
… …
171 . $_[1]->content->present ($_[0]) 148 . $_[1]->content->present ($_[0])
172} 149}
173 150
174sub view_verbatim { 151sub view_verbatim {
175 (join "", 152 (join "",
176 map +("\t" x ($indent / 2)) . "$_\n", 153 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
177 split /\n/, CFClient::UI::Label::escape ($_[1])) 154 split /\n/, CFClient::UI::Label::escape ($_[1]))
178 . "\n" 155 . "\n"
179} 156}
180 157
181sub view_textblock { 158sub view_textblock {
182 ("\t" x ($indent / 2)) . "$_[1]\n\n" 159 ("\t" x ($indent / 2)) . "$_[1]\n\n"
183} 160}
184 161
185sub view_head1 { 162sub view_head1 {
186 "<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 163 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
187 . $_[1]->content->present ($_[0]) 164 . $_[1]->content->present ($_[0])
188}; 165};
189 166
190sub view_head2 { 167sub view_head2 {
191 "<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 168 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
169 . $_[1]->content->present ($_[0])
170};
171
172sub view_head3 {
173 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
192 . $_[1]->content->present ($_[0]) 174 . $_[1]->content->present ($_[0])
193}; 175};
194 176
195sub view_over { 177sub view_over {
196 local $indent = $indent + $_[1]->indent; 178 local $indent = $indent + $_[1]->indent;
… …
218 200
219 $db->db_put ($key => $data) 201 $db->db_put ($key => $data)
220} 202}
221 203
222package CFClient::Item; 204package CFClient::Item;
205
206use strict;
207use Crossfire::Protocol::Constants;
223 208
224sub desc_string { 209sub desc_string {
225 my ($self) = @_; 210 my ($self) = @_;
226 211
227 my $desc = 212 my $desc =
228 $self->{nrof} < 2 213 $self->{nrof} < 2
229 ? $self->{name} 214 ? $self->{name}
230 : "$self->{nrof} × $self->{name_pl}"; 215 : "$self->{nrof} × $self->{name_pl}";
231 216
232 $self->{flags} & Crossfire::Protocol::F_OPEN 217 $self->{flags} & F_OPEN
233 and $desc .= " (open)"; 218 and $desc .= " (open)";
234 $self->{flags} & Crossfire::Protocol::F_APPLIED 219 $self->{flags} & F_APPLIED
235 and $desc .= " (applied)"; 220 and $desc .= " (applied)";
236 $self->{flags} & Crossfire::Protocol::F_UNPAID 221 $self->{flags} & F_UNPAID
237 and $desc .= " (unpaid)"; 222 and $desc .= " (unpaid)";
238 $self->{flags} & Crossfire::Protocol::F_MAGIC 223 $self->{flags} & F_MAGIC
239 and $desc .= " (magic)"; 224 and $desc .= " (magic)";
240 $self->{flags} & Crossfire::Protocol::F_CURSED 225 $self->{flags} & F_CURSED
241 and $desc .= " (cursed)"; 226 and $desc .= " (cursed)";
242 $self->{flags} & Crossfire::Protocol::F_DAMNED 227 $self->{flags} & F_DAMNED
243 and $desc .= " (damned)"; 228 and $desc .= " (damned)";
244 $self->{flags} & Crossfire::Protocol::F_LOCKED 229 $self->{flags} & F_LOCKED
245 and $desc .= " *"; 230 and $desc .= " *";
246 231
247 $desc 232 $desc
248} 233}
249 234
… …
255 $weight < 0 ? "?" : $weight * 0.001 240 $weight < 0 ? "?" : $weight * 0.001
256} 241}
257 242
258sub update_widgets { 243sub update_widgets {
259 my ($self) = @_; 244 my ($self) = @_;
245
246 my $button_cb = sub {
247 my (undef, $ev, $x, $y) = @_;
248
249 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
250 my $targ = $::CONN->{player}{tag};
251
252 if ($self->{container} == $::CONN->{player}{tag}) {
253 $targ = $::CONN->{open_container};
254 }
255
256 $::CONN->send ("move $targ $self->{tag} 0")
257 if $targ || !($self->{flags} & F_LOCKED);
258 } elsif ($ev->{button} == 1) {
259 $::CONN->send ("examine $self->{tag}");
260 } elsif ($ev->{button} == 2) {
261 $::CONN->send ("apply $self->{tag}");
262 } elsif ($ev->{button} == 3) {
263 my @menu_items = (
264 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
265 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
266 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
267 (
268 $self->{flags} & F_LOCKED
269 ? (
270 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
271 )
272 : (
273 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
274 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
275 )
276 ),
277 );
278
279 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
280 }
281
282 1
283 };
260 284
261 my $tooltip_std = "<small>" 285 my $tooltip_std = "<small>"
262 . "Left click - examine item\n" 286 . "Left click - examine item\n"
263 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" 287 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
264 . "Middle click - apply\n" 288 . "Middle click - apply\n"
265 . "Right click - further options" 289 . "Right click - further options"
266 . "</small>\n"; 290 . "</small>\n";
267 291
268 $self->{face_widget} ||= new CFClient::UI::Face can_events => 1, can_hover => 1; 292 $self->{face_widget} ||= new CFClient::UI::Face
293 can_events => 1,
294 can_hover => 1,
295 anim => $self->{anim},
296 animspeed => $self->{animspeed}, # TODO# must be set at creation time
297 on_button_down => $button_cb,
298 ;
269 $self->{face_widget}{face} = $self->{face}; 299 $self->{face_widget}{face} = $self->{face};
270 $self->{face_widget}{anim} = $self->{anim}; 300 $self->{face_widget}{anim} = $self->{anim};
271 $self->{face_widget}{animspeed} = $self->{animespeed}; 301 $self->{face_widget}{animspeed} = $self->{animspeed};
272 $self->{face_widget}->set_tooltip ( 302 $self->{face_widget}->set_tooltip (
273 "<b>Face/Animation.</b>\n" 303 "<b>Face/Animation.</b>\n"
274 . "Item uses face #$self->{face}. " 304 . "Item uses face #$self->{face}. "
275 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 305 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
276 . "\n\n$tooltip_std" 306 . "\n\n$tooltip_std"
277 ); 307 );
278 308
279 $self->{desc_widget} ||= new CFClient::UI::Label ellipsise => 2, can_events => 1, can_hover => 1; 309 $self->{desc_widget} ||= new CFClient::UI::Label
280 $self->{desc_widget}->set_text (CFClient::Item::desc_string $self); 310 can_events => 1,
311 can_hover => 1,
312 ellipsise => 2,
313 align => -1,
314 on_button_down => $button_cb,
315 ;
316 my $desc = CFClient::Item::desc_string $self;
317 $self->{desc_widget}->set_text ($desc);
318 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
281 319
282 $self->{weight_widget} ||= new CFClient::UI::Label ellipsise => 0, can_events => 1, can_hover => 1, align => 0.5; 320 $self->{weight_widget} ||= new CFClient::UI::Label
321 can_events => 1,
322 can_hover => 1,
323 ellipsise => 0,
324 align => 0,
325 on_button_down => $button_cb,
326 ;
283 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 327 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
284 328
285 $self->{weight_widget}->set_tooltip ( 329 $self->{weight_widget}->set_tooltip (
286 "<b>Weight</b>.\n" 330 "<b>Weight</b>.\n"
287 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") 331 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
288 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 332 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
289 . "\n\n$tooltip_std" 333 . "\n\n$tooltip_std"
290 ); 334 );
291} 335}
292 336
293package CFClient::Texture; 337package CFClient::Recorder;
294 338
295use strict; 339our $RECORD_WINDOW;
296 340
297use Scalar::Util; 341my $CMDBOX;
342my $CURRENT_CMDS;
343my $REC_BTN;
298 344
299use CFClient::OpenGL; 345my @ALLOWED_MODIFIER_KEYS = (
346 (CFClient::SDLK_LSHIFT) => "LSHIFT",
347 (CFClient::SDLK_LCTRL ) => "LCTRL",
348 (CFClient::SDLK_LALT ) => "LALT",
349 (CFClient::SDLK_LMETA ) => "LMETA",
300 350
301my %TEXTURES; 351 (CFClient::SDLK_RSHIFT) => "RSHIFT",
352 (CFClient::SDLK_RCTRL ) => "RCTRL",
353 (CFClient::SDLK_RALT ) => "RALT",
354 (CFClient::SDLK_RMETA ) => "RMETA",
355);
302 356
303sub new { 357my %ALLOWED_MODIFIERS = (
358 (CFClient::KMOD_LSHIFT) => "LSHIFT",
359 (CFClient::KMOD_LCTRL ) => "LCTRL",
360 (CFClient::KMOD_LALT ) => "LALT",
361 (CFClient::KMOD_LMETA ) => "LMETA",
362
363 (CFClient::KMOD_RSHIFT) => "RSHIFT",
364 (CFClient::KMOD_RCTRL ) => "RCTRL",
365 (CFClient::KMOD_RALT ) => "RALT",
366 (CFClient::KMOD_RMETA ) => "RMETA",
367);
368
369my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
370my @DIRECT_BIND_KEYS = (
371 CFClient::SDLK_F1,
372 CFClient::SDLK_F2,
373 CFClient::SDLK_F3,
374 CFClient::SDLK_F4,
375 CFClient::SDLK_F5,
376 CFClient::SDLK_F6,
377 CFClient::SDLK_F7,
378 CFClient::SDLK_F8,
379 CFClient::SDLK_F9,
380 CFClient::SDLK_F10,
381 CFClient::SDLK_F11,
382 CFClient::SDLK_F12,
383 CFClient::SDLK_F13,
384 CFClient::SDLK_F14,
385 CFClient::SDLK_F15,
386);
387
388# this binding dialog asks for a key-combo to be pressed
389# and if successful it binds the modifier+symbol to the
390# supplied actions in $cmd.
391# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
392sub open_binding_dialog {
304 my ($class, %data) = @_; 393 my ($cmd) = @_;
305 394
306 my $self = bless { 395 my $w = new CFClient::UI::FancyFrame
307 internalformat => GL_RGBA, 396 title => "Bind Action",
308 format => GL_RGBA, 397 x => "center",
309 type => GL_UNSIGNED_BYTE, 398 y => "center";
310 %data,
311 }, $class;
312 399
313 Scalar::Util::weaken ($TEXTURES{$self+0} = $self); 400 $w->add (my $vb = new CFClient::UI::VBox);
314 401 $vb->add (new CFClient::UI::Label
315 $self->upload; 402 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
316 403 ."You can only bind 0-9 and F1-F15 without modifiers."
317 $self
318}
319
320sub new_from_image {
321 my ($class, $image, %arg) = @_;
322
323 $class->new (image => $image, %arg)
324}
325
326sub new_from_file {
327 my ($class, $path, %arg) = @_;
328
329 open my $fh, "<:raw", $path
330 or die "$path: $!";
331
332 local $/;
333 $class->new_from_image (<$fh>, %arg)
334}
335
336#sub new_from_surface {
337# my ($class, $surface) = @_;
338#
339# $surface->rgba;
340#
341# $class->new (
342# data => $surface->pixels,
343# w => $surface->width,
344# h => $surface->height,
345# )
346#}
347
348sub new_from_layout {
349 my ($class, $layout, %arg) = @_;
350
351 my ($w, $h, $data, $format, $internalformat) = $layout->render;
352
353 $class->new (
354 w => $w,
355 h => $h,
356 data => $data,
357 format => $format,
358 internalformat => $format,
359 type => GL_UNSIGNED_BYTE,
360 %arg,
361 ) 404 );
362} 405 $vb->add (my $entry = new CFClient::UI::Entry
406 text => "",
407 on_key_down => sub {
408 my ($entry, $ev) = @_;
363 409
364sub new_from_opengl { 410 my $mod = $ev->{mod};
365 my ($class, $w, $h, $cb) = @_; 411 my $sym = $ev->{sym};
366 412
367 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) 413 # XXX: This seems a little bit hackisch to me, but i have to ignore them
368} 414 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
415 return;
416 }
369 417
370sub topot { 418 if ($mod == CFClient::KMOD_NONE
371 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 419 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
372} 420 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
421 {
422 $::STATUSBOX->add (
423 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
424 ." directly without modifier! It would damage the completer handling."
425 );
426 return;
427 }
373 428
374sub upload { 429 $entry->focus_out;
430
431 $::CFG->{bindings}->{$mod}->{$sym} = $cmd;
432 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
433
434 $w->destroy
435 });
436
437 $entry->focus_in;
438 $w->show;
439}
440
441sub keycombo_to_name {
442 my ($mod, $sym) = @_;
443
444 my $mods = join '+',
445 map { $ALLOWED_MODIFIERS{$_} }
446 grep { $_ & $mod }
447 keys %ALLOWED_MODIFIERS;
448 $mods .= "+" if $mods ne '';
449
450 return $mods . CFClient::SDL_GetKeyName ($sym);
451}
452
453sub clear_command_list {
454 $CMDBOX->clear () if $CMDBOX;
455}
456
457sub set_command_list {
375 my ($self) = @_; 458 my ($list) = @_;
376 459
377 return unless $GL_VERSION; 460 return unless $CMDBOX;
378 461
379 my $data; 462 $CMDBOX->clear ();
463 $CURRENT_CMDS = $list;
380 464
381 if (exists $self->{data}) { 465 my $idx = 0;
382 $data = $self->{data};
383 466
384 } elsif (exists $self->{render_cb}) { 467 for (@$list) {
385 glViewport 0, 0, $self->{w}, $self->{h}; 468 $CMDBOX->add (my $hb = new CFClient::UI::HBox);
386 glMatrixMode GL_PROJECTION;
387 glLoadIdentity;
388 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
389 glMatrixMode GL_MODELVIEW;
390 glLoadIdentity;
391 $self->{render_cb}->($self, $self->{w}, $self->{h});
392 469
393 } else { 470 my $i = $idx;
394 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 471 $hb->add (new CFClient::UI::Button
395 = CFClient::load_image_inline $self->{image}; 472 text => "delete",
473 tooltip => "Deletes the action from the record",
474 on_activate => sub {
475 $CMDBOX->remove ($hb);
476 $list->[$i] = undef;
477 });
478
479 $hb->add (new CFClient::UI::Label text => $_);
480
481 $idx++
396 } 482 }
483}
397 484
398 my ($tw, $th) = @$self{qw(w h)}; 485# if $show is 1 the recorder will be shown
486sub start {
487 my ($show) = @_;
399 488
400 unless ($tw > 0 && $th > 0) { 489 $RECORD_WINDOW->show if $show;
401 $tw = $th = 1; 490
402 $data = "\x00" x 64; 491 $REC_BTN->set_text ("stop recording");
492 $REC_BTN->{recording} = 1;
493 clear_command_list;
494 $::CONN->start_record;
495}
496
497# if $autobind is 1 the recorder will be automatically
498# jump into the binding query and hide the recorder window
499sub stop {
500 my ($autobind) = @_;
501
502 $REC_BTN->set_text ("start recording");
503 $REC_BTN->{recording} = 0;
504
505 my $rec = $::CONN->stop_record;
506 return unless ref $rec eq 'ARRAY';
507 set_command_list ($rec);
508
509 if ($autobind) {
510 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
511 $RECORD_WINDOW->hide;
403 } 512 }
513}
404 514
405 $self->{minified} = [CFClient::average $tw, $th, $data] 515sub make_window {
406 if $self->{minify}; 516 $RECORD_WINDOW = new CFClient::UI::FancyFrame
517 req_y => 1,
518 req_x => -1,
519 title => "Action Recorder";
407 520
408 unless ($GL_NPOT) { 521 $RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
409 # TODO: does not work for zero-sized textures 522 $vb->add ($REC_BTN = new CFClient::UI::Button
410 $tw = topot $tw; 523 text => "start recording",
411 $th = topot $th; 524 tooltip => "Start/Stops recording of actions."
525 ."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
526 ."All subsequent actions after the recording started will be captured."
527 ."The actions are displayed after the record was stopped."
528 ."To bind the action you have to click on the 'Bind' button",
529 on_activate => sub {
530 my ($btn) = @_;
412 531
413 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) { 532 unless ($btn->{recording}) {
414 my $bpp = (length $data) / ($self->{w} * $self->{h}); 533 start;
415 $data = pack "(a" . ($tw * $bpp) . ")*", 534 } else {
416 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 535 stop;
417 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 536 }
418 } 537 });
419 } 538 $vb->add ($CMDBOX = new CFClient::UI::VBox);
539 $vb->add (new CFClient::UI::Button
540 text => "bind",
541 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
542 on_activate => sub {
543 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
544 });
420 545
421 $self->{s} = $self->{w} / $tw; 546 $RECORD_WINDOW
422 $self->{t} = $self->{h} / $th;
423
424 $self->{name} ||= glGenTexture;
425
426 glBindTexture GL_TEXTURE_2D, $self->{name};
427
428 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
429 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
430
431 if ($::FAST) {
432 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
433 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
434 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
435 # alternatively check for 0x8191
436 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
437 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
438 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
439 } else {
440 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
441 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
442 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
443 }
444
445 glGetError;
446
447 if (defined $data) {
448 glTexImage2D GL_TEXTURE_2D, 0,
449 $self->{internalformat},
450 $tw, $th,
451 0,
452 $self->{format},
453 $self->{type},
454 $data;
455 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
456 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
457 } else {
458 glCopyTexImage2D GL_TEXTURE_2D, 0,
459 $self->{internalformat},
460 0, 0,
461 $tw, $th,
462 0;
463 CFClient::gl_check "copying to texture %dx%d if=%x",
464 $tw, $th, $self->{internalformat};
465 }
466
467 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
468}
469
470sub DESTROY {
471 my ($self) = @_;
472
473 delete $TEXTURES{$self+0};
474
475 glDeleteTexture delete $self->{name}
476 if $self->{name};
477}
478
479sub restore_state {
480 $_->upload
481 for values %TEXTURES;
482} 547}
483 548
4841; 5491;
485 550
486=back 551=back

Diff Legend

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