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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.15 by elmex, Fri Apr 7 23:05:21 2006 UTC vs.
Revision 1.22 by elmex, Sat Apr 8 18:18:09 2006 UTC

…		…
1	package Crossfire::Client::Widget;	1	package Crossfire::Client::Widget;
2		2
3	use strict;	3	use strict;
		4
		5	use Scalar::Util;
		6
4	use SDL::OpenGL;	7	use SDL::OpenGL;
5	use SDL::OpenGL::Constants;	8	use SDL::OpenGL::Constants;
6		9
7	our $FOCUS; # the widget with current focus	10	our $FOCUS; # the widget with current focus
8	our @ACTIVE_WIDGETS;	11	our @ACTIVE_WIDGETS;
19	bless { @_ }, $class	22	bless { @_ }, $class
20	}	23	}
21		24
22	sub activate {	25	sub activate {
23	push @ACTIVE_WIDGETS, $_[0];	26	push @ACTIVE_WIDGETS, $_[0];
		27	Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
24	}	28	}
25		29
26	sub deactivate {	30	sub deactivate {
27	@ACTIVE_WIDGETS =	31	@ACTIVE_WIDGETS =
28	sort { $a->{z} <=> $b->{z} }	32	sort { $a->{z} <=> $b->{z} }
29	grep { $_ != $_[0] }	33	grep { $_ && $_ != $_[0] }
30	@ACTIVE_WIDGETS;	34	@ACTIVE_WIDGETS;
		35	}
		36
		37	sub move {
		38	my ($self, $x, $y, $z) = @_;
		39	$self->{x} = $x;
		40	$self->{y} = $y;
		41	$self->{z} = $z if defined $z;
		42	}
		43
		44	sub needs_redraw {
		45	0
31	}	46	}
32		47
33	sub size_request {	48	sub size_request {
34	die "size_request is abtract";	49	die "size_request is abtract";
35	}	50	}
…		…
80		95
81	sub bbox {	96	sub bbox {
82	my ($widget) = @_;	97	my ($widget) = @_;
83	}	98	}
84		99
		100	sub DESTROY {
		101	my ($self) = @_;
		102
		103	$self->deactivate;
		104	}
		105
85	package Crossfire::Client::Widget::Container;	106	package Crossfire::Client::Widget::Container;
86		107
87	our @ISA = Crossfire::Client::Widget::;	108	our @ISA = Crossfire::Client::Widget::;
88		109
89	use SDL::OpenGL;	110	use SDL::OpenGL;
…		…
92	sub get { $_[0]->{child} }	113	sub get { $_[0]->{child} }
93		114
94	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }	115	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
95		116
96	sub _draw { die "Containers can't be drawn!" }	117	sub _draw { die "Containers can't be drawn!" }
		118
		119	package Crossfire::Client::Widget::Window;
		120
		121	our @ISA = Crossfire::Client::Widget::Container::;
		122
		123	use SDL::OpenGL;
		124
		125	sub add {
		126	my ($self, $chld) = @_;
		127	$self->SUPER::add ($chld);
		128	$self->render_chld;
		129	}
		130
		131	sub render_chld {
		132	my ($self) = @_;
		133	my $chld = $self->get;
		134	my ($w, $h) = $self->size_request;
		135
		136	$w = $h = 256;
		137
		138	$self->{texture} =
		139	Crossfire::Client::Texture->new_from_opengl (
		140	$w, $h, sub {
		141	glPushMatrix;
		142	glLoadIdentity;
		143	$chld->_draw;
		144	glPopMatrix;
		145	}
		146	);
		147	$self->{texture}->upload;
		148	}
		149
		150	sub size_request {
		151	my ($self) = @_;
		152	my $chld = $self->get
		153	or return (0, 0);
		154	$chld->size_request
		155	}
		156
		157	sub _draw {
		158	my ($self) = @_;
		159
		160	my ($w, $h) = $self->size_request;
		161	my $tex = $self->{texture}
		162	or return;
		163
		164	glEnable GL_BLEND;
		165	glEnable GL_TEXTURE_2D;
		166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		167	glBindTexture GL_TEXTURE_2D, $tex->{name};
		168
		169	glColor 1, 1, 1;
		170
		171	glBegin GL_QUADS;
		172	glTexCoord 0, 0; glVertex 0 , 0;
		173	glTexCoord 0, 1; glVertex 0 , $h;
		174	glTexCoord 1, 1; glVertex $w , $h;
		175	glTexCoord 1, 0; glVertex $w , 0;
		176	glEnd;
		177
		178	glDisable GL_BLEND;
		179	glDisable GL_TEXTURE_2D;
		180	}
97		181
98	package Crossfire::Client::Widget::Frame;	182	package Crossfire::Client::Widget::Frame;
99		183
100	our @ISA = Crossfire::Client::Widget::Container::;	184	our @ISA = Crossfire::Client::Widget::Container::;
101		185
…		…
144	my ($self, $row) = @_;	228	my ($self, $row) = @_;
145		229
146	my $hs = 0;	230	my $hs = 0;
147	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {	231	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {
148	my $c = $self->{childs}->[$row]->[$xi];	232	my $c = $self->{childs}->[$row]->[$xi];
		233	if ($c) {
149	my ($w, $h) = $c->size_request if $c;	234	my ($w, $h) = $c->size_request;
150	if ($hs < $h) { $hs = $h }	235	if ($hs < $h) { $hs = $h }
		236	}
151	}	237	}
152	return $hs;	238	return $hs;
153	}	239	}
154		240
155	sub max_col_width {	241	sub max_col_width {
156	my ($self, $col) = @_;	242	my ($self, $col) = @_;
157		243
158	my $ws = 0;	244	my $ws = 0;
159	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {	245	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {
160	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];	246	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];
		247	if ($c) {
161	my ($w, $h) = $c->size_request if $c;	248	my ($w, $h) = $c->size_request;
162	if ($ws < $w) { $ws = $w }	249	if ($ws < $w) { $ws = $w }
		250	}
163	}	251	}
164	return $ws;	252	return $ws;
165	}	253	}
166		254
167	sub size_request {	255	sub size_request {
…		…
282	sub _draw {	370	sub _draw {
283	my ($self) = @_;	371	my ($self) = @_;
284		372
285	my $tex = $self->{texture};	373	my $tex = $self->{texture};
286		374
287	$self->{x}--;
288
289	glEnable GL_BLEND;	375	glEnable GL_BLEND;
290	glEnable GL_TEXTURE_2D;	376	glEnable GL_TEXTURE_2D;
291	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	377	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
292	glBindTexture GL_TEXTURE_2D, $tex->{name};	378	glBindTexture GL_TEXTURE_2D, $tex->{name};
293		379
…		…
327		413
328	use strict;	414	use strict;
329		415
330	our @ISA = qw/Crossfire::Client::Widget/;	416	our @ISA = qw/Crossfire::Client::Widget/;
331		417
		418	use SDL;
332	use SDL::OpenGL;	419	use SDL::OpenGL;
333	use SDL::OpenGL::Constants;	420	use SDL::OpenGL::Constants;
334		421
335	sub key_down {	422	sub key_down {
336	print "MAPKEYDOWN\n";	423	print "MAPKEYDOWN\n";
…		…
338		425
339	sub key_up {	426	sub key_up {
340	}	427	}
341		428
342	sub _draw {	429	sub _draw {
		430	my ($self) = @_;
		431
343	glEnable GL_TEXTURE_2D;	432	glEnable GL_TEXTURE_2D;
344	glEnable GL_BLEND;	433	glEnable GL_BLEND;
345	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	434	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
346		435
347	my $map = $::CONN->{map};	436	my $map = $::CONN->{map};
348		437
349	for my $x (0 .. $::CONN->{mapw} - 1) {	438	for my $x (0 .. int $::WIDTH / 32) {
350	for my $y (0 .. $::CONN->{maph} - 1) {	439	for my $y (0 .. int $::HEIGHT / 32) {
351		440
352	my $cell = $map->[$x][$y]	441	my $cell = $map->[$x + $::CONN->{mapx}]
		442	[$y + $::CONN->{mapy}]
353	or next;	443	or next;
354		444
355	my $darkness = $cell->[3] * (1 / 255);	445	my $darkness = $cell->[0] * (1 / 255);
		446	if ($darkness < 0) {
		447	$darkness = 0.5;
		448	}
356	glColor $darkness, $darkness, $darkness;	449	glColor $darkness, $darkness, $darkness;
357		450
358	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {	451	for my $num (grep $_, @$cell[1,2,3]) {
359	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	452	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
360		453
361	glBindTexture GL_TEXTURE_2D, $tex->{name};	454	glBindTexture GL_TEXTURE_2D, $tex->{name};
362		455
		456	my $w = $tex->{width};
		457	my $h = $tex->{height};
		458
		459	my $px = ($x + 1) * 32 - $w;
		460	my $py = ($y + 1) * 32 - $h;
		461
363	glBegin GL_QUADS;	462	glBegin GL_QUADS;
364	glTexCoord 0, 0; glVertex $x * 32 , $y * 32;	463	glTexCoord 0, 0; glVertex $px , $py;
365	glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32;	464	glTexCoord 0, 1; glVertex $px , $py + $h;
366	glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32;	465	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
367	glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32;	466	glTexCoord 1, 0; glVertex $px + $w, $py;
368	glEnd;	467	glEnd;
369	}	468	}
370	}	469	}
371	}	470	}
372		471
373	glDisable GL_TEXTURE_2D;	472	glDisable GL_TEXTURE_2D;
374	glDisable GL_BLEND;	473	glDisable GL_BLEND;
375	}	474	}
376		475
		476	my %DIR = (
		477	SDLK_KP8, [1, "north"],
		478	SDLK_KP9, [2, "northeast"],
		479	SDLK_KP6, [3, "east"],
		480	SDLK_KP3, [4, "southeast"],
		481	SDLK_KP2, [5, "south"],
		482	SDLK_KP1, [6, "southwest"],
		483	SDLK_KP4, [7, "west"],
		484	SDLK_KP7, [8, "northwest"],
		485
		486	SDLK_UP, [1, "north"],
		487	SDLK_RIGHT, [3, "east"],
		488	SDLK_DOWN, [5, "south"],
		489	SDLK_LEFT, [7, "west"],
		490	);
		491
		492	sub key_down {
		493	my ($self, $ev) = @_;
		494
		495	my $mod = $ev->key_mod;
		496	my $sym = $ev->key_sym;
		497
		498	if ($sym == SDLK_KP5) {
		499	$::CONN->send ("command stay fire");
		500	} elsif (exists $DIR{$sym}) {
		501	if ($mod & KMOD_SHIFT) {
		502	$self->{shft}++;
		503	$::CONN->send ("command fire $DIR{$sym}[0]");
		504	} elsif ($mod & KMOD_CTRL) {
		505	$self->{ctrl}++;
		506	$::CONN->send ("command run $DIR{$sym}[0]");
		507	} else {
		508	$::CONN->send ("command $DIR{$sym}[1]");
		509	}
		510	}
		511	}
		512
		513	sub key_up {
		514	my ($self, $ev) = @_;
		515
		516	my $mod = $ev->key_mod;
		517	my $sym = $ev->key_sym;
		518
		519	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
		520	$::CONN->send ("command fire_stop");
		521	}
		522	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
		523	$::CONN->send ("command run_stop");
		524	}
		525	}
		526
377	1;	527	1;
378		528

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.15 by elmex, Fri Apr 7 23:05:21 2006 UTC vs. Revision 1.22 by elmex, Sat Apr 8 18:18:09 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.15 by elmex, Fri Apr 7 23:05:21 2006 UTC vs.
Revision 1.22 by elmex, Sat Apr 8 18:18:09 2006 UTC