ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.24 by root, Tue Apr 11 18:06:52 2006 UTC vs.
Revision 1.57 by root, Sun May 21 00:02:00 2006 UTC

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

Diff Legend

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