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.3 by root, Fri Apr 7 18:20:13 2006 UTC vs.
Revision 1.8 by root, Sat Apr 8 13:36:25 2006 UTC

… …
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "Crossfire::Client", $VERSION; 21 XSLoader::load "Crossfire::Client", $VERSION;
22} 22}
23 23
24sub find_rcfile($) {
25 my $path;
26
27 for (@INC) {
28 $path = "$_/Crossfire/resources/$_[0]";
29 return $path if -r $path;
30 }
31
32 die "FATAL: can't find required file $_[0]\n";
33}
34
35sub read_cfg {
36 my ($file) = @_;
37
38 open CFG, $file
39 or return;
40
41 my $CFG;
42
43 local $/;
44 $CFG = eval <CFG>;
45
46 $::CFG = $CFG;
47
48 close CFG;
49}
50
51sub write_cfg {
52 my ($file) = @_;
53
54 open CFG, ">$file"
55 or return;
56
57 {
58 local $Data::Dumper::Purity = 1;
59 $::CFG->{VERSION} = $::VERSION;
60 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
61 }
62
63 close CFG;
64}
65
24package Crossfire::Client::Texture; 66package Crossfire::Client::Texture;
25 67
26use Scalar::Util; 68use Scalar::Util;
27 69
28use SDL::OpenGL; 70use SDL::OpenGL;
29 71
30my @textures; 72my @textures;
73
74sub _new {
75 my ($class, %data) = @_;
76
77 my $self = bless \%data, $class;
78
79 push @textures, $self;
80 Scalar::Util::weaken $textures[-1];
81
82 $self->upload;
83
84 $self
85}
86
87sub new_from_image {
88 my ($class, $image) = @_;
89
90 $class->_new (image => $image)
91}
31 92
32sub new_from_file { 93sub new_from_file {
33 my ($class, $path) = @_; 94 my ($class, $path) = @_;
34 95
35 open my $fh, "<:raw", $path 96 open my $fh, "<:raw", $path
36 or die "$path: $!"; 97 or die "$path: $!";
37 98
38 local $/; 99 local $/;
39 $class->new_from_data (<$fh>) 100 $class->new_from_image (<$fh>)
40} 101}
41 102
42sub new_from_image { 103sub new_from_surface {
43 my ($class, $image) = @_; 104 my ($class, $surface) = @_;
44 105
45 my $self = bless { 106 $surface->rgba;
46 image => $data,
47 };
48 107
49 push @textures, $self; 108 $class->_new (
50 Scalar::Util::weaken $textures[-1]; 109 data => $surface->pixels,
110 width => $surface->width,
111 height => $surface->height,
112 )
113}
51 114
52 $self->upload; 115sub new_from_ttf {
116 my ($class, $ttf, $text) = @_;
53 117
54 $self 118 utf8::encode $text;
119
120 my $surface = SDL::TTFRenderUTF8Blended $ttf, $text,
121 (new SDL::Color -r => 255, -g => 255, -b => 255);
122
123 $class->new_from_surface (bless \$surface, SDL::Surface::)
124}
125
126sub new_from_opengl {
127 my ($class, $w, $h, $cb) = @_;
128
129 $class->_new (width => $w, height => $h, render => $cb)
55} 130}
56 131
57sub upload { 132sub upload {
58 my ($self) = @_; 133 my ($self) = @_;
59 134
60 return unless $SDL::App::USING_OPENGL; 135 return unless $SDL::App::USING_OPENGL;
61 136
62 my ($data, $width, $height); 137 my $data;
63 138
64 if (exists $self->{data}) { 139 if (exists $self->{data}) {
65 ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height}); 140 $data = $self->{data};
141 } elsif (exists $self->{rendercb}) {
142 glViewport 0, 0, $self->{width}, $self->{height};
143 glClear GL_COLOR_BUFFER_BIT;
144
145 $self->{rendercb}->($self, $self->{width}, $self->{height});
66 } else { 146 } else {
67 my $pb = new Gtk2::Gdk::PixbufLoader; 147 my $pb = new Gtk2::Gdk::PixbufLoader;
68 $pb->write ($self->{data}); 148 $pb->write ($self->{image});
69 $pb->close; 149 $pb->close;
70 150
71 $pb = $pb->get_pixbuf; 151 $pb = $pb->get_pixbuf;
72 $pb = $pb->add_alpha (0, 0, 0, 0); 152 $pb = $pb->add_alpha (0, 0, 0, 0);
73 153
74 ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height); 154 $self->{width} = $pb->get_width;
155 $self->{height} = $pb->get_height;
156
157 $data = $pb->get_pixels;
75 } 158 }
76 159
77 ($self->{name}) = @{glGenTextures 1}; 160 ($self->{name}) = @{glGenTextures 1};
78 161
79 glBindTexture GL_TEXTURE_2D, $self->{name}; 162 glBindTexture GL_TEXTURE_2D, $self->{name};
… …
81 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 164 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
82 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 165 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
83 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 166 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
84 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 167 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
85 168
169 if (defined $data) {
86 glTexImage2D GL_TEXTURE_2D, 0, 170 glTexImage2D GL_TEXTURE_2D, 0,
87 GL_RGBA8, 171 GL_RGBA8,
88 $width, $height, 172 $self->{width}, $self->{height},
89 0, 173 0,
90 GL_RGBA, 174 GL_RGBA,
91 GL_UNSIGNED_BYTE, 175 GL_UNSIGNED_BYTE,
92 $data; 176 $data;
177 } else {
178 glCopyTexImage2D GL_TEXTURE_2D, 0,
179 GL_RGBA8,
180 0, 0,
181 $self->{width}, $self->{height},
182 0;
183 }
93} 184}
94 185
95sub DESTROY { 186sub DESTROY {
96 my ($self) = @_; 187 my ($self) = @_;
97 188

Diff Legend

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