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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.37 by root, Sun Apr 16 07:25:29 2006 UTC vs.
Revision 1.52 by root, Wed May 17 15:18:57 2006 UTC

…		…
19		19
20	use XSLoader;	20	use XSLoader;
21	XSLoader::load "CFClient", $VERSION;	21	XSLoader::load "CFClient", $VERSION;
22	}	22	}
23		23
		24	use Carp ();
24	use AnyEvent;	25	use AnyEvent ();
25	use BerkeleyDB;	26	use BerkeleyDB;
26	use SDL::OpenGL;	27
		28	use CFClient::OpenGL;
27		29
28	our %GL_EXT;	30	our %GL_EXT;
29	our $GL_VERSION;	31	our $GL_VERSION;
30		32
31	our $GL_NPOT;	33	our $GL_NPOT;
		34	our $GL_DEBUG = 1;
32		35
33	sub gl_init {	36	sub gl_init {
34	$GL_VERSION = gl_version * 1;	37	$GL_VERSION = gl_version * 1;
35	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;	38	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
36		39
37	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;	40	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;
38		41
39	glEnable GL_TEXTURE_2D;
40	glEnable GL_COLOR_MATERIAL;	42	glDisable GL_COLOR_MATERIAL;
41	glShadeModel GL_FLAT;	43	glShadeModel GL_FLAT;
		44	glDisable GL_DITHER;
42	glDisable GL_DEPTH_TEST;	45	glDisable GL_DEPTH_TEST;
43	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
44
45	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;	46	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46		47
47	CFClient::Texture::restore_state ();	48	CFClient::Texture::restore_state ();
		49	}
		50
		51	sub 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	}
48	}	57	}
49		58
50	sub find_rcfile($) {	59	sub find_rcfile($) {
51	my $path;	60	my $path;
52		61
53	for (@INC) {	62	for (grep !ref, @INC) {
54	$path = "$_/CFClient/resources/$_[0]";	63	$path = "$_/CFClient/resources/$_[0]";
55	return $path if -r $path;	64	return $path if -r $path;
56	}	65	}
57		66
58	die "FATAL: can't find required file $_[0]\n";	67	die "FATAL: can't find required file $_[0]\n";
…		…
93	mkdir "$Crossfire::VARDIR/pclient", 0777;	102	mkdir "$Crossfire::VARDIR/pclient", 0777;
94		103
95	our $DB_ENV = new BerkeleyDB::Env	104	our $DB_ENV = new BerkeleyDB::Env
96	-Home => "$Crossfire::VARDIR/pclient",	105	-Home => "$Crossfire::VARDIR/pclient",
97	-Cachesize => 1_000_000,	106	-Cachesize => 1_000_000,
98	-ErrFile => "/proc/self/fd/2",	107	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
99	-ErrPrefix => "DATABASE",	108	# -ErrPrefix => "DATABASE",
100	-Verbose => 1,	109	-Verbose => 1,
101	-Flags => DB_CREATE \| DB_JOINENV \| DB_RECOVER_FATAL \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	110	-Flags => DB_CREATE \| DB_RECOVER_FATAL \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,
102	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	111	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
103		112
104	sub db_table($) {	113	sub db_table($) {
		114	my ($table) = @_;
		115
		116	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		117
105	new CFClient::Database	118	new CFClient::Database
106	-Env => $DB_ENV,	119	-Env => $DB_ENV,
		120	-Filename => $table,
107	-Filename => "database",	121	# -Filename => "database",
108	-Subname => $_[0],	122	# -Subname => $table,
		123	-Property => DB_CHKSUM,
109	-Flags => DB_CREATE \| DB_UPGRADE,	124	-Flags => DB_CREATE \| DB_UPGRADE,
110	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	125	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
		126	}
		127
		128	sub pod_to_pango($) {
		129	my ($pom) = @_;
		130
		131	$pom->present ("CFClient::PodToPango")
		132	}
		133
		134	package CFClient::PodToPango;
		135
		136	use base Pod::POM::View::Text;
		137
		138	our $indent = 0;
		139
		140	*view_seq_code =
		141	*view_seq_bold = sub { "<b>$_[1]</b>" };
		142	*view_seq_italic = sub { "<i>$_[1]</i>" };
		143	*view_seq_space =
		144	*view_seq_link =
		145	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
		146
		147	sub view_seq_text {
		148	my $text = $_[1];
		149	$text =~ s/\s+/ /g;
		150	CFClient::UI::Label::escape ($text)
		151	}
		152
		153	sub view_item {
		154	("\t" x ($indent / 4))
		155	. $_[1]->title->present ($_[0])
		156	. "\n"
		157	. $_[1]->content->present ($_[0])
		158	}
		159
		160	sub view_textblock {
		161	("\t" x ($indent / 2)) . "$_[1]\n\n"
		162	}
		163
		164	sub view_head2 {
		165	"<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n"
		166	. $_[1]->content->present ($_[0])
		167	};
		168
		169	sub view_over {
		170	local $indent = $indent + $_[1]->indent;
		171	$_[1]->content->present ($_[0])
111	}	172	}
112		173
113	package CFClient::Database;	174	package CFClient::Database;
114		175
115	our @ISA = BerkeleyDB::Btree::;	176	our @ISA = BerkeleyDB::Btree::;
…		…
136		197
137	use strict;	198	use strict;
138		199
139	use Scalar::Util;	200	use Scalar::Util;
140		201
141	use SDL::OpenGL;	202	use CFClient::OpenGL;
142		203
143	my %TEXTURES;	204	my %TEXTURES;
144		205
145	sub new {	206	sub new {
146	my ($class, %data) = @_;	207	my ($class, %data) = @_;
…		…
164		225
165	$class->new (image => $image, %arg)	226	$class->new (image => $image, %arg)
166	}	227	}
167		228
168	sub new_from_file {	229	sub new_from_file {
169	my ($class, $path) = @_;	230	my ($class, $path, %arg) = @_;
170		231
171	open my $fh, "<:raw", $path	232	open my $fh, "<:raw", $path
172	or die "$path: $!";	233	or die "$path: $!";
173		234
174	local $/;	235	local $/;
175	$class->new_from_image (<$fh>)	236	$class->new_from_image (<$fh>, %arg)
176	}	237	}
177		238
178	#sub new_from_surface {	239	#sub new_from_surface {
179	# my ($class, $surface) = @_;	240	# my ($class, $surface) = @_;
180	#	241	#
…		…
186	# h => $surface->height,	247	# h => $surface->height,
187	# )	248	# )
188	#}	249	#}
189		250
190	sub new_from_layout {	251	sub new_from_layout {
191	my ($class, $layout) = @_;	252	my ($class, $layout, %arg) = @_;
192		253
193	my ($w, $h, $data) = $layout->render;	254	my ($w, $h, $data, $format, $internalformat) = $layout->render;
194		255
195	$class->new (	256	$class->new (
196	w => $w,	257	w => $w,
197	h => $h,	258	h => $h,
198	data => $data,	259	data => $data,
199	internalformat => GL_ALPHA4,
200	format => GL_ALPHA,	260	format => $format,
		261	internalformat => $format,
201	type => GL_UNSIGNED_BYTE,	262	type => GL_UNSIGNED_BYTE,
		263	%arg,
202	)	264	)
203	}	265	}
204		266
205	sub new_from_opengl {	267	sub new_from_opengl {
206	my ($class, $w, $h, $cb) = @_;	268	my ($class, $w, $h, $cb) = @_;
207		269
208	$class->new (w => $w, h => $h, render_cb => $cb)	270	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
209	}	271	}
210		272
211	sub topot {	273	sub topot {
212	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]	274	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
213	}	275	}
…		…
236	= CFClient::load_image_inline $self->{image};	298	= CFClient::load_image_inline $self->{image};
237	}	299	}
238		300
239	my ($tw, $th) = @$self{qw(w h)};	301	my ($tw, $th) = @$self{qw(w h)};
240		302
241	unless ($tw && $th) {	303	unless ($tw > 0 && $th > 0) {
242	$tw = $th = 1;	304	$tw = $th = 1;
243	$data = "\x00" x 64;	305	$data = "\x00" x 64;
244	}	306	}
245		307
246	$self->{minified} = [CFClient::average $tw, $th, $data]	308	$self->{minified} = [CFClient::average $tw, $th, $data]
…		…
249	unless ($GL_NPOT) {	311	unless ($GL_NPOT) {
250	# TODO: does not work for zero-sized textures	312	# TODO: does not work for zero-sized textures
251	$tw = topot $tw;	313	$tw = topot $tw;
252	$th = topot $th;	314	$th = topot $th;
253		315
254	if ($tw != $self->{w} \|\| $th != $self->{h} && defined $data) {	316	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {
255	my $bpp = (length $data) / ($self->{w} * $self->{h});	317	my $bpp = (length $data) / ($self->{w} * $self->{h});
256	$data = pack "(a" . ($tw * $bpp) . ")*",	318	$data = pack "(a" . ($tw * $bpp) . ")*",
257	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;	319	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
258	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});	320	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
259	}	321	}
260	}	322	}
261		323
262	$self->{s} = $self->{w} / $tw;	324	$self->{s} = $self->{w} / $tw;
263	$self->{t} = $self->{h} / $th;	325	$self->{t} = $self->{h} / $th;
264		326
265	$self->{name} \|\|= (glGenTextures 1)->[0];	327	$self->{name} \|\|= glGenTexture;
266		328
267	glBindTexture GL_TEXTURE_2D, $self->{name};	329	glBindTexture GL_TEXTURE_2D, $self->{name};
268		330
269	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
270	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
271	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	331	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
272	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, 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	}
273		347
		348	glGetError;
		349
274	if (defined $data) {	350	if (defined $data) {
275	glTexImage2D GL_TEXTURE_2D, 0,	351	glTexImage2D GL_TEXTURE_2D, 0,
276	$self->{internalformat},	352	$self->{internalformat},
277	$tw, $th, # need to pad texture first	353	$tw, $th, # need to pad texture first
278	0,	354	0,
279	$self->{format},	355	$self->{format},
280	$self->{type},	356	$self->{type},
281	$data;	357	$data;
282	glGetError and die;	358	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
		359	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
283	} else {	360	} else {
284	glCopyTexImage2D GL_TEXTURE_2D, 0,	361	glCopyTexImage2D GL_TEXTURE_2D, 0,
285	$self->{internalformat},	362	$self->{internalformat},
286	0, 0,	363	0, 0,
287	$tw, $th,	364	$tw, $th,
288	0;	365	0;
289	glGetError and die "glCopyTexImage2D $tw,$th";	366	CFClient::gl_check "copying to texture %dx%d if=%x",
		367	$tw, $th, $self->{internalformat};
290	}	368	}
291	}	369	}
292		370
293	sub DESTROY {	371	sub DESTROY {
294	my ($self) = @_;	372	my ($self) = @_;
295		373
296	delete $TEXTURES{$self+0};	374	delete $TEXTURES{$self+0};
297		375
298	glDeleteTextures delete $self->{name}	376	glDeleteTexture delete $self->{name}
299	if $self->{name};	377	if $self->{name};
300	}	378	}
301		379
302	sub restore_state{	380	sub restore_state{
303	$_->upload	381	$_->upload

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.37 by root, Sun Apr 16 07:25:29 2006 UTC vs. Revision 1.52 by root, Wed May 17 15:18:57 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.37 by root, Sun Apr 16 07:25:29 2006 UTC vs.
Revision 1.52 by root, Wed May 17 15:18:57 2006 UTC