Minor cleanups in nvmath.

pull/310/head
Ignacio 4 years ago
parent 4f0ecc4506
commit 7f9c87713a

@ -96,12 +96,12 @@ namespace nv
/// 16 bit 565 BGR color. /// 16 bit 565 BGR color.
class NVMATH_CLASS Color16 struct NVMATH_CLASS Color16
{ {
public:
Color16() { } Color16() { }
Color16(const Color16 & c) : u(c.u) { } Color16(const Color16 & c) : u(c.u) { }
explicit Color16(uint16 U) : u(U) { } explicit Color16(uint16 U) : u(U) { }
Color16(uint8 r, uint8 g, uint8 b) : r(r), g(g), b(b) { }
union { union {
struct { struct {

@ -3,12 +3,12 @@
#include "Fitting.h" #include "Fitting.h"
#include "Vector.inl" #include "Vector.inl"
#include "Plane.inl" #include "Plane.inl"
#include "Matrix.inl"
#include "nvcore/Array.inl" #include "nvcore/Array.inl"
#include "nvcore/Utils.h" // max, swap #include "nvcore/Utils.h" // max, swap
#include <float.h> // FLT_MAX #include <float.h> // FLT_MAX
//#include <vector>
#include <string.h> #include <string.h>
using namespace nv; using namespace nv;
@ -668,7 +668,7 @@ bool nv::Fit::eigenSolveSymmetric4(const float matrix[10], float eigenValues[4],
return true; return true;
} }
#include "nvmath/Matrix.inl"
inline float signNonzero(float x) inline float signNonzero(float x)
{ {

@ -1,8 +1,5 @@
// This code is in the public domain -- Ignacio Castaño <castano@gmail.com> // This code is in the public domain -- Ignacio Castaño <castano@gmail.com>
#pragma once #pragma once
#ifndef NV_MATH_FITTING_H
#define NV_MATH_FITTING_H
#include "Vector.h" #include "Vector.h"
#include "Plane.h" #include "Plane.h"
@ -46,5 +43,3 @@ namespace nv
} }
} // nv namespace } // nv namespace
#endif // NV_MATH_FITTING_H

@ -1,8 +1,8 @@
// This code is in the public domain -- Ignacio Castaño <castano@gmail.com> // This code is in the public domain -- Ignacio Castaño <castano@gmail.com>
#pragma once
#include "Vector.h" // Vector3, Vector4 #include "Vector.h" // Vector3, Vector4
#if NV_USE_ALTIVEC #if NV_USE_ALTIVEC
# include "SimdVector_VE.h" # include "SimdVector_VE.h"
#endif #endif

@ -22,9 +22,7 @@
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#pragma once
#ifndef NV_SIMD_VECTOR_SSE_H
#define NV_SIMD_VECTOR_SSE_H
#include "nvcore/Memory.h" #include "nvcore/Memory.h"
@ -212,5 +210,3 @@ namespace nv {
} }
} // namespace nv } // namespace nv
#endif // NV_SIMD_VECTOR_SSE_H

Loading…
Cancel
Save