save

Author: hjanetzek

paparazzi/src/paparazzi.cpp

@@ -36,15 +36,7 @@ double getTime() {
     return ((unsigned long long)(tv.tv_sec) * 1000 + (unsigned long long)(tv.tv_usec) / 1000) * 0.001;
 }
 
-Paparazzi::Paparazzi()
-  : m_scene(""),
-    m_lat(0.0),
-    m_lon(0.0),
-    m_zoom(0.0f),
-    m_rotation(0.0f),
-    m_tilt(0.0),
-    m_width(0),
-    m_height(0) {
+Paparazzi::Paparazzi() {
 
     m_glContext = std::make_unique<HeadlessContext>();
     if (!m_glContext->init()) {
@@ -162,12 +154,12 @@ bool Paparazzi::update(int32_t _maxWaitTime) {
         delta = float(getTime() - startTime);
 
         if (bFinish) {
-            logMsg("Update: Finish!\n");
+            LOG("Update: Finish!\n");
             return true;
         }
         usleep(10000);
     }
-    logMsg("Update: Done waiting...\n");
+    LOG("Update: Done waiting...\n");
     return false;
 }
 
@@ -178,9 +170,9 @@ void Paparazzi::render(std::string& _image) {
 
     GL::finish();
 
-    stbi_write_png_to_func([](void *context, void *data, int size) {
-            static_cast<std::string*>(context)->append(static_cast<const char*>(data), size);
-        },
+    stbi_write_png_to_func(
+        [](void *context, void *data, int size) {
+            static_cast<std::string*>(context)->append(static_cast<const char*>(data), size); },
         &_image,
         m_glContext->width(),
         m_glContext->height(),

paparazzi/src/paparazzi.h

@@ -27,13 +27,13 @@ class Paparazzi {
 
     std::string m_scene;
     std::string m_apiKey;
-    double m_lat;
-    double m_lon;
-    float m_zoom;
-    float m_rotation;
-    float m_tilt;
-    int m_width;
-    int m_height;
+    double m_lat = 0.0;
+    double m_lon = 0.0;
+    float m_zoom = 0.0f;
+    float m_rotation = 0.0f;
+    float m_tilt = 0.0f;
+    int m_width = 0;
+    int m_height = 0;
 
     std::unique_ptr<Tangram::Map> m_map;
     std::unique_ptr<Tangram::HeadlessContext> m_glContext;

scripts/travis/script_build.sh

@@ -12,7 +12,7 @@ fi
 if [[ ${PLATFORM} == "linux" ]]; then
     # Build linux project
     echo "Building linux project"
-    CMAKE_OPTIONS="-DUSE_SYSTEM_FONT_LIBS=1 -DHEADLESS=1 -DUSE_SYSTEM_OSMESA_LIBS=1 -DPAPARAZZI=1 -DUNIT_TESTS=1 -DBENCHMARK=1" make -j 4 linux
+    CMAKE_OPTIONS="-DTANGRAM_USE_SYSTEM_FONT_LIBS=1 -DTANGRAM_HEADLESS=1 -DTANGRAM_USE_SYSTEM_OSMESA_LIBS=1 -DTANGRAM_PAPARAZZI=1 -DUNIT_TESTS=1 -DBENCHMARK=1" make -j 4 linux
 fi
 
 if [[ ${PLATFORM} == "ios" ]]; then

toolchains/linux.cmake

@@ -31,7 +31,7 @@ add_definitions(-DTANGRAM_LINUX)
 add_subdirectory(${PROJECT_SOURCE_DIR}/core)
 
 add_library(platform_linux
-  ${PROJECT_SOURCE_DIR}/platforms/linux/src/platform_linux.cpp
+  ${PROJECT_SOURCE_DIR}/platforms/linux/src/linuxPlatform.cpp
   ${PROJECT_SOURCE_DIR}/platforms/common/urlClient.cpp)
 
 target_include_directories(platform_linux
@@ -67,7 +67,6 @@ if(TANGRAM_APPLICATION)
   endif()
 
   add_executable(${EXECUTABLE_NAME}
-    ${PROJECT_SOURCE_DIR}/platforms/linux/src/linuxPlatform.cpp
     ${PROJECT_SOURCE_DIR}/platforms/linux/src/main.cpp
     ${PROJECT_SOURCE_DIR}/platforms/common/platform_gl.cpp
     ${PROJECT_SOURCE_DIR}/platforms/common/glfwApp.cpp
@@ -92,9 +91,9 @@ if(TANGRAM_APPLICATION)
 
 endif()
 
-if (HEADLESS)
+if (TANGRAM_HEADLESS)
 
-  if (USE_SYSTEM_OSMESA_LIBS)
+  if (TANGRAM_USE_SYSTEM_OSMESA_LIBS)
     include(FindPkgConfig)
     pkg_check_modules(OSMesa REQUIRED osmesa)
   else ()
@@ -119,7 +118,7 @@ if (HEADLESS)
     PUBLIC
     PLATFORM_HEADLESS=1)
 
-  if (USE_SYSTEM_OSMESA_LIBS)
+  if (TANGRAM_USE_SYSTEM_OSMESA_LIBS)
   else() # if use ExternalProject
     add_dependencies(headless_context OSMesa)
   endif()