Skip to content
This repository has been archived by the owner on Nov 19, 2022. It is now read-only.

Commit

Permalink
Add spatial functions
Browse files Browse the repository at this point in the history
  • Loading branch information
drakeee committed Mar 4, 2021
1 parent 2dc993f commit c3d8538
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/CLuaResourceImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <dirent.h>
#endif

CLuaResourceImpl::CLuaResourceImpl(CLuaScriptRuntime* runtime, alt::IResource* resource) :
runtime(runtime),
CLuaResourceImpl::CLuaResourceImpl(CLuaScriptRuntime* runtime, alt::IResource* resource)
: runtime(runtime),
resource(resource),
exportFunction(Core->CreateMValueDict())
{
Expand Down
2 changes: 1 addition & 1 deletion src/CLuaScriptRuntime.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class CLuaScriptRuntime : public alt::IScriptRuntime
~CLuaScriptRuntime() { };

private:
const semver::version version{ 1, 1, 3, alt::ICore::SDK_VERSION, semver::branch::dev };
const semver::version version{ 1, 1, 4, alt::ICore::SDK_VERSION, semver::branch::dev };
#ifdef ALT_SERVER_API
alt::config::Node::Dict serverConfigDict;

Expand Down
84 changes: 84 additions & 0 deletions src/Defs/Entity/CLuaPlayerDefs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ void CLuaPlayerDefs::Init(lua_State* L)

lua_classfunction(L, "isTalking", IsTalking);
lua_classfunction(L, "getMicLevel", GetMicLevel);

lua_classfunction(L, "setSpatialVolume", SetSpatialVolume);
lua_classfunction(L, "getSpatialVolume", GetSpatialVolume);
lua_classfunction(L, "setNonSpatialVolume", SetNonSpatialVolume);
lua_classfunction(L, "getNonSpatialVolume", GetNonSpatialVolume);
#endif

lua_classvariable(L, "name", nullptr, "getName");
Expand Down Expand Up @@ -185,6 +190,8 @@ void CLuaPlayerDefs::Init(lua_State* L)
lua_classvariable(L, "health", nullptr, "getHealth");
lua_classvariable(L, "maxHealth", nullptr, "getMaxHealth");
lua_classvariable(L, "micLevel", nullptr, "getMicLevel");
lua_classvariable(L, "spatialVolume", SetSpatialVolume, GetSpatialVolume);
lua_classvariable(L, "nonSpatialVolume", SetNonSpatialVolume, GetNonSpatialVolume);
lua_classvariable(L, "local", nullptr, "getLocalPlayer");
#endif
}
Expand Down Expand Up @@ -1448,4 +1455,81 @@ int CLuaPlayerDefs::GetMicLevel(lua_State* L)

return 1;
}

int CLuaPlayerDefs::GetSpatialVolume(lua_State* L)
{
alt::IPlayer* player;

CArgReader argReader(L);
argReader.ReadBaseObject(player);

if (argReader.HasAnyError())
{
argReader.GetErrorMessages();
return 0;
}

lua_pushnumber(L, player->GetSpatialVolume());

return 1;
}

int CLuaPlayerDefs::SetSpatialVolume(lua_State* L)
{
alt::IPlayer* player;
float volume;

CArgReader argReader(L);
argReader.ReadBaseObject(player);
argReader.ReadNumber(volume);

if (argReader.HasAnyError())
{
argReader.GetErrorMessages();
return 0;
}

player->SetSpatialVolume(volume);

return 1;
}

int CLuaPlayerDefs::GetNonSpatialVolume(lua_State* L)
{
alt::IPlayer* player;

CArgReader argReader(L);
argReader.ReadBaseObject(player);

if (argReader.HasAnyError())
{
argReader.GetErrorMessages();
return 0;
}

lua_pushnumber(L, player->GetNonSpatialVolume());

return 1;
}

int CLuaPlayerDefs::SetNonSpatialVolume(lua_State* L)
{
alt::IPlayer* player;
float volume;

CArgReader argReader(L);
argReader.ReadBaseObject(player);
argReader.ReadNumber(volume);

if (argReader.HasAnyError())
{
argReader.GetErrorMessages();
return 0;
}

player->SetNonSpatialVolume(volume);

return 1;
}

#endif
5 changes: 5 additions & 0 deletions src/Defs/Entity/CLuaPlayerDefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,10 @@ class CLuaPlayerDefs

static int IsTalking(lua_State* L);
static int GetMicLevel(lua_State* L);

static int GetSpatialVolume(lua_State* L);
static int SetSpatialVolume(lua_State* L);
static int GetNonSpatialVolume(lua_State* L);
static int SetNonSpatialVolume(lua_State* L);
#endif
};
2 changes: 1 addition & 1 deletion vendors/cpp-sdk

0 comments on commit c3d8538

Please sign in to comment.