Implement RGSS2 Tilemap class (TilemapVX)

binding-mri/binding-mri.cpp

@@ -61,6 +61,7 @@ void tilemapBindingInit();
 
 #ifdef RGSS2
 void windowVXBindingInit();
+void tilemapVXBindingInit();
 #endif
 
 void inputBindingInit();
@@ -87,12 +88,13 @@ static void mriBindingInit()
 	spriteBindingInit();
 	viewportBindingInit();
 	planeBindingInit();
-	tilemapBindingInit();
 
 #ifdef RGSS2
 	windowVXBindingInit();
+	tilemapVXBindingInit();
 #else
 	windowBindingInit();
+	tilemapBindingInit();
 #endif
 
 	inputBindingInit();

binding-mri/binding-util.h

@@ -126,9 +126,10 @@ setPrivateData(VALUE self, void *p)
 }
 
 inline VALUE
-wrapObject(void *p, const rb_data_type_struct &type)
+wrapObject(void *p, const rb_data_type_struct &type,
+           VALUE underKlass = rb_cObject)
 {
-	VALUE klass = rb_const_get(rb_cObject, rb_intern(type.wrap_struct_name));
+	VALUE klass = rb_const_get(underKlass, rb_intern(type.wrap_struct_name));
 	VALUE obj = rb_obj_alloc(klass);
 
 	setPrivateData(obj, p);
@@ -138,9 +139,10 @@ wrapObject(void *p, const rb_data_type_struct &type)
 
 inline VALUE
 wrapProperty(VALUE self, void *prop, const char *iv,
-             const rb_data_type_struct &type)
+             const rb_data_type_struct &type,
+             VALUE underKlass = rb_cObject)
 {
-	VALUE propObj = wrapObject(prop, type);
+	VALUE propObj = wrapObject(prop, type, underKlass);
 
 	rb_iv_set(self, iv, propObj);
 

binding-mri/tilemapvx-binding.cpp

@@ -0,0 +1,158 @@
+/*
+** tilemapvx-binding.cpp
+**
+** This file is part of mkxp.
+**
+** Copyright (C) 2014 Jonas Kulla <Nyocurio@gmail.com>
+**
+** mkxp 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.
+**
+** mkxp 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 mkxp.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "tilemapvx.h"
+#include "viewport.h"
+#include "bitmap.h"
+#include "table.h"
+
+#include "disposable-binding.h"
+#include "binding-util.h"
+#include "binding-types.h"
+
+DEF_TYPE(TilemapVX);
+rb_data_type_struct BitmapArrayType;
+
+RB_METHOD(tilemapVXInitialize)
+{
+	TilemapVX *t;
+
+	/* Get parameters */
+	VALUE viewportObj = Qnil;
+	Viewport *viewport = 0;
+
+	rb_get_args(argc, argv, "|o", &viewportObj RB_ARG_END);
+
+	if (!NIL_P(viewportObj))
+		viewport = getPrivateDataCheck<Viewport>(viewportObj, ViewportType);
+
+	/* Construct object */
+	t = new TilemapVX(viewport);
+
+	setPrivateData(self, t);
+
+	rb_iv_set(self, "viewport", viewportObj);
+
+	wrapProperty(self, &t->getBitmapArray(), "bitmap_array", BitmapArrayType,
+	             rb_const_get(rb_cObject, rb_intern("Tilemap")));
+
+	VALUE autotilesObj = rb_iv_get(self, "bitmap_array");
+
+	VALUE ary = rb_ary_new2(7);
+	for (int i = 0; i < 7; ++i)
+		rb_ary_push(ary, Qnil);
+
+	rb_iv_set(autotilesObj, "array", ary);
+
+	return self;
+}
+
+RB_METHOD(tilemapVXGetBitmapArray)
+{
+	RB_UNUSED_PARAM;
+
+	return rb_iv_get(self, "bitmap_array");
+}
+
+RB_METHOD(tilemapVXUpdate)
+{
+	RB_UNUSED_PARAM;
+
+	TilemapVX *t = getPrivateData<TilemapVX>(self);
+
+	t->update();
+
+	return Qnil;
+}
+
+DEF_PROP_OBJ_NIL(TilemapVX, Viewport, Viewport, "viewport")
+
+DEF_PROP_OBJ(TilemapVX, Table, MapData,   "map_data")
+DEF_PROP_OBJ(TilemapVX, Table, FlashData, "flash_data")
+DEF_PROP_OBJ(TilemapVX, Table, Flags,     "flags")
+
+DEF_PROP_B(TilemapVX, Visible)
+
+DEF_PROP_I(TilemapVX, OX)
+DEF_PROP_I(TilemapVX, OY)
+
+RB_METHOD(tilemapVXBitmapsSet)
+{
+	TilemapVX::BitmapArray *a = getPrivateData<TilemapVX::BitmapArray>(self);
+
+	int i;
+	VALUE bitmapObj;
+
+	rb_get_args(argc, argv, "io", &i, &bitmapObj RB_ARG_END);
+
+	Bitmap *bitmap = getPrivateDataCheck<Bitmap>(bitmapObj, BitmapType);
+
+	a->set(i, bitmap);
+
+	VALUE ary = rb_iv_get(self, "array");
+	rb_ary_store(ary, i, bitmapObj);
+
+	return self;
+}
+
+RB_METHOD(tilemapVXBitmapsGet)
+{
+	int i;
+	rb_get_args (argc, argv, "i", &i RB_ARG_END);
+
+	if (i < 0 || i > 6)
+		return Qnil;
+
+	VALUE ary = rb_iv_get(self, "array");
+
+	return rb_ary_entry(ary, i);
+}
+
+void
+tilemapVXBindingInit()
+{
+	initType(TilemapVXType, "Tilemap", freeInstance<TilemapVX>);
+
+	VALUE klass = rb_define_class("Tilemap", rb_cObject);
+	rb_define_alloc_func(klass, classAllocate<&TilemapVXType>);
+
+	disposableBindingInit<TilemapVX>(klass);
+
+	_rb_define_method(klass, "initialize", tilemapVXInitialize);
+	_rb_define_method(klass, "bitmaps", tilemapVXGetBitmapArray);
+	_rb_define_method(klass, "update", tilemapVXUpdate);
+
+	INIT_PROP_BIND( TilemapVX, Viewport,  "viewport"   );
+	INIT_PROP_BIND( TilemapVX, MapData,   "map_data"   );
+	INIT_PROP_BIND( TilemapVX, FlashData, "flash_data" );
+	INIT_PROP_BIND( TilemapVX, Flags,     "flags"      );
+	INIT_PROP_BIND( TilemapVX, Visible,   "visible"    );
+	INIT_PROP_BIND( TilemapVX, OX,        "ox"         );
+	INIT_PROP_BIND( TilemapVX, OY,        "oy"         );
+
+	initType(BitmapArrayType, "BitmapArray", 0);
+
+	klass = rb_define_class_under(klass, "BitmapArray", rb_cObject);
+	rb_define_alloc_func(klass, classAllocate<&BitmapArrayType>);
+
+	_rb_define_method(klass, "[]=", tilemapVXBitmapsSet);
+	_rb_define_method(klass, "[]", tilemapVXBitmapsGet);
+}