From 4c247418c910417ffe6d6f7b462a4f8b8fefd6eb Mon Sep 17 00:00:00 2001 From: Rod Kay Date: Sun, 31 Dec 2023 21:20:28 +1100 Subject: [PATCH] physics.box2d.thin: Update swig binding. --- .../physics/implement/box2d/generate/builder | 2 +- .../box2d/source/thin/box2d_c-b2d_contact.ads | 50 +- .../source/thin/box2d_c-b2d_ray_collision.ads | 50 +- .../box2d/source/thin/box2d_c-binding.ads | 10 +- .../source/thin/box2d_c-joint_cursor.ads | 50 +- .../source/thin/box2d_c-pointer_pointers.ads | 64 +- .../box2d/source/thin/box2d_c-pointers.ads | 82 +- .../implement/box2d/source/thin/box2d_c.ads | 16 +- .../box2d/source/thin/box2d_c_wrap.cxx | 823 +++++++++--------- 9 files changed, 651 insertions(+), 496 deletions(-) diff --git a/3-mid/physics/implement/box2d/generate/builder b/3-mid/physics/implement/box2d/generate/builder index 866ea8f..93bfe7f 100755 --- a/3-mid/physics/implement/box2d/generate/builder +++ b/3-mid/physics/implement/box2d/generate/builder @@ -16,7 +16,7 @@ echo echo Generating the binding. echo -swig_gnat -gnat -c++ -cpperraswarn box2d_c.i +swig4ada -ada -c++ -cpperraswarn box2d_c.i rm portable_new_line_Token.tmp diff --git a/3-mid/physics/implement/box2d/source/thin/box2d_c-b2d_contact.ads b/3-mid/physics/implement/box2d/source/thin/box2d_c-b2d_contact.ads index d25a03c..5b199cf 100644 --- a/3-mid/physics/implement/box2d/source/thin/box2d_c-b2d_contact.ads +++ b/3-mid/physics/implement/box2d/source/thin/box2d_c-b2d_contact.ads @@ -1,16 +1,19 @@ --- This file is generated by SWIG. Please do *not* modify by hand. +-- This file is generated by SWIG. Please do not modify by hand. -- with c_math_c.Vector_3; -with interfaces.C; +with Interfaces.C; + +use Interfaces.C; +with interfaces.C.Pointers; package box2d_c.b2d_Contact is -- Item - -- + -- -type Item is +type Item is record Object_A : access box2d_c.Object; Object_B : access box2d_c.Object; @@ -19,25 +22,35 @@ type Item is - -- Items - -- - type Items is array (interfaces.C.Size_t range <>) of aliased box2d_c.b2d_Contact.Item; + -- Item_Array + -- + type Item_Array is array (interfaces.C.Size_t range <>) of aliased box2d_c.b2d_Contact.Item; -- Pointer - -- - type Pointer is access all box2d_c.b2d_Contact.Item; + -- + package C_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.b2d_Contact.Item, + element_Array => box2d_c.b2d_Contact.Item_Array, + default_Terminator => (others => <>)); - -- Pointers - -- - type Pointers is array (interfaces.C.Size_t range <>) of aliased box2d_c.b2d_Contact.Pointer; +subtype Pointer is C_Pointers.Pointer; + + -- Pointer_Array + -- + type Pointer_Array is array (interfaces.C.Size_t range <>) of aliased box2d_c.b2d_Contact.Pointer; -- Pointer_Pointer - -- - type Pointer_Pointer is access all box2d_c.b2d_Contact.Pointer; + -- + package C_Pointer_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.b2d_Contact.Pointer, + element_Array => box2d_c.b2d_Contact.Pointer_Array, + default_Terminator => null); + +subtype Pointer_Pointer is C_Pointer_Pointers.Pointer; @@ -46,6 +59,10 @@ type Item is function construct return box2d_c.b2d_Contact.Item; + procedure destruct_0 (Self : in box2d_c.b2d_Contact.Item); + + procedure destruct (Self : in box2d_c.b2d_Contact.Item); + @@ -58,7 +75,10 @@ private - pragma Import (C, construct, "Ada_new_b2d_Contact"); + + pragma Import (CPP, construct, "ada_new_b2d_Contact_b2d_Contact"); + pragma Import (CPP, destruct_0, "_ZN11b2d_ContactD1Ev"); + pragma Import (CPP, destruct, "_ZN11b2d_ContactD1Ev"); diff --git a/3-mid/physics/implement/box2d/source/thin/box2d_c-b2d_ray_collision.ads b/3-mid/physics/implement/box2d/source/thin/box2d_c-b2d_ray_collision.ads index 567e022..4ef4dd9 100644 --- a/3-mid/physics/implement/box2d/source/thin/box2d_c-b2d_ray_collision.ads +++ b/3-mid/physics/implement/box2d/source/thin/box2d_c-b2d_ray_collision.ads @@ -1,17 +1,20 @@ --- This file is generated by SWIG. Please do *not* modify by hand. +-- This file is generated by SWIG. Please do not modify by hand. -- with c_math_c; with c_math_c.Vector_3; -with interfaces.C; +with Interfaces.C; + +use Interfaces.C; +with interfaces.C.Pointers; package box2d_c.b2d_ray_Collision is -- Item - -- + -- -type Item is +type Item is record near_Object : access box2d_c.Object; hit_Fraction : aliased c_math_c.Real; @@ -21,25 +24,35 @@ type Item is - -- Items - -- - type Items is array (interfaces.C.Size_t range <>) of aliased box2d_c.b2d_ray_Collision.Item; + -- Item_Array + -- + type Item_Array is array (interfaces.C.Size_t range <>) of aliased box2d_c.b2d_ray_Collision.Item; -- Pointer - -- - type Pointer is access all box2d_c.b2d_ray_Collision.Item; + -- + package C_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.b2d_ray_Collision.Item, + element_Array => box2d_c.b2d_ray_Collision.Item_Array, + default_Terminator => (others => <>)); - -- Pointers - -- - type Pointers is array (interfaces.C.Size_t range <>) of aliased box2d_c.b2d_ray_Collision.Pointer; +subtype Pointer is C_Pointers.Pointer; + + -- Pointer_Array + -- + type Pointer_Array is array (interfaces.C.Size_t range <>) of aliased box2d_c.b2d_ray_Collision.Pointer; -- Pointer_Pointer - -- - type Pointer_Pointer is access all box2d_c.b2d_ray_Collision.Pointer; + -- + package C_Pointer_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.b2d_ray_Collision.Pointer, + element_Array => box2d_c.b2d_ray_Collision.Pointer_Array, + default_Terminator => null); + +subtype Pointer_Pointer is C_Pointer_Pointers.Pointer; @@ -48,6 +61,10 @@ type Item is function construct return box2d_c.b2d_ray_Collision.Item; + procedure destruct_0 (Self : in box2d_c.b2d_ray_Collision.Item); + + procedure destruct (Self : in box2d_c.b2d_ray_Collision.Item); + @@ -60,7 +77,10 @@ private - pragma Import (C, construct, "Ada_new_b2d_ray_Collision"); + + pragma Import (CPP, construct, "ada_new_b2d_ray_Collision_b2d_ray_Collision"); + pragma Import (CPP, destruct_0, "_ZN17b2d_ray_CollisionD1Ev"); + pragma Import (CPP, destruct, "_ZN17b2d_ray_CollisionD1Ev"); diff --git a/3-mid/physics/implement/box2d/source/thin/box2d_c-binding.ads b/3-mid/physics/implement/box2d/source/thin/box2d_c-binding.ads index 5a0d165..250f228 100644 --- a/3-mid/physics/implement/box2d/source/thin/box2d_c-binding.ads +++ b/3-mid/physics/implement/box2d/source/thin/box2d_c-binding.ads @@ -1,7 +1,8 @@ --- This file is generated by SWIG. Please do *not* modify by hand. +-- This file is generated by SWIG. Please do not modify by hand. -- with box2d_c.Pointers; with box2d_c.b2d_Contact; +with box2d_c.b2d_point_Collision; with box2d_c.b2d_ray_Collision; with box2d_c.joint_Cursor; with c_math_c; @@ -12,6 +13,9 @@ with c_math_c.Vector_2; with c_math_c.Vector_3; with interfaces.c; with swig; +with Interfaces.C; + +use Interfaces.C; @@ -251,6 +255,9 @@ By : in interfaces.c.c_float); From : in c_math_c.Vector_3.Pointer; To : in c_math_c.Vector_3.Pointer) return box2d_c.b2d_ray_Collision.Item; + function b2d_Space_cast_Point (Self : in box2d_c.Pointers.Space_Pointer; +Point : in c_math_c.Vector_3.Pointer) return box2d_c.b2d_point_Collision.Item; + function b2d_space_contact_Count (Self : in box2d_c.Pointers.Space_Pointer) return interfaces.c.int; function b2d_space_Contact (Self : in box2d_c.Pointers.Space_Pointer; @@ -344,6 +351,7 @@ private pragma Import (C, b2d_Space_Gravity_is, "Ada_b2d_Space_Gravity_is"); pragma Import (C, b2d_Space_evolve, "Ada_b2d_Space_evolve"); pragma Import (C, b2d_Space_cast_Ray, "Ada_b2d_Space_cast_Ray"); + pragma Import (C, b2d_Space_cast_Point, "Ada_b2d_Space_cast_Point"); pragma Import (C, b2d_space_contact_Count, "Ada_b2d_space_contact_Count"); pragma Import (C, b2d_space_Contact, "Ada_b2d_space_Contact"); diff --git a/3-mid/physics/implement/box2d/source/thin/box2d_c-joint_cursor.ads b/3-mid/physics/implement/box2d/source/thin/box2d_c-joint_cursor.ads index 291d96d..77def45 100644 --- a/3-mid/physics/implement/box2d/source/thin/box2d_c-joint_cursor.ads +++ b/3-mid/physics/implement/box2d/source/thin/box2d_c-joint_cursor.ads @@ -1,40 +1,53 @@ --- This file is generated by SWIG. Please do *not* modify by hand. +-- This file is generated by SWIG. Please do not modify by hand. -- -with interfaces.C; +with Interfaces.C; + +use Interfaces.C; +with interfaces.C.Pointers; package box2d_c.joint_Cursor is -- Item - -- + -- -type Item is +type Item is record Joint : access box2d_c.b2Joint; end record; - -- Items - -- - type Items is array (interfaces.C.Size_t range <>) of aliased box2d_c.joint_Cursor.Item; + -- Item_Array + -- + type Item_Array is array (interfaces.C.Size_t range <>) of aliased box2d_c.joint_Cursor.Item; -- Pointer - -- - type Pointer is access all box2d_c.joint_Cursor.Item; + -- + package C_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.joint_Cursor.Item, + element_Array => box2d_c.joint_Cursor.Item_Array, + default_Terminator => (others => <>)); - -- Pointers - -- - type Pointers is array (interfaces.C.Size_t range <>) of aliased box2d_c.joint_Cursor.Pointer; +subtype Pointer is C_Pointers.Pointer; + + -- Pointer_Array + -- + type Pointer_Array is array (interfaces.C.Size_t range <>) of aliased box2d_c.joint_Cursor.Pointer; -- Pointer_Pointer - -- - type Pointer_Pointer is access all box2d_c.joint_Cursor.Pointer; + -- + package C_Pointer_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.joint_Cursor.Pointer, + element_Array => box2d_c.joint_Cursor.Pointer_Array, + default_Terminator => null); + +subtype Pointer_Pointer is C_Pointer_Pointers.Pointer; @@ -43,6 +56,10 @@ type Item is function construct return box2d_c.joint_Cursor.Item; + procedure destruct_0 (Self : in box2d_c.joint_Cursor.Item); + + procedure destruct (Self : in box2d_c.joint_Cursor.Item); + @@ -55,7 +72,10 @@ private - pragma Import (C, construct, "Ada_new_joint_Cursor"); + + pragma Import (CPP, construct, "ada_new_joint_Cursor_joint_Cursor"); + pragma Import (CPP, destruct_0, "_ZN12joint_CursorD1Ev"); + pragma Import (CPP, destruct, "_ZN12joint_CursorD1Ev"); diff --git a/3-mid/physics/implement/box2d/source/thin/box2d_c-pointer_pointers.ads b/3-mid/physics/implement/box2d/source/thin/box2d_c-pointer_pointers.ads index 035d26a..1b680ae 100644 --- a/3-mid/physics/implement/box2d/source/thin/box2d_c-pointer_pointers.ads +++ b/3-mid/physics/implement/box2d/source/thin/box2d_c-pointer_pointers.ads @@ -1,39 +1,77 @@ --- This file is generated by SWIG. Please do *not* modify by hand. +-- This file is generated by SWIG. Please do not modify by hand. -- with box2d_c.Pointers; +with Interfaces.C; + +use Interfaces.C; +with interfaces.C.Pointers; -package box2d_c.pointer_Pointers -is +package box2d_c.pointer_Pointers is + + -- Shape_Pointer_Pointer - -- - type Shape_Pointer_Pointer is access all box2d_c.Pointers.Shape_Pointer; + -- + package C_Shape_Pointer_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.Pointers.Shape_Pointer, + element_Array => box2d_c.Pointers.Shape_Pointer_Array, + default_Terminator => null); + +subtype Shape_Pointer_Pointer is C_Shape_Pointer_Pointers.Pointer; -- Object_Pointer_Pointer - -- - type Object_Pointer_Pointer is access all box2d_c.Pointers.Object_Pointer; + -- + package C_Object_Pointer_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.Pointers.Object_Pointer, + element_Array => box2d_c.Pointers.Object_Pointer_Array, + default_Terminator => null); + +subtype Object_Pointer_Pointer is C_Object_Pointer_Pointers.Pointer; -- Joint_Pointer_Pointer - -- - type Joint_Pointer_Pointer is access all box2d_c.Pointers.Joint_Pointer; + -- + package C_Joint_Pointer_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.Pointers.Joint_Pointer, + element_Array => box2d_c.Pointers.Joint_Pointer_Array, + default_Terminator => null); + +subtype Joint_Pointer_Pointer is C_Joint_Pointer_Pointers.Pointer; -- Space_Pointer_Pointer - -- - type Space_Pointer_Pointer is access all box2d_c.Pointers.Space_Pointer; + -- + package C_Space_Pointer_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.Pointers.Space_Pointer, + element_Array => box2d_c.Pointers.Space_Pointer_Array, + default_Terminator => null); + +subtype Space_Pointer_Pointer is C_Space_Pointer_Pointers.Pointer; -- b2Joint_Pointer_Pointer - -- - type b2Joint_Pointer_Pointer is access all box2d_c.Pointers.b2Joint_Pointer; + -- + package C_b2Joint_Pointer_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.Pointers.b2Joint_Pointer, + element_Array => box2d_c.Pointers.b2Joint_Pointer_Array, + default_Terminator => null); + +subtype b2Joint_Pointer_Pointer is C_b2Joint_Pointer_Pointers.Pointer; + + + + + + + + end box2d_c.pointer_Pointers; diff --git a/3-mid/physics/implement/box2d/source/thin/box2d_c-pointers.ads b/3-mid/physics/implement/box2d/source/thin/box2d_c-pointers.ads index 5a9f175..a1f1207 100644 --- a/3-mid/physics/implement/box2d/source/thin/box2d_c-pointers.ads +++ b/3-mid/physics/implement/box2d/source/thin/box2d_c-pointers.ads @@ -1,6 +1,9 @@ --- This file is generated by SWIG. Please do *not* modify by hand. +-- This file is generated by SWIG. Please do not modify by hand. -- -with interfaces.C; +with Interfaces.C; + +use Interfaces.C; +with interfaces.C.Pointers; @@ -9,52 +12,77 @@ package box2d_c.Pointers is -- Shape_Pointer - -- - type Shape_Pointer is access all box2d_c.Shape; + -- + package C_Shape_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.Shape, + element_Array => box2d_c.Shape_Array, + default_Terminator => 0); - -- Shape_Pointers - -- - type Shape_Pointers is array (interfaces.C.Size_t range <>) of aliased box2d_c.Pointers.Shape_Pointer; +subtype Shape_Pointer is C_Shape_Pointers.Pointer; + + -- Shape_Pointer_Array + -- + type Shape_Pointer_Array is array (interfaces.C.Size_t range <>) of aliased box2d_c.Pointers.Shape_Pointer; -- Object_Pointer - -- - type Object_Pointer is access all box2d_c.Object; + -- + package C_Object_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.Object, + element_Array => box2d_c.Object_Array, + default_Terminator => 0); - -- Object_Pointers - -- - type Object_Pointers is array (interfaces.C.Size_t range <>) of aliased box2d_c.Pointers.Object_Pointer; +subtype Object_Pointer is C_Object_Pointers.Pointer; + + -- Object_Pointer_Array + -- + type Object_Pointer_Array is array (interfaces.C.Size_t range <>) of aliased box2d_c.Pointers.Object_Pointer; -- Joint_Pointer - -- - type Joint_Pointer is access all box2d_c.Joint; + -- + package C_Joint_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.Joint, + element_Array => box2d_c.Joint_Array, + default_Terminator => 0); - -- Joint_Pointers - -- - type Joint_Pointers is array (interfaces.C.Size_t range <>) of aliased box2d_c.Pointers.Joint_Pointer; +subtype Joint_Pointer is C_Joint_Pointers.Pointer; + + -- Joint_Pointer_Array + -- + type Joint_Pointer_Array is array (interfaces.C.Size_t range <>) of aliased box2d_c.Pointers.Joint_Pointer; -- Space_Pointer - -- - type Space_Pointer is access all box2d_c.Space; + -- + package C_Space_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.Space, + element_Array => box2d_c.Space_Array, + default_Terminator => 0); - -- Space_Pointers - -- - type Space_Pointers is array (interfaces.C.Size_t range <>) of aliased box2d_c.Pointers.Space_Pointer; +subtype Space_Pointer is C_Space_Pointers.Pointer; + + -- Space_Pointer_Array + -- + type Space_Pointer_Array is array (interfaces.C.Size_t range <>) of aliased box2d_c.Pointers.Space_Pointer; -- b2Joint_Pointer - -- - type b2Joint_Pointer is access all box2d_c.b2Joint; + -- + package C_b2Joint_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, + Element => box2d_c.b2Joint, + element_Array => box2d_c.b2Joint_Array, + default_Terminator => 0); - -- b2Joint_Pointers - -- - type b2Joint_Pointers is array (interfaces.C.Size_t range <>) of aliased box2d_c.Pointers.b2Joint_Pointer; +subtype b2Joint_Pointer is C_b2Joint_Pointers.Pointer; + + -- b2Joint_Pointer_Array + -- + type b2Joint_Pointer_Array is array (interfaces.C.Size_t range <>) of aliased box2d_c.Pointers.b2Joint_Pointer; diff --git a/3-mid/physics/implement/box2d/source/thin/box2d_c.ads b/3-mid/physics/implement/box2d/source/thin/box2d_c.ads index 50863ed..4e64c9f 100644 --- a/3-mid/physics/implement/box2d/source/thin/box2d_c.ads +++ b/3-mid/physics/implement/box2d/source/thin/box2d_c.ads @@ -1,38 +1,40 @@ --- This file is generated by SWIG. Please do *not* modify by hand. +-- This file is generated by SWIG. Please do not modify by hand. -- with swig; -with interfaces.C; +with Interfaces.C; + +use Interfaces.C; package box2d_c is -- Shape - -- + -- subtype Shape is swig.opaque_structure; type Shape_array is array (interfaces.C.Size_t range <>) of aliased box2d_c.Shape; -- Object - -- + -- subtype Object is swig.opaque_structure; type Object_array is array (interfaces.C.Size_t range <>) of aliased box2d_c.Object; -- Joint - -- + -- subtype Joint is swig.opaque_structure; type Joint_array is array (interfaces.C.Size_t range <>) of aliased box2d_c.Joint; -- Space - -- + -- subtype Space is swig.opaque_structure; type Space_array is array (interfaces.C.Size_t range <>) of aliased box2d_c.Space; -- b2Joint - -- + -- subtype b2Joint is swig.opaque_structure; type b2Joint_array is array (interfaces.C.Size_t range <>) of aliased box2d_c.b2Joint; diff --git a/3-mid/physics/implement/box2d/source/thin/box2d_c_wrap.cxx b/3-mid/physics/implement/box2d/source/thin/box2d_c_wrap.cxx index 0ecb3f6..f33913f 100644 --- a/3-mid/physics/implement/box2d/source/thin/box2d_c_wrap.cxx +++ b/3-mid/physics/implement/box2d/source/thin/box2d_c_wrap.cxx @@ -1,27 +1,29 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 1.3.36 - * - * This file is not intended to be easily readable and contains a number of + * Version 4.0.0 + * + * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make - * changes to this file unless you know what you are doing--modify the SWIG - * interface file instead. + * changes to this file unless you know what you are doing--modify the SWIG + * interface file instead. * ----------------------------------------------------------------------------- */ - #ifdef __cplusplus +/* SwigValueWrapper is described in swig.swg */ template class SwigValueWrapper { - T *tt; + struct SwigMovePointer { + T *ptr; + SwigMovePointer(T *p) : ptr(p) { } + ~SwigMovePointer() { delete ptr; } + SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } + } pointer; + SwigValueWrapper& operator=(const SwigValueWrapper& rhs); + SwigValueWrapper(const SwigValueWrapper& rhs); public: - SwigValueWrapper() : tt(0) { } - SwigValueWrapper(const SwigValueWrapper& rhs) : tt(new T(*rhs.tt)) { } - SwigValueWrapper(const T& t) : tt(new T(t)) { } - ~SwigValueWrapper() { delete tt; } - SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; } - operator T&() const { return *tt; } - T *operator&() { return tt; } -private: - SwigValueWrapper& operator=(const SwigValueWrapper& rhs); + SwigValueWrapper() : pointer(0) { } + SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; } + operator T&() const { return *pointer.ptr; } + T *operator&() { return pointer.ptr; } }; template T SwigValueInit() { @@ -60,14 +62,20 @@ template T SwigValueInit() { #ifndef SWIGUNUSED # if defined(__GNUC__) # if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) -# define SWIGUNUSED __attribute__ ((__unused__)) +# define SWIGUNUSED __attribute__ ((__unused__)) # else # define SWIGUNUSED # endif # elif defined(__ICC) -# define SWIGUNUSED __attribute__ ((__unused__)) +# define SWIGUNUSED __attribute__ ((__unused__)) # else -# define SWIGUNUSED +# define SWIGUNUSED +# endif +#endif + +#ifndef SWIG_MSC_UNSUPPRESS_4505 +# if defined(_MSC_VER) +# pragma warning(disable : 4505) /* unreferenced local function has been removed */ # endif #endif @@ -75,7 +83,7 @@ template T SwigValueInit() { # ifdef __cplusplus # define SWIGUNUSEDPARM(p) # else -# define SWIGUNUSEDPARM(p) p SWIGUNUSED +# define SWIGUNUSEDPARM(p) p SWIGUNUSED # endif #endif @@ -90,9 +98,11 @@ template T SwigValueInit() { #endif /* exporting methods */ -#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) -# ifndef GCC_HASCLASSVISIBILITY -# define GCC_HASCLASSVISIBILITY +#if defined(__GNUC__) +# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif # endif #endif @@ -118,7 +128,7 @@ template T SwigValueInit() { # define SWIGSTDCALL __stdcall # else # define SWIGSTDCALL -# endif +# endif #endif /* Deal with Microsoft's attempt at deprecating C standard runtime functions */ @@ -131,6 +141,19 @@ template T SwigValueInit() { # define _SCL_SECURE_NO_DEPRECATE #endif +/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */ +#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES) +# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 +#endif + +/* Intel's compiler complains if a variable which was never initialised is + * cast to void, which is a common idiom which we use to indicate that we + * are aware a variable isn't used. So we just silence that warning. + * See: https://github.com/swig/swig/issues/192 for more discussion. + */ +#ifdef __INTEL_COMPILER +# pragma warning disable 592 +#endif #include @@ -153,8 +176,6 @@ template T SwigValueInit() { -#define protected public -#define private public extern "C" { @@ -167,13 +188,11 @@ extern "C" -#undef protected -#undef private #ifdef __cplusplus extern "C" { #endif DllExport void * SWIGSTDCALL Ada_b2d_new_Circle ( - float jarg1 + float a_arg1 ) { void * jresult ; @@ -181,7 +200,7 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Circle ( Shape *result = 0 ; - arg1 = (Real) jarg1; + arg1 = (Real) a_arg1; result = (Shape *)b2d_new_Circle(arg1); @@ -196,10 +215,10 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Circle ( DllExport void * SWIGSTDCALL Ada_b2d_new_Polygon ( - void * jarg1 + void * a_arg1 , - int jarg2 + int a_arg2 ) { void * jresult ; @@ -207,10 +226,10 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Polygon ( int arg2 ; Shape *result = 0 ; - arg1 = (Vector_2 *) jarg1; + arg1 = (Vector_2 *) a_arg1; - arg2 = (int) jarg2; + arg2 = (int) a_arg2; result = (Shape *)b2d_new_Polygon(arg1,arg2); @@ -225,14 +244,14 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Polygon ( DllExport void * SWIGSTDCALL Ada_b2d_new_Box ( - void * jarg1 + void * a_arg1 ) { void * jresult ; Vector_3 *arg1 = (Vector_3 *) 0 ; Shape *result = 0 ; - arg1 = (Vector_3 *)jarg1; + arg1 = (Vector_3 *)a_arg1; result = (Shape *)b2d_new_Box(arg1); jresult = (void *) result; @@ -246,10 +265,10 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Box ( DllExport void * SWIGSTDCALL Ada_b2d_new_Capsule ( - void * jarg1 + void * a_arg1 , - float jarg2 + float a_arg2 ) { void * jresult ; @@ -257,10 +276,10 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Capsule ( Real arg2 ; Shape *result = 0 ; - arg1 = (Vector_2 *)jarg1; + arg1 = (Vector_2 *)a_arg1; - arg2 = (Real) jarg2; + arg2 = (Real) a_arg2; result = (Shape *)b2d_new_Capsule(arg1,arg2); @@ -275,10 +294,10 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Capsule ( DllExport void * SWIGSTDCALL Ada_b2d_new_Cone ( - float jarg1 + float a_arg1 , - float jarg2 + float a_arg2 ) { void * jresult ; @@ -287,11 +306,11 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Cone ( Shape *result = 0 ; - arg1 = (Real) jarg1; + arg1 = (Real) a_arg1; - arg2 = (Real) jarg2; + arg2 = (Real) a_arg2; result = (Shape *)b2d_new_Cone(arg1,arg2); @@ -306,10 +325,10 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Cone ( DllExport void * SWIGSTDCALL Ada_b2d_new_convex_Hull ( - void * jarg1 + void * a_arg1 , - int jarg2 + int a_arg2 ) { void * jresult ; @@ -317,10 +336,10 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_convex_Hull ( int arg2 ; Shape *result = 0 ; - arg1 = (Vector_3 *) jarg1; + arg1 = (Vector_3 *) a_arg1; - arg2 = (int) jarg2; + arg2 = (int) a_arg2; result = (Shape *)b2d_new_convex_Hull(arg1,arg2); @@ -335,14 +354,14 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_convex_Hull ( DllExport void * SWIGSTDCALL Ada_b2d_new_Cylinder ( - void * jarg1 + void * a_arg1 ) { void * jresult ; Vector_3 *arg1 = (Vector_3 *) 0 ; Shape *result = 0 ; - arg1 = (Vector_3 *)jarg1; + arg1 = (Vector_3 *)a_arg1; result = (Shape *)b2d_new_Cylinder(arg1); jresult = (void *) result; @@ -356,22 +375,22 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Cylinder ( DllExport void * SWIGSTDCALL Ada_b2d_new_Heightfield ( - int jarg1 + int a_arg1 , - int jarg2 + int a_arg2 , - float* jarg3 + float* a_arg3 , - float jarg4 + float a_arg4 , - float jarg5 + float a_arg5 , - void * jarg6 + void * a_arg6 ) { void * jresult ; @@ -384,26 +403,26 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Heightfield ( Shape *result = 0 ; - arg1 = (int) jarg1; + arg1 = (int) a_arg1; - arg2 = (int) jarg2; + arg2 = (int) a_arg2; - arg3 = (Real *) jarg3; + arg3 = (Real *) a_arg3; - arg4 = (Real) jarg4; + arg4 = (Real) a_arg4; - arg5 = (Real) jarg5; + arg5 = (Real) a_arg5; - arg6 = (Vector_3 *)jarg6; + arg6 = (Vector_3 *)a_arg6; result = (Shape *)b2d_new_Heightfield(arg1,arg2,arg3,arg4,arg5,arg6); jresult = (void *) result; @@ -417,13 +436,13 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Heightfield ( DllExport void * SWIGSTDCALL Ada_b2d_new_multiSphere ( - void * jarg1 + void * a_arg1 , - float* jarg2 + float* a_arg2 , - int jarg3 + int a_arg3 ) { void * jresult ; @@ -432,14 +451,14 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_multiSphere ( int arg3 ; Shape *result = 0 ; - arg1 = (Vector_3 *) jarg1; + arg1 = (Vector_3 *) a_arg1; - arg2 = (Real *) jarg2; + arg2 = (Real *) a_arg2; - arg3 = (int) jarg3; + arg3 = (int) a_arg3; result = (Shape *)b2d_new_multiSphere(arg1,arg2,arg3); @@ -454,10 +473,10 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_multiSphere ( DllExport void * SWIGSTDCALL Ada_b2d_new_Plane ( - void * jarg1 + void * a_arg1 , - float jarg2 + float a_arg2 ) { void * jresult ; @@ -465,10 +484,10 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Plane ( Real arg2 ; Shape *result = 0 ; - arg1 = (Vector_3 *)jarg1; + arg1 = (Vector_3 *)a_arg1; - arg2 = (Real) jarg2; + arg2 = (Real) a_arg2; result = (Shape *)b2d_new_Plane(arg1,arg2); @@ -483,7 +502,7 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Plane ( DllExport void * SWIGSTDCALL Ada_b2d_new_Sphere ( - float jarg1 + float a_arg1 ) { void * jresult ; @@ -491,7 +510,7 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Sphere ( Shape *result = 0 ; - arg1 = (Real) jarg1; + arg1 = (Real) a_arg1; result = (Shape *)b2d_new_Sphere(arg1); @@ -506,12 +525,12 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Sphere ( DllExport void SWIGSTDCALL Ada_b2d_free_Shape ( - void * jarg1 + void * a_arg1 ) { Shape *arg1 = (Shape *) 0 ; - arg1 = (Shape *)jarg1; + arg1 = (Shape *)a_arg1; b2d_free_Shape(arg1); @@ -521,14 +540,14 @@ DllExport void SWIGSTDCALL Ada_b2d_free_Shape ( DllExport void* SWIGSTDCALL Ada_b2d_Shape_user_Data ( - void * jarg1 + void * a_arg1 ) { void* jresult ; Shape *arg1 = (Shape *) 0 ; void *result = 0 ; - arg1 = (Shape *)jarg1; + arg1 = (Shape *)a_arg1; result = (void *)b2d_Shape_user_Data(arg1); jresult = (void *) result; @@ -542,18 +561,18 @@ DllExport void* SWIGSTDCALL Ada_b2d_Shape_user_Data ( DllExport void SWIGSTDCALL Ada_b2d_Shape_user_Data_is ( - void * jarg1 + void * a_arg1 , - void* jarg2 + void* a_arg2 ) { Shape *arg1 = (Shape *) 0 ; void *arg2 = (void *) 0 ; - arg1 = (Shape *)jarg1; + arg1 = (Shape *)a_arg1; - arg2 = (void *)jarg2; + arg2 = (void *)a_arg2; b2d_Shape_user_Data_is(arg1,arg2); @@ -563,20 +582,20 @@ DllExport void SWIGSTDCALL Ada_b2d_Shape_user_Data_is ( DllExport void SWIGSTDCALL Ada_b2d_shape_Scale_is ( - void * jarg1 + void * a_arg1 , - Vector_2 jarg2 + Vector_2 a_arg2 ) { Shape *arg1 = (Shape *) 0 ; Vector_2 arg2 ; Vector_2 *argp2 ; - arg1 = (Shape *)jarg1; + arg1 = (Shape *)a_arg1; - argp2 = (Vector_2 *) &jarg2; + argp2 = (Vector_2 *) &a_arg2; arg2 = *argp2; @@ -589,19 +608,19 @@ DllExport void SWIGSTDCALL Ada_b2d_shape_Scale_is ( DllExport void * SWIGSTDCALL Ada_b2d_new_Object ( - void * jarg1 + void * a_arg1 , - float jarg2 + float a_arg2 , - float jarg3 + float a_arg3 , - float jarg4 + float a_arg4 , - void * jarg5 + void * a_arg5 ) { void * jresult ; @@ -612,21 +631,21 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Object ( Shape *arg5 = (Shape *) 0 ; Object *result = 0 ; - arg1 = (Vector_2 *)jarg1; + arg1 = (Vector_2 *)a_arg1; - arg2 = (Real) jarg2; + arg2 = (Real) a_arg2; - arg3 = (Real) jarg3; + arg3 = (Real) a_arg3; - arg4 = (Real) jarg4; + arg4 = (Real) a_arg4; - arg5 = (Shape *)jarg5; + arg5 = (Shape *)a_arg5; result = (Object *)b2d_new_Object(arg1,arg2,arg3,arg4,arg5); jresult = (void *) result; @@ -640,12 +659,12 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Object ( DllExport void SWIGSTDCALL Ada_b2d_free_Object ( - void * jarg1 + void * a_arg1 ) { Object *arg1 = (Object *) 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; b2d_free_Object(arg1); @@ -655,18 +674,18 @@ DllExport void SWIGSTDCALL Ada_b2d_free_Object ( DllExport void SWIGSTDCALL Ada_b2d_Object_Scale_is ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Object *arg1 = (Object *) 0 ; Vector_2 *arg2 = (Vector_2 *) 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Vector_2 *)jarg2; + arg2 = (Vector_2 *)a_arg2; b2d_Object_Scale_is(arg1,arg2); @@ -676,14 +695,14 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_Scale_is ( DllExport void * SWIGSTDCALL Ada_b2d_Object_Shape ( - void * jarg1 + void * a_arg1 ) { void * jresult ; Object *arg1 = (Object *) 0 ; Shape *result = 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; result = (Shape *)b2d_Object_Shape(arg1); jresult = (void *) result; @@ -697,14 +716,14 @@ DllExport void * SWIGSTDCALL Ada_b2d_Object_Shape ( DllExport void* SWIGSTDCALL Ada_b2d_Object_user_Data ( - void * jarg1 + void * a_arg1 ) { void* jresult ; Object *arg1 = (Object *) 0 ; void *result = 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; result = (void *)b2d_Object_user_Data(arg1); jresult = (void *) result; @@ -718,18 +737,18 @@ DllExport void* SWIGSTDCALL Ada_b2d_Object_user_Data ( DllExport void SWIGSTDCALL Ada_b2d_Object_user_Data_is ( - void * jarg1 + void * a_arg1 , - void* jarg2 + void* a_arg2 ) { Object *arg1 = (Object *) 0 ; void *arg2 = (void *) 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (void *)jarg2; + arg2 = (void *)a_arg2; b2d_Object_user_Data_is(arg1,arg2); @@ -739,14 +758,14 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_user_Data_is ( DllExport float SWIGSTDCALL Ada_b2d_Object_Mass ( - void * jarg1 + void * a_arg1 ) { float jresult ; Object *arg1 = (Object *) 0 ; Real result; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; result = (Real)b2d_Object_Mass(arg1); jresult = result; @@ -760,19 +779,19 @@ DllExport float SWIGSTDCALL Ada_b2d_Object_Mass ( DllExport void SWIGSTDCALL Ada_b2d_Object_Friction_is ( - void * jarg1 + void * a_arg1 , - float jarg2 + float a_arg2 ) { Object *arg1 = (Object *) 0 ; Real arg2 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Real) jarg2; + arg2 = (Real) a_arg2; b2d_Object_Friction_is(arg1,arg2); @@ -783,19 +802,19 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_Friction_is ( DllExport void SWIGSTDCALL Ada_b2d_Object_Restitution_is ( - void * jarg1 + void * a_arg1 , - float jarg2 + float a_arg2 ) { Object *arg1 = (Object *) 0 ; Real arg2 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Real) jarg2; + arg2 = (Real) a_arg2; b2d_Object_Restitution_is(arg1,arg2); @@ -806,14 +825,14 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_Restitution_is ( DllExport Vector_3 SWIGSTDCALL Ada_b2d_Object_Site ( - void * jarg1 + void * a_arg1 ) { Vector_3 jresult ; Object *arg1 = (Object *) 0 ; Vector_3 result; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; result = b2d_Object_Site(arg1); @@ -830,18 +849,18 @@ DllExport Vector_3 SWIGSTDCALL Ada_b2d_Object_Site ( DllExport void SWIGSTDCALL Ada_b2d_Object_Site_is ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Object *arg1 = (Object *) 0 ; Vector_3 *arg2 = (Vector_3 *) 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Vector_3 *)jarg2; + arg2 = (Vector_3 *)a_arg2; b2d_Object_Site_is(arg1,arg2); @@ -851,14 +870,14 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_Site_is ( DllExport Matrix_3x3 SWIGSTDCALL Ada_b2d_Object_Spin ( - void * jarg1 + void * a_arg1 ) { Matrix_3x3 jresult ; Object *arg1 = (Object *) 0 ; Matrix_3x3 result; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; result = b2d_Object_Spin(arg1); @@ -875,18 +894,18 @@ DllExport Matrix_3x3 SWIGSTDCALL Ada_b2d_Object_Spin ( DllExport void SWIGSTDCALL Ada_b2d_Object_Spin_is ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Object *arg1 = (Object *) 0 ; Matrix_3x3 *arg2 = (Matrix_3x3 *) 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Matrix_3x3 *)jarg2; + arg2 = (Matrix_3x3 *)a_arg2; b2d_Object_Spin_is(arg1,arg2); @@ -896,14 +915,14 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_Spin_is ( DllExport float SWIGSTDCALL Ada_b2d_Object_xy_Spin ( - void * jarg1 + void * a_arg1 ) { float jresult ; Object *arg1 = (Object *) 0 ; Real result; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; result = (Real)b2d_Object_xy_Spin(arg1); jresult = result; @@ -917,19 +936,19 @@ DllExport float SWIGSTDCALL Ada_b2d_Object_xy_Spin ( DllExport void SWIGSTDCALL Ada_b2d_Object_xy_Spin_is ( - void * jarg1 + void * a_arg1 , - float jarg2 + float a_arg2 ) { Object *arg1 = (Object *) 0 ; Real arg2 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Real) jarg2; + arg2 = (Real) a_arg2; b2d_Object_xy_Spin_is(arg1,arg2); @@ -940,14 +959,14 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_xy_Spin_is ( DllExport Matrix_4x4 SWIGSTDCALL Ada_b2d_Object_Transform ( - void * jarg1 + void * a_arg1 ) { Matrix_4x4 jresult ; Object *arg1 = (Object *) 0 ; Matrix_4x4 result; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; result = b2d_Object_Transform(arg1); @@ -964,18 +983,18 @@ DllExport Matrix_4x4 SWIGSTDCALL Ada_b2d_Object_Transform ( DllExport void SWIGSTDCALL Ada_b2d_Object_Transform_is ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Object *arg1 = (Object *) 0 ; Matrix_4x4 *arg2 = (Matrix_4x4 *) 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Matrix_4x4 *)jarg2; + arg2 = (Matrix_4x4 *)a_arg2; b2d_Object_Transform_is(arg1,arg2); @@ -985,14 +1004,14 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_Transform_is ( DllExport Vector_3 SWIGSTDCALL Ada_b2d_Object_Speed ( - void * jarg1 + void * a_arg1 ) { Vector_3 jresult ; Object *arg1 = (Object *) 0 ; Vector_3 result; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; result = b2d_Object_Speed(arg1); @@ -1009,18 +1028,18 @@ DllExport Vector_3 SWIGSTDCALL Ada_b2d_Object_Speed ( DllExport void SWIGSTDCALL Ada_b2d_Object_Speed_is ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Object *arg1 = (Object *) 0 ; Vector_3 *arg2 = (Vector_3 *) 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Vector_3 *)jarg2; + arg2 = (Vector_3 *)a_arg2; b2d_Object_Speed_is(arg1,arg2); @@ -1030,14 +1049,14 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_Speed_is ( DllExport Vector_3 SWIGSTDCALL Ada_b2d_Object_Gyre ( - void * jarg1 + void * a_arg1 ) { Vector_3 jresult ; Object *arg1 = (Object *) 0 ; Vector_3 result; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; result = b2d_Object_Gyre(arg1); @@ -1054,18 +1073,18 @@ DllExport Vector_3 SWIGSTDCALL Ada_b2d_Object_Gyre ( DllExport void SWIGSTDCALL Ada_b2d_Object_Gyre_is ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Object *arg1 = (Object *) 0 ; Vector_3 *arg2 = (Vector_3 *) 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Vector_3 *)jarg2; + arg2 = (Vector_3 *)a_arg2; b2d_Object_Gyre_is(arg1,arg2); @@ -1075,18 +1094,18 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_Gyre_is ( DllExport void SWIGSTDCALL Ada_b2d_Object_apply_Force ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Object *arg1 = (Object *) 0 ; Vector_3 *arg2 = (Vector_3 *) 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Vector_3 *)jarg2; + arg2 = (Vector_3 *)a_arg2; b2d_Object_apply_Force(arg1,arg2); @@ -1096,18 +1115,18 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_apply_Force ( DllExport void SWIGSTDCALL Ada_b2d_Object_apply_Torque ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Object *arg1 = (Object *) 0 ; Vector_3 *arg2 = (Vector_3 *) 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Vector_3 *)jarg2; + arg2 = (Vector_3 *)a_arg2; b2d_Object_apply_Torque(arg1,arg2); @@ -1117,18 +1136,18 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_apply_Torque ( DllExport void SWIGSTDCALL Ada_b2d_Object_apply_Torque_impulse ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Object *arg1 = (Object *) 0 ; Vector_3 *arg2 = (Vector_3 *) 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Vector_3 *)jarg2; + arg2 = (Vector_3 *)a_arg2; b2d_Object_apply_Torque_impulse(arg1,arg2); @@ -1138,12 +1157,12 @@ DllExport void SWIGSTDCALL Ada_b2d_Object_apply_Torque_impulse ( DllExport void SWIGSTDCALL Ada_b2d_dump ( - void * jarg1 + void * a_arg1 ) { Object *arg1 = (Object *) 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; b2d_dump(arg1); @@ -1153,28 +1172,28 @@ DllExport void SWIGSTDCALL Ada_b2d_dump ( DllExport void * SWIGSTDCALL Ada_b2d_new_hinge_Joint_with_local_anchors ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 , - void * jarg3 + void * a_arg3 , - void * jarg4 + void * a_arg4 , - void * jarg5 + void * a_arg5 , - float jarg6 + float a_arg6 , - float jarg7 + float a_arg7 , - unsigned int jarg8 + unsigned int a_arg8 ) { void * jresult ; @@ -1188,26 +1207,26 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_hinge_Joint_with_local_anchors ( bool arg8 ; Joint *result = 0 ; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; - arg2 = (Object *)jarg2; + arg2 = (Object *)a_arg2; - arg3 = (Object *)jarg3; + arg3 = (Object *)a_arg3; - arg4 = (Vector_3 *)jarg4; + arg4 = (Vector_3 *)a_arg4; - arg5 = (Vector_3 *)jarg5; + arg5 = (Vector_3 *)a_arg5; - arg6 = (float) jarg6; + arg6 = (float) a_arg6; - arg7 = (float) jarg7; + arg7 = (float) a_arg7; - arg8 = jarg8 ? true : false; + arg8 = a_arg8 ? true : false; result = (Joint *)b2d_new_hinge_Joint_with_local_anchors(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); @@ -1222,28 +1241,28 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_hinge_Joint_with_local_anchors ( DllExport void * SWIGSTDCALL Ada_b2d_new_hinge_Joint ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 , - void * jarg3 + void * a_arg3 , - void * jarg4 + void * a_arg4 , - void * jarg5 + void * a_arg5 , - float jarg6 + float a_arg6 , - float jarg7 + float a_arg7 , - unsigned int jarg8 + unsigned int a_arg8 ) { void * jresult ; @@ -1257,26 +1276,26 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_hinge_Joint ( bool arg8 ; Joint *result = 0 ; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; - arg2 = (Object *)jarg2; + arg2 = (Object *)a_arg2; - arg3 = (Object *)jarg3; + arg3 = (Object *)a_arg3; - arg4 = (Matrix_4x4 *)jarg4; + arg4 = (Matrix_4x4 *)a_arg4; - arg5 = (Matrix_4x4 *)jarg5; + arg5 = (Matrix_4x4 *)a_arg5; - arg6 = (float) jarg6; + arg6 = (float) a_arg6; - arg7 = (float) jarg7; + arg7 = (float) a_arg7; - arg8 = jarg8 ? true : false; + arg8 = a_arg8 ? true : false; result = (Joint *)b2d_new_hinge_Joint(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); @@ -1291,12 +1310,12 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_hinge_Joint ( DllExport void SWIGSTDCALL Ada_b2d_free_hinge_Joint ( - void * jarg1 + void * a_arg1 ) { Joint *arg1 = (Joint *) 0 ; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; b2d_free_hinge_Joint(arg1); @@ -1306,10 +1325,10 @@ DllExport void SWIGSTDCALL Ada_b2d_free_hinge_Joint ( DllExport void * SWIGSTDCALL Ada_b2d_new_space_hinge_Joint ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { void * jresult ; @@ -1317,9 +1336,9 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_space_hinge_Joint ( Matrix_4x4 *arg2 = (Matrix_4x4 *) 0 ; Joint *result = 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Matrix_4x4 *)jarg2; + arg2 = (Matrix_4x4 *)a_arg2; result = (Joint *)b2d_new_space_hinge_Joint(arg1,arg2); jresult = (void *) result; @@ -1333,16 +1352,16 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_space_hinge_Joint ( DllExport void * SWIGSTDCALL Ada_b2d_new_DoF6_Joint ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 , - void * jarg3 + void * a_arg3 , - void * jarg4 + void * a_arg4 ) { void * jresult ; @@ -1352,13 +1371,13 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_DoF6_Joint ( Matrix_4x4 *arg4 = (Matrix_4x4 *) 0 ; Joint *result = 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Object *)jarg2; + arg2 = (Object *)a_arg2; - arg3 = (Matrix_4x4 *)jarg3; + arg3 = (Matrix_4x4 *)a_arg3; - arg4 = (Matrix_4x4 *)jarg4; + arg4 = (Matrix_4x4 *)a_arg4; result = (Joint *)b2d_new_DoF6_Joint(arg1,arg2,arg3,arg4); jresult = (void *) result; @@ -1372,16 +1391,16 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_DoF6_Joint ( DllExport void * SWIGSTDCALL Ada_b2d_new_cone_twist_Joint ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 , - void * jarg3 + void * a_arg3 , - void * jarg4 + void * a_arg4 ) { void * jresult ; @@ -1391,13 +1410,13 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_cone_twist_Joint ( Matrix_4x4 *arg4 = (Matrix_4x4 *) 0 ; Joint *result = 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Object *)jarg2; + arg2 = (Object *)a_arg2; - arg3 = (Matrix_4x4 *)jarg3; + arg3 = (Matrix_4x4 *)a_arg3; - arg4 = (Matrix_4x4 *)jarg4; + arg4 = (Matrix_4x4 *)a_arg4; result = (Joint *)b2d_new_cone_twist_Joint(arg1,arg2,arg3,arg4); jresult = (void *) result; @@ -1411,16 +1430,16 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_cone_twist_Joint ( DllExport void * SWIGSTDCALL Ada_b2d_new_slider_Joint ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 , - void * jarg3 + void * a_arg3 , - void * jarg4 + void * a_arg4 ) { void * jresult ; @@ -1430,13 +1449,13 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_slider_Joint ( Matrix_4x4 *arg4 = (Matrix_4x4 *) 0 ; Joint *result = 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Object *)jarg2; + arg2 = (Object *)a_arg2; - arg3 = (Matrix_4x4 *)jarg3; + arg3 = (Matrix_4x4 *)a_arg3; - arg4 = (Matrix_4x4 *)jarg4; + arg4 = (Matrix_4x4 *)a_arg4; result = (Joint *)b2d_new_slider_Joint(arg1,arg2,arg3,arg4); jresult = (void *) result; @@ -1450,16 +1469,16 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_slider_Joint ( DllExport void * SWIGSTDCALL Ada_b2d_new_ball_Joint ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 , - void * jarg3 + void * a_arg3 , - void * jarg4 + void * a_arg4 ) { void * jresult ; @@ -1469,13 +1488,13 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_ball_Joint ( Vector_3 *arg4 = (Vector_3 *) 0 ; Joint *result = 0 ; - arg1 = (Object *)jarg1; + arg1 = (Object *)a_arg1; - arg2 = (Object *)jarg2; + arg2 = (Object *)a_arg2; - arg3 = (Vector_3 *)jarg3; + arg3 = (Vector_3 *)a_arg3; - arg4 = (Vector_3 *)jarg4; + arg4 = (Vector_3 *)a_arg4; result = (Joint *)b2d_new_ball_Joint(arg1,arg2,arg3,arg4); jresult = (void *) result; @@ -1489,14 +1508,14 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_ball_Joint ( DllExport void* SWIGSTDCALL Ada_b2d_Joint_user_Data ( - void * jarg1 + void * a_arg1 ) { void* jresult ; Joint *arg1 = (Joint *) 0 ; void *result = 0 ; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; result = (void *)b2d_Joint_user_Data(arg1); jresult = (void *) result; @@ -1508,37 +1527,37 @@ DllExport void* SWIGSTDCALL Ada_b2d_Joint_user_Data ( } - -// DllExport void SWIGSTDCALL Ada_b2d_Joint_user_Data_is ( -// void * jarg1 -// , -// -// void* jarg2 -// ) -// { -// Joint *arg1 = (Joint *) 0 ; -// void *arg2 = (void *) 0 ; -// -// arg1 = (Joint *)jarg1; -// -// arg2 = (void *)jarg2; -// -// b2d_Joint_user_Data_is(arg1,arg2); -// -// -// } -// +/* RAK +DllExport void SWIGSTDCALL Ada_b2d_Joint_user_Data_is ( + void * a_arg1 + , + + void* a_arg2 + ) +{ + Joint *arg1 = (Joint *) 0 ; + void *arg2 = (void *) 0 ; + + arg1 = (Joint *)a_arg1; + + arg2 = (void *)a_arg2; + + b2d_Joint_user_Data_is(arg1,arg2); + + +} +*/ DllExport void * SWIGSTDCALL Ada_b2d_Joint_Object_A ( - void * jarg1 + void * a_arg1 ) { void * jresult ; Joint *arg1 = (Joint *) 0 ; Object *result = 0 ; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; result = (Object *)b2d_Joint_Object_A(arg1); jresult = (void *) result; @@ -1552,14 +1571,14 @@ DllExport void * SWIGSTDCALL Ada_b2d_Joint_Object_A ( DllExport void * SWIGSTDCALL Ada_b2d_Joint_Object_B ( - void * jarg1 + void * a_arg1 ) { void * jresult ; Joint *arg1 = (Joint *) 0 ; Object *result = 0 ; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; result = (Object *)b2d_Joint_Object_B(arg1); jresult = (void *) result; @@ -1573,14 +1592,14 @@ DllExport void * SWIGSTDCALL Ada_b2d_Joint_Object_B ( DllExport Matrix_4x4 SWIGSTDCALL Ada_b2d_Joint_Frame_A ( - void * jarg1 + void * a_arg1 ) { Matrix_4x4 jresult ; Joint *arg1 = (Joint *) 0 ; Matrix_4x4 result; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; result = b2d_Joint_Frame_A(arg1); @@ -1597,14 +1616,14 @@ DllExport Matrix_4x4 SWIGSTDCALL Ada_b2d_Joint_Frame_A ( DllExport Matrix_4x4 SWIGSTDCALL Ada_b2d_Joint_Frame_B ( - void * jarg1 + void * a_arg1 ) { Matrix_4x4 jresult ; Joint *arg1 = (Joint *) 0 ; Matrix_4x4 result; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; result = b2d_Joint_Frame_B(arg1); @@ -1621,18 +1640,18 @@ DllExport Matrix_4x4 SWIGSTDCALL Ada_b2d_Joint_Frame_B ( DllExport void SWIGSTDCALL Ada_b2d_Joint_Frame_A_is ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Joint *arg1 = (Joint *) 0 ; Matrix_4x4 *arg2 = (Matrix_4x4 *) 0 ; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; - arg2 = (Matrix_4x4 *)jarg2; + arg2 = (Matrix_4x4 *)a_arg2; b2d_Joint_Frame_A_is(arg1,arg2); @@ -1642,18 +1661,18 @@ DllExport void SWIGSTDCALL Ada_b2d_Joint_Frame_A_is ( DllExport void SWIGSTDCALL Ada_b2d_Joint_Frame_B_is ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Joint *arg1 = (Joint *) 0 ; Matrix_4x4 *arg2 = (Matrix_4x4 *) 0 ; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; - arg2 = (Matrix_4x4 *)jarg2; + arg2 = (Matrix_4x4 *)a_arg2; b2d_Joint_Frame_B_is(arg1,arg2); @@ -1663,26 +1682,26 @@ DllExport void SWIGSTDCALL Ada_b2d_Joint_Frame_B_is ( DllExport void SWIGSTDCALL Ada_b2d_Joint_set_local_Anchor ( - void * jarg1 + void * a_arg1 , - unsigned int jarg2 + unsigned int a_arg2 , - void * jarg3 + void * a_arg3 ) { Joint *arg1 = (Joint *) 0 ; bool arg2 ; Vector_3 *arg3 = (Vector_3 *) 0 ; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; - arg2 = jarg2 ? true : false; + arg2 = a_arg2 ? true : false; - arg3 = (Vector_3 *)jarg3; + arg3 = (Vector_3 *)a_arg3; b2d_Joint_set_local_Anchor(arg1,arg2,arg3); @@ -1692,10 +1711,10 @@ DllExport void SWIGSTDCALL Ada_b2d_Joint_set_local_Anchor ( DllExport unsigned int SWIGSTDCALL Ada_b2d_Joint_is_Limited ( - void * jarg1 + void * a_arg1 , - int jarg2 + int a_arg2 ) { unsigned int jresult ; @@ -1703,10 +1722,10 @@ DllExport unsigned int SWIGSTDCALL Ada_b2d_Joint_is_Limited ( int arg2 ; bool result; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; - arg2 = (int) jarg2; + arg2 = (int) a_arg2; result = (bool)b2d_Joint_is_Limited(arg1,arg2); @@ -1721,10 +1740,10 @@ DllExport unsigned int SWIGSTDCALL Ada_b2d_Joint_is_Limited ( DllExport unsigned int SWIGSTDCALL Ada_b2d_Joint_Extent ( - void * jarg1 + void * a_arg1 , - int jarg2 + int a_arg2 ) { unsigned int jresult ; @@ -1732,10 +1751,10 @@ DllExport unsigned int SWIGSTDCALL Ada_b2d_Joint_Extent ( int arg2 ; bool result; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; - arg2 = (int) jarg2; + arg2 = (int) a_arg2; result = (bool)b2d_Joint_Extent(arg1,arg2); @@ -1750,27 +1769,27 @@ DllExport unsigned int SWIGSTDCALL Ada_b2d_Joint_Extent ( DllExport void SWIGSTDCALL Ada_b2d_Joint_Velocity_is ( - void * jarg1 + void * a_arg1 , - int jarg2 + int a_arg2 , - float jarg3 + float a_arg3 ) { Joint *arg1 = (Joint *) 0 ; int arg2 ; Real arg3 ; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; - arg2 = (int) jarg2; + arg2 = (int) a_arg2; - arg3 = (Real) jarg3; + arg3 = (Real) a_arg3; b2d_Joint_Velocity_is(arg1,arg2,arg3); @@ -1781,14 +1800,14 @@ DllExport void SWIGSTDCALL Ada_b2d_Joint_Velocity_is ( DllExport Vector_3 SWIGSTDCALL Ada_b2d_Joint_reaction_Force ( - void * jarg1 + void * a_arg1 ) { Vector_3 jresult ; Joint *arg1 = (Joint *) 0 ; Vector_3 result; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; result = b2d_Joint_reaction_Force(arg1); @@ -1805,14 +1824,14 @@ DllExport Vector_3 SWIGSTDCALL Ada_b2d_Joint_reaction_Force ( DllExport float SWIGSTDCALL Ada_b2d_Joint_reaction_Torque ( - void * jarg1 + void * a_arg1 ) { float jresult ; Joint *arg1 = (Joint *) 0 ; Real result; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; result = (Real)b2d_Joint_reaction_Torque(arg1); jresult = result; @@ -1826,27 +1845,27 @@ DllExport float SWIGSTDCALL Ada_b2d_Joint_reaction_Torque ( DllExport void SWIGSTDCALL Ada_b2d_Joint_hinge_Limits_are ( - void * jarg1 + void * a_arg1 , - float jarg2 + float a_arg2 , - float jarg3 + float a_arg3 ) { Joint *arg1 = (Joint *) 0 ; Real arg2 ; Real arg3 ; - arg1 = (Joint *)jarg1; + arg1 = (Joint *)a_arg1; - arg2 = (Real) jarg2; + arg2 = (Real) a_arg2; - arg3 = (Real) jarg3; + arg3 = (Real) a_arg3; b2d_Joint_hinge_Limits_are(arg1,arg2,arg3); @@ -1874,12 +1893,12 @@ DllExport void * SWIGSTDCALL Ada_b2d_new_Space ( DllExport void SWIGSTDCALL Ada_b2d_free_Space ( - void * jarg1 + void * a_arg1 ) { Space *arg1 = (Space *) 0 ; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; b2d_free_Space(arg1); @@ -1889,18 +1908,18 @@ DllExport void SWIGSTDCALL Ada_b2d_free_Space ( DllExport void SWIGSTDCALL Ada_b2d_Space_add_Object ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Space *arg1 = (Space *) 0 ; Object *arg2 = (Object *) 0 ; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; - arg2 = (Object *)jarg2; + arg2 = (Object *)a_arg2; b2d_Space_add_Object(arg1,arg2); @@ -1910,18 +1929,18 @@ DllExport void SWIGSTDCALL Ada_b2d_Space_add_Object ( DllExport void SWIGSTDCALL Ada_b2d_Space_rid_Object ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Space *arg1 = (Space *) 0 ; Object *arg2 = (Object *) 0 ; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; - arg2 = (Object *)jarg2; + arg2 = (Object *)a_arg2; b2d_Space_rid_Object(arg1,arg2); @@ -1931,18 +1950,18 @@ DllExport void SWIGSTDCALL Ada_b2d_Space_rid_Object ( DllExport void SWIGSTDCALL Ada_b2d_Space_add_Joint ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Space *arg1 = (Space *) 0 ; Joint *arg2 = (Joint *) 0 ; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; - arg2 = (Joint *)jarg2; + arg2 = (Joint *)a_arg2; b2d_Space_add_Joint(arg1,arg2); @@ -1952,18 +1971,18 @@ DllExport void SWIGSTDCALL Ada_b2d_Space_add_Joint ( DllExport void SWIGSTDCALL Ada_b2d_Space_rid_Joint ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Space *arg1 = (Space *) 0 ; Joint *arg2 = (Joint *) 0 ; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; - arg2 = (Joint *)jarg2; + arg2 = (Joint *)a_arg2; b2d_Space_rid_Joint(arg1,arg2); @@ -1973,14 +1992,14 @@ DllExport void SWIGSTDCALL Ada_b2d_Space_rid_Joint ( DllExport void* SWIGSTDCALL Ada_b2d_b2Joint_user_Data ( - void * jarg1 + void * a_arg1 ) { void* jresult ; b2Joint *arg1 = (b2Joint *) 0 ; void *result = 0 ; - arg1 = (b2Joint *)jarg1; + arg1 = (b2Joint *)a_arg1; result = (void *)b2d_b2Joint_user_Data(arg1); jresult = (void *) result; @@ -1993,30 +2012,13 @@ DllExport void* SWIGSTDCALL Ada_b2d_b2Joint_user_Data ( -DllExport void * SWIGSTDCALL Ada_new_joint_Cursor ( - ) -{ - void * jresult ; - joint_Cursor *result = 0 ; - - result = (joint_Cursor *)new joint_Cursor(); - jresult = (void *) result; - - - - return jresult; - -} - - - DllExport void SWIGSTDCALL Ada_delete_joint_Cursor ( - void * jarg1 + void * a_arg1 ) { joint_Cursor *arg1 = (joint_Cursor *) 0 ; - arg1 = (joint_Cursor *)jarg1; + arg1 = (joint_Cursor *)a_arg1; delete arg1; @@ -2026,14 +2028,14 @@ DllExport void SWIGSTDCALL Ada_delete_joint_Cursor ( DllExport joint_Cursor SWIGSTDCALL Ada_b2d_Space_first_Joint ( - void * jarg1 + void * a_arg1 ) { joint_Cursor jresult ; Space *arg1 = (Space *) 0 ; joint_Cursor result; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; result = b2d_Space_first_Joint(arg1); @@ -2050,12 +2052,12 @@ DllExport joint_Cursor SWIGSTDCALL Ada_b2d_Space_first_Joint ( DllExport void SWIGSTDCALL Ada_b2d_Space_next_Joint ( - void * jarg1 + void * a_arg1 ) { joint_Cursor *arg1 = (joint_Cursor *) 0 ; - arg1 = (joint_Cursor *)jarg1; + arg1 = (joint_Cursor *)a_arg1; b2d_Space_next_Joint(arg1); @@ -2065,14 +2067,14 @@ DllExport void SWIGSTDCALL Ada_b2d_Space_next_Joint ( DllExport void * SWIGSTDCALL Ada_b2d_Space_joint_Element ( - void * jarg1 + void * a_arg1 ) { void * jresult ; joint_Cursor *arg1 = (joint_Cursor *) 0 ; b2Joint *result = 0 ; - arg1 = (joint_Cursor *)jarg1; + arg1 = (joint_Cursor *)a_arg1; result = (b2Joint *)b2d_Space_joint_Element(arg1); jresult = (void *) result; @@ -2086,18 +2088,18 @@ DllExport void * SWIGSTDCALL Ada_b2d_Space_joint_Element ( DllExport void SWIGSTDCALL Ada_b2d_Space_Gravity_is ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 ) { Space *arg1 = (Space *) 0 ; Vector_3 *arg2 = (Vector_3 *) 0 ; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; - arg2 = (Vector_3 *)jarg2; + arg2 = (Vector_3 *)a_arg2; b2d_Space_Gravity_is(arg1,arg2); @@ -2107,19 +2109,19 @@ DllExport void SWIGSTDCALL Ada_b2d_Space_Gravity_is ( DllExport void SWIGSTDCALL Ada_b2d_Space_evolve ( - void * jarg1 + void * a_arg1 , - float jarg2 + float a_arg2 ) { Space *arg1 = (Space *) 0 ; float arg2 ; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; - arg2 = (float) jarg2; + arg2 = (float) a_arg2; b2d_Space_evolve(arg1,arg2); @@ -2129,30 +2131,13 @@ DllExport void SWIGSTDCALL Ada_b2d_Space_evolve ( -DllExport void * SWIGSTDCALL Ada_new_b2d_ray_Collision ( - ) -{ - void * jresult ; - b2d_ray_Collision *result = 0 ; - - result = (b2d_ray_Collision *)new b2d_ray_Collision(); - jresult = (void *) result; - - - - return jresult; - -} - - - DllExport void SWIGSTDCALL Ada_delete_b2d_ray_Collision ( - void * jarg1 + void * a_arg1 ) { b2d_ray_Collision *arg1 = (b2d_ray_Collision *) 0 ; - arg1 = (b2d_ray_Collision *)jarg1; + arg1 = (b2d_ray_Collision *)a_arg1; delete arg1; @@ -2162,13 +2147,13 @@ DllExport void SWIGSTDCALL Ada_delete_b2d_ray_Collision ( DllExport b2d_ray_Collision SWIGSTDCALL Ada_b2d_Space_cast_Ray ( - void * jarg1 + void * a_arg1 , - void * jarg2 + void * a_arg2 , - void * jarg3 + void * a_arg3 ) { b2d_ray_Collision jresult ; @@ -2177,11 +2162,11 @@ DllExport b2d_ray_Collision SWIGSTDCALL Ada_b2d_Space_cast_Ray ( Vector_3 *arg3 = (Vector_3 *) 0 ; b2d_ray_Collision result; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; - arg2 = (Vector_3 *)jarg2; + arg2 = (Vector_3 *)a_arg2; - arg3 = (Vector_3 *)jarg3; + arg3 = (Vector_3 *)a_arg3; result = b2d_Space_cast_Ray(arg1,arg2,arg3); @@ -2197,14 +2182,42 @@ DllExport b2d_ray_Collision SWIGSTDCALL Ada_b2d_Space_cast_Ray ( -DllExport void * SWIGSTDCALL Ada_new_b2d_Contact ( +DllExport void SWIGSTDCALL Ada_delete_b2d_point_Collision ( + void * a_arg1 ) { - void * jresult ; - b2d_Contact *result = 0 ; + b2d_point_Collision *arg1 = (b2d_point_Collision *) 0 ; + + arg1 = (b2d_point_Collision *)a_arg1; + + delete arg1; + + +} + + + +DllExport b2d_point_Collision SWIGSTDCALL Ada_b2d_Space_cast_Point ( + void * a_arg1 + , + + void * a_arg2 + ) +{ + b2d_point_Collision jresult ; + Space *arg1 = (Space *) 0 ; + Vector_3 *arg2 = (Vector_3 *) 0 ; + b2d_point_Collision result; + + arg1 = (Space *)a_arg1; + + arg2 = (Vector_3 *)a_arg2; + + result = b2d_Space_cast_Point(arg1,arg2); + + jresult = result; + //jresult = new b2d_point_Collision ((b2d_point_Collision &) result); - result = (b2d_Contact *)new b2d_Contact(); - jresult = (void *) result; @@ -2215,12 +2228,12 @@ DllExport void * SWIGSTDCALL Ada_new_b2d_Contact ( DllExport void SWIGSTDCALL Ada_delete_b2d_Contact ( - void * jarg1 + void * a_arg1 ) { b2d_Contact *arg1 = (b2d_Contact *) 0 ; - arg1 = (b2d_Contact *)jarg1; + arg1 = (b2d_Contact *)a_arg1; delete arg1; @@ -2230,14 +2243,14 @@ DllExport void SWIGSTDCALL Ada_delete_b2d_Contact ( DllExport int SWIGSTDCALL Ada_b2d_space_contact_Count ( - void * jarg1 + void * a_arg1 ) { int jresult ; Space *arg1 = (Space *) 0 ; int result; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; result = (int)b2d_space_contact_Count(arg1); jresult = result; @@ -2251,10 +2264,10 @@ DllExport int SWIGSTDCALL Ada_b2d_space_contact_Count ( DllExport b2d_Contact SWIGSTDCALL Ada_b2d_space_Contact ( - void * jarg1 + void * a_arg1 , - int jarg2 + int a_arg2 ) { b2d_Contact jresult ; @@ -2262,10 +2275,10 @@ DllExport b2d_Contact SWIGSTDCALL Ada_b2d_space_Contact ( int arg2 ; b2d_Contact result; - arg1 = (Space *)jarg1; + arg1 = (Space *)a_arg1; - arg2 = (int) jarg2; + arg2 = (int) a_arg2; result = b2d_space_Contact(arg1,arg2); @@ -2288,19 +2301,25 @@ DllExport b2d_Contact SWIGSTDCALL Ada_b2d_space_Contact ( #ifdef __cplusplus extern "C" { #endif -extern joint_Cursor gnat_new_joint_Cursor() +extern joint_Cursor ada_new_joint_Cursor_joint_Cursor() { return joint_Cursor(); } -extern b2d_ray_Collision gnat_new_b2d_ray_Collision() +extern b2d_ray_Collision ada_new_b2d_ray_Collision_b2d_ray_Collision() { return b2d_ray_Collision(); } -extern b2d_Contact gnat_new_b2d_Contact() +extern b2d_point_Collision ada_new_b2d_point_Collision_b2d_point_Collision() +{ + return b2d_point_Collision(); +} + + +extern b2d_Contact ada_new_b2d_Contact_b2d_Contact() { return b2d_Contact(); }