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.28 by root, Wed Apr 12 20:06:36 2006 UTC vs.
Revision 1.35 by root, Sat Apr 15 22:55:59 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 => "/proc/self/fd/2",
99 -ErrPrefix => "DATABASE",
100 -Verbose => 1,
101 -Flags => DB_CREATE | DB_JOINENV | 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 new CFClient::Database
106 -Env => $DB_ENV,
107 -Filename => "database",
108 -Subname => $_[0],
109 -Flags => DB_CREATE | DB_UPGRADE,
110 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
111}
112
113package CFClient::Database;
114
115our @ISA = BerkeleyDB::Btree::;
116
117sub get($$) {
118 my $data;
119
120 $_[0]->db_get ($_[1], $data) == 0
121 ? $data
122 : ();
123}
124
125my %DB_SYNC;
126
127sub put($$$) {
128 my ($db, $key, $data) = @_;
129
130 $db->db_put ($key => $data);
131
132 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
133
134}
135
93package CFClient::Texture; 136package CFClient::Texture;
94 137
95use strict; 138use strict;
96 139
97use Scalar::Util; 140use Scalar::Util;
98 141
99use SDL::OpenGL; 142use SDL::OpenGL;
100 143
101my @textures; 144my %TEXTURES;
145my @NAMES;
102 146
103sub new { 147sub new {
104 my ($class, %data) = @_; 148 my ($class, %data) = @_;
105 149
106 my $self = bless { 150 my $self = bless {
107 internalformat => GL_RGBA, 151 internalformat => GL_RGBA,
108 format => GL_RGBA, 152 format => GL_RGBA,
153 type => GL_UNSIGNED_BYTE,
109 %data, 154 %data,
110 }, $class; 155 }, $class;
111 156
112 push @textures, $self; 157 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
113 Scalar::Util::weaken $textures[-1];
114 158
115 $self->upload; 159 $self->upload;
116 160
117 $self 161 $self
118} 162}
119 163
120sub new_from_image { 164sub new_from_image {
121 my ($class, $image) = @_; 165 my ($class, $image, %arg) = @_;
122 166
123 $class->new (image => $image) 167 $class->new (image => $image, %arg)
124} 168}
125 169
126sub new_from_file { 170sub new_from_file {
127 my ($class, $path) = @_; 171 my ($class, $path) = @_;
128 172
… …
154 w => $w, 198 w => $w,
155 h => $h, 199 h => $h,
156 data => $data, 200 data => $data,
157 internalformat => GL_ALPHA4, 201 internalformat => GL_ALPHA4,
158 format => GL_ALPHA, 202 format => GL_ALPHA,
203 type => GL_UNSIGNED_BYTE,
159 ) 204 )
160} 205}
161 206
162sub new_from_opengl { 207sub new_from_opengl {
163 my ($class, $w, $h, $cb) = @_; 208 my ($class, $w, $h, $cb) = @_;
… …
179 if (exists $self->{data}) { 224 if (exists $self->{data}) {
180 $data = $self->{data}; 225 $data = $self->{data};
181 226
182 } elsif (exists $self->{render_cb}) { 227 } elsif (exists $self->{render_cb}) {
183 glViewport 0, 0, $self->{w}, $self->{h}; 228 glViewport 0, 0, $self->{w}, $self->{h};
184 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
185 glMatrixMode GL_PROJECTION; 229 glMatrixMode GL_PROJECTION;
186 glLoadIdentity; 230 glLoadIdentity;
231 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
187 glMatrixMode GL_MODELVIEW; 232 glMatrixMode GL_MODELVIEW;
188 glLoadIdentity; 233 glLoadIdentity;
189 glClear GL_COLOR_BUFFER_BIT;
190 $self->{render_cb}->($self, $self->{w}, $self->{h}); 234 $self->{render_cb}->($self, $self->{w}, $self->{h});
191 235
192 } else { 236 } else {
193 use Gtk2;#d# TODO kill 237 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
194 my $pb = new Gtk2::Gdk::PixbufLoader; 238 = CFClient::load_image_inline $self->{image};
195 $pb->write ($self->{image});
196 $pb->close;
197
198 $pb = $pb->get_pixbuf;
199 $pb = $pb->add_alpha (0, 0, 0, 0);
200
201 $self->{w} = $pb->get_width;
202 $self->{h} = $pb->get_height;
203
204 $data = $pb->get_pixels;
205 } 239 }
206 240
207 my ($tw, $th) = @$self{qw(w h)}; 241 my ($tw, $th) = @$self{qw(w h)};
208 242
209 unless ($tw && $th) { 243 unless ($tw && $th) {
210 $tw = $th = 1; 244 $tw = $th = 1;
211 $data = "\x00" x 64; 245 $data = "\x00" x 64;
212 } 246 }
247
248 $self->{minified} = [CFClient::average $tw, $th, $data]
249 if $self->{minify};
213 250
214 unless ($GL_NPOT) { 251 unless ($GL_NPOT) {
215 # TODO: does not work for zero-sized textures 252 # TODO: does not work for zero-sized textures
216 $tw = topot $tw; 253 $tw = topot $tw;
217 $th = topot $th; 254 $th = topot $th;
… …
225 } 262 }
226 263
227 $self->{s} = $self->{w} / $tw; 264 $self->{s} = $self->{w} / $tw;
228 $self->{t} = $self->{h} / $th; 265 $self->{t} = $self->{h} / $th;
229 266
230 $self->{name} ||= (glGenTextures 1)->[0]; 267 $self->{name} ||= (pop @NAMES) || (glGenTextures 1)->[0];
231 268
232 glBindTexture GL_TEXTURE_2D, $self->{name}; 269 glBindTexture GL_TEXTURE_2D, $self->{name};
233 270
234 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR; 271 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
235 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR; 272 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
… …
240 glTexImage2D GL_TEXTURE_2D, 0, 277 glTexImage2D GL_TEXTURE_2D, 0,
241 $self->{internalformat}, 278 $self->{internalformat},
242 $tw, $th, # need to pad texture first 279 $tw, $th, # need to pad texture first
243 0, 280 0,
244 $self->{format}, 281 $self->{format},
245 GL_UNSIGNED_BYTE, 282 $self->{type},
246 $data; 283 $data;
247 glGetError and die; 284 glGetError and die;
248 } else { 285 } else {
249 glCopyTexImage2D GL_TEXTURE_2D, 0, 286 glCopyTexImage2D GL_TEXTURE_2D, 0,
250 $self->{internalformat}, 287 $self->{internalformat},
251 0, 0, 288 0, 0,
252 $tw, $th, 289 $tw, $th,
253 0; 290 0;
254 glGetError and die; 291 glGetError and die "glCopyTexImage2D $tw,$th";
255 } 292 }
256} 293}
257 294
258sub DESTROY { 295sub DESTROY {
259 my ($self) = @_; 296 my ($self) = @_;
260 297
261 return unless exists $self->{name}; 298 delete $TEXTURES{$self+0};
262 299
263 glDeleteTextures delete $self->{name}; 300 if (my $name = delete $self->{name}) {
301 glDeleteTextures $name;
302 push @NAMES, $name;
303 }
304
264} 305}
265 306
266sub restore_state{ 307sub restore_state{
267 $_->upload 308 $_->upload
268 for grep $_, @textures; 309 for grep $_, values %TEXTURES;
269}; 310};
270 311
2711; 3121;
272 313
273=back 314=back

Diff Legend

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