Use GObject properties for stuff since it makes much more sense.

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

diff --git a/src/engine/texture.c b/src/engine/texture.c
index 1b64590bfb062b2c82000c9d00479c9b6eb4f445..e9ea07d66ee9f4826b8a7dfc578083d7e0519925 100644 (file)
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -10,6 +10,12 @@
 #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;
 
@@ -34,16 +40,6 @@ static int deserialize(UObject *o, struct upkg_file *f)
 
        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);
 
        return 0;
@@ -54,17 +50,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)