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

Diff Legend

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