[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.18 by root, Sat Apr 8 13:36:26 2006 UTC vs.
Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC

…		…
6		6
7	use SDL::OpenGL;	7	use SDL::OpenGL;
8	use SDL::OpenGL::Constants;	8	use SDL::OpenGL::Constants;
9		9
10	our $FOCUS; # the widget with current focus	10	our $FOCUS; # the widget with current focus
11	our @ACTIVE_WIDGETS;	11	#our @ACTIVE_WIDGETS;
12		12
13	# class methods for events	13	# class methods for events
14	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }	14	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }	15	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16	sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS }	16	sub feed_sdl_button_down_event { }
17	sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS }	17	sub feed_sdl_button_up_event { }
18		18
19	sub new {	19	sub new {
20	my $class = shift;	20	my $class = shift;
21		21
22	bless { @_ }, $class	22	bless { @_ }, $class
23	}	23	}
24		24
25	sub activate {	25	#sub activate {
26	push @ACTIVE_WIDGETS, $_[0];	26	# push @ACTIVE_WIDGETS, $_[0];
27	Scalar::Util::weaken $ACTIVE_WIDGETS[-1];	27	# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28	}	28	#}
29		29
30	sub deactivate {	30	#sub deactivate {
31	@ACTIVE_WIDGETS =	31	# @ACTIVE_WIDGETS =
32	sort { $a->{z} <=> $b->{z} }	32	# sort { $a->{z} <=> $b->{z} }
33	grep { $_ && $_ != $_[0] }	33	# grep { $_ && $_ != $_[0] }
34	@ACTIVE_WIDGETS;	34	# @ACTIVE_WIDGETS;
35	}	35	#}
36		36
37	sub move {	37	sub move {
38	my ($self, $x, $y, $z) = @_;	38	my ($self, $x, $y, $z) = @_;
39	$self->{x} = $x;	39	$self->{x} = $x;
40	$self->{y} = $y;	40	$self->{y} = $y;
41	$self->{z} = $z if defined $z;	41	$self->{z} = $z if defined $z;
42	}	42	}
43		43
		44	sub needs_redraw {
		45	0
		46	}
		47
44	sub size_request {	48	sub size_request {
45	die "size_request is abtract";	49	die "size_request is abtract";
46	}	50	}
47		51
48	sub focus_in {	52	sub focus_in {
…		…
88	sub _draw {	92	sub _draw {
89	my ($widget) = @_;	93	my ($widget) = @_;
90	}	94	}
91		95
92	sub bbox {	96	sub bbox {
93	my ($widget) = @_;	97	my ($self) = @_;
		98	my ($w, $h) = $self->size_request;
		99	(
		100	$self->{x},
		101	$self->{y},
		102	$self->{x} = $w,
		103	$self->{y} = $h
		104	)
		105	}
		106
		107	sub del_parent { $_[0]->{parent} = undef }
		108
		109	sub set_parent {
		110	my ($self, $par) = @_;
		111
		112	$self->{parent} = $par;
		113	Scalar::Util::weaken $self->{parent};
		114	}
		115
		116	sub get_parent {
		117	$_[0]->{parent}
		118	}
		119
		120	sub update {
		121	my ($self) = @_;
		122
		123	$self->{parent}->update
		124	if $self->{parent};
94	}	125	}
95		126
96	sub DESTROY {	127	sub DESTROY {
97	my ($self) = @_;	128	my ($self) = @_;
98		129
99	$self->deactivate;	130	#$self->deactivate;
100	}	131	}
101		132
102	package Crossfire::Client::Widget::Container;	133	package Crossfire::Client::Widget::Container;
103		134
104	our @ISA = Crossfire::Client::Widget::;	135	our @ISA = Crossfire::Client::Widget::;
105		136
106	use SDL::OpenGL;	137	use SDL::OpenGL;
107		138
108	sub add { $_[0]->{child} = $_[1] }	139	sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
109	sub get { $_[0]->{child} }	140	sub get { $_[0]->{child} }
		141	sub remove {
		142	my ($self, $chld) = @_;
		143	delete $self->{child}
		144	if $self->{child} == $chld;
		145	}
110		146
111	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }	147	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
112		148
113	sub _draw { die "Containers can't be drawn!" }	149	sub _draw { die "Containers can't be drawn!" }
114		150
115	package Crossfire::Client::Widget::Frame;	151	package Crossfire::Client::Widget::Toplevel;
		152
		153	our @ISA = Crossfire::Client::Widget::;
		154
		155	use SDL::OpenGL;
		156
		157	sub add {
		158	my ($self, $chld) = @_;
		159
		160	push @{$self->{childs}}, $chld;
		161	@{$self->{childs}} =
		162	sort { $a->{z} <=> $b->{z} }
		163	@{$self->{childs}};
		164
		165	$chld->set_parent ($self);
		166	}
		167
		168	sub remove {
		169	my ($self, $chld) = @_;
		170	@{$self->{childs}} =
		171	sort { $a->{z} <=> $b->{z} }
		172	grep { $_ && $_ != $_[0] }
		173	@{$self->{childs}}
		174	}
		175
		176	sub update {
		177	my ($self) = @_;
		178	::refresh ();
		179	}
		180
		181	sub _draw {
		182	my ($self) = @_;
		183
		184	$_->draw for @{$self->{childs}};
		185	}
		186
		187	package Crossfire::Client::Widget::Window;
116		188
117	our @ISA = Crossfire::Client::Widget::Container::;	189	our @ISA = Crossfire::Client::Widget::Container::;
118		190
119	use SDL::OpenGL;	191	use SDL::OpenGL;
		192
		193	sub add {
		194	my ($self, $chld) = @_;
		195	$self->SUPER::add ($chld);
		196	$chld->set_parent ($self);
		197	$self->update; #TODO: Move this to the size_request event propably?
		198	}
		199
		200	sub remove {
		201	my ($self) = @_;
		202	# TODO FIXME: removing a child from a window will crash, see render_chld
		203	$self->update;
		204	}
		205
		206	sub update {
		207	my ($self) = @_;
		208	$self->render_chld;
		209	}
		210
		211	sub render_chld {
		212	my ($self) = @_;
		213	my $chld = $self->get;
		214	my ($w, $h) = $self->size_request;
		215
		216	$self->{texture} =
		217	Crossfire::Client::Texture->new_from_opengl (
		218	$w, $h, sub { $chld->draw }
		219	);
		220	$self->{texture}->upload;
		221	}
120		222
121	sub size_request {	223	sub size_request {
122	my ($self) = @_;	224	my ($self) = @_;
123	my $chld = $self->get	225	my $chld = $self->get
124	or return (0, 0);	226	or return (0, 0);
		227	$chld->size_request
		228	}
		229
		230	sub _draw {
		231	my ($self) = @_;
		232
		233	my ($w, $h) = $self->size_request;#TODO# use width/height of texture
		234
		235	my $tex = $self->{texture}
		236	or return;
		237
		238	glEnable GL_BLEND;
		239	glEnable GL_TEXTURE_2D;
		240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		241	glBindTexture GL_TEXTURE_2D, $tex->{name};
		242
		243	glColor 1, 0, 1;
		244
		245	glBegin GL_QUADS;
		246	glTexCoord 0, 0; glVertex 0, 0;
		247	glTexCoord 0, 1; glVertex 0, $h;
		248	glTexCoord 1, 1; glVertex $w, $h;
		249	glTexCoord 1, 0; glVertex $w, 0;
		250	glEnd;
		251
		252	glDisable GL_BLEND;
		253	glDisable GL_TEXTURE_2D;
		254	}
		255
		256	package Crossfire::Client::Widget::Frame;
		257
		258	our @ISA = Crossfire::Client::Widget::Container::;
		259
		260	use SDL::OpenGL;
		261
		262	sub size_request {
		263	my ($self) = @_;
		264	my $chld = $self->get
		265	or return (0, 0);
		266
		267	$chld->move (2, 2);
		268
125	map { $_ + 4 } $chld->size_request;	269	map { $_ + 4 } $chld->size_request;
126	}	270	}
127		271
128	sub _draw {	272	sub _draw {
129	my ($self) = @_;	273	my ($self) = @_;
130		274
131	my $chld = $self->get;	275	my $chld = $self->get;
132		276
133	my ($w, $h) = $chld->size_request;	277	my ($w, $h) = $chld->size_request;
134		278
135	glColor 1, 0, 0;
136	glBegin GL_QUADS;	279	glBegin GL_QUADS;
		280	glColor 0, 0, 0;
137	glTexCoord 0, 0; glVertex 0 , 0;	281	glTexCoord 0, 0; glVertex 0 , 0;
138	glTexCoord 0, 1; glVertex 0 , $h + 4;	282	glTexCoord 0, 1; glVertex 0 , $h + 4;
139	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	283	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
140	glTexCoord 1, 0; glVertex $w + 4 , 0;	284	glTexCoord 1, 0; glVertex $w + 4 , 0;
141	glEnd;	285	glEnd;
142		286
143	glPushMatrix;
144	glTranslate (2, 2, 0);
145	$chld->_draw;	287	$chld->draw;
146	glPopMatrix;
147	}	288	}
		289
		290	package Crossfire::Client::Widget::FancyFrame;
		291
		292	our @ISA = Crossfire::Client::Widget::Frame::;
		293
		294	use SDL::OpenGL;
		295
		296	#TODO: implement themed frame
148		297
149	package Crossfire::Client::Widget::Table;	298	package Crossfire::Client::Widget::Table;
150		299
151	our @ISA = Crossfire::Client::Widget::Container::;	300	our @ISA = Crossfire::Client::Widget::Container::;
152		301
153	use SDL::OpenGL;	302	use SDL::OpenGL;
154		303
155	sub add {	304	sub add {
156	my ($self, $x, $y, $chld) = @_;	305	my ($self, $x, $y, $chld) = @_;
		306	my $old_chld = $self->{childs}[$y][$x];
		307
157	$self->{childs}[$y][$x] = $chld;	308	$self->{childs}[$y][$x] = $chld;
		309	$chld->set_parent ($self);
		310	$self->update;
158	}	311	}
159		312
160	sub max_row_height {	313	sub max_row_height {
161	my ($self, $row) = @_;	314	my ($self, $row) = @_;
162		315
…		…
212	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	365	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
213	my $x = 0;	366	my $x = 0;
214		367
215	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	368	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
216		369
217	glPushMatrix;
218	glTranslate ($x, $y, 0);
219	my $c = $self->{childs}->[$yi]->[$xi];	370	my $c = $self->{childs}->[$yi]->[$xi];
		371	if ($c) {
		372	$c->move ($x, $y, 0); #TODO: Move to size_request
220	$c->_draw if $c;	373	$c->draw if $c;
221	glPopMatrix;	374	}
222		375
223	$x += $self->max_col_width ($xi);	376	$x += $self->max_col_width ($xi);
224	}	377	}
225		378
226	$y += $self->max_row_height ($yi);	379	$y += $self->max_row_height ($yi);
…		…
234	use SDL::OpenGL;	387	use SDL::OpenGL;
235		388
236	sub add {	389	sub add {
237	my ($self, $chld) = @_;	390	my ($self, $chld) = @_;
238	push @{$self->{childs}}, $chld;	391	push @{$self->{childs}}, $chld;
		392	$chld->set_parent ($self);
		393	$self->update;
239	}	394	}
240		395
241	sub size_request {	396	sub size_request {
242	my ($self) = @_;	397	my ($self) = @_;
243		398
…		…
254	sub _draw {	409	sub _draw {
255	my ($self) = @_;	410	my ($self) = @_;
256		411
257	my ($x, $y);	412	my ($x, $y);
258	for (@{$self->{childs} \|\| []}) {	413	for (@{$self->{childs} \|\| []}) {
259	glPushMatrix;	414	$_->move (0, $y, 0); #TODO: move to size_request
260	glTranslate (0, $y, 0);
261	$_->_draw;	415	$_->draw;
262	glPopMatrix;
263	my ($w, $h) = $_->size_request;	416	my ($w, $h) = $_->size_request;
264	$y += $h;	417	$y += $h;
265	}	418	}
266	}	419	}
267		420
…		…
270	our @ISA = Crossfire::Client::Widget::;	423	our @ISA = Crossfire::Client::Widget::;
271		424
272	use SDL::OpenGL;	425	use SDL::OpenGL;
273		426
274	sub new {	427	sub new {
275	my ($class, $x, $y, $z, $ttf, $text) = @_;	428	my ($class, $x, $y, $z, $height, $text) = @_;
276		429
		430	# TODO: color, and make height, xyz etc. optional
277	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf);	431	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
278		432
279	$self->set_text ($text);	433	$self->set_text ($text);
280		434
281	$self	435	$self
282	}	436	}
283		437
284	sub set_text {	438	sub set_text {
285	my ($self, $text) = @_;	439	my ($self, $text) = @_;
		440
		441	$self->{text} = $text;
286	$self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text;	442	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
		443
		444	$self->update;
287	}	445	}
288		446
289	sub get_text {	447	sub get_text {
290	my ($self, $text) = @_;	448	my ($self, $text) = @_;
		449
291	$self->{text}	450	$self->{text}
292	}	451	}
293		452
294	sub size_request {	453	sub size_request {
295	my ($self) = @_;	454	my ($self) = @_;
…		…
305		464
306	my $tex = $self->{texture};	465	my $tex = $self->{texture};
307		466
308	glEnable GL_BLEND;	467	glEnable GL_BLEND;
309	glEnable GL_TEXTURE_2D;	468	glEnable GL_TEXTURE_2D;
		469	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
310	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
311	glBindTexture GL_TEXTURE_2D, $tex->{name};	471	glBindTexture GL_TEXTURE_2D, $tex->{name};
312		472
313	glColor 1, 1, 1;	473	glColor 1, 1, 1, 0.6; # TODO color
314		474
315	glBegin GL_QUADS;	475	glBegin GL_QUADS;
316	glTexCoord 0, 0; glVertex 0 , 0;	476	glTexCoord 0, 0; glVertex 0 , 0;
317	glTexCoord 0, 1; glVertex 0 , $tex->{height};	477	glTexCoord 0, 1; glVertex 0 , $tex->{height};
318	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	478	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
…		…
321		481
322	glDisable GL_BLEND;	482	glDisable GL_BLEND;
323	glDisable GL_TEXTURE_2D;	483	glDisable GL_TEXTURE_2D;
324	}	484	}
325		485
		486	package Crossfire::Client::Widget::TextEntry;
		487
		488	our @ISA = Crossfire::Client::Widget::Label::;
		489
		490	use SDL;
		491	use SDL::OpenGL;
		492
		493	sub key_down {
		494	my ($self, $ev) = @_;
		495
		496	my $mod = $ev->key_mod;
		497	my $sym = $ev->key_sym;
		498
		499	$ev->set_unicode (1);
		500	my $uni = $ev->key_unicode;
		501
		502	my $text = $self->get_text;
		503
		504	if ($sym == SDLK_BACKSPACE) {
		505	substr $text, -1, 1, '';
		506
		507	} elsif ($uni) {
		508	$text .= chr $uni;
		509	}
		510	$self->set_text ($text);
		511	}
		512
		513
		514	# XXX: TextView isn't neccessary with pango multiline text rendering
326	package Crossfire::Client::Widget::TextView;	515	package Crossfire::Client::Widget::TextView;
327		516
328	use strict;	517	use strict;
329		518
330	our @ISA = qw/Crossfire::Client::Widget/;	519	our @ISA = qw/Crossfire::Client::Widget/;
331		520
332	use SDL::OpenGL;	521	use SDL::OpenGL;
333	use SDL::OpenGL::Constants;	522	use SDL::OpenGL::Constants;
		523
		524	sub new {
		525	my ($class, $text, $h) = @_;
		526	my $self = $class->SUPER::new ();
		527
		528	$self->{txt_height} = $h;
		529	@{$self->{lines}} = split /\r?\n/, $text;
		530
		531	for (split /\r?\n/, $text) {
		532	$self->add_line ($_);
		533	}
		534	$self
		535	}
		536
		537	#sub render_lines {
		538	# my ($self) = @_;
		539	#
		540	# $self->{txt_lines} = [];
		541	#
		542	# for (@{$self->{lines}}) {
		543	# push @{$self->{txt_lines}},
		544	# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
		545	# }
		546	#}
334		547
335	sub add_line {	548	sub add_line {
336	my ($self, $line) = @_;	549	my ($self, $line) = @_;
337	push @{$self->{lines}}, $line;	550	push @{$self->{lines}}, $line;
338	}
339		551
		552	push @{$self->{txt_lines}},
		553	new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
		554	}
		555
		556	sub size_request {
		557	my ($self) = @_;
		558
		559	my $w = 0;
		560	my $h = 0;
		561
		562	for (@{$self->{txt_lines}}) {
		563	if ($w < $_->{width}) { $w = $_->{width} }
		564	$h += $_->{height};
		565	}
		566
		567	return ($w, $h);
		568	}
		569
340	sub _draw {	570	sub draw_line {
341	my ($self) = @_;	571	my ($self, $tex, $y) = @_;
342		572
		573	glBindTexture GL_TEXTURE_2D, $tex->{name};
		574
		575	glColor 1, 0, 1;
		576
		577	glBegin GL_QUADS;
		578	glTexCoord 0, 0; glVertex 0 , $y;
		579	glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
		580	glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
		581	glTexCoord 1, 0; glVertex $tex->{width}, $y;
		582	glEnd;
		583	}
		584
		585	sub _draw {
		586	my ($self) = @_;
		587
		588	glEnable GL_BLEND;
		589	glEnable GL_TEXTURE_2D;
		590	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
		591
		592	my $l = 0;
		593	for (@{$self->{txt_lines}}) {
		594	$self->draw_line ($_, $l);
		595	$l += $_->{height};
		596	}
		597
		598	glDisable GL_BLEND;
		599	glDisable GL_TEXTURE_2D;
343	}	600	}
344		601
345	package Crossfire::Client::Widget::MapWidget;	602	package Crossfire::Client::Widget::MapWidget;
346		603
347	use strict;	604	use strict;
348		605
349	our @ISA = qw/Crossfire::Client::Widget/;	606	use List::Util qw(min max);
350		607
351	use SDL;	608	use SDL;
352	use SDL::OpenGL;	609	use SDL::OpenGL;
353	use SDL::OpenGL::Constants;	610	use SDL::OpenGL::Constants;
		611
		612	our @ISA = Crossfire::Client::Widget::;
354		613
355	sub key_down {	614	sub key_down {
356	print "MAPKEYDOWN\n";	615	print "MAPKEYDOWN\n";
357	}	616	}
358		617
359	sub key_up {	618	sub key_up {
360	}	619	}
361		620
362	sub _draw {	621	sub _draw {
		622	my ($self) = @_;
		623
		624	my $mx = $::CONN->{mapx};
		625	my $my = $::CONN->{mapy};
		626
		627	my $map = $::CONN->{map};
		628
		629	my ($xofs, $yofs);
		630
		631	my $sw = 1 + int $::WIDTH / 32;
		632	my $sh = 1 + int $::HEIGHT / 32;
		633
		634	if ($::CONN->{mapw} > $sw) {
		635	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
		636	} else {
		637	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
		638	}
		639
		640	if ($::CONN->{maph} > $sh) {
		641	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
		642	} else {
		643	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
		644	}
		645
363	glEnable GL_TEXTURE_2D;	646	glEnable GL_TEXTURE_2D;
364	glEnable GL_BLEND;	647	glEnable GL_BLEND;
365	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	648	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
366		649
367	my $map = $::CONN->{map};	650	for my $x (0 .. $sw - 1) {
368
369	for my $x (0 .. $::CONN->{mapw} - 1) {
370	for my $y (0 .. $::CONN->{maph} - 1) {	651	for my $y (0 .. $sh - 1) {
371		652
372	my $cell = $map->[$x][$y]	653	my $cell = $map->[$x + $xofs][$y + $yofs]
373	or next;	654	or next;
374		655
375	my $darkness = $cell->[3] * (1 / 255);	656	my $darkness = $cell->[0] * (1 / 255);
		657	if ($darkness < 0) {
		658	glColor 0.3, 0.3, 0.3;
		659	} else {
376	glColor $darkness, $darkness, $darkness;	660	glColor $darkness, $darkness, $darkness;
		661	}
377		662
378	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {	663	for my $num (grep $_, @$cell[1,2,3]) {
379	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	664	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
380		665
381	glBindTexture GL_TEXTURE_2D, $tex->{name};	666	glBindTexture GL_TEXTURE_2D, $tex->{name};
382		667
		668	my $w = $tex->{width};
		669	my $h = $tex->{height};
		670
		671	my $px = ($x + 1) * 32 - $w;
		672	my $py = ($y + 1) * 32 - $h;
		673
383	glBegin GL_QUADS;	674	glBegin GL_QUADS;
384	glTexCoord 0, 0; glVertex $x * 32 , $y * 32;	675	glTexCoord 0, 0; glVertex $px , $py;
385	glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32;	676	glTexCoord 0, 1; glVertex $px , $py + $h;
386	glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32;	677	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
387	glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32;	678	glTexCoord 1, 0; glVertex $px + $w, $py;
388	glEnd;	679	glEnd;
389	}	680	}
390	}	681	}
391	}	682	}
392		683

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.18 by root, Sat Apr 8 13:36:26 2006 UTC vs. Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.18 by root, Sat Apr 8 13:36:26 2006 UTC vs.
Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC