Code-style consistency improvement:

Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files.
make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type.
This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
2018-09-23 14:17:31 -07:00
parent b73b05e9fb
commit ab8f16961e
1773 changed files with 1081087 additions and 474249 deletions

View File

@@ -18,8 +18,8 @@ subject to the following restrictions:
#define _BOOLINVEC_H
#include <math.h>
namespace Vectormath {
namespace Vectormath
{
class floatInVec;
//--------------------------------------------------------------------------------------------------
@@ -29,80 +29,77 @@ class floatInVec;
class boolInVec
{
private:
unsigned int mData;
unsigned int mData;
public:
// Default constructor; does no initialization
//
inline boolInVec( ) { };
// Default constructor; does no initialization
//
inline boolInVec(){};
// Construct from a value converted from float
//
inline boolInVec(floatInVec vec);
// Construct from a value converted from float
//
inline boolInVec(floatInVec vec);
// Explicit cast from bool
//
explicit inline boolInVec(bool scalar);
// Explicit cast from bool
//
explicit inline boolInVec(bool scalar);
// Explicit cast to bool
//
inline bool getAsBool() const;
// Explicit cast to bool
//
inline bool getAsBool() const;
#ifndef _VECTORMATH_NO_SCALAR_CAST
// Implicit cast to bool
//
inline operator bool() const;
// Implicit cast to bool
//
inline operator bool() const;
#endif
// Boolean negation operator
//
inline const boolInVec operator ! () const;
// Boolean negation operator
//
inline const boolInVec operator!() const;
// Assignment operator
//
inline boolInVec& operator = (boolInVec vec);
// Assignment operator
//
inline boolInVec& operator=(boolInVec vec);
// Boolean and assignment operator
//
inline boolInVec& operator &= (boolInVec vec);
// Boolean and assignment operator
//
inline boolInVec& operator&=(boolInVec vec);
// Boolean exclusive or assignment operator
//
inline boolInVec& operator ^= (boolInVec vec);
// Boolean or assignment operator
//
inline boolInVec& operator |= (boolInVec vec);
// Boolean exclusive or assignment operator
//
inline boolInVec& operator^=(boolInVec vec);
// Boolean or assignment operator
//
inline boolInVec& operator|=(boolInVec vec);
};
// Equal operator
//
inline const boolInVec operator == (boolInVec vec0, boolInVec vec1);
inline const boolInVec operator==(boolInVec vec0, boolInVec vec1);
// Not equal operator
//
inline const boolInVec operator != (boolInVec vec0, boolInVec vec1);
inline const boolInVec operator!=(boolInVec vec0, boolInVec vec1);
// And operator
//
inline const boolInVec operator & (boolInVec vec0, boolInVec vec1);
inline const boolInVec operator&(boolInVec vec0, boolInVec vec1);
// Exclusive or operator
//
inline const boolInVec operator ^ (boolInVec vec0, boolInVec vec1);
inline const boolInVec operator^(boolInVec vec0, boolInVec vec1);
// Or operator
//
inline const boolInVec operator | (boolInVec vec0, boolInVec vec1);
inline const boolInVec operator|(boolInVec vec0, boolInVec vec1);
// Conditionally select between two values
//
inline const boolInVec select(boolInVec vec0, boolInVec vec1, boolInVec select_vec1);
} // namespace Vectormath
} // namespace Vectormath
//--------------------------------------------------------------------------------------------------
// boolInVec implementation
@@ -110,117 +107,101 @@ inline const boolInVec select(boolInVec vec0, boolInVec vec1, boolInVec select_v
#include "floatInVec.h"
namespace Vectormath {
inline
boolInVec::boolInVec(floatInVec vec)
namespace Vectormath
{
*this = (vec != floatInVec(0.0f));
inline boolInVec::boolInVec(floatInVec vec)
{
*this = (vec != floatInVec(0.0f));
}
inline
boolInVec::boolInVec(bool scalar)
inline boolInVec::boolInVec(bool scalar)
{
mData = -(int)scalar;
mData = -(int)scalar;
}
inline
bool
inline bool
boolInVec::getAsBool() const
{
return (mData > 0);
return (mData > 0);
}
#ifndef _VECTORMATH_NO_SCALAR_CAST
inline
boolInVec::operator bool() const
inline boolInVec::operator bool() const
{
return getAsBool();
return getAsBool();
}
#endif
inline
const boolInVec
boolInVec::operator ! () const
inline const boolInVec
boolInVec::operator!() const
{
return boolInVec(!mData);
return boolInVec(!mData);
}
inline
boolInVec&
boolInVec::operator = (boolInVec vec)
inline boolInVec&
boolInVec::operator=(boolInVec vec)
{
mData = vec.mData;
return *this;
mData = vec.mData;
return *this;
}
inline
boolInVec&
boolInVec::operator &= (boolInVec vec)
inline boolInVec&
boolInVec::operator&=(boolInVec vec)
{
*this = *this & vec;
return *this;
*this = *this & vec;
return *this;
}
inline
boolInVec&
boolInVec::operator ^= (boolInVec vec)
inline boolInVec&
boolInVec::operator^=(boolInVec vec)
{
*this = *this ^ vec;
return *this;
*this = *this ^ vec;
return *this;
}
inline
boolInVec&
boolInVec::operator |= (boolInVec vec)
inline boolInVec&
boolInVec::operator|=(boolInVec vec)
{
*this = *this | vec;
return *this;
*this = *this | vec;
return *this;
}
inline
const boolInVec
operator == (boolInVec vec0, boolInVec vec1)
inline const boolInVec
operator==(boolInVec vec0, boolInVec vec1)
{
return boolInVec(vec0.getAsBool() == vec1.getAsBool());
return boolInVec(vec0.getAsBool() == vec1.getAsBool());
}
inline
const boolInVec
operator != (boolInVec vec0, boolInVec vec1)
inline const boolInVec
operator!=(boolInVec vec0, boolInVec vec1)
{
return !(vec0 == vec1);
return !(vec0 == vec1);
}
inline
const boolInVec
operator & (boolInVec vec0, boolInVec vec1)
inline const boolInVec
operator&(boolInVec vec0, boolInVec vec1)
{
return boolInVec(vec0.getAsBool() & vec1.getAsBool());
return boolInVec(vec0.getAsBool() & vec1.getAsBool());
}
inline
const boolInVec
operator | (boolInVec vec0, boolInVec vec1)
inline const boolInVec
operator|(boolInVec vec0, boolInVec vec1)
{
return boolInVec(vec0.getAsBool() | vec1.getAsBool());
return boolInVec(vec0.getAsBool() | vec1.getAsBool());
}
inline
const boolInVec
operator ^ (boolInVec vec0, boolInVec vec1)
inline const boolInVec
operator^(boolInVec vec0, boolInVec vec1)
{
return boolInVec(vec0.getAsBool() ^ vec1.getAsBool());
return boolInVec(vec0.getAsBool() ^ vec1.getAsBool());
}
inline
const boolInVec
inline const boolInVec
select(boolInVec vec0, boolInVec vec1, boolInVec select_vec1)
{
return (select_vec1.getAsBool() == 0) ? vec0 : vec1;
return (select_vec1.getAsBool() == 0) ? vec0 : vec1;
}
} // namespace Vectormath
#endif // boolInVec_h
} // namespace Vectormath
#endif // boolInVec_h