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.7 by root, Fri Apr 7 20:55:32 2006 UTC vs.
Revision 1.25 by root, Tue Apr 11 19:31:17 2006 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire::Client - undocumented utility garbage for our crossfire client 3CFClient - undocumented utility garbage for our crossfire client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use Crossfire::Client; 7 use CFClient;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package Crossfire::Client; 15package CFClient;
16 16
17BEGIN { 17BEGIN {
18 $VERSION = '0.1'; 18 $VERSION = '0.1';
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "Crossfire::Client", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22}
23
24our %GL_EXT;
25our $GL_VERSION;
26
27our $GL_NPOT;
28
29sub gl_init {
30 $GL_VERSION = gl_version * 1;
31 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
32
33 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
34
35 CFClient::Texture::restore_state ();
22} 36}
23 37
24sub find_rcfile($) { 38sub find_rcfile($) {
25 my $path; 39 my $path;
26 40
27 for (@INC) { 41 for (@INC) {
28 $path = "$_/Crossfire/resources/$_[0]"; 42 $path = "$_/CFClient/resources/$_[0]";
29 return $path if -r $path; 43 return $path if -r $path;
30 } 44 }
31 45
32 die "FATAL: can't find required file $_[0]\n"; 46 die "FATAL: can't find required file $_[0]\n";
33} 47}
… …
53 67
54 open CFG, ">$file" 68 open CFG, ">$file"
55 or return; 69 or return;
56 70
57 { 71 {
72 require Data::Dumper;
58 local $Data::Dumper::Purity = 1; 73 local $Data::Dumper::Purity = 1;
59 $::CFG->{VERSION} = $::VERSION; 74 $::CFG->{VERSION} = $::VERSION;
60 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); 75 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
61 } 76 }
62 77
63 close CFG; 78 close CFG;
64} 79}
65 80
66package Crossfire::Client::Texture; 81package CFClient::Texture;
82
83use strict;
67 84
68use Scalar::Util; 85use Scalar::Util;
69 86
70use SDL::OpenGL; 87use SDL::OpenGL;
71 88
72my @textures; 89my @textures;
73 90
74sub _new { 91sub new {
75 my ($class, %data) = @_; 92 my ($class, %data) = @_;
76 93
77 my $self = bless \%data, $class; 94 my $self = bless {
95 internalformat => GL_RGBA,
96 format => GL_RGBA,
97 %data,
98 }, $class;
78 99
79 push @textures, $self; 100 push @textures, $self;
80 Scalar::Util::weaken $textures[-1]; 101 Scalar::Util::weaken $textures[-1];
81 102
82 $self->upload; 103 $self->upload;
… …
85} 106}
86 107
87sub new_from_image { 108sub new_from_image {
88 my ($class, $image) = @_; 109 my ($class, $image) = @_;
89 110
90 $class->_new (image => $image) 111 $class->new (image => $image)
91} 112}
92 113
93sub new_from_file { 114sub new_from_file {
94 my ($class, $path) = @_; 115 my ($class, $path) = @_;
95 116
… …
98 119
99 local $/; 120 local $/;
100 $class->new_from_image (<$fh>) 121 $class->new_from_image (<$fh>)
101} 122}
102 123
103sub new_from_surface { 124#sub new_from_surface {
104 my ($class, $surface) = @_; 125# my ($class, $surface) = @_;
105 126#
106 $surface->rgba; 127# $surface->rgba;
107 128#
108 $class->_new ( 129# $class->new (
109 data => $surface->pixels, 130# data => $surface->pixels,
110 width => $surface->width, 131# w => $surface->width,
111 height => $surface->height, 132# h => $surface->height,
133# )
134#}
135
136sub new_from_layout {
137 my ($class, $layout) = @_;
138
139 my ($w, $h, $data) = $layout->render;
140
141 $class->new (
142 w => $w,
143 h => $h,
144 data => $data,
145 internalformat => GL_ALPHA4,
146 format => GL_ALPHA,
112 ) 147 )
113} 148}
114 149
115sub new_from_ttf { 150sub new_from_opengl {
116 my ($class, $ttf, $text) = @_; 151 my ($class, $w, $h, $cb) = @_;
117 152
118 utf8::encode $text; 153 $class->new (w => $w, h => $h, render_cb => $cb)
154}
119 155
120 my $surface = SDL::TTFRenderUTF8Blended $ttf, $text, 156sub topot {
121 (new SDL::Color -r => 255, -g => 255, -b => 255); 157 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
122
123 $class->new_from_surface (bless \$surface, SDL::Surface::)
124} 158}
125 159
126sub upload { 160sub upload {
127 my ($self) = @_; 161 my ($self) = @_;
128 162
… …
130 164
131 my $data; 165 my $data;
132 166
133 if (exists $self->{data}) { 167 if (exists $self->{data}) {
134 $data = $self->{data}; 168 $data = $self->{data};
169
170 } elsif (exists $self->{render_cb}) {
171 glViewport 0, 0, $self->{w}, $self->{h};
172 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
173 glMatrixMode GL_PROJECTION;
174 glLoadIdentity;
175 glMatrixMode GL_MODELVIEW;
176 glLoadIdentity;
177 glClear GL_COLOR_BUFFER_BIT;
178 $self->{render_cb}->($self, $self->{w}, $self->{h});
179
135 } else { 180 } else {
136 my $pb = new Gtk2::Gdk::PixbufLoader; 181 my $pb = new Gtk2::Gdk::PixbufLoader;
137 $pb->write ($self->{image}); 182 $pb->write ($self->{image});
138 $pb->close; 183 $pb->close;
139 184
140 $pb = $pb->get_pixbuf; 185 $pb = $pb->get_pixbuf;
141 $pb = $pb->add_alpha (0, 0, 0, 0); 186 $pb = $pb->add_alpha (0, 0, 0, 0);
142 187
143 $self->{width} = $pb->get_width; 188 $self->{w} = $pb->get_width;
144 $self->{height} = $pb->get_height; 189 $self->{h} = $pb->get_height;
145 190
146 $data = $pb->get_pixels; 191 $data = $pb->get_pixels;
147 } 192 }
148 193
194 my ($tw, $th) = @$self{qw(w h)};
195
196 unless ($tw && $th) {
197 $tw = $th = 1;
198 $data = "\x00" x 64;
199 }
200
201 unless ($GL_NPOT) {
202 # TODO: does not work for zero-sized textures
203 $tw = topot $tw;
204 $th = topot $th;
205
206 if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
207 my $bpp = (length $data) / ($self->{w} * $self->{h});
208 $data = pack "(a" . ($tw * $bpp) . ")*",
209 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
210 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
211 }
212 }
213
214 $self->{s} = $self->{w} / $tw;
215 $self->{t} = $self->{h} / $th;
216
149 ($self->{name}) = @{glGenTextures 1}; 217 $self->{name} ||= (glGenTextures 1)->[0];
150 218
151 glBindTexture GL_TEXTURE_2D, $self->{name}; 219 glBindTexture GL_TEXTURE_2D, $self->{name};
152 220
153 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 221 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
154 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 222 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
155 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 223 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
156 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 224 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
157 225
226 if (defined $data) {
158 glTexImage2D GL_TEXTURE_2D, 0, 227 glTexImage2D GL_TEXTURE_2D, 0,
159 GL_RGBA8, 228 $self->{internalformat},
160 $self->{width}, $self->{height}, 229 $tw, $th, # need to pad texture first
161 0, 230 0,
162 GL_RGBA, 231 $self->{format},
163 GL_UNSIGNED_BYTE, 232 GL_UNSIGNED_BYTE,
164 $data; 233 $data;
234 glGetError and die;
235 } else {
236 glCopyTexImage2D GL_TEXTURE_2D, 0,
237 $self->{internalformat},
238 0, 0,
239 $tw, $th,
240 0;
241 glGetError and die;
242 }
165} 243}
166 244
167sub DESTROY { 245sub DESTROY {
168 my ($self) = @_; 246 my ($self) = @_;
169 247
170 return unless exists $self->{name}; 248 return unless exists $self->{name};
171 249
172 glDeleteTextures delete $self->{name}; 250 glDeleteTextures delete $self->{name};
173} 251}
174 252
175push @::GLINIT, sub { 253sub restore_state{
176 $_->upload 254 $_->upload
177 for grep $_, @textures; 255 for grep $_, @textures;
178}; 256};
179 257
1801; 2581;

Diff Legend

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