mirror of
https://github.com/VCMP-SqMod/SqMod.git
synced 2024-11-08 08:47:17 +01:00
Implemented functions to create blip entities and added constructor to create an entity reference from a base reference.
This commit is contained in:
Sandu Liviu Catalin
parent
9686f9e664
commit
2a3cef8318
@ -1,8 +1,16 @@
|
|||||||
#include "Entity/Blip.hpp"
|
#include "Entity/Blip.hpp"
|
||||||
|
#include "Core.hpp"
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
namespace SqMod {
|
namespace SqMod {
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
CBlip::CBlip(const Reference< CBlip > & o) noexcept
|
||||||
|
: Reference(o)
|
||||||
|
{
|
||||||
|
/* ... */
|
||||||
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
SQInteger CBlip::GetWorld() const noexcept
|
SQInteger CBlip::GetWorld() const noexcept
|
||||||
{
|
{
|
||||||
@ -121,6 +129,158 @@ SQInt32 CBlip::GetSprID() const noexcept
|
|||||||
return SQMOD_UNKNOWN;
|
return SQMOD_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
Reference< CBlip > CreateBaseBlip_ES(SQInt32 world,
|
||||||
|
SQFloat x, SQFloat y, SQFloat z,
|
||||||
|
SQInt32 scale,
|
||||||
|
Uint8 r, Uint8 g, Uint8 b, Uint8 a,
|
||||||
|
SQInt32 sprid) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(SQMOD_UNKNOWN, world, x, y, z, scale, PACK_RGBA(r, g, b, a), sprid,
|
||||||
|
SQMOD_CREATE_DEFAULT, NullData());
|
||||||
|
}
|
||||||
|
|
||||||
|
Reference< CBlip > CreateBaseBlip_ES(SQInt32 world,
|
||||||
|
SQFloat x, SQFloat y, SQFloat z,
|
||||||
|
SQInt32 scale,
|
||||||
|
Uint8 r, Uint8 g, Uint8 b, Uint8 a,
|
||||||
|
SQInt32 sprid,
|
||||||
|
SQInt32 header, SqObj & payload) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(SQMOD_UNKNOWN, world, x, y, z, scale, PACK_RGBA(r, g, b, a), sprid,
|
||||||
|
header, payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
Reference< CBlip > CreateBaseBlip_EF(SQInt32 index, SQInt32 world,
|
||||||
|
SQFloat x, SQFloat y, SQFloat z,
|
||||||
|
SQInt32 scale,
|
||||||
|
Uint8 r, Uint8 g, Uint8 b, Uint8 a,
|
||||||
|
SQInt32 sprid) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(index, world, x, y, z, scale, PACK_RGBA(r, g, b, a), sprid,
|
||||||
|
SQMOD_CREATE_DEFAULT, NullData());
|
||||||
|
}
|
||||||
|
|
||||||
|
Reference< CBlip > CreateBaseBlip_EF(SQInt32 index, SQInt32 world,
|
||||||
|
SQFloat x, SQFloat y, SQFloat z,
|
||||||
|
SQInt32 scale,
|
||||||
|
Uint8 r, Uint8 g, Uint8 b, Uint8 a,
|
||||||
|
SQInt32 sprid,
|
||||||
|
SQInt32 header, SqObj & payload) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(index, world, x, y, z, scale, PACK_RGBA(r, g, b, a), sprid,
|
||||||
|
header, payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
Reference< CBlip > CreateBaseBlip_CS(SQInt32 world, const Vector3 & pos,
|
||||||
|
SQInt32 scale, const Color4 & color, SQInt32 sprid) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(SQMOD_UNKNOWN, world, pos.x, pos.y, pos.z, scale, color.GetRGBA(), sprid,
|
||||||
|
SQMOD_CREATE_DEFAULT, NullData());
|
||||||
|
}
|
||||||
|
|
||||||
|
Reference< CBlip > CreateBaseBlip_CS(SQInt32 world, const Vector3 & pos,
|
||||||
|
SQInt32 scale, const Color4 & color, SQInt32 sprid,
|
||||||
|
SQInt32 header, SqObj & payload) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(SQMOD_UNKNOWN, world, pos.x, pos.y, pos.z, scale, color.GetRGBA(), sprid,
|
||||||
|
header, payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
Reference< CBlip > CreateBaseBlip_CF(SQInt32 index, SQInt32 world, const Vector3 & pos,
|
||||||
|
SQInt32 scale, const Color4 & color, SQInt32 sprid) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(index, world, pos.x, pos.y, pos.z, scale, color.GetRGBA(), sprid,
|
||||||
|
SQMOD_CREATE_DEFAULT, NullData());
|
||||||
|
}
|
||||||
|
|
||||||
|
Reference< CBlip > CreateBaseBlip_CF(SQInt32 index, SQInt32 world, const Vector3 & pos,
|
||||||
|
SQInt32 scale, const Color4 & color, SQInt32 sprid,
|
||||||
|
SQInt32 header, SqObj & payload) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(index, world, pos.x, pos.y, pos.z, scale, color.GetRGBA(), sprid,
|
||||||
|
header, payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
CBlip CreateBlip_ES(SQInt32 world,
|
||||||
|
SQFloat x, SQFloat y, SQFloat z,
|
||||||
|
SQInt32 scale,
|
||||||
|
Uint8 r, Uint8 g, Uint8 b, Uint8 a,
|
||||||
|
SQInt32 sprid) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(SQMOD_UNKNOWN, world, x, y, z, scale, PACK_RGBA(r, g, b, a), sprid,
|
||||||
|
SQMOD_CREATE_DEFAULT, NullData());
|
||||||
|
}
|
||||||
|
|
||||||
|
CBlip CreateBlip_ES(SQInt32 world,
|
||||||
|
SQFloat x, SQFloat y, SQFloat z,
|
||||||
|
SQInt32 scale,
|
||||||
|
Uint8 r, Uint8 g, Uint8 b, Uint8 a,
|
||||||
|
SQInt32 sprid,
|
||||||
|
SQInt32 header, SqObj & payload) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(SQMOD_UNKNOWN, world, x, y, z, scale, PACK_RGBA(r, g, b, a), sprid,
|
||||||
|
header, payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
CBlip CreateBlip_EF(SQInt32 index, SQInt32 world,
|
||||||
|
SQFloat x, SQFloat y, SQFloat z,
|
||||||
|
SQInt32 scale,
|
||||||
|
Uint8 r, Uint8 g, Uint8 b, Uint8 a,
|
||||||
|
SQInt32 sprid) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(index, world, x, y, z, scale, PACK_RGBA(r, g, b, a), sprid,
|
||||||
|
SQMOD_CREATE_DEFAULT, NullData());
|
||||||
|
}
|
||||||
|
|
||||||
|
CBlip CreateBlip_EF(SQInt32 index, SQInt32 world,
|
||||||
|
SQFloat x, SQFloat y, SQFloat z,
|
||||||
|
SQInt32 scale,
|
||||||
|
Uint8 r, Uint8 g, Uint8 b, Uint8 a,
|
||||||
|
SQInt32 sprid,
|
||||||
|
SQInt32 header, SqObj & payload) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(index, world, x, y, z, scale, PACK_RGBA(r, g, b, a), sprid,
|
||||||
|
header, payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
CBlip CreateBlip_CS(SQInt32 world, const Vector3 & pos,
|
||||||
|
SQInt32 scale, const Color4 & color, SQInt32 sprid) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(SQMOD_UNKNOWN, world, pos.x, pos.y, pos.z, scale, color.GetRGBA(), sprid,
|
||||||
|
SQMOD_CREATE_DEFAULT, NullData());
|
||||||
|
}
|
||||||
|
|
||||||
|
CBlip CreateBlip_CS(SQInt32 world, const Vector3 & pos,
|
||||||
|
SQInt32 scale, const Color4 & color, SQInt32 sprid,
|
||||||
|
SQInt32 header, SqObj & payload) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(SQMOD_UNKNOWN, world, pos.x, pos.y, pos.z, scale, color.GetRGBA(), sprid,
|
||||||
|
header, payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
CBlip CreateBlip_CF(SQInt32 index, SQInt32 world, const Vector3 & pos,
|
||||||
|
SQInt32 scale, const Color4 & color, SQInt32 sprid) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(index, world, pos.x, pos.y, pos.z, scale, color.GetRGBA(), sprid,
|
||||||
|
SQMOD_CREATE_DEFAULT, NullData());
|
||||||
|
}
|
||||||
|
|
||||||
|
CBlip CreateBlip_CF(SQInt32 index, SQInt32 world, const Vector3 & pos,
|
||||||
|
SQInt32 scale, const Color4 & color, SQInt32 sprid,
|
||||||
|
SQInt32 header, SqObj & payload) noexcept
|
||||||
|
{
|
||||||
|
return _Core->NewBlip(index, world, pos.x, pos.y, pos.z, scale, color.GetRGBA(), sprid,
|
||||||
|
header, payload);
|
||||||
|
}
|
||||||
|
|
||||||
// ================================================================================================
|
// ================================================================================================
|
||||||
bool Register_CBlip(HSQUIRRELVM vm)
|
bool Register_CBlip(HSQUIRRELVM vm)
|
||||||
{
|
{
|
||||||
@ -131,10 +291,12 @@ bool Register_CBlip(HSQUIRRELVM vm)
|
|||||||
// Registration failed
|
// Registration failed
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
// Typedef the base reference type for simplicity
|
||||||
|
typedef Reference< CBlip > RefType;
|
||||||
// Output debugging information
|
// Output debugging information
|
||||||
LogDbg("Beginning registration of <CBlip> type");
|
LogDbg("Beginning registration of <CBlip> type");
|
||||||
// Attempt to register the actual reference that implements all of the entity functionality
|
// Attempt to register the actual reference that implements all of the entity functionality
|
||||||
Sqrat::RootTable(vm).Bind(_SC("CBlip"), Sqrat::DerivedClass< CBlip, Reference< CBlip > >(vm, _SC("CBlip"))
|
Sqrat::RootTable(vm).Bind(_SC("CBlip"), Sqrat::DerivedClass< CBlip, RefType >(vm, _SC("CBlip"))
|
||||||
/* Constructors */
|
/* Constructors */
|
||||||
.Ctor()
|
.Ctor()
|
||||||
.Ctor< SQInt32 >()
|
.Ctor< SQInt32 >()
|
||||||
@ -151,6 +313,52 @@ bool Register_CBlip(HSQUIRRELVM vm)
|
|||||||
);
|
);
|
||||||
// Output debugging information
|
// Output debugging information
|
||||||
LogDbg("Registration of <CBlip> type was successful");
|
LogDbg("Registration of <CBlip> type was successful");
|
||||||
|
// Output debugging information
|
||||||
|
LogDbg("Beginning registration of <Blip functions> type");
|
||||||
|
// Register global functions related to this entity type
|
||||||
|
Sqrat::RootTable(vm)
|
||||||
|
/* Create BaseBlip [E]xtended [S]ubstitute */
|
||||||
|
.Overload< RefType (*)(SQInt32, SQFloat, SQFloat, SQFloat, SQInt32, Uint8, Uint8, Uint8, Uint8, SQInt32) >
|
||||||
|
(_SC("CreateBaseBlip_ES"), &CreateBaseBlip_ES)
|
||||||
|
.Overload< RefType (*)(SQInt32, SQFloat, SQFloat, SQFloat, SQInt32, Uint8, Uint8, Uint8, Uint8, SQInt32, SQInt32, SqObj &) >
|
||||||
|
(_SC("CreateBaseBlip_ES"), &CreateBaseBlip_ES)
|
||||||
|
/* Create BaseBlip [E]xtended [F]Full */
|
||||||
|
.Overload< RefType (*)(SQInt32, SQInt32, SQFloat, SQFloat, SQFloat, SQInt32, Uint8, Uint8, Uint8, Uint8, SQInt32) >
|
||||||
|
(_SC("CreateBaseBlip_EF"), &CreateBaseBlip_EF)
|
||||||
|
.Overload< RefType (*)(SQInt32, SQInt32, SQFloat, SQFloat, SQFloat, SQInt32, Uint8, Uint8, Uint8, Uint8, SQInt32, SQInt32, SqObj &) >
|
||||||
|
(_SC("CreateBaseBlip_EF"), &CreateBaseBlip_EF)
|
||||||
|
/* Create BaseBlip [C]ompact [S]ubstitute */
|
||||||
|
.Overload< RefType (*)(SQInt32, const Vector3 &, SQInt32, const Color4 &, SQInt32) >
|
||||||
|
(_SC("CreateBaseBlip_CS"), &CreateBaseBlip_CS)
|
||||||
|
.Overload< RefType (*)(SQInt32, const Vector3 &, SQInt32, const Color4 &, SQInt32, SQInt32, SqObj &) >
|
||||||
|
(_SC("CreateBaseBlip_CS"), &CreateBaseBlip_CS)
|
||||||
|
/* Create BaseBlip [C]ompact [F]ull */
|
||||||
|
.Overload< RefType (*)(SQInt32, SQInt32, const Vector3 &, SQInt32, const Color4 &, SQInt32) >
|
||||||
|
(_SC("CreateBaseBlip_CF"), &CreateBaseBlip_CF)
|
||||||
|
.Overload< RefType (*)(SQInt32, SQInt32, const Vector3 &, SQInt32, const Color4 &, SQInt32, SQInt32, SqObj &) >
|
||||||
|
(_SC("CreateBaseBlip_CF"), &CreateBaseBlip_CF)
|
||||||
|
/* Create CBlip [E]xtended [S]ubstitute */
|
||||||
|
.Overload< CBlip (*)(SQInt32, SQFloat, SQFloat, SQFloat, SQInt32, Uint8, Uint8, Uint8, Uint8, SQInt32) >
|
||||||
|
(_SC("CreateBlip_ES"), &CreateBlip_ES)
|
||||||
|
.Overload< CBlip (*)(SQInt32, SQFloat, SQFloat, SQFloat, SQInt32, Uint8, Uint8, Uint8, Uint8, SQInt32, SQInt32, SqObj &) >
|
||||||
|
(_SC("CreateBlip_ES"), &CreateBlip_ES)
|
||||||
|
/* Create CBlip [E]xtended [F]Full */
|
||||||
|
.Overload< CBlip (*)(SQInt32, SQInt32, SQFloat, SQFloat, SQFloat, SQInt32, Uint8, Uint8, Uint8, Uint8, SQInt32) >
|
||||||
|
(_SC("CreateBlip_EF"), &CreateBlip_EF)
|
||||||
|
.Overload< CBlip (*)(SQInt32, SQInt32, SQFloat, SQFloat, SQFloat, SQInt32, Uint8, Uint8, Uint8, Uint8, SQInt32, SQInt32, SqObj &) >
|
||||||
|
(_SC("CreateBlip_EF"), &CreateBlip_EF)
|
||||||
|
/* Create CBlip [C]ompact [S]ubstitute */
|
||||||
|
.Overload< CBlip (*)(SQInt32, const Vector3 &, SQInt32, const Color4 &, SQInt32) >
|
||||||
|
(_SC("CreateBlip_CS"), &CreateBlip_CS)
|
||||||
|
.Overload< CBlip (*)(SQInt32, const Vector3 &, SQInt32, const Color4 &, SQInt32, SQInt32, SqObj &) >
|
||||||
|
(_SC("CreateBlip_CS"), &CreateBlip_CS)
|
||||||
|
/* Create CBlip [C]ompact [F]ull */
|
||||||
|
.Overload< CBlip (*)(SQInt32, SQInt32, const Vector3 &, SQInt32, const Color4 &, SQInt32) >
|
||||||
|
(_SC("CreateBlip_CF"), &CreateBlip_CF)
|
||||||
|
.Overload< CBlip (*)(SQInt32, SQInt32, const Vector3 &, SQInt32, const Color4 &, SQInt32, SQInt32, SqObj &) >
|
||||||
|
(_SC("CreateBlip_CF"), &CreateBlip_CF);
|
||||||
|
// Output debugging information
|
||||||
|
LogDbg("Registration of <Blip functions> type was successful");
|
||||||
// Registration succeeded
|
// Registration succeeded
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,6 +19,11 @@ public:
|
|||||||
*/
|
*/
|
||||||
using RefType::Reference;
|
using RefType::Reference;
|
||||||
|
|
||||||
|
/* --------------------------------------------------------------------------------------------
|
||||||
|
* Construct a reference from a base reference.
|
||||||
|
*/
|
||||||
|
CBlip(const Reference< CBlip > & o) noexcept;
|
||||||
|
|
||||||
/* --------------------------------------------------------------------------------------------
|
/* --------------------------------------------------------------------------------------------
|
||||||
* Retrieve the world in which the referenced blip instance exists.
|
* Retrieve the world in which the referenced blip instance exists.
|
||||||
*/
|
*/
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user