thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-07-05 16:37:12 +02:00
Code Releases Activity

Do not register two Quaternion types.

Browse Source
This commit is contained in:
Sandu Liviu Catalin
2021-03-20 20:21:05 +02:00
parent 370c5cfe88
commit 8985866060
2 changed files with 15 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/Misc/Official.cpp
View File

@ -39,7 +39,6 @@ SQMOD_DECL_TYPENAME(EntityRGBTn, _SC("LgEntityRGB"))
SQMOD_DECL_TYPENAME(RGBATn, _SC("RGBA"))
SQMOD_DECL_TYPENAME(ARGBTn, _SC("ARGB"))
SQMOD_DECL_TYPENAME(VectorTn, _SC("Vector"))
SQMOD_DECL_TYPENAME(QuaternionTn, _SC("Quaternion"))
SQMOD_DECL_TYPENAME(EntityVectorTn, _SC("LgEntityVector"))
SQMOD_DECL_TYPENAME(EntityQuaternionTn, _SC("LgEntityQuaternion"))
SQMOD_DECL_TYPENAME(BoundsTn, _SC("Bounds"))
@ -156,7 +155,7 @@ static SQInteger QuaternionToString(HSQUIRRELVM vm)
{
try
{
Var< LgQuaternion * > v(SqVM(), 1);
Var< Quaternion * > v(SqVM(), 1);
// Validate the instance, just to be sure
if (!v.value)
{
@ -309,16 +308,8 @@ void Register_Official(HSQUIRRELVM vm)
.Prop(_SC("z"), &LgEntityVector::GetZ, &LgEntityVector::SetZ)
);
// --------------------------------------------------------------------------------------------
RootTable(vm).Bind(QuaternionTn::Str,
DerivedClass< LgQuaternion, Quaternion >(vm, QuaternionTn::Str)
// Constructors
.Ctor< Quaternion::Value, Quaternion::Value, Quaternion::Value >()
// Global Member Methods
.SquirrelFunc(_SC("_tostring"), &QuaternionToString)
);
// --------------------------------------------------------------------------------------------
RootTable(vm).Bind(EntityQuaternionTn::Str,
DerivedClass< LgEntityQuaternion, LgQuaternion >(vm, EntityQuaternionTn::Str)
DerivedClass< LgEntityQuaternion, Quaternion >(vm, EntityQuaternionTn::Str)
// Constructors
.Ctor< int, int, int, Quaternion::Value, Quaternion::Value, Quaternion::Value, Quaternion::Value >()
// Properties