X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/4cac9f15932adee255ed2be1f6d419ffe068c438..d32d8618e0dcf6e83872394f68fd1770d6bd803f:/src/engine/texture.c

diff --git a/src/engine/texture.c b/src/engine/texture.c
index 9cd6571..f0f0aaa 100644
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -1,10 +1,10 @@
 /*
  *  upkg: tool for manipulating Unreal Tournament packages.
- *  Copyright (C) 2009 Nick Bowler
+ *  Copyright © 2009-2011 Nick Bowler
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  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
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
@@ -33,6 +32,10 @@ enum {
 	PROP_0,
 	PROP_USIZE,
 	PROP_VSIZE,
+	PROP_UCLAMP,
+	PROP_VCLAMP,
+	PROP_UBITS,
+	PROP_VBITS,
 };
 
 struct texture_priv {
@@ -51,14 +54,12 @@ void exportable_init(UObjectExportable *e)
 
 G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_OBJECT_TYPE);
 
-static int deserialize(UObject *o, struct upkg_file *f)
+static int deserialize(UObject *uo)
 {
-	struct texture_priv *priv = TEXTURE_GET_PRIV(o);
-	EngineTexture *t = ENGINE_TEXTURE(o);
-
-	U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
+	struct texture_priv *priv = TEXTURE_GET_PRIV(uo);
+	EngineTexture *t = ENGINE_TEXTURE(uo);
 
-	printf("Texture size: %ux%u\n", t->usize, t->vsize);
+	U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(uo);
 
 	return 0;
 }
@@ -80,6 +81,18 @@ set_property(GObject *o, guint id, const GValue *val, GParamSpec *spec)
 	case PROP_VSIZE:
 		t->vsize = g_value_get_uint(val);
 		break;
+	case PROP_UCLAMP:
+		t->uclamp = g_value_get_uint(val);
+		break;
+	case PROP_VCLAMP:
+		t->vclamp = g_value_get_uint(val);
+		break;
+	case PROP_UBITS:
+		t->ubits = g_value_get_uint(val);
+		break;
+	case PROP_VBITS:
+		t->vbits = g_value_get_uint(val);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID(o, id, spec);
 	}
@@ -92,10 +105,22 @@ get_property(GObject *o, guint id, GValue *val, GParamSpec *spec)
 
 	switch (id) {
 	case PROP_USIZE:
-		g_value_set_boolean(val, t->usize);
+		g_value_set_uint(val, t->usize);
 		break;
 	case PROP_VSIZE:
-		g_value_set_boolean(val, t->vsize);
+		g_value_set_uint(val, t->vsize);
+		break;
+	case PROP_UCLAMP:
+		g_value_set_uint(val, t->uclamp);
+		break;
+	case PROP_VCLAMP:
+		g_value_set_uint(val, t->vclamp);
+		break;
+	case PROP_UBITS:
+		g_value_set_uint(val, t->ubits);
+		break;
+	case PROP_VBITS:
+		g_value_set_uint(val, t->vbits);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID(o, id, spec);
@@ -130,6 +155,30 @@ static void engine_texture_class_init(EngineTextureClass *class)
 			"Height of the texture.",
 			0, 2048, 0,
 			G_PARAM_READWRITE));
+	g_object_class_install_property(go, PROP_UCLAMP,
+		g_param_spec_uint("UClamp",
+			"UClamp",
+			"???",
+			0, 2048, 0,
+			G_PARAM_READWRITE));
+	g_object_class_install_property(go, PROP_VCLAMP,
+		g_param_spec_uint("VClamp",
+			"VClamp",
+			"???",
+			0, 2048, 0,
+			G_PARAM_READWRITE));
+	g_object_class_install_property(go, PROP_UBITS,
+		g_param_spec_uint("UBits",
+			"UBits",
+			"???",
+			0, 64, 0,
+			G_PARAM_READWRITE));
+	g_object_class_install_property(go, PROP_VBITS,
+		g_param_spec_uint("VBits",
+			"VBits",
+			"???",
+			0, 64, 0,
+			G_PARAM_READWRITE));
 }
 
 static void engine_texture_class_finalize(EngineTextureClass *class)