Skip to content

Commit d11eda8

Browse files
committed
More lint
1 parent 49cf81d commit d11eda8

File tree

8 files changed

+63
-63
lines changed

8 files changed

+63
-63
lines changed

Inc/DirectXMathMatrix.inl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*
1616
****************************************************************************/
1717

18-
//------------------------------------------------------------------------------
19-
// Comparison operations
20-
//------------------------------------------------------------------------------
18+
//------------------------------------------------------------------------------
19+
// Comparison operations
20+
//------------------------------------------------------------------------------
2121

22-
//------------------------------------------------------------------------------
22+
//------------------------------------------------------------------------------
2323

2424
#if !defined(_XM_NO_INTRINSICS_) && defined(_MSC_VER) && !defined(__INTEL_COMPILER)
2525
#pragma float_control(push)
@@ -3213,7 +3213,7 @@ inline XMMATRIX XM_CALLCONV XMMatrixOrthographicOffCenterRH
32133213
*
32143214
****************************************************************************/
32153215

3216-
//------------------------------------------------------------------------------
3216+
//------------------------------------------------------------------------------
32173217

32183218
inline XMMATRIX::XMMATRIX
32193219
(
@@ -3448,7 +3448,7 @@ inline XMMATRIX XM_CALLCONV operator*
34483448
*
34493449
****************************************************************************/
34503450

3451-
//------------------------------------------------------------------------------
3451+
//------------------------------------------------------------------------------
34523452
_Use_decl_annotations_
34533453
inline XMFLOAT3X3::XMFLOAT3X3(const float* pArray) noexcept
34543454
{
@@ -3468,7 +3468,7 @@ inline XMFLOAT3X3::XMFLOAT3X3(const float* pArray) noexcept
34683468
*
34693469
****************************************************************************/
34703470

3471-
//------------------------------------------------------------------------------
3471+
//------------------------------------------------------------------------------
34723472
_Use_decl_annotations_
34733473
inline XMFLOAT4X3::XMFLOAT4X3(const float* pArray) noexcept
34743474
{
@@ -3525,7 +3525,7 @@ inline XMFLOAT3X4::XMFLOAT3X4(const float* pArray) noexcept
35253525
*
35263526
****************************************************************************/
35273527

3528-
//------------------------------------------------------------------------------
3528+
//------------------------------------------------------------------------------
35293529
_Use_decl_annotations_
35303530
inline XMFLOAT4X4::XMFLOAT4X4(const float* pArray) noexcept
35313531
{

Inc/DirectXMathMisc.inl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*
1616
****************************************************************************/
1717

18-
//------------------------------------------------------------------------------
19-
// Comparison operations
20-
//------------------------------------------------------------------------------
18+
//------------------------------------------------------------------------------
19+
// Comparison operations
20+
//------------------------------------------------------------------------------
2121

22-
//------------------------------------------------------------------------------
22+
//------------------------------------------------------------------------------
2323

2424
inline bool XM_CALLCONV XMQuaternionEqual
2525
(
@@ -966,11 +966,11 @@ inline void XM_CALLCONV XMQuaternionToAxisAngle
966966
*
967967
****************************************************************************/
968968

969-
//------------------------------------------------------------------------------
970-
// Comparison operations
971-
//------------------------------------------------------------------------------
969+
//------------------------------------------------------------------------------
970+
// Comparison operations
971+
//------------------------------------------------------------------------------
972972

973-
//------------------------------------------------------------------------------
973+
//------------------------------------------------------------------------------
974974

975975
inline bool XM_CALLCONV XMPlaneEqual
976976
(
@@ -1298,11 +1298,11 @@ inline XMVECTOR XM_CALLCONV XMPlaneFromPoints
12981298
*
12991299
****************************************************************************/
13001300

1301-
//------------------------------------------------------------------------------
1302-
// Comparison operations
1303-
//------------------------------------------------------------------------------
1301+
//------------------------------------------------------------------------------
1302+
// Comparison operations
1303+
//------------------------------------------------------------------------------
13041304

1305-
//------------------------------------------------------------------------------
1305+
//------------------------------------------------------------------------------
13061306

13071307
inline bool XM_CALLCONV XMColorEqual
13081308
(
@@ -1967,7 +1967,7 @@ inline XMVECTOR XM_CALLCONV XMColorSRGBToRGB(FXMVECTOR srgb) noexcept
19671967
*
19681968
****************************************************************************/
19691969

1970-
//------------------------------------------------------------------------------
1970+
//------------------------------------------------------------------------------
19711971

19721972
inline bool XMVerifyCPUSupport() noexcept
19731973
{

Inc/DirectXMathVector.inl

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
*
3838
****************************************************************************/
3939

40-
//------------------------------------------------------------------------------
41-
// Assignment operations
42-
//------------------------------------------------------------------------------
40+
//------------------------------------------------------------------------------
41+
// Assignment operations
42+
//------------------------------------------------------------------------------
4343

44-
//------------------------------------------------------------------------------
45-
// Return a vector with all elements equaling zero
44+
//------------------------------------------------------------------------------
45+
// Return a vector with all elements equaling zero
4646
inline XMVECTOR XM_CALLCONV XMVectorZero() noexcept
4747
{
4848
#if defined(_XM_NO_INTRINSICS_)
@@ -6183,11 +6183,11 @@ inline XMVECTOR XM_CALLCONV XMVectorBaryCentricV
61836183
*
61846184
****************************************************************************/
61856185

6186-
//------------------------------------------------------------------------------
6187-
// Comparison operations
6188-
//------------------------------------------------------------------------------
6186+
//------------------------------------------------------------------------------
6187+
// Comparison operations
6188+
//------------------------------------------------------------------------------
61896189

6190-
//------------------------------------------------------------------------------
6190+
//------------------------------------------------------------------------------
61916191

61926192
inline bool XM_CALLCONV XMVector2Equal
61936193
(
@@ -8911,11 +8911,11 @@ inline XMFLOAT2* XM_CALLCONV XMVector2TransformNormalStream
89118911
*
89128912
****************************************************************************/
89138913

8914-
//------------------------------------------------------------------------------
8915-
// Comparison operations
8916-
//------------------------------------------------------------------------------
8914+
//------------------------------------------------------------------------------
8915+
// Comparison operations
8916+
//------------------------------------------------------------------------------
89178917

8918-
//------------------------------------------------------------------------------
8918+
//------------------------------------------------------------------------------
89198919

89208920
inline bool XM_CALLCONV XMVector3Equal
89218921
(
@@ -12776,11 +12776,11 @@ inline XMFLOAT3* XM_CALLCONV XMVector3UnprojectStream
1277612776
*
1277712777
****************************************************************************/
1277812778

12779-
//------------------------------------------------------------------------------
12780-
// Comparison operations
12781-
//------------------------------------------------------------------------------
12779+
//------------------------------------------------------------------------------
12780+
// Comparison operations
12781+
//------------------------------------------------------------------------------
1278212782

12783-
//------------------------------------------------------------------------------
12783+
//------------------------------------------------------------------------------
1278412784

1278512785
inline bool XM_CALLCONV XMVector4Equal
1278612786
(
@@ -13512,7 +13512,7 @@ inline XMVECTOR XM_CALLCONV XMVector4Cross
1351213512
XMVECTOR vTemp2 = XM_PERMUTE_PS(V2, _MM_SHUFFLE(1, 3, 2, 3));
1351313513
vTemp3 = XM_PERMUTE_PS(vTemp3, _MM_SHUFFLE(1, 3, 0, 1));
1351413514
vResult = XM_FNMADD_PS(vTemp2, vTemp3, vResult);
13515-
// term1 * V1yxxx
13515+
// term1 * V1yxxx
1351613516
XMVECTOR vTemp1 = XM_PERMUTE_PS(V1, _MM_SHUFFLE(0, 0, 0, 1));
1351713517
vResult = _mm_mul_ps(vResult, vTemp1);
1351813518

@@ -14690,7 +14690,7 @@ inline XMFLOAT4* XM_CALLCONV XMVector4TransformStream
1469014690

1469114691
#ifndef _XM_NO_XMVECTOR_OVERLOADS_
1469214692

14693-
//------------------------------------------------------------------------------
14693+
//------------------------------------------------------------------------------
1469414694

1469514695
inline XMVECTOR XM_CALLCONV operator+ (FXMVECTOR V) noexcept
1469614696
{

Inc/DirectXPackedVector.inl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3720,7 +3720,7 @@ inline void XM_CALLCONV XMStoreU555
37203720
*
37213721
****************************************************************************/
37223722

3723-
//------------------------------------------------------------------------------
3723+
//------------------------------------------------------------------------------
37243724

37253725
inline XMCOLOR::XMCOLOR
37263726
(
@@ -3917,7 +3917,7 @@ inline XMBYTE2::XMBYTE2(const float* pArray) noexcept
39173917
*
39183918
****************************************************************************/
39193919

3920-
//------------------------------------------------------------------------------
3920+
//------------------------------------------------------------------------------
39213921

39223922
inline XMUBYTEN2::XMUBYTEN2
39233923
(
@@ -4193,7 +4193,7 @@ inline XMXDECN4::XMXDECN4(const float* pArray) noexcept
41934193
#ifdef _MSC_VER
41944194
#pragma warning(push)
41954195
#pragma warning(disable : 4996)
4196-
// C4996: ignore deprecation warning
4196+
// C4996: ignore deprecation warning
41974197
#endif
41984198

41994199
#ifdef __clang__
@@ -4258,7 +4258,7 @@ inline XMDECN4::XMDECN4(const float* pArray) noexcept
42584258
*
42594259
****************************************************************************/
42604260

4261-
//------------------------------------------------------------------------------
4261+
//------------------------------------------------------------------------------
42624262

42634263
inline XMDEC4::XMDEC4
42644264
(

SHMath/DirectXSH.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1426,10 +1426,10 @@ float DirectX::XMSHDot(
14261426
// Computes the product of two functions represented using SH (f and g), where:
14271427
// result[i] = int(y_i(s) * f(s) * g(s)), where y_i(s) is the ith SH basis
14281428
// function, f(s) and g(s) are SH functions (sum_i(y_i(s)*c_i)). The order O
1429-
// determines the lengths of the arrays, where there should always be O^2
1429+
// determines the lengths of the arrays, where there should always be O^2
14301430
// coefficients. In general the product of two SH functions of order O generates
14311431
// and SH function of order 2*O - 1, but we truncate the result. This means
1432-
// that the product commutes (f*g == g*f) but doesn't associate
1432+
// that the product commutes (f*g == g*f) but doesn't associate
14331433
// (f*(g*h) != (f*g)*h.
14341434
//-------------------------------------------------------------------------------------
14351435
_Use_decl_annotations_
@@ -4470,7 +4470,7 @@ float* DirectX::XMSHMultiply6(
44704470

44714471

44724472
//-------------------------------------------------------------------------------------
4473-
// Evaluates a directional light and returns spectral SH data. The output
4473+
// Evaluates a directional light and returns spectral SH data. The output
44744474
// vector is computed so that if the intensity of R/G/B is unit the resulting
44754475
// exit radiance of a point directly under the light on a diffuse object with
44764476
// an albedo of 1 would be 1.0. This will compute 3 spectral samples, resultR
@@ -4537,10 +4537,10 @@ bool XM_CALLCONV DirectX::XMSHEvalDirectionalLight(
45374537

45384538

45394539
//------------------------------------------------------------------------------------
4540-
// Evaluates a spherical light and returns spectral SH data. There is no
4540+
// Evaluates a spherical light and returns spectral SH data. There is no
45414541
// normalization of the intensity of the light like there is for directional
4542-
// lights, care has to be taken when specifiying the intensities. This will
4543-
// compute 3 spectral samples, resultR has to be specified, while resultG and
4542+
// lights, care has to be taken when specifiying the intensities. This will
4543+
// compute 3 spectral samples, resultR has to be specified, while resultG and
45444544
// resultB are optional.
45454545
//
45464546
// http://msdn.microsoft.com/en-us/library/windows/desktop/bb205451.aspx
@@ -4575,7 +4575,7 @@ bool XM_CALLCONV DirectX::XMSHEvalSphericalLight(
45754575

45764576
//
45774577
// Sphere at distance fDist, the cone angle is determined by looking at the
4578-
// right triangle with one side (the hypotenuse) beind the vector from the
4578+
// right triangle with one side (the hypotenuse) beind the vector from the
45794579
// origin to the center of the sphere, another side is from the origin to
45804580
// a point on the sphere whose normal is perpendicular to the given side (this
45814581
// is one of the points on the cone that is defined by the projection of the sphere
@@ -4590,7 +4590,7 @@ bool XM_CALLCONV DirectX::XMSHEvalSphericalLight(
45904590
// no default normalization is done for this case, have to be careful how
45914591
// you represent the coefficients...
45924592

4593-
const float fNewNorm = 1.0f;///(fSinConeAngle*fSinConeAngle);
4593+
const float fNewNorm = 1.0f;///(fSinConeAngle*fSinConeAngle);
45944594

45954595
ComputeCapInt(order, fConeAngle, fTmpL0);
45964596

@@ -4791,7 +4791,7 @@ bool XM_CALLCONV DirectX::XMSHEvalConeLight(
47914791
// is normalized so that a point on a perfectly diffuse surface with no
47924792
// shadowing and a normal pointed in the direction pDir would result in exit
47934793
// radiance with a value of 1 if the top color was white and the bottom color
4794-
// was black. This is a very simple model where topColor represents the intensity
4794+
// was black. This is a very simple model where topColor represents the intensity
47954795
// of the "sky" and bottomColor represents the intensity of the "ground".
47964796
//
47974797
// http://msdn.microsoft.com/en-us/library/windows/desktop/bb204989.aspx

SHMath/DirectXSHD3D11.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ HRESULT DirectX::SHProjectCubeMap(
261261

262262
// index from [0,W-1], f(0) maps to -1 + 1/W, f(W-1) maps to 1 - 1/w
263263
// linear function x*S +B, 1st constraint means B is (-1+1/W), plug into
264-
// second and solve for S: S = 2*(1-1/W)/(W-1). The old code that did
264+
// second and solve for S: S = 2*(1-1/W)/(W-1). The old code that did
265265
// this was incorrect - but only for computing the differential solid
266266
// angle, where the final value was 1.0 instead of 1-1/w...
267267

Stereo3D/Stereo3DMatrixHelper.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ namespace
2323
)
2424
{
2525
// note that most people have difficulty fusing images into 3D
26-
// if the separation equals even just the human average. by
26+
// if the separation equals even just the human average. by
2727
// reducing the separation (interocular distance) by 1/2, we
2828
// guarantee a larger subset of people will see full 3D
2929

3030
// the conservative setting should always be used. the only problem
31-
// with the conservative setting is that the 3D effect will be less
31+
// with the conservative setting is that the 3D effect will be less
3232
// impressive on smaller screens (which makes sense, since your eye
3333
// cannot be tricked as easily based on the smaller fov). to simulate
3434
// the effect of a larger screen, use the liberal settings (debug only)
@@ -37,10 +37,10 @@ namespace
3737

3838
// Liberal Settings: * max acuity angle: 1.6f degrees * interoc distance: 2.5f inches
3939

40-
// maximum visual accuity angle allowed is 3.2 degrees for
41-
// a physical scene, and 1.6 degrees for a virtual one.
40+
// maximum visual accuity angle allowed is 3.2 degrees for
41+
// a physical scene, and 1.6 degrees for a virtual one.
4242
// thus we cannot allow an object to appear any closer to
43-
// the viewer than 1.6 degrees (divided by two for most
43+
// the viewer than 1.6 degrees (divided by two for most
4444
// half-angle calculations)
4545

4646
static const float fMaxStereoDistance = 780; // inches (should be between 10 and 20m)
@@ -135,7 +135,7 @@ XMMATRIX DirectX::StereoProjectionFovLH
135135
fVirtualProjection *= pStereoParameters->fStereoSeparationFactor; // incorporate developer defined bias
136136

137137
//
138-
// By applying a translation, we are forcing our cameras to be parallel
138+
// By applying a translation, we are forcing our cameras to be parallel
139139
//
140140

141141
float fInvertedAngle = atanf(fVirtualProjection / (2.0f * NearZ));
@@ -212,15 +212,15 @@ XMMATRIX DirectX::StereoProjectionFovRH
212212
fVirtualProjection *= pStereoParameters->fStereoSeparationFactor; // incorporate developer defined bias
213213

214214
//
215-
// By applying a translation, we are forcing our cameras to be parallel
215+
// By applying a translation, we are forcing our cameras to be parallel
216216
//
217217

218218
float fInvertedAngle = atanf(fVirtualProjection / (2.0f * NearZ));
219219

220220
XMMATRIX proj = XMMatrixPerspectiveFovRH(FovAngleY, AspectRatio, NearZ, FarZ);
221221

222222
//
223-
// By applying a translation, we are forcing our cameras to be parallel
223+
// By applying a translation, we are forcing our cameras to be parallel
224224
//
225225

226226
XMMATRIX patchedProjection;

Stereo3D/Stereo3DMatrixHelper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace DirectX
4141
// be 1.0, but during development, on small screens, this value can be raised to up to 2.0 in
4242
// order to exaggerate the 3D effect. Values over 1.0 may cause discomfort on normal sized
4343
// displays. It defaults to 1.0.
44-
//
44+
//
4545
struct STEREO_PARAMETERS
4646
{
4747
float fViewerDistanceInches;

0 commit comments

Comments
 (0)