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.52 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.77 by root, Mon May 29 21:54:15 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines