Skip to content

Commit 3446e19

Browse files
author
devsh
committed
add good header guards
1 parent 99c5f70 commit 3446e19

17 files changed

+108
-197
lines changed

include/nbl/ext/MitsubaLoader/CElementBSDF.h

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
1+
// Copyright (C) 2018-2025 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4+
#ifndef _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_BSDF_H_INCLUDED_
5+
#define _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_BSDF_H_INCLUDED_
46

5-
#ifndef __C_ELEMENT_BSDF_H_INCLUDED__
6-
#define __C_ELEMENT_BSDF_H_INCLUDED__
77

88
#include "nbl/ext/MitsubaLoader/CElementTexture.h"
99

10-
namespace nbl
11-
{
12-
namespace ext
13-
{
14-
namespace MitsubaLoader
15-
{
1610

11+
namespace nbl::ext::MitsubaLoader
12+
{
1713

1814
class CElementBSDF : public IElement
1915
{
@@ -422,9 +418,5 @@ class CElementBSDF : public IElement
422418
};
423419

424420

425-
426-
}
427421
}
428-
}
429-
430422
#endif

include/nbl/ext/MitsubaLoader/CElementEmissionProfile.h

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
// Copyright (C) 2018-2023 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4+
#ifndef _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_EMISSION_PROFILE_H_INCLUDED_
5+
#define _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_EMISSION_PROFILE_H_INCLUDED_
46

5-
#ifndef __C_ELEMENT_EMISSION_PROFILE_H_INCLUDED__
6-
#define __C_ELEMENT_EMISSION_PROFILE_H_INCLUDED__
77

8-
#include "vectorSIMD.h"
98
#include "nbl/ext/MitsubaLoader/CElementTexture.h"
109
#include "nbl/ext/MitsubaLoader/CElementTransform.h"
1110

1211

13-
namespace nbl
14-
{
15-
namespace ext
16-
{
17-
namespace MitsubaLoader
12+
namespace nbl::ext::MitsubaLoader
1813
{
1914

2015
struct CElementEmissionProfile : public IElement {
@@ -71,7 +66,4 @@ struct CElementEmissionProfile : public IElement {
7166
};
7267

7368
}
74-
}
75-
}
76-
7769
#endif

include/nbl/ext/MitsubaLoader/CElementEmitter.h

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
1-
// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
1+
// Copyright (C) 2018-2025 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4+
#ifndef _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_EMITTER_H_INCLUDED_
5+
#define _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_EMITTER_H_INCLUDED_
46

5-
#ifndef __C_ELEMENT_EMITTER_H_INCLUDED__
6-
#define __C_ELEMENT_EMITTER_H_INCLUDED__
77

8-
#include <cmath>
9-
10-
#include "vectorSIMD.h"
118
#include "nbl/ext/MitsubaLoader/CElementTexture.h"
129
#include "nbl/ext/MitsubaLoader/CElementEmissionProfile.h"
1310

14-
namespace nbl
15-
{
16-
namespace ext
17-
{
18-
namespace MitsubaLoader
11+
#include <cmath>
12+
13+
14+
namespace nbl::ext::MitsubaLoader
1915
{
2016

21-
2217
class CElementEmitter : public IElement
2318
{
2419
public:
@@ -302,10 +297,5 @@ class CElementEmitter : public IElement
302297
};
303298
};
304299

305-
306-
307300
}
308-
}
309-
}
310-
311301
#endif

include/nbl/ext/MitsubaLoader/CElementFilm.h

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4+
#ifndef _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_FILM_H_INCLUDED_
5+
#define _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_FILM_H_INCLUDED_
46

5-
#ifndef __C_ELEMENT_FILM_H_INCLUDED__
6-
#define __C_ELEMENT_FILM_H_INCLUDED__
77

88
#include "nbl/macros.h"
9-
109
#include "nbl/ext/MitsubaLoader/CElementRFilter.h"
1110

12-
namespace nbl
13-
{
14-
namespace ext
15-
{
16-
namespace MitsubaLoader
17-
{
1811

12+
namespace nbl::ext::MitsubaLoader
13+
{
1914

2015
class CElementFilm : public IElement
2116
{
@@ -149,7 +144,4 @@ class CElementFilm : public IElement
149144

150145

151146
}
152-
}
153-
}
154-
155147
#endif

include/nbl/ext/MitsubaLoader/CElementIntegrator.h

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4+
#ifndef _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_INTEGRATOR_H_INCLUDED_
5+
#define _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_INTEGRATOR_H_INCLUDED_
46

5-
#ifndef __C_ELEMENT_INTEGRATOR_H_INCLUDED__
6-
#define __C_ELEMENT_INTEGRATOR_H_INCLUDED__
77

88
#include "nbl/ext/MitsubaLoader/IElement.h"
99

10-
namespace nbl
11-
{
12-
namespace ext
13-
{
14-
namespace MitsubaLoader
10+
11+
namespace nbl::ext::MitsubaLoader
1512
{
1613

1714

@@ -334,9 +331,5 @@ class CElementIntegrator : public IElement
334331
};
335332

336333

337-
338334
}
339-
}
340-
}
341-
342335
#endif

include/nbl/ext/MitsubaLoader/CElementRFilter.h

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
1+
// Copyright (C) 2018-2025 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4+
#ifndef _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_R_FILTER_H_INCLUDED_
5+
#define _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_R_FILTER_H_INCLUDED_
46

5-
#ifndef __C_ELEMENT_R_FILTER_H_INCLUDED__
6-
#define __C_ELEMENT_R_FILTER_H_INCLUDED__
77

88
#include "nbl/ext/MitsubaLoader/PropertyElement.h"
9-
109
#include "nbl/ext/MitsubaLoader/IElement.h"
1110

12-
namespace nbl
13-
{
14-
namespace ext
15-
{
16-
namespace MitsubaLoader
11+
12+
namespace nbl::ext::MitsubaLoader
1713
{
1814

1915

@@ -70,7 +66,4 @@ class CElementRFilter : public IElement
7066

7167

7268
}
73-
}
74-
}
75-
7669
#endif

include/nbl/ext/MitsubaLoader/CElementSampler.h

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4+
#ifndef _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_SAMPLER_H_INCLUDED_
5+
#define _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_SAMPLER_H_INCLUDED_
46

5-
#ifndef __C_ELEMENT_SAMPLER_H_INCLUDED__
6-
#define __C_ELEMENT_SAMPLER_H_INCLUDED__
77

88
#include "nbl/ext/MitsubaLoader/IElement.h"
99

10-
namespace nbl
11-
{
12-
namespace ext
13-
{
14-
namespace MitsubaLoader
15-
{
1610

11+
namespace nbl::ext::MitsubaLoader
12+
{
1713
class CGlobalMitsubaMetadata;
1814

1915
class CElementSampler : public IElement
@@ -50,7 +46,4 @@ class CElementSampler : public IElement
5046

5147

5248
}
53-
}
54-
}
55-
5649
#endif

include/nbl/ext/MitsubaLoader/CElementSensor.h

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4+
#ifndef _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_SENSOR_H_INCLUDED_
5+
#define _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_SENSOR_H_INCLUDED_
46

5-
#ifndef __C_ELEMENT_SENSOR_H_INCLUDED__
6-
#define __C_ELEMENT_SENSOR_H_INCLUDED__
77

88
#include "nbl/ext/MitsubaLoader/IElement.h"
99
#include "nbl/ext/MitsubaLoader/CElementTransform.h"
1010
#include "nbl/ext/MitsubaLoader/CElementFilm.h"
1111
#include "nbl/ext/MitsubaLoader/CElementSampler.h"
1212

1313

14-
namespace nbl
15-
{
16-
namespace ext
17-
{
18-
namespace MitsubaLoader
14+
namespace nbl::ext::MitsubaLoader
1915
{
2016

2117

@@ -226,7 +222,4 @@ class CElementSensor : public IElement
226222

227223

228224
}
229-
}
230-
}
231-
232225
#endif

include/nbl/ext/MitsubaLoader/CElementShape.h

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
1+
// Copyright (C) 2018-2025 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4+
#ifndef _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_SHAPE_H_INCLUDED_
5+
#define _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_SHAPE_H_INCLUDED_
46

5-
#ifndef __C_ELEMENT_SHAPE_H_INCLUDED__
6-
#define __C_ELEMENT_SHAPE_H_INCLUDED__
77

88
#include "nbl/ext/MitsubaLoader/IElement.h"
99
#include "nbl/ext/MitsubaLoader/CElementTransform.h"
1010
#include "nbl/ext/MitsubaLoader/CElementBSDF.h"
1111
#include "nbl/ext/MitsubaLoader/CElementEmitter.h"
1212

1313

14-
namespace nbl
15-
{
16-
namespace ext
17-
{
18-
namespace MitsubaLoader
14+
namespace nbl::ext::MitsubaLoader
1915
{
2016

2117

@@ -281,7 +277,4 @@ class CElementShape : public IElement
281277

282278

283279
}
284-
}
285-
}
286-
287280
#endif

include/nbl/ext/MitsubaLoader/CElementTexture.h

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
1+
// Copyright (C) 2018-2025 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4+
#ifndef _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_TEXTURE_H_INCLUDED_
5+
#define _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_TEXTURE_H_INCLUDED_
46

5-
#ifndef __C_ELEMENT_TEXTURE_H_INCLUDED__
6-
#define __C_ELEMENT_TEXTURE_H_INCLUDED__
77

88
#include "nbl/ext/MitsubaLoader/PropertyElement.h"
99
#include "nbl/ext/MitsubaLoader/IElement.h"
1010

11-
namespace nbl
12-
{
13-
namespace ext
14-
{
15-
namespace MitsubaLoader
16-
{
1711

12+
namespace nbl::ext::MitsubaLoader
13+
{
1814

1915
class CElementTexture : public IElement
2016
{
@@ -256,9 +252,5 @@ class CElementTexture : public IElement
256252
};
257253

258254

259-
260-
}
261255
}
262-
}
263-
264256
#endif

0 commit comments

Comments
 (0)