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.26 by root, Wed Apr 12 02:00:06 2006 UTC vs.
Revision 1.39 by root, Tue Apr 18 01:36:12 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 AnyEvent;
25use BerkeleyDB;
24use SDL::OpenGL; 26use SDL::OpenGL;
25 27
26our %GL_EXT; 28our %GL_EXT;
27our $GL_VERSION; 29our $GL_VERSION;
28 30
… …
31sub gl_init { 33sub gl_init {
32 $GL_VERSION = gl_version * 1; 34 $GL_VERSION = gl_version * 1;
33 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
34 36
35 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 37 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
36
37 glClearColor 0.45, 0.45, 0.45, 1;
38 38
39 glEnable GL_TEXTURE_2D; 39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL; 40 glEnable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT; 41 glShadeModel GL_FLAT;
42 glDisable GL_DEPTH_TEST; 42 glDisable GL_DEPTH_TEST;
… …
88 } 88 }
89 89
90 close CFG; 90 close CFG;
91} 91}
92 92
93mkdir "$Crossfire::VARDIR/pclient", 0777;
94
95our $DB_ENV = new BerkeleyDB::Env
96 -Home => "$Crossfire::VARDIR/pclient",
97 -Cachesize => 1_000_000,
98 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
99# -ErrPrefix => "DATABASE",
100 -Verbose => 1,
101 -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";
103
104sub db_table($) {
105 my ($table) = @_;
106
107 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108
109 new CFClient::Database
110 -Env => $DB_ENV,
111 -Filename => $table,
112# -Filename => "database",
113# -Subname => $table,
114 -Flags => DB_CREATE | DB_UPGRADE,
115 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
116}
117
118package CFClient::Database;
119
120our @ISA = BerkeleyDB::Btree::;
121
122sub get($$) {
123 my $data;
124
125 $_[0]->db_get ($_[1], $data) == 0
126 ? $data
127 : ()
128}
129
130my %DB_SYNC;
131
132sub put($$$) {
133 my ($db, $key, $data) = @_;
134
135 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
136
137 $db->db_put ($key => $data)
138}
139
93package CFClient::Texture; 140package CFClient::Texture;
94 141
95use strict; 142use strict;
96 143
97use Scalar::Util; 144use Scalar::Util;
98 145
99use SDL::OpenGL; 146use SDL::OpenGL;
100 147
101my @textures; 148my %TEXTURES;
102 149
103sub new { 150sub new {
104 my ($class, %data) = @_; 151 my ($class, %data) = @_;
105 152
106 my $self = bless { 153 my $self = bless {
107 internalformat => GL_RGBA, 154 internalformat => GL_RGBA,
108 format => GL_RGBA, 155 format => GL_RGBA,
156 type => GL_UNSIGNED_BYTE,
109 %data, 157 %data,
110 }, $class; 158 }, $class;
111 159
112 push @textures, $self; 160 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
113 Scalar::Util::weaken $textures[-1];
114 161
115 $self->upload; 162 $self->upload;
116 163
117 $self 164 $self
118} 165}
119 166
120sub new_from_image { 167sub new_from_image {
121 my ($class, $image) = @_; 168 my ($class, $image, %arg) = @_;
122 169
123 $class->new (image => $image) 170 $class->new (image => $image, %arg)
124} 171}
125 172
126sub new_from_file { 173sub new_from_file {
127 my ($class, $path) = @_; 174 my ($class, $path) = @_;
128 175
… …
154 w => $w, 201 w => $w,
155 h => $h, 202 h => $h,
156 data => $data, 203 data => $data,
157 internalformat => GL_ALPHA4, 204 internalformat => GL_ALPHA4,
158 format => GL_ALPHA, 205 format => GL_ALPHA,
206 type => GL_UNSIGNED_BYTE,
159 ) 207 )
160} 208}
161 209
162sub new_from_opengl { 210sub new_from_opengl {
163 my ($class, $w, $h, $cb) = @_; 211 my ($class, $w, $h, $cb) = @_;
… …
170} 218}
171 219
172sub upload { 220sub upload {
173 my ($self) = @_; 221 my ($self) = @_;
174 222
175 return unless $SDL::App::USING_OPENGL; 223 return unless $GL_VERSION;
176 224
177 my $data; 225 my $data;
178 226
179 if (exists $self->{data}) { 227 if (exists $self->{data}) {
180 $data = $self->{data}; 228 $data = $self->{data};
181 229
182 } elsif (exists $self->{render_cb}) { 230 } elsif (exists $self->{render_cb}) {
183 glViewport 0, 0, $self->{w}, $self->{h}; 231 glViewport 0, 0, $self->{w}, $self->{h};
184 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
185 glMatrixMode GL_PROJECTION; 232 glMatrixMode GL_PROJECTION;
186 glLoadIdentity; 233 glLoadIdentity;
234 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
187 glMatrixMode GL_MODELVIEW; 235 glMatrixMode GL_MODELVIEW;
188 glLoadIdentity; 236 glLoadIdentity;
189 glClear GL_COLOR_BUFFER_BIT;
190 $self->{render_cb}->($self, $self->{w}, $self->{h}); 237 $self->{render_cb}->($self, $self->{w}, $self->{h});
191 238
192 } else { 239 } else {
193 my $pb = new Gtk2::Gdk::PixbufLoader; 240 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
194 $pb->write ($self->{image}); 241 = CFClient::load_image_inline $self->{image};
195 $pb->close;
196
197 $pb = $pb->get_pixbuf;
198 $pb = $pb->add_alpha (0, 0, 0, 0);
199
200 $self->{w} = $pb->get_width;
201 $self->{h} = $pb->get_height;
202
203 $data = $pb->get_pixels;
204 } 242 }
205 243
206 my ($tw, $th) = @$self{qw(w h)}; 244 my ($tw, $th) = @$self{qw(w h)};
207 245
208 unless ($tw && $th) { 246 unless ($tw && $th) {
209 $tw = $th = 1; 247 $tw = $th = 1;
210 $data = "\x00" x 64; 248 $data = "\x00" x 64;
211 } 249 }
250
251 $self->{minified} = [CFClient::average $tw, $th, $data]
252 if $self->{minify};
212 253
213 unless ($GL_NPOT) { 254 unless ($GL_NPOT) {
214 # TODO: does not work for zero-sized textures 255 # TODO: does not work for zero-sized textures
215 $tw = topot $tw; 256 $tw = topot $tw;
216 $th = topot $th; 257 $th = topot $th;
… …
239 glTexImage2D GL_TEXTURE_2D, 0, 280 glTexImage2D GL_TEXTURE_2D, 0,
240 $self->{internalformat}, 281 $self->{internalformat},
241 $tw, $th, # need to pad texture first 282 $tw, $th, # need to pad texture first
242 0, 283 0,
243 $self->{format}, 284 $self->{format},
244 GL_UNSIGNED_BYTE, 285 $self->{type},
245 $data; 286 $data;
246 glGetError and die; 287 if (my $error = glGetError) {
288 warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
289 $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
290 }
247 } else { 291 } else {
248 glCopyTexImage2D GL_TEXTURE_2D, 0, 292 glCopyTexImage2D GL_TEXTURE_2D, 0,
249 $self->{internalformat}, 293 $self->{internalformat},
250 0, 0, 294 0, 0,
251 $tw, $th, 295 $tw, $th,
252 0; 296 0;
253 glGetError and die; 297 glGetError and die "glCopyTexImage2D $tw,$th";
254 } 298 }
255} 299}
256 300
257sub DESTROY { 301sub DESTROY {
258 my ($self) = @_; 302 my ($self) = @_;
259 303
260 return unless exists $self->{name}; 304 delete $TEXTURES{$self+0};
261 305
262 glDeleteTextures delete $self->{name}; 306 glDeleteTextures delete $self->{name}
307 if $self->{name};
263} 308}
264 309
265sub restore_state{ 310sub restore_state{
266 $_->upload 311 $_->upload
267 for grep $_, @textures; 312 for values %TEXTURES;
268}; 313};
269 314
2701; 3151;
271 316
272=back 317=back

Diff Legend

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