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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.31 by elmex, Sun Apr 9 00:43:11 2006 UTC vs.
Revision 1.35 by root, Sun Apr 9 17:34:15 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;
…		…
92	sub _draw {	92	sub _draw {
93	my ($widget) = @_;	93	my ($widget) = @_;
94	}	94	}
95		95
96	sub bbox {	96	sub bbox {
97	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};
98	}	125	}
99		126
100	sub DESTROY {	127	sub DESTROY {
101	my ($self) = @_;	128	my ($self) = @_;
102		129
103	$self->deactivate;	130	#$self->deactivate;
104	}	131	}
105		132
106	package Crossfire::Client::Widget::Container;	133	package Crossfire::Client::Widget::Bin;
107		134
108	our @ISA = Crossfire::Client::Widget::;	135	our @ISA = Crossfire::Client::Widget::;
109		136
110	use SDL::OpenGL;	137	sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
111		138
112	sub add { $_[0]->{child} = $_[1] }
113	sub get { $_[0]->{child} }	139	sub get { $_[0]->{child} }
114		140
		141	sub remove {
		142	my ($self, $chld) = @_;
		143	delete $self->{child}
		144	if $self->{child} == $chld;
		145	}
		146
		147	sub size_request {
115	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }	148	$_[0]->{child}->size_request if $_[0]->{child}
		149	}
116		150
117	sub _draw { die "Containers can't be drawn!" }	151	sub _draw {
		152	my ($self) = @_;
		153
		154	$self->{child}->draw;
		155	}
		156
		157	package Crossfire::Client::Widget::Toplevel;
		158
		159	our @ISA = Crossfire::Client::Widget::;
		160
		161	use SDL::OpenGL;
		162
		163	sub add {
		164	my ($self, $chld) = @_;
		165
		166	push @{$self->{childs}}, $chld;
		167	@{$self->{childs}} =
		168	sort { $a->{z} <=> $b->{z} }
		169	@{$self->{childs}};
		170
		171	$chld->set_parent ($self);
		172	}
		173
		174	sub remove {
		175	my ($self, $chld) = @_;
		176	@{$self->{childs}} =
		177	sort { $a->{z} <=> $b->{z} }
		178	grep { $_ && $_ != $_[0] }
		179	@{$self->{childs}}
		180	}
		181
		182	sub update {
		183	my ($self) = @_;
		184	::refresh ();
		185	}
		186
		187	sub _draw {
		188	my ($self) = @_;
		189
		190	$_->draw for @{$self->{childs}};
		191	}
118		192
119	package Crossfire::Client::Widget::Window;	193	package Crossfire::Client::Widget::Window;
120		194
121	our @ISA = Crossfire::Client::Widget::Container::;	195	our @ISA = Crossfire::Client::Widget::Bin::;
122		196
123	use SDL::OpenGL;	197	use SDL::OpenGL;
124		198
125	sub add {	199	sub add {
126	my ($self, $chld) = @_;	200	my ($self, $chld) = @_;
127	$self->SUPER::add ($chld);	201	$self->SUPER::add ($chld);
		202	$chld->set_parent ($self);
128	$self->render_chld; #TODO: Move this to the size_request event propably?	203	$self->update; #TODO: Move this to the size_request event propably?
		204	}
		205
		206	sub remove {
		207	my ($self) = @_;
		208	# TODO FIXME: removing a child from a window will crash, see render_chld
		209	$self->update;
		210	}
		211
		212	sub update {
		213	my ($self) = @_;
		214	$self->render_chld;
129	}	215	}
130		216
131	sub render_chld {	217	sub render_chld {
132	my ($self) = @_;	218	my ($self) = @_;
133	my $chld = $self->get;	219	my $chld = $self->get;
…		…
155	my $tex = $self->{texture}	241	my $tex = $self->{texture}
156	or return;	242	or return;
157		243
158	glEnable GL_BLEND;	244	glEnable GL_BLEND;
159	glEnable GL_TEXTURE_2D;	245	glEnable GL_TEXTURE_2D;
160	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	246	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
161	glBindTexture GL_TEXTURE_2D, $tex->{name};	247	glBindTexture GL_TEXTURE_2D, $tex->{name};
162
163	glColor 1, 0, 1;
164		248
165	glBegin GL_QUADS;	249	glBegin GL_QUADS;
166	glTexCoord 0, 0; glVertex 0, 0;	250	glTexCoord 0, 0; glVertex 0, 0;
167	glTexCoord 0, 1; glVertex 0, $h;	251	glTexCoord 0, 1; glVertex 0, $h;
168	glTexCoord 1, 1; glVertex $w, $h;	252	glTexCoord 1, 1; glVertex $w, $h;
…		…
173	glDisable GL_TEXTURE_2D;	257	glDisable GL_TEXTURE_2D;
174	}	258	}
175		259
176	package Crossfire::Client::Widget::Frame;	260	package Crossfire::Client::Widget::Frame;
177		261
178	our @ISA = Crossfire::Client::Widget::Container::;	262	our @ISA = Crossfire::Client::Widget::Bin::;
179		263
180	use SDL::OpenGL;	264	use SDL::OpenGL;
181		265
182	sub size_request {	266	sub size_request {
183	my ($self) = @_;	267	my ($self) = @_;
…		…
211		295
212	our @ISA = Crossfire::Client::Widget::Frame::;	296	our @ISA = Crossfire::Client::Widget::Frame::;
213		297
214	use SDL::OpenGL;	298	use SDL::OpenGL;
215		299
216	#TODO: implement themed frame	300	sub new {
		301	my ($self, $theme) = @_;
		302	$self = $self->SUPER::new;
		303
		304	$self->{txts} = [
		305	map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
		306	qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/
		307	];
		308	$self
		309
		310	}
		311
		312	sub size_request {
		313	my ($self) = @_;
		314	my ($w, $h) = $self->get->size_request;
		315
		316	$h += $self->{txts}->[1]->{height};
		317	$h += $self->{txts}->[4]->{height};
		318	$w += $self->{txts}->[2]->{width};
		319	$w += $self->{txts}->[3]->{width};
		320
		321	$self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
		322
		323	($w, $h)
		324	}
		325
		326	sub _draw {
		327	my ($self) = @_;
		328
		329	my ($w, $h) = $self->size_request;
		330	my ($cw, $ch) = $self->get->size_request;
		331
		332	glEnable GL_BLEND;
		333	glEnable GL_TEXTURE_2D;
		334	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		335	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		336
		337
		338	my $top = $self->{txts}->[1];
		339	glBindTexture GL_TEXTURE_2D, $top->{name};
		340
		341	glColor 1, 1, 1, 0.8;
		342
		343	glBegin GL_QUADS;
		344	glTexCoord 0, 0; glVertex 0 , 0;
		345	glTexCoord 0, 1; glVertex 0 , $top->{height};
		346	glTexCoord 1, 1; glVertex $w , $top->{height};
		347	glTexCoord 1, 0; glVertex $w , 0;
		348	glEnd;
		349
		350	my $left = $self->{txts}->[3];
		351	glBindTexture GL_TEXTURE_2D, $left->{name};
		352
		353	glColor 1, 1, 1, 0.8;
		354
		355	glBegin GL_QUADS;
		356	glTexCoord 0, 0; glVertex 0 , $top->{height};
		357	glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
		358	glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
		359	glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
		360	glEnd;
		361
		362	my $right = $self->{txts}->[2];
		363	glBindTexture GL_TEXTURE_2D, $right->{name};
		364
		365	glColor 1, 1, 1, 0.8;
		366
		367	glBegin GL_QUADS;
		368	glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
		369	glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
		370	glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
		371	glTexCoord 1, 0; glVertex $w , $top->{height};
		372	glEnd;
		373
		374	my $bottom = $self->{txts}->[4];
		375	glBindTexture GL_TEXTURE_2D, $bottom->{name};
		376
		377	glColor 1, 1, 1, 0.8;
		378
		379	glBegin GL_QUADS;
		380	glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
		381	glTexCoord 0, 1; glVertex 0 , $h;
		382	glTexCoord 1, 1; glVertex $w , $h;
		383	glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
		384	glEnd;
		385
		386	my $bg = $self->{txts}->[0];
		387	glBindTexture GL_TEXTURE_2D, $bg->{name};
		388	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
		389	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
		390
		391	glColor 1, 1, 1, 0.8;
		392
		393	my $rep_x = $cw / $bg->{width};
		394	my $rep_y = $ch / $bg->{height};
		395
		396	glBegin GL_QUADS;
		397	glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
		398	glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
		399	glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
		400	glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
		401	glEnd;
		402
		403	$self->get->draw;
		404
		405	glDisable GL_BLEND;
		406	glDisable GL_TEXTURE_2D;
		407	}
217		408
218	package Crossfire::Client::Widget::Table;	409	package Crossfire::Client::Widget::Table;
219		410
220	our @ISA = Crossfire::Client::Widget::Container::;	411	our @ISA = Crossfire::Client::Widget::Bin::;
221		412
222	use SDL::OpenGL;	413	use SDL::OpenGL;
223		414
224	sub add {	415	sub add {
225	my ($self, $x, $y, $chld) = @_;	416	my ($self, $x, $y, $chld) = @_;
		417	my $old_chld = $self->{childs}[$y][$x];
		418
226	$self->{childs}[$y][$x] = $chld;	419	$self->{childs}[$y][$x] = $chld;
		420	$chld->set_parent ($self);
		421	$self->update;
227	}	422	}
228		423
229	sub max_row_height {	424	sub max_row_height {
230	my ($self, $row) = @_;	425	my ($self, $row) = @_;
231		426
…		…
296	}	491	}
297	}	492	}
298		493
299	package Crossfire::Client::Widget::VBox;	494	package Crossfire::Client::Widget::VBox;
300		495
301	our @ISA = Crossfire::Client::Widget::Container::;	496	our @ISA = Crossfire::Client::Widget::Bin::;
302		497
303	use SDL::OpenGL;	498	use SDL::OpenGL;
304		499
305	sub add {	500	sub add {
306	my ($self, $chld) = @_;	501	my ($self, $chld) = @_;
307	push @{$self->{childs}}, $chld;	502	push @{$self->{childs}}, $chld;
		503	$chld->set_parent ($self);
		504	$self->update;
308	}	505	}
309		506
310	sub size_request {	507	sub size_request {
311	my ($self) = @_;	508	my ($self) = @_;
312		509
…		…
339	use SDL::OpenGL;	536	use SDL::OpenGL;
340		537
341	sub new {	538	sub new {
342	my ($class, $x, $y, $z, $height, $text) = @_;	539	my ($class, $x, $y, $z, $height, $text) = @_;
343		540
		541	# TODO: color, and make height, xyz etc. optional
344	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);	542	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
345		543
346	$self->set_text ($text);	544	$self->set_text ($text);
347		545
348	$self	546	$self
…		…
350		548
351	sub set_text {	549	sub set_text {
352	my ($self, $text) = @_;	550	my ($self, $text) = @_;
353		551
354	$self->{text} = $text;	552	$self->{text} = $text;
355
356	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};	553	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
		554
		555	$self->update;
357	}	556	}
358		557
359	sub get_text {	558	sub get_text {
360	my ($self, $text) = @_;	559	my ($self, $text) = @_;
361		560
…		…
380	glEnable GL_TEXTURE_2D;	579	glEnable GL_TEXTURE_2D;
381	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	580	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
382	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	581	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
383	glBindTexture GL_TEXTURE_2D, $tex->{name};	582	glBindTexture GL_TEXTURE_2D, $tex->{name};
384		583
385	glColor 1, 1, 1, 0.8;	584	glColor 1, 1, 1, 0.6; # TODO color
386		585
387	glBegin GL_QUADS;	586	glBegin GL_QUADS;
388	glTexCoord 0, 0; glVertex 0 , 0;	587	glTexCoord 0, 0; glVertex 0 , 0;
389	glTexCoord 0, 1; glVertex 0 , $tex->{height};	588	glTexCoord 0, 1; glVertex 0 , $tex->{height};
390	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	589	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
…		…
555	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	754	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
556	}	755	}
557		756
558	glEnable GL_TEXTURE_2D;	757	glEnable GL_TEXTURE_2D;
559	glEnable GL_BLEND;	758	glEnable GL_BLEND;
560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	759	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		760
		761	my $sw4 = ($sw + 3) & ~3;
		762	my $lighting = "\x00" x ($sw4 * $sh);
561		763
562	for my $x (0 .. $sw - 1) {	764	for my $x (0 .. $sw - 1) {
563	for my $y (0 .. $sh - 1) {	765	for my $y (0 .. $sh - 1) {
564		766
565	my $cell = $map->[$x + $xofs][$y + $yofs]	767	my $cell = $map->[$x + $xofs][$y + $yofs]
566	or next;	768	or next;
567		769
568	my $darkness = $cell->[0] * (1 / 255);	770	my $darkness = $cell->[0] * (1 / 255);
569	if ($darkness < 0) {	771	if ($darkness < 0) {
570	glColor 0.3, 0.3, 0.3;	772	$darkness = 0.15;
571	} else {
572	glColor $darkness, $darkness, $darkness;
573	}	773	}
		774	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
574		775
575	for my $num (grep $_, @$cell[1,2,3]) {	776	for my $num (grep $_, @$cell[1,2,3]) {
576	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	777	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
577		778
578	glBindTexture GL_TEXTURE_2D, $tex->{name};	779	glBindTexture GL_TEXTURE_2D, $tex->{name};
…		…
590	glTexCoord 1, 0; glVertex $px + $w, $py;	791	glTexCoord 1, 0; glVertex $px + $w, $py;
591	glEnd;	792	glEnd;
592	}	793	}
593	}	794	}
594	}	795	}
		796
		797	# if (1) { # higher quality darkness
		798	# $lighting =~ s/(.)/$1$1$1/gs;
		799	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
		800	#
		801	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
		802	#
		803	# $lighting = $pb->get_pixels;
		804	# $lighting =~ s/(.)../$1/gs;
		805	# }
		806
		807	$lighting = new Crossfire::Client::Texture
		808	width => $sw4,
		809	height => $sh,
		810	data => $lighting,
		811	internalformat => GL_ALPHA4,
		812	format => GL_ALPHA;
		813
		814	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		815	glColor 0, 0, 0, 0.75;
		816	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		817	glBindTexture GL_TEXTURE_2D, $lighting->{name};
		818	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		819	glBegin GL_QUADS;
		820	glTexCoord 0, 0; glVertex 0 , 0;
		821	glTexCoord 0, 1; glVertex 0 , $sh * 32;
		822	glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
		823	glTexCoord 1, 0; glVertex $sw4 * 32, 0;
		824	glEnd;
595		825
596	glDisable GL_TEXTURE_2D;	826	glDisable GL_TEXTURE_2D;
597	glDisable GL_BLEND;	827	glDisable GL_BLEND;
598	}	828	}
599		829
…		…
646	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	876	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
647	$::CONN->send ("command run_stop");	877	$::CONN->send ("command run_stop");
648	}	878	}
649	}	879	}
650		880
		881	package Crossfire::Client::Widget::Animator;
		882
		883	use SDL::OpenGL;
		884
		885	our @ISA = Crossfire::Client::Widget::Bin::;
		886
		887	sub moveto {
		888	my ($self, $x, $y) = @_;
		889
		890	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
		891	$self->{speed} = 0.01;
		892	$self->{time} = 1;
		893
		894	::animation_start $self;
		895	}
		896
		897	sub animate {
		898	my ($self, $interval) = @_;
		899
		900	$self->{time} -= $interval * $self->{speed};
		901	if ($self->{time} <= 0) {
		902	$self->{time} = 0;
		903	::animation_stop $self;
		904	}
		905
		906	my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
		907
		908	$self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
		909	$self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
		910	}
		911
		912	sub _draw {
		913	my ($self) = @_;
		914
		915	glPushMatrix;
		916	glRotate $self->{time} * 10000, 0, 1, 0;
		917	$self->{child}->draw;
		918	glPopMatrix;
		919	}
		920
651	1;	921	1;
652		922

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.31 by elmex, Sun Apr 9 00:43:11 2006 UTC vs. Revision 1.35 by root, Sun Apr 9 17:34:15 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.31 by elmex, Sun Apr 9 00:43:11 2006 UTC vs.
Revision 1.35 by root, Sun Apr 9 17:34:15 2006 UTC