More renaming

diff --git a/ChangeLog b/ChangeLog
index 85aa548..b7860e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 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>
+
        * cltr-photo-grid.c: (cltr_photo_grid_populate),
        (cltr_photo_grid_redraw), (cltr_photo_grid_new):
        * cltr-photo-grid.h:

diff --git a/Makefile b/Makefile
index a380bf4..3f98c0a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,12 @@ CFLAGS=`pkg-config --cflags pangoft2 pango glib-2.0 gthread-2.0`
 .c.o:
        $(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)
        $(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:
        rm -fr *.o clutter test

diff --git a/cltr-photo-grid.c b/cltr-photo-grid.c
index c8ed5a2..4699b65 100644 (file)
--- a/cltr-photo-grid.c
+++ b/cltr-photo-grid.c
@@ -412,7 +412,6 @@ cltr_photo_grid_redraw(ClutterPhotoGrid *grid)
        {
          ClutterPhotoGridCell *cell = (ClutterPhotoGridCell *)cell_item->data;
          Pixbuf *pixb = NULL;
-         float   tx, ty;
          int     x1, x2, y1, y2, thumb_w, thumb_h;
          int     ns_border, ew_border;
 
@@ -450,9 +449,6 @@ cltr_photo_grid_redraw(ClutterPhotoGrid *grid)
          x2 = x1 + thumb_w;
          y2 = y1 + thumb_h;
 
-         tx = (float) pixb->width  / grid->tex_w;
-         ty = (float) pixb->height / grid->tex_h;
-
          glPushMatrix();
 
          /* 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 */
 
-  grid->tex_w    = 1024;   
-  grid->tex_h    = 512;
-
-  grid->tex_data = malloc (grid->tex_w * grid->tex_h * 4);
-
   Mutex_GRID = g_mutex_new();
 
   /* Load  */

diff --git a/cltr-tex.c b/cltr-texture.c
similarity index 98%
rename from cltr-tex.c
rename to cltr-texture.c
index 41a28ba..549b93f 100644 (file)
--- a/cltr-tex.c
+++ b/cltr-texture.c
@@ -241,7 +241,7 @@ cltr_texture_new(Pixbuf *pixb)
 
   CLTR_MARK();
 
-  img = g_malloc0(sizeof(CltrImage));
+  texture = g_malloc0(sizeof(CltrTexture));
 
   texture->width  = pixb->width;
   texture->height = pixb->height;
@@ -249,7 +249,7 @@ cltr_texture_new(Pixbuf *pixb)
 
   pixbuf_ref(pixb);
 
-  init_tiles (img);
+  init_tiles (texture);
 
   for (x=0; x < texture->n_x_tiles; x++)
     for (y=0; y < texture->n_y_tiles; y++)
@@ -307,5 +307,5 @@ cltr_texture_new(Pixbuf *pixb)
 
       }
 
-  return img;
+  return texture;
 }

diff --git a/cltr-tex.h b/cltr-texture.h
similarity index 100%
rename from cltr-tex.h
rename to cltr-texture.h