Skip to content
This repository has been archived by the owner on Dec 12, 2024. It is now read-only.

Commit

Permalink
remove busted 3d audio attempt
Browse files Browse the repository at this point in the history
  • Loading branch information
FrazzIe committed Jul 19, 2020
1 parent 3cfba5b commit 107d64c
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
50 changes: 25 additions & 25 deletions client.lua
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ AddEventHandler("onClientResourceStart", function(resName)
return
end

if mumbleConfig.use3dAudio then
NetworkSetTalkerProximity(mumbleConfig.voiceModes[2][1] + 0.0)
else
-- if mumbleConfig.use3dAudio then
-- NetworkSetTalkerProximity(mumbleConfig.voiceModes[2][1] + 0.0)
-- else
NetworkSetTalkerProximity(0.0)
end
-- end

TriggerServerEvent("mumble:Initialise")

Expand Down Expand Up @@ -183,9 +183,9 @@ Citizen.CreateThread(function()
voiceMode = newMode
end

if mumbleConfig.use3dAudio then
NetworkSetTalkerProximity(mumbleConfig.voiceModes[voiceMode][1])
end
-- if mumbleConfig.use3dAudio then
-- NetworkSetTalkerProximity(mumbleConfig.voiceModes[voiceMode][1])
-- end

SetVoiceData("mode", voiceMode)
playerData.mode = voiceMode
Expand Down Expand Up @@ -319,11 +319,11 @@ Citizen.CreateThread(function()

local inRange = false

if mumbleConfig.use3dAudio then
inRange = distance < mumbleConfig.voiceModes[playerMode][1]
else
-- if mumbleConfig.use3dAudio then
-- inRange = distance < mumbleConfig.voiceModes[playerMode][1]
-- else
inRange = distance < mumbleConfig.voiceModes[mode][1]
end
-- end

-- Check if player is in range
if inRange then
Expand All @@ -334,15 +334,15 @@ Citizen.CreateThread(function()
player = remotePlayerId,
}

if not mumbleConfig.use3dAudio then
-- if not mumbleConfig.use3dAudio then
local volume = 1.0 - (distance / mumbleConfig.voiceModes[mode][1])^0.5

if volume < 0 then
volume = 0.0
end

voiceList[idx].volume = volume
end
-- end

if distance < mumbleConfig.speakerRange then
local volume = 1.0 - (distance / mumbleConfig.speakerRange)^0.5
Expand Down Expand Up @@ -389,28 +389,28 @@ Citizen.CreateThread(function()
end
end

if mumbleConfig.use3dAudio then
MumbleClearVoiceTarget(0)
-- if mumbleConfig.use3dAudio then
-- MumbleClearVoiceTarget(0)

for j = 1, #voiceList do
if mutedPlayers[voiceList[j].id] ~= nil then -- Only re-enable 3d audio if player was muted
mutedPlayers[voiceList[j].id] = nil
MumbleSetVolumeOverride(voiceList[j].player, -1.0) -- Re-enable 3d audio
end
-- for j = 1, #voiceList do
-- if mutedPlayers[voiceList[j].id] ~= nil then -- Only re-enable 3d audio if player was muted
-- mutedPlayers[voiceList[j].id] = nil
-- MumbleSetVolumeOverride(voiceList[j].player, -1.0) -- Re-enable 3d audio
-- end

MumbleAddVoiceTargetPlayer(2, voiceList[j].player) -- Broadcast voice to player if they are in my voice range
end
-- MumbleAddVoiceTargetPlayer(2, voiceList[j].player) -- Broadcast voice to player if they are in my voice range
-- end

MumbleSetVoiceTarget(0)
else
-- MumbleSetVoiceTarget(0)
-- else
for j = 1, #voiceList do
if mutedPlayers[voiceList[j].id] ~= nil then
mutedPlayers[voiceList[j].id] = nil
end

MumbleSetVolumeOverride(voiceList[j].player, voiceList[j].volume)
end
end
-- end

for j = 1, #muteList do
if mumbleConfig.callSpeakerEnabled then
Expand Down
2 changes: 1 addition & 1 deletion config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ mumbleConfig = {
callChannelNames = { -- Add named call channels (Defaults to [channel number])

},
use3dAudio = false, -- (currently doesn't work properly) make sure setr voice_use3dAudio true and setr voice_useSendingRangeOnly true is in your server.cfg (currently doesn't work properly)
-- use3dAudio = false, -- (currently doesn't work properly) make sure setr voice_use3dAudio true and setr voice_useSendingRangeOnly true is in your server.cfg (currently doesn't work properly)
}
resourceName = GetCurrentResourceName()

Expand Down

0 comments on commit 107d64c

Please sign in to comment.