Skip to content

Commit

Permalink
Compile-time dependencies reduction and minor formatting cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
@tamlin-mike @Xottab-DUTY
tamlin-mike authored and Xottab-DUTY committed Aug 5, 2017
1 parent 7d29e2f commit 9998198
Show file tree
Hide file tree
Showing 55 changed files with 665 additions and 317 deletions.
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@
<Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\utils\xrMiscMath_lib\xrMiscMath_lib.vcxproj">
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
<Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
</ProjectReference>
<ProjectReference Include="..\..\xrScriptEngine\xrScriptEngine.vcxproj">
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@
<Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\utils\xrMiscMath_lib\xrMiscMath_lib.vcxproj">
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
<Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
</ProjectReference>
<ProjectReference Include="..\..\xrScriptEngine\xrScriptEngine.vcxproj">
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@
<Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\utils\xrMiscMath_lib\xrMiscMath_lib.vcxproj">
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
<Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
</ProjectReference>
<ProjectReference Include="..\..\xrScriptEngine\xrScriptEngine.vcxproj">
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\utils\xrMiscMath_lib\xrMiscMath_lib.vcxproj">
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
<Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
</ProjectReference>
<ProjectReference Include="..\..\xrEngine\xrEngine.vcxproj">
Expand Down
34 changes: 17 additions & 17 deletions src/editors/LevelEditor/Edit/ESound_Source.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ bool ESoundSource::LoadLTX(CInifile& ini, LPCSTR sect_name)
case stStaticSource:
if (m_Flags.is(flPlaying))
Play();
//. if (m_Flags.is(flSimulating)) Simulate();
//. if (m_Flags.is(flSimulating)) Simulate();
break;
default: THROW;
}
Expand Down Expand Up @@ -255,7 +255,7 @@ bool ESoundSource::LoadStream(IReader& F)
case stStaticSource:
if (m_Flags.is(flPlaying))
Play();
//. if (m_Flags.is(flSimulating)) Simulate();
//. if (m_Flags.is(flSimulating)) Simulate();
break;
default: THROW;
}
Expand Down Expand Up @@ -351,8 +351,8 @@ void ESoundSource::FillProp(LPCSTR pref, PropItemVec& values)
PHelper().CreateCaption(values, PrepareKey(pref, "Game\\Pause delta\\Hint"), "Zero - play sound looped.");
PHelper().CreateTime(values, PrepareKey(pref, "Game\\Pause delta\\From"), &m_RandomPause.x);
PHelper().CreateTime(values, PrepareKey(pref, "Game\\Pause delta\\To"), &m_RandomPause.y);
// V=PHelper().CreateFlag32 (values,PHelper().PrepareKey(pref,"Looped"), &m_Flags, flLooped);
// V->OnChangeEvent = OnChangeSource;
// V=PHelper().CreateFlag32 (values,PHelper().PrepareKey(pref,"Looped"), &m_Flags, flLooped);
// V->OnChangeEvent = OnChangeSource;
}

//----------------------------------------------------
Expand Down Expand Up @@ -386,43 +386,43 @@ void ESoundSource::OnFrame()
case stSimulate:
{
/*
m_Flags.set (flSimulating,TRUE);
m_Flags.set (flSimulating,TRUE);
if ((fis_zero(m_ActiveTime.x)&&fis_zero(m_ActiveTime.y))||
((g_pGamePersistent->Environment().GetGameTime()>m_ActiveTime.x)&&(g_pGamePersistent->Environment().GetGameTime()<m_ActiveTime.y)))
{
if (0==m_Source._feedback())
{
if (fis_zero(m_RandomPause.x)&&fis_zero(m_RandomPause.y))
{
m_Source.play (0,sm_Looped);
m_Source.set_params (&m_Params);
m_StopTime = 0xFFFFFFFF;
m_Source.play (0,sm_Looped);
m_Source.set_params (&m_Params);
m_StopTime = 0xFFFFFFFF;
}else{
if (EDevice.dwTimeGlobal>=m_NextTime)
{
bool bFullPlay = fis_zero(m_PlayTime.x)&&fis_zero(m_PlayTime.y);
m_Source.play (0,bFullPlay?0:sm_Looped);
m_Source.set_params (&m_Params);
bool bFullPlay = fis_zero(m_PlayTime.x)&&fis_zero(m_PlayTime.y);
m_Source.play (0,bFullPlay?0:sm_Looped);
m_Source.set_params (&m_Params);
if (bFullPlay)
{
m_StopTime = 0xFFFFFFFF;
m_NextTime =
m_StopTime = 0xFFFFFFFF;
m_NextTime =
EDevice.dwTimeGlobal+iFloor(m_Source.get_length_sec()/1000.0f)+Random.randF(m_RandomPause.x,m_RandomPause.y)*1000;
}else{
m_StopTime =
m_StopTime =
bFullPlay?0:EDevice.dwTimeGlobal+Random.randF(m_PlayTime.x,m_PlayTime.y)*1000;
m_NextTime = m_StopTime+Random.randF(m_RandomPause.x,m_RandomPause.y)*1000;
m_NextTime = m_StopTime+Random.randF(m_RandomPause.x,m_RandomPause.y)*1000;
}
}
}
}else{
if (EDevice.dwTimeGlobal>=m_StopTime)
m_Source.stop_deffered();
m_Source.stop_deferred();
}
}else{
if (0!=m_Source._feedback())
m_Source.stop_deffered();
m_Source.stop_deferred();
}
*/
}
Expand Down
74 changes: 74 additions & 0 deletions src/engine.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oalib", "Externals\OpenAuto
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "Externals\cryptlib.vcxproj", "{C39F4B46-6E89-4074-902E-CA57073044D2}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrMiscMath_lib", "utils\xrMiscMath_lib\xrMiscMath_lib.vcxproj", "{CC912A26-E688-49F5-99F4-7A0F9AF4E438}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy", "dummy\dummy.vcxproj", "{B5A3098C-C768-45FF-8B6C-1F707C0344F0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrMisc", "xrMisc\xrMisc.vcxproj", "{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrMiscMath", "utils\xrMiscMath\xrMiscMath.vcxproj", "{CC912A26-E688-49F5-99F4-7A0F9AF4E438}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -913,6 +918,74 @@ Global
{C39F4B46-6E89-4074-902E-CA57073044D2}.Release|Win32.Build.0 = Release|Win32
{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|x64.ActiveCfg = Release|x64
{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|x64.Build.0 = Release|x64
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug_Dedicated|x64.ActiveCfg = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug_Dedicated|x64.Build.0 = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug|Win32.ActiveCfg = Debug|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug|Win32.Build.0 = Debug|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug|x64.ActiveCfg = Debug|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed_Dedicated|x64.ActiveCfg = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed_Dedicated|x64.Build.0 = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed|Mixed Platforms.Build.0 = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed|Win32.ActiveCfg = Mixed|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed|Win32.Build.0 = Mixed|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed|x64.ActiveCfg = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed|x64.Build.0 = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release_Dedicated|Win32.Build.0 = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release_Dedicated|x64.ActiveCfg = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release_Dedicated|x64.Build.0 = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|Mixed Platforms.Build.0 = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|Win32.ActiveCfg = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|Win32.Build.0 = Release|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|x64.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug_Dedicated|x64.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug_Dedicated|x64.Build.0 = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|Win32.ActiveCfg = Debug|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|Win32.Build.0 = Debug|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|x64.ActiveCfg = Debug|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed_Dedicated|x64.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed_Dedicated|x64.Build.0 = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|Mixed Platforms.Build.0 = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|Win32.ActiveCfg = Mixed|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|Win32.Build.0 = Mixed|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|x64.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|x64.Build.0 = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release_Dedicated|Win32.Build.0 = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release_Dedicated|x64.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release_Dedicated|x64.Build.0 = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|Mixed Platforms.Build.0 = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|Win32.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|Win32.Build.0 = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|x64.ActiveCfg = Release|Win32
{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
Expand Down Expand Up @@ -1010,6 +1083,7 @@ Global
{848E8AB3-9962-4C04-B813-5690399C8A3E} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{61D4856F-FA82-4F02-BB88-909DDFB1FE74} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{C39F4B46-6E89-4074-902E-CA57073044D2} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
{CC912A26-E688-49F5-99F4-7A0F9AF4E438} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
EndGlobalSection
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/Max/MAX_Export60.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
<None Include="Export\Utility.def" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\utils\xrMiscMath_lib\xrMiscMath_lib.vcxproj">
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
<Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
</ProjectReference>
<ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/lw/LW_Export80.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@
<ClInclude Include="Export\stdafx.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\utils\xrMiscMath_lib\xrMiscMath_lib.vcxproj">
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
<Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
</ProjectReference>
<ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
Expand Down
2 changes: 1 addition & 1 deletion src/utils/ETools/ETools.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\xrMiscMath_lib\xrMiscMath_lib.vcxproj">
<ProjectReference Include="..\xrMiscMath\xrMiscMath.vcxproj">
<Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
</ProjectReference>
<ProjectReference Include="..\xrQSlim\xrQSlim.vcxproj">
Expand Down
2 changes: 1 addition & 1 deletion src/utils/xrAI/xrAI.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@
<ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
</ProjectReference>
<ProjectReference Include="..\xrMiscMath_lib\xrMiscMath_lib.vcxproj">
<ProjectReference Include="..\xrMiscMath\xrMiscMath.vcxproj">
<Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/utils/xrDXT/DXT.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
<ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
</ProjectReference>
<ProjectReference Include="..\xrMiscMath_lib\xrMiscMath_lib.vcxproj">
<ProjectReference Include="..\xrMiscMath\xrMiscMath.vcxproj">
<Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/utils/xrLC/xrLC.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
<ClCompile Include="xrT_Junction.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\xrMiscMath_lib\xrMiscMath_lib.vcxproj">
<ProjectReference Include="..\xrMiscMath\xrMiscMath.vcxproj">
<Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/utils/xrLC_Light/xrLC_Light.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
</ProjectReference>
<ProjectReference Include="..\..\Externals\zlib.vcxproj">
<Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
<ProjectReference Include="..\xrMiscMath_lib\xrMiscMath_lib.vcxproj">
<ProjectReference Include="..\xrMiscMath\xrMiscMath.vcxproj">
<Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
0 src/utils/xrMiscMath_lib/matrix.cpp → src/utils/xrMiscMath/matrix.cpp
View file
File renamed without changes.
0 src/utils/xrMiscMath_lib/quaternion.cpp → src/utils/xrMiscMath/quaternion.cpp
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions src/utils/xrMiscMath_lib/vector.cpp → src/utils/xrMiscMath/vector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -677,8 +677,8 @@ template Dvector& Dvector::reflect(const Dvector& dir, const Dvector& norm);
template Fvector& Fvector::slide(const Fvector& dir, const Fvector& norm);
template Dvector& Dvector::slide(const Dvector& dir, const Dvector& norm);

template void _vector3<float>::generate_orthonormal_basis(const _vector3<float>& dir, _vector3<float>& up, _vector3<float>& right);
template void _vector3<double>::generate_orthonormal_basis(const _vector3<double>& dir, _vector3<double>& up, _vector3<double>& right);
template void _vector3<float>::generate_orthonormal_basis_normalized(_vector3<float>& dir, _vector3<float>& up, _vector3<float>& right);
template void _vector3<double>::generate_orthonormal_basis_normalized(_vector3<double>& dir, _vector3<double>& up, _vector3<double>& right);
template void Fvector::generate_orthonormal_basis(const Fvector& dir, Fvector& up, Fvector& right);
template void Dvector::generate_orthonormal_basis(const Dvector& dir, Dvector& up, Dvector& right);
template void Fvector::generate_orthonormal_basis_normalized(Fvector& dir, Fvector& up, Fvector& right);
template void Dvector::generate_orthonormal_basis_normalized(Dvector& dir, Dvector& up, Dvector& right);

0 src/utils/xrMiscMath_lib/vector3d_ext.cpp → src/utils/xrMiscMath/vector3d_ext.cpp
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions src/utils/xrMiscMath_lib/xrMiscMath.cpp → src/utils/xrMiscMath/xrMiscMath.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ bool exact_normalize(float* a)
{
goto aa2_largest;
}
else // aa1 is largest
else // aa1 is largest
{
a0 /= aa1;
a2 /= aa1;
Expand All @@ -52,11 +52,11 @@ bool exact_normalize(float* a)
a[1] = a1*l;
a[2] = (double)_copysign(l, a2);
}
else // aa0 is largest
else // aa0 is largest
{
if (aa0 <= 0)
{
// dDEBUGMSG ("vector has zero size"); ... this messace is annoying
// dDEBUGMSG ("vector has zero size"); ... this message is annoying
a[0] = 0; // if all a's are zero, this is where we'll end up.
a[1] = 1; // return a default unit length vector.
a[2] = 0;
Expand Down
4 changes: 3 additions & 1 deletion ...ils/xrMiscMath_lib/xrMiscMath_lib.vcxproj → src/utils/xrMiscMath/xrMiscMath.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{CC912A26-E688-49F5-99F4-7A0F9AF4E438}</ProjectGuid>
<RootNamespace>xrMiscMath_lib</RootNamespace>
<RootNamespace>xrMiscMath</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<ProjectName>xrMiscMath</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -66,6 +67,7 @@
<DisableSpecificWarnings>4251;4275;4458;4244</DisableSpecificWarnings>
<FloatingPointModel>Fast</FloatingPointModel>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
Expand Down
0 ...scMath_lib/xrMiscMath_lib.vcxproj.filters → ...ils/xrMiscMath/xrMiscMath.vcxproj.filters
View file
File renamed without changes.
Loading

0 comments on commit 9998198

Please sign in to comment.