This commit is contained in:
Virgile Bello 2019-02-12 15:46:15 +09:00
Родитель d52b6ac6a4
Коммит 06ee913014
7 изменённых файлов: 14 добавлений и 13 удалений

4
deps/LLVM/clang-cl.exe поставляемый
Просмотреть файл

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5962bb9db971bf254736be753a36257d71c5b4324b2975a7b7cbc192425d7f59
size 54069760
oid sha256:43dd4210d948e24510ad5c431858cc083393ec0c9a4547aaa167439d6629c4c7
size 61692416

4
deps/LLVM/clang.exe поставляемый
Просмотреть файл

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5962bb9db971bf254736be753a36257d71c5b4324b2975a7b7cbc192425d7f59
size 54069760
oid sha256:43dd4210d948e24510ad5c431858cc083393ec0c9a4547aaa167439d6629c4c7
size 61692416

4
deps/LLVM/lld.exe поставляемый
Просмотреть файл

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ec7c2f8a0d73c165caa823f5b73d3ce4c87eebba2c517db81ef230e9b8376a9
size 39591424
oid sha256:62b8ec1e555575bfa3df4560391e80eac6b2fb1a5111de6228f11de42729ad59
size 42303488

4
deps/LLVM/llvm-ar.exe поставляемый
Просмотреть файл

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:803d8569a95db9c1b9b72e7fa458ccc9038e0abb83715c909553f5829de365f8
size 13033472
oid sha256:6fc4040efe914cf38937dc16d086a4b4abfa41a909f8c8f4fdf42e4dd7d29314
size 14857728

Просмотреть файл

@ -2111,7 +2111,7 @@ extern "C" {
source->source_voice_->SetOutputMatrix(source->mastering_voice_, 1, AUDIO_CHANNELS, source->dsp_settings_->pMatrixCoefficients);
source->doppler_pitch_ = source->dsp_settings_->DopplerFactor;
source->source_voice_->SetFrequencyRatio(source->dsp_settings_->DopplerFactor * source->pitch_);
XAUDIO2_FILTER_PARAMETERS filter_parameters = { LowPassFilter, 2.0f * sin(X3DAUDIO_PI / 6.0f * source->dsp_settings_->LPFDirectCoefficient), 1.0f };
XAUDIO2_FILTER_PARAMETERS filter_parameters = { LowPassFilter, 2.0f * (float)sin(X3DAUDIO_PI / 6.0f * source->dsp_settings_->LPFDirectCoefficient), 1.0f };
if (!xnAudioWindows7Hacks) source->source_voice_->SetFilterParameters(&filter_parameters);
source->apply3DLock_.Unlock();

Просмотреть файл

@ -6,7 +6,7 @@
#include "../../../deps/Recast/include/DetourNavMeshQuery.h"
#include "../../deps/NativePath/TINYSTL/unordered_set.h"
#pragma pack(4)
#pragma pack(push, 4)
struct NavMeshPathfindQuery
{
Vector3 source;
@ -34,6 +34,7 @@ struct NavMeshRaycastResult
Vector3 position;
Vector3 normal;
};
#pragma pack(pop)
class NavigationMesh
{

Просмотреть файл

@ -141,15 +141,15 @@
<Target Name="CompileNativeClang_UWP" Inputs="@(XenkoNativeCFile);@(XenkoNativeHFile)" Outputs="@(XenkoNativeOutput)" Condition="'$(XenkoPlatform)' == 'UWP' And $(DesignTimeBuild) != true And $(BuildingProject) != false" BeforeTargets="CoreCompile" DependsOnTargets="_XenkoRegisterNativeOutputs">
<MakeDir Directories="$(OutputObjectPath)\x86"/>
<Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\clang-cl.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x86\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -WX -EHsc -GS- -MD -DUWP -m32" />
<Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\clang-cl.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x86\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -WX -GS- -MD -DUWP -m32" />
<MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\UWP\UWP.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\x86;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x86;Configuration=$(Configuration);Platform=x86" StopOnFirstFailure="true" />
<MakeDir Directories="$(OutputObjectPath)\x64"/>
<Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\clang-cl.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x64\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -WX -EHsc -GS- -MD -DUWP -m64" />
<Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\clang-cl.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x64\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -WX -GS- -MD -DUWP -m64" />
<MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\UWP\UWP.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\x64;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x64;Configuration=$(Configuration);Platform=x64" StopOnFirstFailure="true" />
<MakeDir Directories="$(OutputObjectPath)\ARM"/>
<Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\clang-cl.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\ARM\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -WX -EHsc -GS- -MD -DUWP -m32 --target=thumbv7-windows-msvc" />
<Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\clang-cl.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\ARM\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -WX -GS- -MD -DUWP -m32 --target=thumbv7-windows-msvc" />
<MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\UWP\UWP.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\ARM;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\ARM;Configuration=$(Configuration);Platform=ARM" StopOnFirstFailure="true" />
<!-- Workaround: forcing C# rebuild so that timestamp are up to date (ideally we should have separate input/output groups for C# and Native) -->