Skip to content

Commit 72423af

Browse files
author
Pavel Kovalenko
committed
Remove duplicated code.
1 parent 52462dc commit 72423af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+40
-5300
lines changed

src/Layers/xrRender/DetailManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#pragma hdrstop
77

88
#include "DetailManager.h"
9-
#include "cl_intersect.h"
9+
#include "xrCDB/Intersect.hpp"
1010

1111
#ifdef _EDITOR
1212
# include "ESceneClassList.h"

src/Layers/xrRender/DetailManager_Decompress.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 "DetailManager.h"
5-
#include "cl_intersect.h"
5+
#include "xrCDB/Intersect.hpp"
66

77
#ifdef _EDITOR
88
# include "scene.h"

src/Layers/xrRender/FSkinned.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ void CSkeletonX_ext::_Load_hw (Fvisual& V, void * _verts_)
695695
//-----------------------------------------------------------------------------------------------------
696696
// Wallmarks
697697
//-----------------------------------------------------------------------------------------------------
698-
#include "cl_intersect.h"
698+
#include "xrCDB/Intersect.hpp"
699699

700700
#ifdef DEBUG
701701

src/Layers/xrRender/SkeletonCustom.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ void CKinematics::EnumBoneVertices (SEnumVerticesCallback &C, u16 bone_id)
541541
for ( u32 i=0; i<children.size(); i++ )
542542
LL_GetChild( i )->EnumBoneVertices( C, bone_id );
543543
}
544-
#include "cl_intersect.h"
544+
#include "xrCDB/Intersect.hpp"
545545

546546
DEFINE_VECTOR(Fobb,OBBVec,OBBVecIt);
547547

src/Layers/xrRender/SkeletonX.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ void get_pos_bones(const vertBoned4W &vert, Fvector& p, CKinematics* Parent )
420420
//-----------------------------------------------------------------------------------------------------
421421
// Wallmarks
422422
//-----------------------------------------------------------------------------------------------------
423-
#include "cl_intersect.h"
423+
#include "xrCDB/Intersect.hpp"
424424
BOOL CSkeletonX::_PickBoneSoft1W (IKinematics::pick_result &r, float dist, const Fvector& S, const Fvector& D, u16* indices, CBoneData::FacesVec& faces)
425425
{
426426
return pick_bone<vertBoned1W>( Vertices1W, Parent, r, dist, S, D, indices, faces);

0 commit comments

Comments
 (0)