uobject: Namespace changes.

[upkg.git] / src / engine / texture.c

diff --git a/src/engine/texture.c b/src/engine/texture.c
index 1b64590bfb062b2c82000c9d00479c9b6eb4f445..9cd6571bbae872ed89bfe333f9ca7fd4229831de 100644 (file)
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -1,15 +1,40 @@
+/*
+ *  upkg: tool for manipulating Unreal Tournament packages.
+ *  Copyright (C) 2009 Nick Bowler
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <glib-object.h>
 
-#include "exportable.h"
-#include "uobject.h"
+#include <uobject/uobject.h>
+#include <uobject/exportable.h>
 #include "texture.h"
 #include "upkg.h"
 
 #define TEXTURE_GET_PRIV(o) \
        G_TYPE_INSTANCE_GET_PRIVATE(o, ENGINE_TEXTURE_TYPE, struct texture_priv)
 
+enum {
+       PROP_0,
+       PROP_USIZE,
+       PROP_VSIZE,
+};
+
 struct texture_priv {
        unsigned type;
 
@@ -30,21 +55,10 @@ static int deserialize(UObject *o, struct upkg_file *f)
 {
        struct texture_priv *priv = TEXTURE_GET_PRIV(o);
        EngineTexture *t = ENGINE_TEXTURE(o);
-       const GValue *val;
 
        U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
 
-       val = u_object_get_property(o, "USize");
-       if (!(val && G_VALUE_HOLDS(val, G_TYPE_ULONG)))
-               return -1;
-       t->usize = g_value_get_ulong(val);
-
-       val = u_object_get_property(o, "USize");
-       if (!(val && G_VALUE_HOLDS(val, G_TYPE_ULONG)))
-               return -1;
-       t->vsize = g_value_get_ulong(val);
-
-       printf("Texture size: %lux%lu\n", t->usize, t->vsize);
+       printf("Texture size: %ux%u\n", t->usize, t->vsize);
 
        return 0;
 }
@@ -54,17 +68,68 @@ void texture_register(GTypeModule *m)
        engine_texture_register_type(m);
 }
 
-static void engine_texture_init(EngineTexture *m)
+static void
+set_property(GObject *o, guint id, const GValue *val, GParamSpec *spec)
+{
+       EngineTexture *t = ENGINE_TEXTURE(o);
+
+       switch (id) {
+       case PROP_USIZE:
+               t->usize = g_value_get_uint(val);
+               break;
+       case PROP_VSIZE:
+               t->vsize = g_value_get_uint(val);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID(o, id, spec);
+       }
+}
+
+static void
+get_property(GObject *o, guint id, GValue *val, GParamSpec *spec)
+{
+       EngineTexture *t = ENGINE_TEXTURE(o);
+
+       switch (id) {
+       case PROP_USIZE:
+               g_value_set_boolean(val, t->usize);
+               break;
+       case PROP_VSIZE:
+               g_value_set_boolean(val, t->vsize);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID(o, id, spec);
+       }
+}
+
+static void engine_texture_init(EngineTexture *t)
 {
+       t->usize = t->vsize = 0;
 }
 
 static void engine_texture_class_init(EngineTextureClass *class)
 {
        UObjectClass *uo = U_OBJECT_CLASS(class);
+       GObjectClass *go = G_OBJECT_CLASS(class);
 
        g_type_class_add_private(class, sizeof (struct texture_priv));
 
        uo->deserialize = deserialize;
+       go->set_property = set_property;
+       go->get_property = get_property;
+
+       g_object_class_install_property(go, PROP_USIZE,
+               g_param_spec_uint("USize",
+                       "USize",
+                       "Width of the texture.",
+                       0, 2048, 0,
+                       G_PARAM_READWRITE));
+       g_object_class_install_property(go, PROP_VSIZE,
+               g_param_spec_uint("VSize",
+                       "VSize",
+                       "Height of the texture.",
+                       0, 2048, 0,
+                       G_PARAM_READWRITE));
 }
 
 static void engine_texture_class_finalize(EngineTextureClass *class)