Add Irr_gui.cursor#rel_pos.

antegallya · Aug 30, 2011 · 83452ed · 83452ed
1 parent bfe2b14
commit 83452ed
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 0 deletions.
diff --git a/irr_core_wrap.cpp b/irr_core_wrap.cpp
@@ -36,6 +36,21 @@ value copy_pos2d_s32(position2d<s32> pos) {
 	return v;
 }
 
+position2d<f32> Pos2d_f32_val(value v) {
+	return position2d<f32>(Double_val(Field(v, 0)), Double_val(Field(v, 1)));
+}
+
+value copy_pos2d_f32(position2d<f32> pos) {
+	CAMLparam0();
+	CAMLlocal2(v, v_double);
+	v = caml_alloc(2, 0);
+	v_double = caml_copy_double(pos.X);
+	Store_field(v, 0, v_double);
+	v_double = caml_copy_double(pos.Y);
+	Store_field(v, 1, v_double);
+	CAMLreturn(v);
+}
+
 vector3df Vector3df_val(value v) {
 	return vector3df(Double_val(Field(v, 0)), Double_val(Field(v, 1)),
 			Double_val(Field(v, 2)));

diff --git a/irr_core_wrap.h b/irr_core_wrap.h
@@ -12,6 +12,9 @@ value copy_dimension2d_f32(dimension2d<f32>);
 position2d<s32> Pos2d_s32_val(value);
 value copy_pos2d_s32(position2d<s32>);
 
+position2d<f32> Pos2d_f32_val(value);
+value copy_pos2d_f32(position2d<f32>);
+
 vector3df Vector3df_val(value);
 value copy_vector3df(vector3df);
 

diff --git a/irr_gui.ml b/irr_gui.ml
@@ -9,12 +9,16 @@ type obj = Irr_base.obj
 external cursor_get_position : obj -> int Irr_core.pos_2d =
   "ml_ICursorControl_getPosition"
 
+external cursor_get_relative_position : obj -> float Irr_core.pos_2d =
+  "ml_ICursorControl_getRelativePosition"
+
 external cursor_set_visible : obj -> bool -> unit =
   "ml_ICursorControl_setVisible"
 
 class cursor obj = object(self)
   inherit Irr_base.reference_counted obj
   method pos = cursor_get_position self#obj
+  method rel_pos = cursor_get_relative_position self#obj
   method set_visible b = cursor_set_visible self#obj b
 end
 

diff --git a/irr_gui.mli b/irr_gui.mli
@@ -6,6 +6,7 @@ type obj = Irr_base.obj
 class cursor : obj -> object
   inherit Irr_base.reference_counted
   method pos : int Irr_core.pos_2d
+  method rel_pos : float Irr_core.pos_2d
   method set_visible : bool -> unit
 end
 

diff --git a/irr_gui_wrap.cpp b/irr_gui_wrap.cpp
@@ -6,6 +6,12 @@ extern "C" CAMLprim value ml_ICursorControl_getPosition(value v_cursor) {
 	return copy_pos2d_s32(((ICursorControl*) v_cursor)->getPosition());
 }
 
+extern "C" CAMLprim
+value ml_ICursorControl_getRelativePosition(value v_cursor) {
+	return copy_pos2d_f32(((ICursorControl*) v_cursor)->
+		getRelativePosition());
+}
+
 extern "C" CAMLprim value ml_ICursorControl_setVisible(
 		value v_cursor, value v_b)
 {