Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Dependencies: Fix some -Wconversion warnings in G3D

Browse Source
This commit is contained in:
jackpoz committed 2014-08-23 19:56:42 +02:00
1 parent 7d4801750b
commit f2fa1533d9
4 files changed
+36 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dep/g3dlite/G3D-v9.0 hotfix2.diff
+32
View File
@@ -0,0 +1,32 @@
dep/g3dlite/include/G3D/Color3.h | 2 +-
dep/g3dlite/include/G3D/Matrix3.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dep/g3dlite/include/G3D/Color3.h b/dep/g3dlite/include/G3D/Color3.h
index 6eedf25..e5c0abc 100644
--- a/dep/g3dlite/include/G3D/Color3.h
+++ b/dep/g3dlite/include/G3D/Color3.h
@@ -187,7 +187,7 @@ public:
Color3 direction() const;
float squaredLength () const;
float dot (const Color3& rkVector) const;
- float unitize (float fTolerance = 1e-06);
+ float unitize (float fTolerance = 1e-06f);
Color3 cross (const Color3& rkVector) const;
Color3 unitCross (const Color3& rkVector) const;
diff --git a/dep/g3dlite/include/G3D/Matrix3.h b/dep/g3dlite/include/G3D/Matrix3.h
index 8cfcfe9..13cd410 100644
--- a/dep/g3dlite/include/G3D/Matrix3.h
+++ b/dep/g3dlite/include/G3D/Matrix3.h
@@ -242,8 +242,8 @@ public:
bool isOrthonormal() const;
Matrix3 transpose () const;
- bool inverse (Matrix3& rkInverse, float fTolerance = 1e-06) const;
- Matrix3 inverse (float fTolerance = 1e-06) const;
+ bool inverse (Matrix3& rkInverse, float fTolerance = 1e-06f) const;
+ Matrix3 inverse (float fTolerance = 1e-06f) const;
float determinant () const;
/** singular value decomposition */
dep/g3dlite/Readme.txt
+1
View File
@@ -11,3 +11,4 @@ G3D-v8.0_hotfix7.diff - 2013-08-31 - fix typo in Matrix4 == operator
G3D-v8.0_hotfix8.diff - 2013-09-01 - fix typo in Vector3int32 += operator G3D-v8.0_hotfix8.diff - 2013-09-01 - fix typo in Vector3int32 += operator
G3D-v8.0_hotfix9.diff - 2014-06-01 - only VS < 10 don't ship inttypes.h G3D-v8.0_hotfix9.diff - 2014-06-01 - only VS < 10 don't ship inttypes.h
G3D-v9.0 hotfix1.diff - 2014-08-22 - updated to G3D9, reapplied previous patches and removed unneeded changes G3D-v9.0 hotfix1.diff - 2014-08-22 - updated to G3D9, reapplied previous patches and removed unneeded changes
G3D-v9.0 hotfix2.diff - 2014-08-23 - fix some -Wconversion warnings
dep/g3dlite/include/G3D/Color3.h
+1 -1
View File
@@ -187,7 +187,7 @@ public:
Color3 direction() const; Color3 direction() const;
float squaredLength () const; float squaredLength () const;
float dot (const Color3& rkVector) const; float dot (const Color3& rkVector) const;
float unitize (float fTolerance = 1e-06); float unitize (float fTolerance = 1e-06f);
Color3 cross (const Color3& rkVector) const; Color3 cross (const Color3& rkVector) const;
Color3 unitCross (const Color3& rkVector) const; Color3 unitCross (const Color3& rkVector) const;
dep/g3dlite/include/G3D/Matrix3.h
+2 -2
View File
@@ -242,8 +242,8 @@ public:
bool isOrthonormal() const; bool isOrthonormal() const;
Matrix3 transpose () const; Matrix3 transpose () const;
bool inverse (Matrix3& rkInverse, float fTolerance = 1e-06) const; bool inverse (Matrix3& rkInverse, float fTolerance = 1e-06f) const;
Matrix3 inverse (float fTolerance = 1e-06) const; Matrix3 inverse (float fTolerance = 1e-06f) const;
float determinant () const; float determinant () const;
/** singular value decomposition */ /** singular value decomposition */