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

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents):
Revision 1.24 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.25 by root, Mon Aug 6 05:06:33 2007 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents): Revision 1.24 by root, Sun Jul 29 03:58:26 2007 UTC vs. Revision 1.25 by root, Mon Aug 6 05:06:33 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents):
Revision 1.24 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.25 by root, Mon Aug 6 05:06:33 2007 UTC