Skip to content

Commit 9766763

Browse files
committed
Replace std::sinf to sinf. More Linux header fix
1 parent cb65b4e commit 9766763

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

src/Layers/xrRender/HWCaps.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4-
#include "hwcaps.h"
5-
#include "hw.h"
4+
#include "HWCaps.h"
5+
#include "HW.h"
66

77
#if !defined(_EDITOR) && !defined(USE_OGL)
88
#include <nvapi.h>

src/Layers/xrRender/ParticleEffect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,8 @@ void ParticleRenderStream(PRS_PARAMS* pParams)
464464
if (angle != m.rot.x)
465465
{
466466
angle = m.rot.x;
467-
sina = std::sinf(angle);
468-
cosa = std::cosf(angle);
467+
sina = sinf(angle);
468+
cosa = cosf(angle);
469469
}
470470

471471
_mm_prefetch(64 + (char*)&particles[i + 1], _MM_HINT_NTA);

src/Layers/xrRender/R_Backend_Runtime.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4+
#if defined(WINDOWS)
45
#pragma warning(push)
56
#pragma warning(disable : 4995)
67
#include <d3dx9.h>
78
#pragma warning(pop)
9+
#endif
810

9-
#include "xrCDB/frustum.h"
11+
#include "xrCDB/Frustum.h"
1012

1113
#if defined(USE_DX10) || defined(USE_DX11)
1214
#include "Layers/xrRenderDX10/StateManager/dx10StateManager.h"

src/Layers/xrRender/ResourceManager.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@
55
#include "stdafx.h"
66
#pragma hdrstop
77

8+
#if defined(WINDOWS)
89
#pragma warning(push)
910
#pragma warning(disable : 4995)
1011
#include <d3dx9.h>
1112
#pragma warning(pop)
13+
#endif
1214

1315
#include <tbb/parallel_for_each.h>
1416

1517
#include "ResourceManager.h"
1618
#include "tss.h"
17-
#include "blenders/blender.h"
18-
#include "blenders/blender_recorder.h"
19+
#include "blenders/Blender.h"
20+
#include "blenders/Blender_Recorder.h"
1921
#include "xrCore/Threading/ThreadPool.hpp"
2022

2123
// Already defined in Texture.cpp

src/Layers/xrRender/ResourceManager_Loader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#pragma hdrstop
33

44
#include "ResourceManager.h"
5-
#include "blenders/blender.h"
5+
#include "blenders/Blender.h"
66

77
void CResourceManager::OnDeviceDestroy(BOOL)
88
{

0 commit comments

Comments
 (0)