Update include locations.

tatsy · Nov 24, 2016 · 3fa98b4 · 3fa98b4
1 parent e4fbcb7
commit 3fa98b4
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 30 deletions.
diff --git a/sources/viewer/CMakeLists.txt b/sources/viewer/CMakeLists.txt
@@ -15,6 +15,7 @@ if (${SPICA_BUILD_GUI})
   set(CMAKE_AUTOMOC ON)
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+  include_directories(${SPICA_ROOT_DIR}/sources)
   link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 
   configure_file(shader_location.in.h

diff --git a/sources/viewer/main.cc b/sources/viewer/main.cc
@@ -1,6 +1,6 @@
 #include <QtWidgets/qapplication.h>
 
-#include "../../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 #include "scene_viewer.h"

diff --git a/sources/viewer/report_engine.h b/sources/viewer/report_engine.h
@@ -5,7 +5,7 @@
 #ifndef _SPICA_REPORT_ENGINE_H_
 #define _SPICA_REPORT_ENGINE_H_
 
-#include "../../include/spica.h"
+#include "spica.h"
 
 #include <QtCore/qobject.h>
 #include <QtGui/qimage.h>
@@ -57,16 +57,16 @@ class ReportEngine : public QObject, public Engine {
 
 
         auto callback = std::make_unique<std::function<void(const Image&)>>([&](const Image& image) {
-            QImage qimage(image.width(), image.height(), QImage::Format_ARGB32_Premultiplied);
-            for (int y = 0; y < image.height(); y++) {
-                for (int x = 0; x < image.width(); x++) {
-                    RGBSpectrum rgb = image(x, y).toRGB();
-                    int r = std::max(0, std::min((int)(rgb.red() * 255.0), 255));
-                    int g = std::max(0, std::min((int)(rgb.green() * 255.0), 255));
-                    int b = std::max(0, std::min((int)(rgb.blue() * 255.0), 255));
-                    qimage.setPixel(x, y, qRgb(r, g, b));
-                }
-            }
+            QImage qimage(image.width(), image.height(), QImage::Format_ARGB32_Premultiplied);
+            for (int y = 0; y < image.height(); y++) {
+                for (int x = 0; x < image.width(); x++) {
+                    RGBSpectrum rgb = image(x, y).toRGB();
+                    int r = std::max(0, std::min((int)(rgb.red() * 255.0), 255));
+                    int g = std::max(0, std::min((int)(rgb.green() * 255.0), 255));
+                    int b = std::max(0, std::min((int)(rgb.blue() * 255.0), 255));
+                    qimage.setPixel(x, y, qRgb(r, g, b));
+                }
+            }
             emit imageSaved(qimage);
         });
 

diff --git a/sources/viewer/scene_viewer.h b/sources/viewer/scene_viewer.h
@@ -16,7 +16,7 @@
 #include "opengl_viewer.h"
 #include "render_worker.h"
 
-#include "../../include/spica.h"
+#include "spica.h"
 
 namespace spica {
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -2,6 +2,7 @@ if (${SPICA_BUILD_TESTS})
   message(STATUS "[spica] Building unit tests.")
 
   enable_testing()
+  include_directories(${SPICA_ROOT_DIR}/sources)
   link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 
   if(WIN32)

diff --git a/tests/test_color.cc b/tests/test_color.cc
@@ -4,7 +4,7 @@
 #include <sstream>
 #include <tuple>
 
-#include "../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 // -----------------------------------------------------------------------------
@@ -213,4 +213,4 @@ std::vector<Spectrum> colors = {
 INSTANTIATE_TEST_CASE_P(, SpectrumTestWithParam,
     ::testing::Combine(::testing::ValuesIn(colors),
                        ::testing::ValuesIn(colors)));
-
+
diff --git a/tests/test_geometry.cc b/tests/test_geometry.cc
@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include "../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 // ------------------------------

diff --git a/tests/test_image.cc b/tests/test_image.cc
@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 #include <string>
@@ -201,4 +201,4 @@ TEST_F(ImageTest, DurandTmo) {
     EXPECT_NO_FATAL_FAILURE(image = tmo.apply(image));
     EXPECT_NO_FATAL_FAILURE(image = GammaTmo(2.2).apply(image));
     image.save(kTempDirectory + "durand.png");
-}
+}
diff --git a/tests/test_matrix4x4.cc b/tests/test_matrix4x4.cc
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 
-#include "../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 //! Fixture class.

diff --git a/tests/test_normal3d.cc b/tests/test_normal3d.cc
@@ -2,7 +2,7 @@
 
 #include <ctime>
 
-#include "../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 class Normal3dTest : public ::testing::Test {

diff --git a/tests/test_point3d.cc b/tests/test_point3d.cc
@@ -2,7 +2,7 @@
 
 #include <ctime>
 
-#include "../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 class Point3dTest : public ::testing::Test {
@@ -123,4 +123,4 @@ TEST_F(Point3dTest, MultiplyAndDivision) {
 
     double t = 0.0;
     ASSERT_DEATH(p1 / t, "");
-}
+}
diff --git a/tests/test_quaternion.cc b/tests/test_quaternion.cc
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 
-#include "../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 #include <vector>
@@ -96,4 +96,4 @@ std::vector<Quaternion> quats = {
 };
 
 INSTANTIATE_TEST_CASE_P(, QuaternionUnaryTest,
-                          ::testing::ValuesIn(quats));
+                          ::testing::ValuesIn(quats));
diff --git a/tests/test_ray.cc b/tests/test_ray.cc
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 
-#include "../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 TEST(RayTest, DefaultInstanceTest) {

diff --git a/tests/test_scene.cc b/tests/test_scene.cc
@@ -4,7 +4,7 @@
 #include <string>
 #include <type_traits>
 
-#include "../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 // -----------------------------------------------------------------------------

diff --git a/tests/test_transform.cc b/tests/test_transform.cc
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 
-#include "../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 //! Fixture class.

diff --git a/tests/test_vector2d.cc b/tests/test_vector2d.cc
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 
-#include "../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 template <class T>

diff --git a/tests/test_vector3d.cc b/tests/test_vector3d.cc
@@ -5,7 +5,7 @@
 #include <tuple>
 #include <algorithm>
 
-#include "../include/spica.h"
+#include "spica.h"
 using namespace spica;
 
 using Vector3dPair = std::tuple<Vector3d, Vector3d>; 
@@ -249,4 +249,4 @@ INSTANTIATE_TEST_CASE_P(, Vector3dUnaryTest,
 
 INSTANTIATE_TEST_CASE_P(, Vector3dPairwiseTest,
     ::testing::Combine(::testing::ValuesIn(vectors),
-                       ::testing::ValuesIn(vectors)));
+                       ::testing::ValuesIn(vectors)));