lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

phonon fixes;

This commit is contained in:
bjorn 2021-03-07 22:42:17 -07:00
parent 45e43bacb3
commit f9f4907a50
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -256,7 +256,7 @@ if(LOVR_USE_STEAM_AUDIO)
if(NOT LOVR_STEAM_AUDIO_PATH) if(NOT LOVR_STEAM_AUDIO_PATH)
message(FATAL_ERROR "LOVR_USE_STEAM_AUDIO requires the LOVR_STEAM_AUDIO_PATH to be set to the location of the Steam Audio folder") message(FATAL_ERROR "LOVR_USE_STEAM_AUDIO requires the LOVR_STEAM_AUDIO_PATH to be set to the location of the Steam Audio folder")
endif() endif()
include_directories("${STEAM_AUDIO_PATH}/include") include_directories("${LOVR_STEAM_AUDIO_PATH}/include")
endif() endif()
# Oculus Audio # Oculus Audio

24
src/modules/audio/spatializer_phonon.c
View File

@ -224,7 +224,7 @@ uint32_t phonon_apply(Source* source, const float* input, float* output, uint32_
.directivity.dipolePower = power .directivity.dipolePower = power
}; };
lovrAudioGetAirAbsorption(iplSource.airAbsorptionModel.coefficients); lovrAudioGetAbsorption(iplSource.airAbsorptionModel.coefficients);
IPLDirectOcclusionMode occlusion = IPL_DIRECTOCCLUSION_NONE; IPLDirectOcclusionMode occlusion = IPL_DIRECTOCCLUSION_NONE;
IPLDirectOcclusionMethod volumetric = IPL_DIRECTOCCLUSION_RAYCAST; IPLDirectOcclusionMethod volumetric = IPL_DIRECTOCCLUSION_RAYCAST;
@ -305,17 +305,17 @@ bool phonon_setGeometry(float* vertices, uint32_t* indices, uint32_t vertexCount
if (state.environmentalRenderer) phonon_iplDestroyEnvironment(&state.environmentalRenderer); if (state.environmentalRenderer) phonon_iplDestroyEnvironment(&state.environmentalRenderer);
IPLMaterial materials[] = { IPLMaterial materials[] = {
[AUDIO_GENERIC] = { .10f, .20f, .30f, .05f, .100f, .050f, .030f }, [MATERIAL_GENERIC] = { .10f, .20f, .30f, .05f, .100f, .050f, .030f },
[AUDIO_BRICK] = { .03f, .04f, .07f, .05f, .015f, .015f, .015f }, [MATERIAL_BRICK] = { .03f, .04f, .07f, .05f, .015f, .015f, .015f },
[AUDIO_CARPET] = { .24f, .69f, .73f, .05f, .020f, .005f, .003f }, [MATERIAL_CARPET] = { .24f, .69f, .73f, .05f, .020f, .005f, .003f },
[AUDIO_CERAMIC] = { .01f, .02f, .02f, .05f, .060f, .044f, .011f }, [MATERIAL_CERAMIC] = { .01f, .02f, .02f, .05f, .060f, .044f, .011f },
[AUDIO_CONCRETE] = { .05f, .07f, .08f, .05f, .015f, .002f, .001f }, [MATERIAL_CONCRETE] = { .05f, .07f, .08f, .05f, .015f, .002f, .001f },
[AUDIO_GLASS] = { .06f, .03f, .02f, .05f, .060f, .044f, .011f }, [MATERIAL_GLASS] = { .06f, .03f, .02f, .05f, .060f, .044f, .011f },
[AUDIO_GRAVEL] = { .60f, .70f, .80f, .05f, .031f, .012f, .008f }, [MATERIAL_GRAVEL] = { .60f, .70f, .80f, .05f, .031f, .012f, .008f },
[AUDIO_METAL] = { .20f, .07f, .06f, .05f, .200f, .025f, .010f }, [MATERIAL_METAL] = { .20f, .07f, .06f, .05f, .200f, .025f, .010f },
[AUDIO_PLASTER] = { .12f, .06f, .04f, .05f, .056f, .056f, .004f }, [MATERIAL_PLASTER] = { .12f, .06f, .04f, .05f, .056f, .056f, .004f },
[AUDIO_ROCK] = { .13f, .20f, .24f, .05f, .015f, .002f, .001f }, [MATERIAL_ROCK] = { .13f, .20f, .24f, .05f, .015f, .002f, .001f },
[AUDIO_WOOD] = { .11f, .07f, .06f, .05f, .070f, .014f, .005f } [MATERIAL_WOOD] = { .11f, .07f, .06f, .05f, .070f, .014f, .005f }
}; };
IPLSimulationSettings settings = (IPLSimulationSettings) { IPLSimulationSettings settings = (IPLSimulationSettings) {

2
src/resources/boot.lua
View File

@ -115,7 +115,7 @@ function lovr.boot()
}, },
audio = { audio = {
start = true, start = true,
spatializer = 'simple' spatializer = nil
}, },
graphics = { graphics = {
debug = false debug = false