isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

More renaming

Browse Source
This commit is contained in:
Matthew Allum 2005-03-30 16:55:06 +00:00
parent c5a9ee7914
commit 251eacc592
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2005-03-30 mallum,,, <mallum@openedhand.com>
* Makefile:
* cltr-photo-grid.c: (cltr_photo_grid_redraw),
(cltr_photo_grid_new):
* cltr-tex.c:
* cltr-tex.h:
* cltr-texture.c: (cltr_texture_new):
More renaming
2005-03-30 mallum,,, <mallum@openedhand.com> 2005-03-30 mallum,,, <mallum@openedhand.com>
* cltr-photo-grid.c: (cltr_photo_grid_populate), * cltr-photo-grid.c: (cltr_photo_grid_populate),

4
Makefile
View File

@ -4,12 +4,12 @@ CFLAGS=`pkg-config --cflags pangoft2 pango glib-2.0 gthread-2.0`
.c.o: .c.o:
$(CC) -g -Wall $(CFLAGS) $(INCS) -c $*.c $(CC) -g -Wall $(CFLAGS) $(INCS) -c $*.c
OBJS=cltr.o pixbuf.o util.o fonts.o cltr-photo-grid.o cltr-tex.o OBJS=cltr.o pixbuf.o util.o fonts.o cltr-photo-grid.o cltr-texture.o
clutter: $(OBJS) clutter: $(OBJS)
$(CC) -g -Wall -o $@ $(OBJS) $(LIBS) $(CC) -g -Wall -o $@ $(OBJS) $(LIBS)
$(OBJS): pixbuf.h util.h fonts.h cltr.h cltr-photo-grid.h cltr-tex.h $(OBJS): pixbuf.h util.h fonts.h cltr.h cltr-photo-grid.h cltr-texture.h
clean: clean:
rm -fr *.o clutter test rm -fr *.o clutter test

9
cltr-photo-grid.c
View File

@ -412,7 +412,6 @@ cltr_photo_grid_redraw(ClutterPhotoGrid *grid)
{ {
ClutterPhotoGridCell *cell = (ClutterPhotoGridCell *)cell_item->data; ClutterPhotoGridCell *cell = (ClutterPhotoGridCell *)cell_item->data;
Pixbuf *pixb = NULL; Pixbuf *pixb = NULL;
float tx, ty;
int x1, x2, y1, y2, thumb_w, thumb_h; int x1, x2, y1, y2, thumb_w, thumb_h;
int ns_border, ew_border; int ns_border, ew_border;
@ -450,9 +449,6 @@ cltr_photo_grid_redraw(ClutterPhotoGrid *grid)
x2 = x1 + thumb_w; x2 = x1 + thumb_w;
y2 = y1 + thumb_h; y2 = y1 + thumb_h;
tx = (float) pixb->width / grid->tex_w;
ty = (float) pixb->height / grid->tex_h;
glPushMatrix(); glPushMatrix();
/* Translate origin to rotation point ( photo center ) */ /* Translate origin to rotation point ( photo center ) */
@ -565,11 +561,6 @@ cltr_photo_grid_new(ClutterWindow *win,
/* Below needs to go else where - some kind of texture manager/helper */ /* Below needs to go else where - some kind of texture manager/helper */
grid->tex_w = 1024;
grid->tex_h = 512;
grid->tex_data = malloc (grid->tex_w * grid->tex_h * 4);
Mutex_GRID = g_mutex_new(); Mutex_GRID = g_mutex_new();
/* Load */ /* Load */

6
cltr-tex.c → cltr-texture.c
View File

@ -241,7 +241,7 @@ cltr_texture_new(Pixbuf *pixb)
CLTR_MARK(); CLTR_MARK();
img = g_malloc0(sizeof(CltrImage)); texture = g_malloc0(sizeof(CltrTexture));
texture->width = pixb->width; texture->width = pixb->width;
texture->height = pixb->height; texture->height = pixb->height;
@ -249,7 +249,7 @@ cltr_texture_new(Pixbuf *pixb)
pixbuf_ref(pixb); pixbuf_ref(pixb);
init_tiles (img); init_tiles (texture);
for (x=0; x < texture->n_x_tiles; x++) for (x=0; x < texture->n_x_tiles; x++)
for (y=0; y < texture->n_y_tiles; y++) for (y=0; y < texture->n_y_tiles; y++)
@ -307,5 +307,5 @@ cltr_texture_new(Pixbuf *pixb)
} }
return img; return texture;
} }

0
cltr-tex.h → cltr-texture.h
View File