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

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents):
Revision 1.20 by root, Thu Jul 19 22:38:53 2007 UTC vs.
Revision 1.35 by root, Wed Sep 3 06:07:39 2008 UTC

…		…
1	=head1 NAME	1	=head1 NAME
2		2
3	CFPlus::Texture - tetxure class for CFPlus	3	DC::Texture - tetxure class for Deliantra-Client
4		4
5	=head1 SYNOPSIS	5	=head1 SYNOPSIS
6		6
7	use CFPlus::Texture;	7	use DC::Texture;
8		8
9	=head1 DESCRIPTION	9	=head1 DESCRIPTION
10		10
11	=over 4	11	=over 4
12		12
13	=cut	13	=cut
14		14
15	package CFPlus::Texture;	15	package DC::Texture;
16		16
17	use strict;	17	use strict;
18		18
19	use List::Util qw(max min);	19	use List::Util qw(max min);
20	use CFPlus::OpenGL;	20	use DC::OpenGL;
21		21
22	my %TEXTURES;	22	my %TEXTURES;
23	my ($MAX_W, $MAX_H) = (4096, 4096); # maximum texture size attempted by this module	23	my ($MAX_W, $MAX_H) = (4096, 4096); # maximum texture size attempted by this module
24		24
25	sub new {	25	sub new {
30	format => GL_RGBA,	30	format => GL_RGBA,
31	type => GL_UNSIGNED_BYTE,	31	type => GL_UNSIGNED_BYTE,
32	%data,	32	%data,
33	}, $class;	33	}, $class;
34		34
35	CFPlus::weaken ($TEXTURES{$self+0} = $self);	35	DC::weaken ($TEXTURES{$self+0} = $self);
36		36
37	$self->upload;	37	$self->upload
		38	unless delete $self->{delay};
38		39
39	$self	40	$self
40	}	41	}
41		42
42	sub new_from_image {	43	sub new_from_image {
43	my ($class, $image, %arg) = @_;	44	my ($class, $image, %arg) = @_;
44		45
		46	Carp::confess "tried to create texture from undefined image"
		47	unless defined $image;
		48
45	$class->new (image => $image, internalformat => undef, %arg)	49	$class->new (image => $image, internalformat => undef, %arg)
46	}	50	}
47		51
48	sub new_from_file {	52	sub new_from_resource {
49	my ($class, $path, %arg) = @_;	53	my ($class, $path, %arg) = @_;
50		54
51	open my $fh, "<:raw", $path	55	$class->new (resource_path => $path, internalformat => undef, %arg)
52	or die "$path: $!";
53
54	local $/;
55	$class->new_from_image (<$fh>, %arg)
56	}	56	}
57		57
58	#sub new_from_surface {	58	#sub new_from_surface {
59	# my ($class, $surface) = @_;	59	# my ($class, $surface) = @_;
60	#	60	#
…		…
87	my ($class, $w, $h, $cb) = @_;	87	my ($class, $w, $h, $cb) = @_;
88		88
89	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb, nearest => 1)	89	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb, nearest => 1)
90	}	90	}
91		91
		92	sub loading_done($$) {
		93	my ($self, $data) = @_;
		94
		95	delete $self->{loading};
		96	++$self->{delete_image};
		97	$self->{image} = $data;
		98	$self->upload;
		99	}
		100
92	sub upload {	101	sub upload {
93	my ($self) = @_;	102	my ($self, $cb) = @_;
94		103
		104	push @{ $self->{upload_done} }, $cb
		105	if $cb;
		106
		107	return if $self->{loading};
		108
95	return unless $GL_VERSION;	109	unless ($GL_VERSION) {
96		110	$self->{want_upload} = -1;
97	# $tw,$th texture	111	return;
98	# $rw,$rh rendered/used size
99	# $dw,$dh $data
100
101	my ($data, $dw, $dh);
102
103	if (exists $self->{data}) {
104	$data = $self->{data};
105	($dw, $dh) = @$self{qw(w h)};
106
107	} elsif (exists $self->{render_cb}) {
108	($dw, $dh) = @$self{qw(w h)};
109
110	} else {
111	($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
112	= CFPlus::load_image_inline $self->{image};
113
114	$self->{internalformat} \|\|= $internalformat;
115	($dw, $dh) = @$self{qw(w h)};
116	}	112	}
117		113
		114	unless ($self->{name}) {
		115	# $tw,$th texture
		116	# $rw,$rh rendered/used size
		117	# $dw,$dh $data
		118
		119	my ($data, $dw, $dh);
		120
		121	if (exists $self->{resource_path}) {
		122	open my $fh, "<:raw", DC::find_rcfile $self->{resource_path};
		123	local $/;
		124	$self->{image} = <$fh>;
		125	$self->{delete_image} = 1;
		126	}
		127
		128	if (defined $self->{data}) {
		129	$data = $self->{data};
		130	($dw, $dh) = @$self{qw(w h)};
		131
		132	} elsif ($self->{render_cb}) {
		133	($dw, $dh) = @$self{qw(w h)};
		134
		135	} elsif (defined $self->{image}) {
		136	($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
		137	= DC::load_image_inline $self->{image};
		138
		139	$self->{internalformat} \|\|= $internalformat;
		140	($dw, $dh) = @$self{qw(w h)};
		141
		142	delete $self->{image} if delete $self->{delete_image};
		143
		144	} elsif (defined $self->{tile}) {
		145	++$self->{loading};
		146	return DC::DB::get tilecache => $self->{tile}, sub {
		147	$self->loading_done ($_[0]);
		148	};
		149
		150	} elsif (defined $self->{path}) {
		151	++$self->{loading};
		152	return DC::DB::read_file $self->{path}, sub {
		153	$self->loading_done ($_[0]);
		154	};
		155
		156	} else {
		157	Carp::confess "tried to create texture that is not data, render or image";
		158	}
		159
118	my ($tw, $th) = ($dw, $dh);	160	my ($tw, $th) = ($dw, $dh);
119		161
120	defined $data or $self->{render_cb} or die; # some sanity check	162	defined $data or $self->{render_cb} or die; # some sanity check
121		163
122	$self->{minified} \|\|= [CFPlus::average $dw, $dh, $data]	164	$self->{minified} \|\|= [DC::average $dw, $dh, $data]
123	if $self->{minify};	165	if $self->{minify};
124		166
125	# against rather broken cards we enforce a maximum texture size	167	# against rather broken cards we enforce a maximum texture size
126	$tw = min $MAX_W, minpot $tw;	168	$tw = min $MAX_W, $tw;
127	$th = min $MAX_H, minpot $th;	169	$th = min $MAX_H, $th;
128		170
129	# if only pot-textures are allowed, pot'ify tw/th	171	# if only pot-textures are allowed, pot'ify tw/th
130	unless ($GL_NPOT && 0) {#d#	172	unless ($GL_NPOT) {
131	$tw = minpot $tw;	173	$tw = DC::minpot $tw;
132	$th = minpot $th;	174	$th = DC::minpot $th;
133	}	175	}
134		176
135	# now further decrease texture size until the	177	# now further decrease texture size until the
136	# card does accept it	178	# card does accept it
137	while (!texture_valid_2d $self->{internalformat}, $tw, $th, $self->{format}, $self->{type}) {	179	while (!texture_valid_2d $self->{internalformat}, $tw, $th, $self->{format}, $self->{type}) {
138	# quarter the texture size	180	# quarter the texture size
139	$tw >>= 1;	181	$tw >>= 1;
140	$th >>= 1;	182	$th >>= 1;
141	}	183	}
142		184
143	# decide the amount of space used in the texture	185	# decide the amount of space used in the texture
144	my ($rw, $rh);	186	my ($rw, $rh);
		187	my ($ox, $oy); # area shift to lessen effetc of buggy opengl implementations (nvida, ati)
145	my $render;	188	my $render;
146		189
147	if ($self->{render_cb}) {	190	if ($self->{render_cb}) {
148	# use only part of the texture	191	# use only part of the texture
149	#$rw >>= 1 while $rw > $tw;	192	#$rw >>= 1 while $rw > $tw;
150	#$rh >>= 1 while $rh > $th;	193	#$rh >>= 1 while $rh > $th;
151	$rw = min $dw, $tw;	194	$rw = min $dw, $tw;
152	$rh = min $dh, $th;	195	$rh = min $dh, $th;
153	++$render;
154	} else {
155	if ($self->{wrap} \|\| $tw < $dw \|\| $th < $dh) {
156	# scale to the full texture size
157	($rw, $rh) = ($tw, $th);
158	++$render;	196	++$render;
159	} else {	197	} else {
		198	if ($self->{wrap} \|\| $tw < $dw \|\| $th < $dh) {
		199	# scale to the full texture size
		200	($rw, $rh) = ($tw, $th);
		201	++$render;
		202	} else {
160	# pad	203	# pad
161	pad $data, $dw, $dh, $tw, $th;	204	pad $data, $dw, $dh, $tw, $th;
162	($rw, $rh) = ($dw, $dh);	205	($rw, $rh) = ($dw, $dh);
163	($dw, $dh) = ($tw, $th);	206	($dw, $dh) = ($tw, $th);
164	}	207	}
165	}	208	}
166		209
167	if ($render) {	210	if ($render) {
		211	$ox = int .5 * ($::WIDTH - $rw);
		212	$oy = int .5 * ($::HEIGHT - $rh);
		213
168	glViewport 0, 0, $tw, $th;	214	glViewport $ox, $oy, $tw, $th;
		215	#glScissor 0, 0, $tw, $th;
		216	#glEnable GL_SCISSOR_TEST;
169	glMatrixMode GL_PROJECTION;	217	glMatrixMode GL_PROJECTION;
170	glLoadIdentity;	218	glLoadIdentity;
171	glOrtho 0, $tw, 0, $th, -10000, 10000;	219	glOrtho 0, $tw, 0, $th, -10000, 10000;
172	glMatrixMode GL_MODELVIEW;	220	glMatrixMode GL_MODELVIEW;
173	glLoadIdentity;	221	glLoadIdentity;
174		222
175	if ($self->{render_cb}) {	223	if ($self->{render_cb}) {
176	glScale $rw / $dw, $rh / $dh;	224	glScale $rw / $dw, $rh / $dh;
177	$self->{render_cb}->($self, $rw, $rh);	225	$self->{render_cb}->($self, $rw, $rh);
178	} else {	226	} else {
179	glClearColor 0, 0, 0, 0;	227	glClearColor 0, 0, 0, 0;
180	glClear GL_COLOR_BUFFER_BIT;	228	glClear GL_COLOR_BUFFER_BIT;
181	glPixelZoom $tw / $dw, $th / $dh;	229	glPixelZoom $tw / $dw, $th / $dh;
		230	glRasterPos 0, 0;
182	glDrawPixels $dw, $dh,	231	glDrawPixels $dw, $dh,
		232	$self->{format},
		233	$self->{type},
		234	$data;
		235	glPixelZoom 1, 1;
		236	}
		237	}
		238
		239	if ((my $name = delete $self->{want_upload}) > 0) {
		240	$self->{name} = $name;
		241	}
		242
		243	glBindTexture GL_TEXTURE_2D, $self->{name} \|\|= glGenTexture;
		244
		245	if ($self->{wrap}) {
		246	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
		247	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
		248	} else {
		249	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
		250	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
		251	}
		252
		253	if ($::FAST \|\| $self->{nearest}) {
		254	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
		255	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
		256	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
		257	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
		258	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		259	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
		260	} else {
		261	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
		262	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		263	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
		264	}
		265
		266	glGetError;
		267
		268	if ($render) {
		269	glCopyTexImage2D GL_TEXTURE_2D, 0,
		270	$self->{internalformat},
		271	$ox, $oy,
		272	$tw, $th,
		273	0;
		274	gl_check "copying to texture %dx%d if=%x",
		275	$tw, $th, $self->{internalformat};
		276
		277	#glDisable GL_SCISSOR_TEST;
		278	} else {
		279	my $if = $self->{internalformat};
		280
		281	if ($GL_COMPRESS && $::CFG->{texture_compression}) {
		282	if ($if == GL_RGB) {
		283	$if = GL_COMPRESSED_RGB_ARB;
		284	} elsif ($if == GL_RGBA) {
		285	$if = GL_COMPRESSED_RGBA_ARB;
		286	}
		287	}
		288
		289	glTexImage2D GL_TEXTURE_2D, 0,
		290	$if,
		291	$dw, $dh,
		292	0,
183	$self->{format},	293	$self->{format},
184	$self->{type},	294	$self->{type},
185	$data;	295	$data;
186	glPixelZoom 1, 1;	296	gl_check "uploading texture %dx%d if=%x f=%x t=%x",
		297	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
		298	}
		299
		300	$self->{s} = $rw / $tw;
		301	$self->{t} = $rh / $th;
		302
		303	if ($self->{tile}) {
		304	$::MAP->set_texture ($self->{tile}, @$self{qw(name w h s t)}, @{$self->{minified}})
		305	if $::MAP;
		306	$::MAPWIDGET->update
		307	if $::MAPWIDGET;
187	}	308	}
188	}	309	}
189		310
190	glBindTexture GL_TEXTURE_2D, $self->{name} \|\|= glGenTexture;	311	$_->($self)
191		312	for @{ (delete $self->{upload_done}) \|\| [] };
192	if ($self->{wrap}) {
193	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
194	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
195	} else {
196	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
197	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
198	}
199
200	if ($::FAST \|\| $self->{nearest}) {
201	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
202	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
203	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
204	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
205	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
206	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
207	} else {
208	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
209	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
210	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
211	}
212
213	glGetError;
214
215	if ($render) {
216	glCopyTexImage2D GL_TEXTURE_2D, 0,
217	$self->{internalformat},
218	0, 0,
219	$tw, $th,
220	0;
221	gl_check "copying to texture %dx%d if=%x",
222	$tw, $th, $self->{internalformat};
223	} else {
224	glTexImage2D GL_TEXTURE_2D, 0,
225	$self->{internalformat},
226	$dw, $dh,
227	0,
228	$self->{format},
229	$self->{type},
230	$data;
231	gl_check "uploading texture %dx%d if=%x f=%x t=%x",
232	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
233	}
234
235	$self->{s} = $rw / $tw;
236	$self->{t} = $rh / $th;
237	}	313	}
238		314
239	sub shutdown {	315	sub unload {
240	my ($self) = @_;	316	my ($self) = @_;
241		317
242	glDeleteTexture $self->{name}	318	glDeleteTexture delete $self->{name}
243	if $self->{name};	319	if $self->{name};
244	}	320	}
245		321
246	sub DESTROY {	322	sub DESTROY {
247	my ($self) = @_;	323	my ($self) = @_;
248		324
249	delete $TEXTURES{$self+0};	325	delete $TEXTURES{$self+0};
250		326
251	$self->shutdown;	327	$self->unload;
252	}	328	}
253		329
254	$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Texture"} = sub {	330	$DC::OpenGL::INIT_HOOK{"DC::Texture"} = sub {
255	# first mark all existing texture names as in-use, in case the context lost textures	331	for my $tex (values %TEXTURES) {
		332	if (my $name = $tex->{want_upload}) {
		333	$tex->upload;
		334
		335	if ($tex->{loading} && $name > 0) {
		336	# if loading is delayed we still have to allocate the texture name
256	glBindTexture GL_TEXTURE_2D, $_->{name}	337	glBindTexture GL_TEXTURE_2D, $name;
257	for values %TEXTURES;	338	glTexImage2D GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE;
258	$_->upload	339	}
259	for values %TEXTURES;	340	}
		341	}
260	};	342	};
261		343
262	$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Texture"} = sub {	344	$DC::OpenGL::SHUTDOWN_HOOK{"DC::Texture"} = sub {
263	$_->shutdown
264	for values %TEXTURES;	345	for (values %TEXTURES) {
		346	next unless $_->{name};
		347	$_->{want_upload} = $_->{name};
		348	$_->unload;
		349	}
265	};	350	};
266		351
267	1;	352	1;
268		353
269	=back	354	=back

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents): Revision 1.20 by root, Thu Jul 19 22:38:53 2007 UTC vs. Revision 1.35 by root, Wed Sep 3 06:07:39 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents):
Revision 1.20 by root, Thu Jul 19 22:38:53 2007 UTC vs.
Revision 1.35 by root, Wed Sep 3 06:07:39 2008 UTC