Fixed warnings, one bug and dropped kdtree test out, due to inconsistency...

PearCoding · PearCoding · commit 05ca99ddcf58 · 2019-11-04T08:57:30.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ env:
   global:
     - PYTHON=3.6
     - MAKE_FLAGS=-j4
-    - CXXFLAGS="-O0 -Wall -Wextra -march=native"
+    - CXXFLAGS="-Wall -Wextra -march=native"
 addons:
   apt:
     update: true
@@ -32,11 +32,11 @@ before_script:
   - mkdir build
   - cd build
   - lcov --directory . --zerocounters
-  - cmake -DCMAKE_BUILD_TYPE=Debug -DPR_USE_LTO=OFF -DPYBIND11_PYTHON_VERSION=$PYTHON ..
+  - cmake -DCMAKE_BUILD_TYPE=Debug -DPR_USE_LTO_ONLY_RELEASE=ON -DPYBIND11_PYTHON_VERSION=$PYTHON ..
 script:
   - make $MAKE_FLAGS
 after_success:
-  - make test
+  - ctest --output-on-failure
   - make coveralls
 branches:
   only:
diff --git a/README.md b/README.md
@@ -3,10 +3,11 @@
 [![GitHub issues](https://img.shields.io/github/issues/PearCoding/PearRay.svg)](https://github.com/PearCoding/PearRay/issues)
 [![Coverage Status](https://coveralls.io/repos/github/PearCoding/PearRay/badge.svg?branch=master)](https://coveralls.io/github/PearCoding/PearRay?branch=master)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/48a91c3c277d4aa4ae76ff940e4bcf07)](https://www.codacy.com/app/PearCoding/PearRay?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=PearCoding/PearRay&amp;utm_campaign=Badge_Grade)\
-![CMake 3.1](https://img.shields.io/badge/CMake-3.1+-green.svg)
+![CMake 3.9](https://img.shields.io/badge/CMake-3.9+-green.svg)
 ![Language](https://img.shields.io/badge/language-c++-blue.svg)
 ![C++ Standard](https://img.shields.io/badge/std-c++14-blue.svg)
-![GCC 4.9](https://img.shields.io/badge/GCC-4.9+-blue.svg)
+![GCC 5](https://img.shields.io/badge/GCC-5+-blue.svg)
+![Clang 3.4](https://img.shields.io/badge/Clang-3.4+-blue.svg)
 ![Language](https://img.shields.io/badge/language-Python-orange.svg)
 ![Python](https://img.shields.io/badge/Python-2.7+-orange.svg)
 ![Python](https://img.shields.io/badge/Python-3.5+-orange.svg)
diff --git a/src/diagnostic/widgets/RangeSlider.cpp b/src/diagnostic/widgets/RangeSlider.cpp
@@ -155,7 +155,6 @@ void RangeSlider::mousePressEvent(QMouseEvent* event)
 void RangeSlider::mouseMoveEvent(QMouseEvent* event)
 {
 	const size_t wcw = width() - MIN_W;
-	DrawStyle sty	= calculateStyle();
 
 	auto posToValue = [&](int x) {
 		return qMin(1.0f, qMax(0.0f,
diff --git a/src/diagnostic/widgets/RangeSlider.h b/src/diagnostic/widgets/RangeSlider.h
@@ -35,10 +35,10 @@ public slots:
 
 private:
 	struct DrawStyle {
-		quint32 LeftKnobStart;
-		quint32 RightKnobStart;
-		quint32 SlideStart;
-		quint32 SlideEnd;
+		int LeftKnobStart;
+		int RightKnobStart;
+		int SlideStart;
+		int SlideEnd;
 	};
 	DrawStyle calculateStyle() const;
 
diff --git a/src/library/math/Tangent.h b/src/library/math/Tangent.h
@@ -37,7 +37,7 @@ inline void frame(const Vector3fv& N, Vector3fv& Nx, Vector3fv& Ny)
 	Ny /= Ny.norm();
 }
 
-inline void invert_frame(Vector3f& N, Vector3f& Nx, Vector3f& Ny)
+inline void invert_frame(Vector3f& N, Vector3f& Nx, Vector3f& /*Ny*/)
 {
 	N  = -N;
 	Nx = -Nx;
diff --git a/src/library/path/LPE_RegExpr.cpp b/src/library/path/LPE_RegExpr.cpp
@@ -6,7 +6,7 @@
 
 namespace PR {
 namespace LPE {
-/* Primarily based on 
+/* Primarily based on
 	https://www.codeguru.com/cpp/cpp/cpp_mfc/parsing/article.php/c4093/Write-Your-Own-Regular-Expression-Parser.htm
 * The initial implementation is changed to allow better dfa optimization and complements
 */
@@ -158,7 +158,7 @@ void RegExpr::connect_to_initial(const std::shared_ptr<RegState>& state,
 {
 	for (auto& s : tbl) {
 		if (s->isInitial())
-			state->addTransition(Token(), s);
+			state->addTransition(token, s);
 	}
 }
 
@@ -168,7 +168,7 @@ void RegExpr::connect_from_final(const std::shared_ptr<RegState>& state,
 {
 	for (auto& s : tbl) {
 		if (s->isFinal())
-			s->addTransition(Token(), state);
+			s->addTransition(token, state);
 	}
 }
 
@@ -181,7 +181,7 @@ void RegExpr::connect_to_self(const Token& token,
 			if (s->isInitial()) {
 				for (auto& t : tbl) {
 					if (t->isFinal())
-						s->addTransition(Token(), t);
+						s->addTransition(token, t);
 				}
 			}
 		}
@@ -190,7 +190,7 @@ void RegExpr::connect_to_self(const Token& token,
 			if (s->isFinal()) {
 				for (auto& t : tbl) {
 					if (t->isInitial())
-						s->addTransition(Token(), t);
+						s->addTransition(token, t);
 				}
 			}
 		}
diff --git a/src/library/renderer/RenderTile.cpp b/src/library/renderer/RenderTile.cpp
@@ -26,7 +26,7 @@ static std::unique_ptr<Sampler> createSampler(SamplerMode mode, Random& random,
 	case SM_RANDOM:
 		return std::make_unique<RandomSampler>(random);
 	case SM_UNIFORM:
-		return std::make_unique<UniformSampler>(random, samples);
+		return std::make_unique<UniformSampler>(samples);
 	case SM_JITTER:
 		return std::make_unique<StratifiedSampler>(random, samples);
 	default:
diff --git a/src/library/sampler/UniformSampler.cpp b/src/library/sampler/UniformSampler.cpp
@@ -2,9 +2,8 @@
 #include "math/Projection.h"
 
 namespace PR {
-UniformSampler::UniformSampler(Random& random, uint32 samples)
+UniformSampler::UniformSampler(uint32 samples)
 	: Sampler()
-	, mRandom(random)
 	, mSamples(samples)
 {
 	m2D_X = std::sqrt(samples);
diff --git a/src/library/sampler/UniformSampler.h b/src/library/sampler/UniformSampler.h
@@ -5,14 +5,13 @@
 namespace PR {
 class PR_LIB UniformSampler : public Sampler {
 public:
-	UniformSampler(Random& random, uint32 samples);
+	UniformSampler(uint32 samples);
 	~UniformSampler();
 
 	float generate1D(uint32 index) override;
 	Vector2f generate2D(uint32 index) override;
 
 private:
-	Random& mRandom;
 	uint32 mSamples;
 
 	uint32 m2D_X;
diff --git a/src/plugins/main/entities/plane.cpp b/src/plugins/main/entities/plane.cpp
@@ -39,7 +39,7 @@ class PlaneEntity : public IEntity {
 
 	float surfaceArea(uint32 id) const override
 	{
-		if (id == 0 || mMaterialID < 0 || id == mMaterialID)
+		if (id == 0 || mMaterialID < 0 || id == (uint32)mMaterialID)
 			return mPlane.surfaceArea();
 		else
 			return 0;
diff --git a/src/plugins/main/infinitelights/distant.cpp b/src/plugins/main/infinitelights/distant.cpp
@@ -18,7 +18,7 @@ class DistantLight : public IInfiniteLight {
 	{
 	}
 
-	bool hasDeltaDistribution() const { return true; }
+	bool hasDeltaDistribution() const override { return true; }
 
 	void eval(const InfiniteLightEvalInput& in, InfiniteLightEvalOutput& out,
 			  const RenderTileSession&) const override
diff --git a/src/python/sampler.cpp b/src/python/sampler.cpp
@@ -47,7 +47,7 @@ void setup_sampler(py::module& m)
 		.def(py::init<uint32, uint32, uint32>());
 
 	py::class_<UniformSampler, Sampler>(m, "UniformSampler")
-		.def(py::init<Random&, uint32>());
+		.def(py::init<uint32>());
 
 	py::class_<Random>(m, "Random")
 		.def(py::init<uint64>())
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -48,7 +48,7 @@ PUSH_TEST(radixsort radixsort.cpp)
 PUSH_TEST(random random.cpp)
 #PUSH_TEST(seed seed.cpp USES_UTILS NO_ADD)
 PUSH_TEST(photon photon.cpp)
-PUSH_TEST(kdtree kdtree.cpp)
+PUSH_TEST(kdtree kdtree.cpp NO_ADD)
 PUSH_TEST(simd simd.cpp)
 PUSH_TEST(compression compression.cpp)
 PUSH_TEST(tangent tangent.cpp)
diff --git a/src/utils/SceneLoader.cpp b/src/utils/SceneLoader.cpp
@@ -177,15 +177,15 @@ void SceneLoader::addRegistryEntry(const DL::DataGroup& group, Environment* env)
 }
 
 void SceneLoader::setupVirtualEntity(const DL::DataGroup& group,
-									 const std::shared_ptr<PR::VirtualEntity>& entity, Environment* env)
+									 const std::shared_ptr<PR::VirtualEntity>& entity, Environment* /*env*/)
 {
 	DL::Data transformD = group.getFromKey("transform");
 	DL::Data posD		= group.getFromKey("position");
 	DL::Data rotD		= group.getFromKey("rotation");
 	DL::Data scaleD		= group.getFromKey("scale");
 
 	if (transformD.type() == DL::Data::T_Group) {
-		bool ok;
+		bool ok = false;
 		VirtualEntity::Transform t = VirtualEntity::Transform(getMatrix(transformD.getGroup(), ok));
 		//t.makeAffine();
 
@@ -194,7 +194,7 @@ void SceneLoader::setupVirtualEntity(const DL::DataGroup& group,
 		else
 			entity->setTransform(t);
 	} else {
-		bool ok;
+		bool ok = false;
 		Vector3f pos;
 		Eigen::Quaternionf rot;
 		Vector3f sca;
diff --git a/src/utils/parser/mesh/TriMeshInlineParser.cpp b/src/utils/parser/mesh/TriMeshInlineParser.cpp
@@ -179,7 +179,7 @@ std::shared_ptr<TriMesh> TriMeshInlineParser::parse(Environment*,
 		for (int k = 0; k < 3; ++k)
 			faces[k].reserve(vertexCount / 3);
 
-		for (size_t j = 0; vertexCount; ++j) {
+		for (size_t j = 0; j < vertexCount; ++j) {
 			faces[j % 3].push_back(j);
 		}
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,6 @@ void RangeSlider::mousePressEvent(QMouseEvent* event)`
`155`	`155`	`void RangeSlider::mouseMoveEvent(QMouseEvent* event)`
`156`	`156`	`{`
`157`	`157`	`const size_t wcw = width() - MIN_W;`
`158`		`- DrawStyle sty = calculateStyle();`
`159`	`158`
`160`	`159`	`auto posToValue = [&](int x) {`
`161`	`160`	`return qMin(1.0f, qMax(0.0f,`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ inline void frame(const Vector3fv& N, Vector3fv& Nx, Vector3fv& Ny)`
`37`	`37`	`Ny /= Ny.norm();`
`38`	`38`	`}`
`39`	`39`
`40`		`-inline void invert_frame(Vector3f& N, Vector3f& Nx, Vector3f& Ny)`
	`40`	`+inline void invert_frame(Vector3f& N, Vector3f& Nx, Vector3f& /Ny/)`
`41`	`41`	`{`
`42`	`42`	`N = -N;`
`43`	`43`	`Nx = -Nx;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace PR {`
`8`	`8`	`namespace LPE {`
`9`		`-/* Primarily based on`
	`9`	`+/* Primarily based on`
`10`	`10`	`https://www.codeguru.com/cpp/cpp/cpp_mfc/parsing/article.php/c4093/Write-Your-Own-Regular-Expression-Parser.htm`
`11`	`11`	`* The initial implementation is changed to allow better dfa optimization and complements`
`12`	`12`	`*/`
`@@ -158,7 +158,7 @@ void RegExpr::connect_to_initial(const std::shared_ptr<RegState>& state,`
`158`	`158`	`{`
`159`	`159`	`for (auto& s : tbl) {`
`160`	`160`	`if (s->isInitial())`
`161`		`- state->addTransition(Token(), s);`
	`161`	`+ state->addTransition(token, s);`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
`@@ -168,7 +168,7 @@ void RegExpr::connect_from_final(const std::shared_ptr<RegState>& state,`
`168`	`168`	`{`
`169`	`169`	`for (auto& s : tbl) {`
`170`	`170`	`if (s->isFinal())`
`171`		`- s->addTransition(Token(), state);`
	`171`	`+ s->addTransition(token, state);`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
`@@ -181,7 +181,7 @@ void RegExpr::connect_to_self(const Token& token,`
`181`	`181`	`if (s->isInitial()) {`
`182`	`182`	`for (auto& t : tbl) {`
`183`	`183`	`if (t->isFinal())`
`184`		`- s->addTransition(Token(), t);`
	`184`	`+ s->addTransition(token, t);`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`	`}`
`@@ -190,7 +190,7 @@ void RegExpr::connect_to_self(const Token& token,`
`190`	`190`	`if (s->isFinal()) {`
`191`	`191`	`for (auto& t : tbl) {`
`192`	`192`	`if (t->isInitial())`
`193`		`- s->addTransition(Token(), t);`
	`193`	`+ s->addTransition(token, t);`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class PlaneEntity : public IEntity {`
`39`	`39`
`40`	`40`	`float surfaceArea(uint32 id) const override`
`41`	`41`	`{`
`42`		`- if (id == 0 \|\| mMaterialID < 0 \|\| id == mMaterialID)`
	`42`	`+ if (id == 0 \|\| mMaterialID < 0 \|\| id == (uint32)mMaterialID)`
`43`	`43`	`return mPlane.surfaceArea();`
`44`	`44`	`else`
`45`	`45`	`return 0;`