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

Diff Legend

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