new version: 2016.4.3

Should fix issues restoring variants in the launcher.

.gitignore

@@ -14,6 +14,3 @@ CTestTestfile.cmake
 install_manifest.txt
 build*
 Build
-CMakeLists.txt.user
-3rdparty/expat_2.2.6/
-nbproject

3rdparty/CMakeLists.txt

@@ -2,6 +2,8 @@ if (NOT SYSTEM_EXPAT)
 	add_subdirectory(expat)
 endif()
 
+add_subdirectory(utf8)
+
 if (ENABLE_DNS AND NOT SYSTEM_UDNS)
 	add_subdirectory(udns)
 endif()

3rdparty/expat/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 configure_file (
     "${PROJECT_SOURCE_DIR}/3rdparty/expat/expat_config_cmake.in"
-    "${PROJECT_BINARY_DIR}/3rdparty/expat/simgear_expat_config.h"
+    "${PROJECT_BINARY_DIR}/3rdparty/expat/expat_config.h"
 )
 
 set(expat_sources 

3rdparty/expat/xmlparse.c

@@ -18,8 +18,6 @@
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"
-#elif defined(HAVE_SIMGEAR_EXPAT_CONFIG_H)
-#include "simgear_expat_config.h"
 #elif defined(HAVE_EXPAT_CONFIG_H)
 #include "expat_config.h"
 #endif /* ndef COMPILED_FROM_DSP */

3rdparty/expat/xmlrole.c

@@ -12,8 +12,6 @@
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"
-#elif defined(HAVE_SIMGEAR_EXPAT_CONFIG_H)
-#include "simgear_expat_config.h"
 #else
 #ifdef HAVE_EXPAT_CONFIG_H
 #include "expat_config.h"

3rdparty/expat/xmltok.c

@@ -12,8 +12,6 @@
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"
-#elif defined(HAVE_SIMGEAR_EXPAT_CONFIG_H)
-#include "simgear_expat_config.h"
 #else
 #ifdef HAVE_EXPAT_CONFIG_H
 #include "expat_config.h"

3rdparty/udns/udns_init.c

@@ -24,7 +24,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
 # include <winsock2.h>          /* includes <windows.h> */
 # include <iphlpapi.h>		/* for dns server addresses etc */
 #else
@@ -53,7 +53,7 @@ static void dns_set_srch_internal(struct dns_ctx *ctx, char *srch) {
     dns_add_srch(ctx, srch);
 }
 
-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
 
 #ifndef NO_IPHLPAPI
 /* Apparently, some systems does not have proper headers for IPHLPAIP to work.
@@ -217,7 +217,7 @@ int dns_init(struct dns_ctx *ctx, int do_open) {
     ctx = &dns_defctx;
   dns_reset(ctx);
 
-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
   if (dns_initns_iphlpapi(ctx) != 0)
     dns_initns_registry(ctx);
   /*XXX WINDOWS: probably good to get default domain and search list too...

3rdparty/udns/udns_resolver.c

@@ -24,7 +24,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
 # include <winsock2.h>          /* includes <windows.h> */
 # include <ws2tcpip.h>          /* needed for struct in6_addr */
 #else
@@ -392,7 +392,7 @@ dns_set_tmcbck(struct dns_ctx *ctx, dns_utm_fn *fn, void *data) {
 }
 
 static unsigned dns_nonrandom_32(void) {
-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
   FILETIME ft;
   GetSystemTimeAsFileTime(&ft);
   return ft.dwLowDateTime;
@@ -551,7 +551,7 @@ int dns_open(struct dns_ctx *ctx) {
     ctx->dnsc_qstatus = DNS_E_TEMPFAIL;
     return -1;
   }
-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
   { unsigned long on = 1;
     if (ioctlsocket(sock, FIONBIO, &on) == SOCKET_ERROR) {
       closesocket(sock);
@@ -991,7 +991,7 @@ again: /* receive the reply */
      * or remote.  On local errors, we should stop, while
      * remote errors should be ignored (for now anyway).
      */
-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
     if (WSAGetLastError() == WSAEWOULDBLOCK)
 #else
     if (errno == EAGAIN)

3rdparty/udns/udns_rr_a.c

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#if !defined(_WINDOWS) && !defined(WINDOWS)
+#ifndef WINDOWS
 # include <sys/types.h>
 # include <netinet/in.h>
 #endif

3rdparty/utf8/CMakeLists.txt

@@ -0,0 +1,17 @@
+include (SimGearComponent)
+
+set(HEADERS
+  source/utf8.h
+)
+
+set(HEADERS_utf8
+  source/utf8/checked.h
+  source/utf8/core.h
+  source/utf8/unchecked.h
+)
+
+set(SOURCES
+)
+
+simgear_component(utf8 3rdparty/utf8 "${SOURCES}" "${HEADERS}")
+simgear_component(utf8-internal 3rdparty/utf8/utf8 "" "${HEADERS_utf8}")

3rdparty/utf8/doc/ReleaseNotes

@@ -0,0 +1,12 @@
+utf8 cpp library
+Release 2.3.4
+
+A minor bug fix release. Thanks to all who reported bugs. 
+
+Note: Version 2.3.3 contained a regression, and therefore was removed.
+
+Changes from version 2.3.2
+- Bug fix [39]: checked.h Line 273 and unchecked.h Line 182 have an extra ';'
+- Bug fix [36]: replace_invalid() only works with back_inserter
+
+Files included in the release: utf8.h, core.h, checked.h, unchecked.h, utf8cpp.html, ReleaseNotes

3rdparty/utf8/source/utf8.h

@@ -0,0 +1,34 @@
+// Copyright 2006 Nemanja Trifunovic
+
+/*
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+
+
+#ifndef UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
+#include "utf8/checked.h"
+#include "utf8/unchecked.h"
+
+#endif // header guard

3rdparty/utf8/source/utf8/checked.h

@@ -0,0 +1,327 @@
+// Copyright 2006 Nemanja Trifunovic
+
+/*
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+
+
+#ifndef UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
+#include "core.h"
+#include <stdexcept>
+
+namespace utf8
+{
+    // Base for the exceptions that may be thrown from the library
+    class exception : public ::std::exception {
+    };
+
+    // Exceptions that may be thrown from the library functions.
+    class invalid_code_point : public exception {
+        uint32_t cp;
+    public:
+        invalid_code_point(uint32_t cp) : cp(cp) {}
+        virtual const char* what() const throw() { return "Invalid code point"; }
+        uint32_t code_point() const {return cp;}
+    };
+
+    class invalid_utf8 : public exception {
+        uint8_t u8;
+    public:
+        invalid_utf8 (uint8_t u) : u8(u) {}
+        virtual const char* what() const throw() { return "Invalid UTF-8"; }
+        uint8_t utf8_octet() const {return u8;}
+    };
+
+    class invalid_utf16 : public exception {
+        uint16_t u16;
+    public:
+        invalid_utf16 (uint16_t u) : u16(u) {}
+        virtual const char* what() const throw() { return "Invalid UTF-16"; }
+        uint16_t utf16_word() const {return u16;}
+    };
+
+    class not_enough_room : public exception {
+    public:
+        virtual const char* what() const throw() { return "Not enough space"; }
+    };
+
+    /// The library API - functions intended to be called by the users
+
+    template <typename octet_iterator>
+    octet_iterator append(uint32_t cp, octet_iterator result)
+    {
+        if (!utf8::internal::is_code_point_valid(cp))
+            throw invalid_code_point(cp);
+
+        if (cp < 0x80)                        // one octet
+            *(result++) = static_cast<uint8_t>(cp);
+        else if (cp < 0x800) {                // two octets
+            *(result++) = static_cast<uint8_t>((cp >> 6)            | 0xc0);
+            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
+        else if (cp < 0x10000) {              // three octets
+            *(result++) = static_cast<uint8_t>((cp >> 12)           | 0xe0);
+            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
+            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
+        else {                                // four octets
+            *(result++) = static_cast<uint8_t>((cp >> 18)           | 0xf0);
+            *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)  | 0x80);
+            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
+            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
+        return result;
+    }
+
+    template <typename octet_iterator, typename output_iterator>
+    output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
+    {
+        while (start != end) {
+            octet_iterator sequence_start = start;
+            internal::utf_error err_code = utf8::internal::validate_next(start, end);
+            switch (err_code) {
+                case internal::UTF8_OK :
+                    for (octet_iterator it = sequence_start; it != start; ++it)
+                        *out++ = *it;
+                    break;
+                case internal::NOT_ENOUGH_ROOM:
+                    throw not_enough_room();
+                case internal::INVALID_LEAD:
+                    out = utf8::append (replacement, out);
+                    ++start;
+                    break;
+                case internal::INCOMPLETE_SEQUENCE:
+                case internal::OVERLONG_SEQUENCE:
+                case internal::INVALID_CODE_POINT:
+                    out = utf8::append (replacement, out);
+                    ++start;
+                    // just one replacement mark for the sequence
+                    while (start != end && utf8::internal::is_trail(*start))
+                        ++start;
+                    break;
+            }
+        }
+        return out;
+    }
+
+    template <typename octet_iterator, typename output_iterator>
+    inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
+    {
+        static const uint32_t replacement_marker = utf8::internal::mask16(0xfffd);
+        return utf8::replace_invalid(start, end, out, replacement_marker);
+    }
+
+    template <typename octet_iterator>
+    uint32_t next(octet_iterator& it, octet_iterator end)
+    {
+        uint32_t cp = 0;
+        internal::utf_error err_code = utf8::internal::validate_next(it, end, cp);
+        switch (err_code) {
+            case internal::UTF8_OK :
+                break;
+            case internal::NOT_ENOUGH_ROOM :
+                throw not_enough_room();
+            case internal::INVALID_LEAD :
+            case internal::INCOMPLETE_SEQUENCE :
+            case internal::OVERLONG_SEQUENCE :
+                throw invalid_utf8(*it);
+            case internal::INVALID_CODE_POINT :
+                throw invalid_code_point(cp);
+        }
+        return cp;
+    }
+
+    template <typename octet_iterator>
+    uint32_t peek_next(octet_iterator it, octet_iterator end)
+    {
+        return utf8::next(it, end);
+    }
+
+    template <typename octet_iterator>
+    uint32_t prior(octet_iterator& it, octet_iterator start)
+    {
+        // can't do much if it == start
+        if (it == start)
+            throw not_enough_room();
+
+        octet_iterator end = it;
+        // Go back until we hit either a lead octet or start
+        while (utf8::internal::is_trail(*(--it)))
+            if (it == start)
+                throw invalid_utf8(*it); // error - no lead byte in the sequence
+        return utf8::peek_next(it, end);
+    }
+
+    /// Deprecated in versions that include "prior"
+    template <typename octet_iterator>
+    uint32_t previous(octet_iterator& it, octet_iterator pass_start)
+    {
+        octet_iterator end = it;
+        while (utf8::internal::is_trail(*(--it)))
+            if (it == pass_start)
+                throw invalid_utf8(*it); // error - no lead byte in the sequence
+        octet_iterator temp = it;
+        return utf8::next(temp, end);
+    }
+
+    template <typename octet_iterator, typename distance_type>
+    void advance (octet_iterator& it, distance_type n, octet_iterator end)
+    {
+        for (distance_type i = 0; i < n; ++i)
+            utf8::next(it, end);
+    }
+
+    template <typename octet_iterator>
+    typename std::iterator_traits<octet_iterator>::difference_type
+    distance (octet_iterator first, octet_iterator last)
+    {
+        typename std::iterator_traits<octet_iterator>::difference_type dist;
+        for (dist = 0; first < last; ++dist)
+            utf8::next(first, last);
+        return dist;
+    }
+
+    template <typename u16bit_iterator, typename octet_iterator>
+    octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
+    {
+        while (start != end) {
+            uint32_t cp = utf8::internal::mask16(*start++);
+            // Take care of surrogate pairs first
+            if (utf8::internal::is_lead_surrogate(cp)) {
+                if (start != end) {
+                    uint32_t trail_surrogate = utf8::internal::mask16(*start++);
+                    if (utf8::internal::is_trail_surrogate(trail_surrogate))
+                        cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
+                    else
+                        throw invalid_utf16(static_cast<uint16_t>(trail_surrogate));
+                }
+                else
+                    throw invalid_utf16(static_cast<uint16_t>(cp));
+
+            }
+            // Lone trail surrogate
+            else if (utf8::internal::is_trail_surrogate(cp))
+                throw invalid_utf16(static_cast<uint16_t>(cp));
+
+            result = utf8::append(cp, result);
+        }
+        return result;
+    }
+
+    template <typename u16bit_iterator, typename octet_iterator>
+    u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
+    {
+        while (start != end) {
+            uint32_t cp = utf8::next(start, end);
+            if (cp > 0xffff) { //make a surrogate pair
+                *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
+                *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
+            }
+            else
+                *result++ = static_cast<uint16_t>(cp);
+        }
+        return result;
+    }
+
+    template <typename octet_iterator, typename u32bit_iterator>
+    octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
+    {
+        while (start != end)
+            result = utf8::append(*(start++), result);
+
+        return result;
+    }
+
+    template <typename octet_iterator, typename u32bit_iterator>
+    u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
+    {
+        while (start != end)
+            (*result++) = utf8::next(start, end);
+
+        return result;
+    }
+
+    // The iterator class
+    template <typename octet_iterator>
+    class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
+      octet_iterator it;
+      octet_iterator range_start;
+      octet_iterator range_end;
+      public:
+      iterator () {}
+      explicit iterator (const octet_iterator& octet_it,
+                         const octet_iterator& range_start,
+                         const octet_iterator& range_end) :
+               it(octet_it), range_start(range_start), range_end(range_end)
+      {
+          if (it < range_start || it > range_end)
+              throw std::out_of_range("Invalid utf-8 iterator position");
+      }
+      // the default "big three" are OK
+      octet_iterator base () const { return it; }
+      uint32_t operator * () const
+      {
+          octet_iterator temp = it;
+          return utf8::next(temp, range_end);
+      }
+      bool operator == (const iterator& rhs) const
+      {
+          if (range_start != rhs.range_start || range_end != rhs.range_end)
+              throw std::logic_error("Comparing utf-8 iterators defined with different ranges");
+          return (it == rhs.it);
+      }
+      bool operator != (const iterator& rhs) const
+      {
+          return !(operator == (rhs));
+      }
+      iterator& operator ++ ()
+      {
+          utf8::next(it, range_end);
+          return *this;
+      }
+      iterator operator ++ (int)
+      {
+          iterator temp = *this;
+          utf8::next(it, range_end);
+          return temp;
+      }
+      iterator& operator -- ()
+      {
+          utf8::prior(it, range_start);
+          return *this;
+      }
+      iterator operator -- (int)
+      {
+          iterator temp = *this;
+          utf8::prior(it, range_start);
+          return temp;
+      }
+    }; // class iterator
+
+} // namespace utf8
+
+#endif //header guard
+
+

3rdparty/utf8/source/utf8/core.h

@@ -0,0 +1,329 @@
+// Copyright 2006 Nemanja Trifunovic
+
+/*
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+
+
+#ifndef UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
+#include <iterator>
+
+namespace utf8
+{
+    // The typedefs for 8-bit, 16-bit and 32-bit unsigned integers
+    // You may need to change them to match your system.
+    // These typedefs have the same names as ones from cstdint, or boost/cstdint
+    typedef unsigned char   uint8_t;
+    typedef unsigned short  uint16_t;
+    typedef unsigned int    uint32_t;
+
+// Helper code - not intended to be directly called by the library users. May be changed at any time
+namespace internal
+{
+    // Unicode constants
+    // Leading (high) surrogates: 0xd800 - 0xdbff
+    // Trailing (low) surrogates: 0xdc00 - 0xdfff
+    const uint16_t LEAD_SURROGATE_MIN  = 0xd800u;
+    const uint16_t LEAD_SURROGATE_MAX  = 0xdbffu;
+    const uint16_t TRAIL_SURROGATE_MIN = 0xdc00u;
+    const uint16_t TRAIL_SURROGATE_MAX = 0xdfffu;
+    const uint16_t LEAD_OFFSET         = LEAD_SURROGATE_MIN - (0x10000 >> 10);
+    const uint32_t SURROGATE_OFFSET    = 0x10000u - (LEAD_SURROGATE_MIN << 10) - TRAIL_SURROGATE_MIN;
+
+    // Maximum valid value for a Unicode code point
+    const uint32_t CODE_POINT_MAX      = 0x0010ffffu;
+
+    template<typename octet_type>
+    inline uint8_t mask8(octet_type oc)
+    {
+        return static_cast<uint8_t>(0xff & oc);
+    }
+    template<typename u16_type>
+    inline uint16_t mask16(u16_type oc)
+    {
+        return static_cast<uint16_t>(0xffff & oc);
+    }
+    template<typename octet_type>
+    inline bool is_trail(octet_type oc)
+    {
+        return ((utf8::internal::mask8(oc) >> 6) == 0x2);
+    }
+
+    template <typename u16>
+    inline bool is_lead_surrogate(u16 cp)
+    {
+        return (cp >= LEAD_SURROGATE_MIN && cp <= LEAD_SURROGATE_MAX);
+    }
+
+    template <typename u16>
+    inline bool is_trail_surrogate(u16 cp)
+    {
+        return (cp >= TRAIL_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
+    }
+
+    template <typename u16>
+    inline bool is_surrogate(u16 cp)
+    {
+        return (cp >= LEAD_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
+    }
+
+    template <typename u32>
+    inline bool is_code_point_valid(u32 cp)
+    {
+        return (cp <= CODE_POINT_MAX && !utf8::internal::is_surrogate(cp));
+    }
+
+    template <typename octet_iterator>
+    inline typename std::iterator_traits<octet_iterator>::difference_type
+    sequence_length(octet_iterator lead_it)
+    {
+        uint8_t lead = utf8::internal::mask8(*lead_it);
+        if (lead < 0x80)
+            return 1;
+        else if ((lead >> 5) == 0x6)
+            return 2;
+        else if ((lead >> 4) == 0xe)
+            return 3;
+        else if ((lead >> 3) == 0x1e)
+            return 4;
+        else
+            return 0;
+    }
+
+    template <typename octet_difference_type>
+    inline bool is_overlong_sequence(uint32_t cp, octet_difference_type length)
+    {
+        if (cp < 0x80) {
+            if (length != 1) 
+                return true;
+        }
+        else if (cp < 0x800) {
+            if (length != 2) 
+                return true;
+        }
+        else if (cp < 0x10000) {
+            if (length != 3) 
+                return true;
+        }
+
+        return false;
+    }
+
+    enum utf_error {UTF8_OK, NOT_ENOUGH_ROOM, INVALID_LEAD, INCOMPLETE_SEQUENCE, OVERLONG_SEQUENCE, INVALID_CODE_POINT};
+
+    /// Helper for get_sequence_x
+    template <typename octet_iterator>
+    utf_error increase_safely(octet_iterator& it, octet_iterator end)
+    {
+        if (++it == end)
+            return NOT_ENOUGH_ROOM;
+
+        if (!utf8::internal::is_trail(*it))
+            return INCOMPLETE_SEQUENCE;
+        
+        return UTF8_OK;
+    }
+
+    #define UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(IT, END) {utf_error ret = increase_safely(IT, END); if (ret != UTF8_OK) return ret;}    
+
+    /// get_sequence_x functions decode utf-8 sequences of the length x
+    template <typename octet_iterator>
+    utf_error get_sequence_1(octet_iterator& it, octet_iterator end, uint32_t& code_point)
+    {
+        if (it == end)
+            return NOT_ENOUGH_ROOM;
+
+        code_point = utf8::internal::mask8(*it);
+
+        return UTF8_OK;
+    }
+
+    template <typename octet_iterator>
+    utf_error get_sequence_2(octet_iterator& it, octet_iterator end, uint32_t& code_point)
+    {
+        if (it == end) 
+            return NOT_ENOUGH_ROOM;
+        
+        code_point = utf8::internal::mask8(*it);
+
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+
+        code_point = ((code_point << 6) & 0x7ff) + ((*it) & 0x3f);
+
+        return UTF8_OK;
+    }
+
+    template <typename octet_iterator>
+    utf_error get_sequence_3(octet_iterator& it, octet_iterator end, uint32_t& code_point)
+    {
+        if (it == end)
+            return NOT_ENOUGH_ROOM;
+            
+        code_point = utf8::internal::mask8(*it);
+
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+
+        code_point = ((code_point << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
+
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+
+        code_point += (*it) & 0x3f;
+
+        return UTF8_OK;
+    }
+
+    template <typename octet_iterator>
+    utf_error get_sequence_4(octet_iterator& it, octet_iterator end, uint32_t& code_point)
+    {
+        if (it == end)
+           return NOT_ENOUGH_ROOM;
+
+        code_point = utf8::internal::mask8(*it);
+
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+
+        code_point = ((code_point << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
+
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+
+        code_point += (utf8::internal::mask8(*it) << 6) & 0xfff;
+
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+
+        code_point += (*it) & 0x3f;
+
+        return UTF8_OK;
+    }
+
+    #undef UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR
+
+    template <typename octet_iterator>
+    utf_error validate_next(octet_iterator& it, octet_iterator end, uint32_t& code_point)
+    {
+        // Save the original value of it so we can go back in case of failure
+        // Of course, it does not make much sense with i.e. stream iterators
+        octet_iterator original_it = it;
+
+        uint32_t cp = 0;
+        // Determine the sequence length based on the lead octet
+        typedef typename std::iterator_traits<octet_iterator>::difference_type octet_difference_type;
+        const octet_difference_type length = utf8::internal::sequence_length(it);
+
+        // Get trail octets and calculate the code point
+        utf_error err = UTF8_OK;
+        switch (length) {
+            case 0: 
+                return INVALID_LEAD;
+            case 1:
+                err = utf8::internal::get_sequence_1(it, end, cp);
+                break;
+            case 2:
+                err = utf8::internal::get_sequence_2(it, end, cp);
+            break;
+            case 3:
+                err = utf8::internal::get_sequence_3(it, end, cp);
+            break;
+            case 4:
+                err = utf8::internal::get_sequence_4(it, end, cp);
+            break;
+        }
+
+        if (err == UTF8_OK) {
+            // Decoding succeeded. Now, security checks...
+            if (utf8::internal::is_code_point_valid(cp)) {
+                if (!utf8::internal::is_overlong_sequence(cp, length)){
+                    // Passed! Return here.
+                    code_point = cp;
+                    ++it;
+                    return UTF8_OK;
+                }
+                else
+                    err = OVERLONG_SEQUENCE;
+            }
+            else 
+                err = INVALID_CODE_POINT;
+        }
+
+        // Failure branch - restore the original value of the iterator
+        it = original_it;
+        return err;
+    }
+
+    template <typename octet_iterator>
+    inline utf_error validate_next(octet_iterator& it, octet_iterator end) {
+        uint32_t ignored;
+        return utf8::internal::validate_next(it, end, ignored);
+    }
+
+} // namespace internal
+
+    /// The library API - functions intended to be called by the users
+
+    // Byte order mark
+    const uint8_t bom[] = {0xef, 0xbb, 0xbf};
+
+    template <typename octet_iterator>
+    octet_iterator find_invalid(octet_iterator start, octet_iterator end)
+    {
+        octet_iterator result = start;
+        while (result != end) {
+            utf8::internal::utf_error err_code = utf8::internal::validate_next(result, end);
+            if (err_code != internal::UTF8_OK)
+                return result;
+        }
+        return result;
+    }
+
+    template <typename octet_iterator>
+    inline bool is_valid(octet_iterator start, octet_iterator end)
+    {
+        return (utf8::find_invalid(start, end) == end);
+    }
+
+    template <typename octet_iterator>
+    inline bool starts_with_bom (octet_iterator it, octet_iterator end)
+    {
+        return (
+            ((it != end) && (utf8::internal::mask8(*it++)) == bom[0]) &&
+            ((it != end) && (utf8::internal::mask8(*it++)) == bom[1]) &&
+            ((it != end) && (utf8::internal::mask8(*it))   == bom[2])
+           );
+    }
+	
+    //Deprecated in release 2.3 
+    template <typename octet_iterator>
+    inline bool is_bom (octet_iterator it)
+    {
+        return (
+            (utf8::internal::mask8(*it++)) == bom[0] &&
+            (utf8::internal::mask8(*it++)) == bom[1] &&
+            (utf8::internal::mask8(*it))   == bom[2]
+           );
+    }
+} // namespace utf8
+
+#endif // header guard
+
+

3rdparty/utf8/source/utf8/unchecked.h

@@ -0,0 +1,228 @@
+// Copyright 2006 Nemanja Trifunovic
+
+/*
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+
+
+#ifndef UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
+#include "core.h"
+
+namespace utf8
+{
+    namespace unchecked 
+    {
+        template <typename octet_iterator>
+        octet_iterator append(uint32_t cp, octet_iterator result)
+        {
+            if (cp < 0x80)                        // one octet
+                *(result++) = static_cast<uint8_t>(cp);  
+            else if (cp < 0x800) {                // two octets
+                *(result++) = static_cast<uint8_t>((cp >> 6)          | 0xc0);
+                *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
+            }
+            else if (cp < 0x10000) {              // three octets
+                *(result++) = static_cast<uint8_t>((cp >> 12)         | 0xe0);
+                *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
+                *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
+            }
+            else {                                // four octets
+                *(result++) = static_cast<uint8_t>((cp >> 18)         | 0xf0);
+                *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)| 0x80);
+                *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
+                *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
+            }
+            return result;
+        }
+
+        template <typename octet_iterator>
+        uint32_t next(octet_iterator& it)
+        {
+            uint32_t cp = utf8::internal::mask8(*it);
+            typename std::iterator_traits<octet_iterator>::difference_type length = utf8::internal::sequence_length(it);
+            switch (length) {
+                case 1:
+                    break;
+                case 2:
+                    it++;
+                    cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
+                    break;
+                case 3:
+                    ++it; 
+                    cp = ((cp << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
+                    ++it;
+                    cp += (*it) & 0x3f;
+                    break;
+                case 4:
+                    ++it;
+                    cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);                
+                    ++it;
+                    cp += (utf8::internal::mask8(*it) << 6) & 0xfff;
+                    ++it;
+                    cp += (*it) & 0x3f; 
+                    break;
+            }
+            ++it;
+            return cp;        
+        }
+
+        template <typename octet_iterator>
+        uint32_t peek_next(octet_iterator it)
+        {
+            return utf8::unchecked::next(it);    
+        }
+
+        template <typename octet_iterator>
+        uint32_t prior(octet_iterator& it)
+        {
+            while (utf8::internal::is_trail(*(--it))) ;
+            octet_iterator temp = it;
+            return utf8::unchecked::next(temp);
+        }
+
+        // Deprecated in versions that include prior, but only for the sake of consistency (see utf8::previous)
+        template <typename octet_iterator>
+        inline uint32_t previous(octet_iterator& it)
+        {
+            return utf8::unchecked::prior(it);
+        }
+
+        template <typename octet_iterator, typename distance_type>
+        void advance (octet_iterator& it, distance_type n)
+        {
+            for (distance_type i = 0; i < n; ++i)
+                utf8::unchecked::next(it);
+        }
+
+        template <typename octet_iterator>
+        typename std::iterator_traits<octet_iterator>::difference_type
+        distance (octet_iterator first, octet_iterator last)
+        {
+            typename std::iterator_traits<octet_iterator>::difference_type dist;
+            for (dist = 0; first < last; ++dist) 
+                utf8::unchecked::next(first);
+            return dist;
+        }
+
+        template <typename u16bit_iterator, typename octet_iterator>
+        octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
+        {       
+            while (start != end) {
+                uint32_t cp = utf8::internal::mask16(*start++);
+            // Take care of surrogate pairs first
+                if (utf8::internal::is_lead_surrogate(cp)) {
+                    uint32_t trail_surrogate = utf8::internal::mask16(*start++);
+                    cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
+                }
+                result = utf8::unchecked::append(cp, result);
+            }
+            return result;         
+        }
+
+        template <typename u16bit_iterator, typename octet_iterator>
+        u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
+        {
+            while (start < end) {
+                uint32_t cp = utf8::unchecked::next(start);
+                if (cp > 0xffff) { //make a surrogate pair
+                    *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
+                    *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
+                }
+                else
+                    *result++ = static_cast<uint16_t>(cp);
+            }
+            return result;
+        }
+
+        template <typename octet_iterator, typename u32bit_iterator>
+        octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
+        {
+            while (start != end)
+                result = utf8::unchecked::append(*(start++), result);
+
+            return result;
+        }
+
+        template <typename octet_iterator, typename u32bit_iterator>
+        u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
+        {
+            while (start < end)
+                (*result++) = utf8::unchecked::next(start);
+
+            return result;
+        }
+
+        // The iterator class
+        template <typename octet_iterator>
+          class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> { 
+            octet_iterator it;
+            public:
+            iterator () {}
+            explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
+            // the default "big three" are OK
+            octet_iterator base () const { return it; }
+            uint32_t operator * () const
+            {
+                octet_iterator temp = it;
+                return utf8::unchecked::next(temp);
+            }
+            bool operator == (const iterator& rhs) const 
+            { 
+                return (it == rhs.it);
+            }
+            bool operator != (const iterator& rhs) const
+            {
+                return !(operator == (rhs));
+            }
+            iterator& operator ++ () 
+            {
+                ::std::advance(it, utf8::internal::sequence_length(it));
+                return *this;
+            }
+            iterator operator ++ (int)
+            {
+                iterator temp = *this;
+                ::std::advance(it, utf8::internal::sequence_length(it));
+                return temp;
+            }  
+            iterator& operator -- ()
+            {
+                utf8::unchecked::prior(it);
+                return *this;
+            }
+            iterator operator -- (int)
+            {
+                iterator temp = *this;
+                utf8::unchecked::prior(it);
+                return temp;
+            }
+          }; // class iterator
+
+    } // namespace utf8::unchecked
+} // namespace utf8 
+
+
+#endif // header guard
+

CMakeLists.txt

@@ -7,29 +7,6 @@ if(COMMAND cmake_policy)
    if(POLICY CMP0042)
        cmake_policy(SET CMP0042 NEW)
    endif()
-   if(POLICY CMP0067)
-       cmake_policy(SET CMP0067 NEW)
-   endif()
-    
-  # OpenGL VND policy : use the old definition for now, until we can audit this
-  if(POLICY CMP0072)
-        cmake_policy(SET CMP0072 OLD)
-  endif()
-
-   if(POLICY CMP0093)
-       cmake_policy(SET CMP0093 NEW)
-   endif()
-endif()
-
-
-message(STATUS "CMAKE Build type: ${CMAKE_BUILD_TYPE}")
-# Set a default build type if none was specified
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  message(STATUS "Setting build type to 'Debug' as none was specified.")
-  set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
-  # Set the possible values of build type for cmake-gui
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
-    "MinSizeRel" "RelWithDebInfo")
 endif()
 
 include (CheckFunctionExists)
@@ -41,7 +18,6 @@ include (GenerateExportHeader)
 
 # only relevant for building shared libs but let's set it regardless
 set(CMAKE_OSX_RPATH 1)
-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
 
 # let's use & require C++11 - note these are only functional with CMake 3.1
 # we do manual fallbacks for CMake 3.0 in the compilers section
@@ -49,15 +25,20 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 
 # read 'version' file into a variable (stripping any newlines or spaces)
-file(READ simgear-version versionFile)
+file(READ version versionFile)
 string(STRIP ${versionFile} SIMGEAR_VERSION)
 
 project(SimGear VERSION ${SIMGEAR_VERSION} LANGUAGES C CXX)
 
-# add a dependency on the version file
+# using 10.7 because boost requires libc++ and 10.6 doesn't include it
+# Cmake documentation says we must set this before calling project(), but
+# it only seems to be picked up setting it /after/ the call to project()
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")
+
+# add a dependency on the versino file
 set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS version)
 
-set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
+set(FIND_LIBRARY_USE_LIB64_PATHS ON)
 
 # use simgear version also as the SO version (if building SOs)
 SET(SIMGEAR_SOVERSION ${SIMGEAR_VERSION})
@@ -128,39 +109,18 @@ endif()
 
 option(SIMGEAR_HEADLESS "Set to ON to build SimGear without GUI/graphics support" OFF)
 option(ENABLE_RTI       "Set to ON to build SimGear with RTI support" OFF)
-option(ENABLE_GDAL      "Set to ON to build SimGear with GDAL support" OFF)
 option(ENABLE_TESTS     "Set to OFF to disable building SimGear's test applications" ON)
 option(ENABLE_SOUND     "Set to OFF to disable building SimGear's sound support" ON)
-option(USE_AEONWAVE     "Set to ON to use AeonWave instead of OpenAL" ON)
+option(USE_AEONWAVE     "Set to ON to use AeonWave instead of OpenAL" OFF)
 option(ENABLE_PKGUTIL   "Set to ON to build the sg_pkgutil application (default)" ON)
 option(ENABLE_DNS       "Set to ON to use udns library and DNS service resolver" ON)
-option(ENABLE_SIMD      "Enable SSE/SSE2 support for compilers" ON)
-option(ENABLE_SIMD_CODE	"Enable SSE/SSE2 support code for compilers" OFF)
-option(ENABLE_OPENMP    "Enable OpenMP compiler support" OFF)
-
-if (NOT ENABLE_SIMD AND ENABLE_SIMD_CODE)
-  set(ENABLE_SIMD_CODE OFF)
-endif()
-
-include (DetectArch)
-include (ExportDebugSymbols)
 
 # until the fstream fix is applied and generally available in OSG,
 # keep the compatability link option as the default
 option(OSG_FSTREAM_EXPORT_FIXED "Set to ON if the osgDB fstream export patch is applied" OFF)
 
-if (CMAKE_COMPILER_IS_GNUCXX OR CLANG)
-  if (CMAKE_VERSION VERSION_LESS 3.1)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
-  elseif (CMAKE_VERSION VERSION_LESS 3.8)
-    # policy CMP0067 (try_compile does not honor CMAKE_CXX_STANDARD)
-    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
-  endif()
-endif()
-
-
 if (MSVC)
-  GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} DIRECTORY)
+  GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} PATH)
   if (CMAKE_CL_64)
     SET(TEST_3RDPARTY_DIR "${PARENT_DIR}/3rdparty.x64")
   else (CMAKE_CL_64)
@@ -171,11 +131,6 @@ if (MSVC)
   else (EXISTS ${TEST_3RDPARTY_DIR})
     set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
   endif (EXISTS ${TEST_3RDPARTY_DIR})
-
-  # override CMake default RelWithDebInfo flags. This is important to ensure
-  # good performance
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Zi /O2 /Ob2 /D NDEBUG")
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO "/Zi /O2 /Ob2 /D NDEBUG")
 else (MSVC)
   set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
 endif (MSVC)
@@ -183,24 +138,14 @@ endif (MSVC)
 if (MSVC AND MSVC_3RDPARTY_ROOT)
   message(STATUS "3rdparty files located in ${MSVC_3RDPARTY_ROOT}")
 
-  string(SUBSTRING ${MSVC_VERSION} 0 2 MSVC_VERSION_MAJOR)
-  string(SUBSTRING ${MSVC_VERSION} 2 2 MSVC_VERSION_MINOR)
-
   set( OSG_MSVC "msvc" )
-  if (${MSVC_VERSION_MAJOR} EQUAL "19")
-    if (${MSVC_VERSION_MINOR} GREATER_EQUAL "20")
-      set( OSG_MSVC ${OSG_MSVC}142 )
-    elseif (${MSVC_VERSION_MINOR} GREATER_EQUAL "10")
-      set( OSG_MSVC ${OSG_MSVC}141 )
-    else ()
+  if (${MSVC_VERSION} EQUAL 1900)
       set( OSG_MSVC ${OSG_MSVC}140 )
-    endif ()
-  elseif (${MSVC_VERSION_MAJOR} EQUAL "18")
-    set( OSG_MSVC ${OSG_MSVC}120 )
+  elseif (${MSVC_VERSION} EQUAL 1800)
+      set( OSG_MSVC ${OSG_MSVC}120 )
   else ()
-    message(FATAL_ERROR "Visual Studio 2013 or higher is required")
+      message(FATAL_ERROR "Visual Studio 2013/2015 is required now")
   endif ()
-
   if (CMAKE_CL_64)
       set( OSG_MSVC ${OSG_MSVC}-64 )
       set( MSVC_3RDPARTY_DIR 3rdParty.x64 )
@@ -215,13 +160,16 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
     # if this variable was not set by the user, set it to 3rdparty root's
     # parent dir, which is the normal location for people using our
     # windows-3rd-party repo
-    get_filename_component(MSVC_ROOT_PARENT_DIR ${MSVC_3RDPARTY_ROOT} DIRECTORY)
+    GET_FILENAME_COMPONENT(MSVC_ROOT_PARENT_DIR ${MSVC_3RDPARTY_ROOT} PATH)
     set(BOOST_INCLUDEDIR ${MSVC_ROOT_PARENT_DIR})
     message(STATUS "BOOST_INCLUDEDIR is ${BOOST_INCLUDEDIR}")
   endif()
 
-  set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include)
-  set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib)
+  if (NOT USE_AEONWAVE)
+    set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include)
+    set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib)
+    message(STATUS "OPENAL_INCLUDE_DIR is ${OPENAL_INCLUDE_DIR}")
+  endif()
 endif (MSVC AND MSVC_3RDPARTY_ROOT)
 
 if(APPLE)
@@ -233,7 +181,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD
 endif()
 
 find_package(Boost REQUIRED)
-set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
+set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
 include(BoostTestTargets)
 
 if(SIMGEAR_HEADLESS)
@@ -245,19 +193,12 @@ else()
 
     if (ENABLE_SOUND)
         if (USE_AEONWAVE)
-            find_package(AAX)
-        endif()
-
-        if(NOT AAX_FOUND)
-            set(USE_AEONWAVE FALSE)
+            find_package(AAX COMPONENTS aax REQUIRED)
+        else()
             find_package(OpenAL REQUIRED)
         endif()
 
-        if(AAX_FOUND)
-            message(STATUS "Sound support: AeonWave")
-        else()
-            message(STATUS "Sound support: OpenAL")
-        endif()
+        message(STATUS "Sound support: ENABLED")
     endif(ENABLE_SOUND)
 
     find_package(OpenSceneGraph 3.2.0 REQUIRED osgText osgSim osgDB osgParticle osgGA osgViewer osgUtil)
@@ -278,15 +219,7 @@ else()
     endif()
 endif(SIMGEAR_HEADLESS)
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    # As of 2020-08-01, OpenBSD's system zlib is slightly old, but it's usable
-    # with a workaround in simgear/io/iostreams/gzfstream.cxx.
-    find_package(ZLIB 1.2.3 REQUIRED)
-else()
-    find_package(ZLIB 1.2.4 REQUIRED)
-endif()
-
-find_package(LibLZMA REQUIRED)
+find_package(ZLIB 1.2.4 REQUIRED)
 find_package(CURL REQUIRED)
 
 if (SYSTEM_EXPAT)
@@ -296,13 +229,17 @@ if (SYSTEM_EXPAT)
 
 else()
     message(STATUS "Using built-in expat code")
+    # XML_STATIC is important to avoid sg_expat_external.h
+    # declaring symbols as declspec(import)
+    add_definitions(-DHAVE_EXPAT_CONFIG_H -DXML_STATIC)
     set(EXPAT_INCLUDE_DIRS
-            ${PROJECT_SOURCE_DIR}/3rdparty/expat
-            ${PROJECT_BINARY_DIR}/3rdparty/expat)
+	    ${PROJECT_SOURCE_DIR}/3rdparty/expat
+	    ${PROJECT_BINARY_DIR}/3rdparty/expat)
 endif(SYSTEM_EXPAT)
 
 check_include_file(inttypes.h HAVE_INTTYPES_H)
 check_include_file(sys/time.h HAVE_SYS_TIME_H)
+check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H)
 check_include_file(unistd.h HAVE_UNISTD_H)
 check_include_file(windows.h HAVE_WINDOWS_H)
 
@@ -312,40 +249,21 @@ if(HAVE_INTTYPES_H)
 endif()
 
 if(ENABLE_RTI)
-    find_package(PkgConfig)
-    if(PKG_CONFIG_FOUND)
-      SET(ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-      pkg_check_modules(RTI hla-rti13)
-    endif(PKG_CONFIG_FOUND)
-    if(RTI_FOUND)
-      message(STATUS "RTI: ENABLED")
-    else()
-      message(STATUS "RTI: DISABLED")
-    endif(RTI_FOUND)
+    # See if we have any rti library variant installed
+    message(STATUS "RTI: ENABLED")
+    find_package(RTI)
 else()
     message(STATUS "RTI: DISABLED")
 endif(ENABLE_RTI)
 
-if(ENABLE_GDAL)
-    find_package(GDAL 2.0.0 REQUIRED)
-    if (GDAL_FOUND)
-        include_directories(${GDAL_INCLUDE_DIR})
-    endif(GDAL_FOUND)
-endif(ENABLE_GDAL)
-
 check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
+check_function_exists(ftime HAVE_FTIME)
+check_function_exists(timegm HAVE_TIMEGM)
 check_function_exists(rint HAVE_RINT)
 check_function_exists(mkdtemp HAVE_MKDTEMP)
 check_function_exists(bcopy HAVE_BCOPY)
 check_function_exists(mmap HAVE_MMAP)
 
-if (NOT MSVC)
-  check_function_exists(timegm HAVE_TIMEGM)
-  if (NOT HAVE_TIMEGM)
-    message(FATAL_ERROR "Non-Windows platforms must support timegm()")
-  endif()
-endif()
-
 if(HAVE_UNISTD_H)
     set(CMAKE_REQUIRED_INCLUDES ${CMAKE_INCLUDE_PATH})
     check_cxx_source_compiles(
@@ -390,7 +308,7 @@ SET(CMAKE_MINSIZEREL_POSTFIX "" CACHE STRING "add a postfix, usually empty on wi
 
 # isnan might not be real symbol, so can't check using function_exists
 check_cxx_source_compiles(
-    "#include <cmath>
+    "#include <cstdlib>
     int main() { return std::isnan(0.0);} "
     HAVE_STD_ISNAN)
 
@@ -398,81 +316,37 @@ if (NOT ${HAVE_STD_ISNAN})
   message(FATAL_ERROR "Your compiler lacks C++11 std::isnan, please update it")
 endif()
 
-# Check if the <regex> implementation in the C++ standard library is usable.
-# This is necessary because g++ 4.8 lies about its C++11 compliance: its
-# <regex> is utterly unusable, cf. [1].
-# The big preprocessor test essentially comes from [2], and gcc upstream devs
-# appear to back it (see comments following [2], as well as [3]).
-#
-#   [1] https://stackoverflow.com/a/12665408/4756009
-#   [2] https://stackoverflow.com/a/41186162/4756009
-#   [3] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78905
-check_cxx_source_compiles(
-    "#include <regex>
-
-     int main() {
-       #if __cplusplus >= 201103L &&                             \
-           (!defined(__GLIBCXX__)                         ||     \
-            (__cplusplus >= 201402L)                      ||     \
-            defined(_GLIBCXX_REGEX_DFS_QUANTIFIERS_LIMIT) ||     \
-            defined(_GLIBCXX_REGEX_STATE_LIMIT)           ||     \
-            (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE > 4))
-       #else
-         nullptr = void; // intentionally trigger a compilation error
-       #endif
-     }"
-    HAVE_WORKING_STD_REGEX)
-
 if(CMAKE_COMPILER_IS_GNUCXX)
-    set(WARNING_FLAGS_CXX "-Wall -fPIC")
-    set(WARNING_FLAGS_C   "-Wall -fPIC")
+    set(WARNING_FLAGS_CXX "-Wall")
+    set(WARNING_FLAGS_C   "-Wall")
+
+    if (CMAKE_VERSION VERSION_LESS 3.1)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    endif()
 
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
       message(WARNING "GCC 4.4 will be required soon, please upgrade")
     endif()
 
-    if (X86 OR X86_64)
-        set(SIMD_COMPILER_FLAGS "-msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
-    endif()
-
     # certain GCC versions don't provide the atomic builds, and hence
     # require is to provide them in SGAtomic.cxx
     set(CMAKE_REQUIRED_INCLUDES ${CMAKE_INCLUDE_PATH})
     check_cxx_source_compiles(
        "int main() { unsigned mValue; return __sync_add_and_fetch(&mValue, 1); }"
         GCC_ATOMIC_BUILTINS_FOUND)
-
-      # override CMake default RelWithDebInfo flags.
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO  "-O3 -g -DNDEBUG")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
-if (CLANG)
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     # Boost redeclares class members
-    set(WARNING_FLAGS_CXX "-Wall -fPIC -Wno-overloaded-virtual -Wno-redeclared-class-member")
-    set(WARNING_FLAGS_C   "-Wall -fPIC")
+    set(WARNING_FLAGS_CXX "-Wall -Wno-overloaded-virtual -Wno-redeclared-class-member")
+    set(WARNING_FLAGS_C   "-Wall")
     set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
     # fix Boost compilation :(
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 
-    # override CMake default RelWithDebInfo flags.
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO  "-O3 -g -DNDEBUG")
-
-    set(SIMD_COMPILER_FLAGS "-msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
-endif()
-
-if (ENABLE_OPENMP)
-    find_package(OpenMP)
-    if(OPENMP_FOUND)
-        message(STATUS "OpenMP: ENABLED")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-    else()
-        message(STATUS "OpenMP: NOT FOUND")
+    if (CMAKE_VERSION VERSION_LESS 3.1)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     endif()
-else()
-    message(STATUS "OpenMP: DISABLED")
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@@ -491,9 +365,6 @@ if(WIN32)
 
     if(MSVC)
         set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /MP")
-        if (X86)
-          set(SIMD_COMPILER_FLAGS "/arch:SSE /arch:SSE2")
-        endif()
 
         if (NOT OSG_FSTREAM_EXPORT_FIXED)
           message(STATUS "For better linking performance, use OSG with patched fstream header")
@@ -516,34 +387,14 @@ if(WIN32)
     set( RT_LIBRARY "winmm" )
 endif(WIN32)
 
-# append the SIMD flags if requested
-if (ENABLE_SIMD)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SIMD_COMPILER_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SIMD_COMPILER_FLAGS}")
-
-  # set for multi-configuration generators
-  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${SIMD_COMPILER_FLAGS}")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${SIMD_COMPILER_FLAGS}")
-
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${SIMD_COMPILER_FLAGS}")
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${SIMD_COMPILER_FLAGS}")
-endif()
-
-
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS_C} ${MSVC_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}")
 
-include(CheckCXXFeatures)
-
 # use BEFORE to ensure local directories are used first,
 # ahead of system-installed libs
 include_directories(BEFORE ${PROJECT_BINARY_DIR}/simgear)
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    include_directories("/usr/X11R6/include")
-endif()
-
 add_definitions(-DHAVE_CONFIG_H)
 
 # configure a header file to pass some of the CMake settings
@@ -572,8 +423,7 @@ set(TEST_LIBS_INTERNAL_CORE
     ${RT_LIBRARY}
     ${DL_LIBRARY}
     ${COCOA_LIBRARY}
-    ${CURL_LIBRARIES}
-    ${GDAL_LIBRARY})
+    ${CURL_LIBRARIES})
 set(TEST_LIBS SimGearCore ${TEST_LIBS_INTERNAL_CORE})
 
 if(NOT SIMGEAR_HEADLESS)

CMakeModules/BoostTestTargets.cmake

@@ -46,17 +46,11 @@ set(BOOST_TEST_TARGET_PREFIX "test")
 if(NOT Boost_FOUND)
 	find_package(Boost 1.34.0 QUIET)
 endif()
-
-if (NOT Boost_VERSION_MACRO)
-	# Compatibility with pre CMP0093 (CMake 3.15)
-	set(Boost_VERSION_MACRO ${Boost_VERSION})
-endif()
-
-if("${Boost_VERSION_MACRO}0" LESS "1034000")
+if("${Boost_VERSION}0" LESS "1034000")
 	set(_shared_msg
 		"NOTE: boost::test-based targets and tests cannot "
 		"be added: boost >= 1.34.0 required but not found. "
-		"(found: '${Boost_VERSION_MACRO}'; want >=103400) ")
+		"(found: '${Boost_VERSION}'; want >=103400) ")
 	if(ENABLE_TESTS)
 		message(FATAL_ERROR
 			${_shared_msg}
@@ -72,7 +66,7 @@ endif()
 include(GetForceIncludeDefinitions)
 include(CopyResourcesToBuildTree)
 
-if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000")
+if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
 	set(_boosttesttargets_libs)
 	set(_boostConfig "BoostTestTargetsIncluded.h")
 	if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
@@ -86,7 +80,7 @@ if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000")
 			set(_boostConfig "BoostTestTargetsDynamic.h")
 		endif()
 	endif()
-	get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} DIRECTORY)
+	get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} PATH)
 	configure_file("${_moddir}/${_boostConfig}"
 		"${CMAKE_CURRENT_BINARY_DIR}/BoostTestTargetConfig.h"
 		COPYONLY)
@@ -135,7 +129,7 @@ function(add_boost_test _name)
 			"Syntax error in use of add_boost_test: at least one source file required!")
 	endif()
 
-	if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000")
+	if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
 
 		include_directories(${Boost_INCLUDE_DIRS})
 
@@ -163,7 +157,7 @@ function(add_boost_test _name)
 		endforeach()
 
 		if(NOT _boostTestTargetsNagged${_name} STREQUAL "${includeType}")
-			if("${includeType}" STREQUAL "CONFIGURED")
+			if("includeType" STREQUAL "CONFIGURED")
 				message(STATUS
 					"Test '${_name}' uses the CMake-configurable form of the boost test framework - congrats! (Including File: ${includeFileLoc})")
 			elseif("${includeType}" STREQUAL "INCLUDED")
@@ -227,7 +221,7 @@ function(add_boost_test _name)
 			set(_test_command ${_target_name})
 		endif()
 
-		if(TESTS AND ( "${Boost_VERSION_MACRO}" VERSION_GREATER "103799" ))
+		if(TESTS AND ( "${Boost_VERSION}" VERSION_GREATER "103799" ))
 			foreach(_test ${TESTS})
 				add_test(
 					${_name}-${_test}

CMakeModules/CheckCXXFeatures.cmake

@@ -1,30 +0,0 @@
-check_cxx_source_compiles("
-  #include <utility>
-  #include <type_traits>
-  std::make_index_sequence<0> t;
-  int main() {}" HAVE_STD_INDEX_SEQUENCE
-)
-
-check_cxx_source_compiles("
-  #include <type_traits>
-  std::remove_cv_t<const int> t;
-  int main() {}" HAVE_STD_REMOVE_CV_T
-)
-
-check_cxx_source_compiles("
-  #include <type_traits>
-  std::remove_cvref_t<const int&> t;
-  int main() {}" HAVE_STD_REMOVE_CVREF_T
-)
-
-check_cxx_source_compiles("
-  #include <type_traits>
-  std::enable_if_t<true, int> t;
-  int main() {}" HAVE_STD_ENABLE_IF_T
-)
-
-check_cxx_source_compiles("
-  #include <type_traits>
-  std::bool_constant<true> t;
-  int main() {}" HAVE_STD_BOOL_CONSTANT
-)

CMakeModules/CopyResourcesToBuildTree.cmake

@@ -30,12 +30,12 @@ function(copy_resources_to_build_tree _target)
 	endif()
 
 	get_target_property(_path ${_target} LOCATION)
-	get_filename_component(_path "${_path}" DIRECTORY)
+	get_filename_component(_path "${_path}" PATH)
 
 	if(NOT MSVC AND NOT "${CMAKE_GENERATOR}" MATCHES "Makefiles")
 		foreach(_config ${CMAKE_CONFIGURATION_TYPES})
 			get_target_property(_path${_config} ${_target} LOCATION_${_config})
-			get_filename_component(_path${_config} "${_path${_config}}" DIRECTORY)
+			get_filename_component(_path${_config} "${_path${_config}}" PATH)
 			add_custom_command(TARGET ${_target}
 						POST_BUILD
 						COMMAND

CMakeModules/DetectArch.cmake

@@ -1,37 +0,0 @@
-IF(CMAKE_SYSTEM_PROCESSOR MATCHES amd64.*|x86_64.* OR CMAKE_GENERATOR MATCHES "Visual Studio.*Win64")
-  IF(CMAKE_C_FLAGS MATCHES -m32 OR CMAKE_CXX_FLAGS MATCHES -m32)
-    SET(X86 1)
-  ELSE(CMAKE_C_FLAGS MATCHES -m32 OR CMAKE_CXX_FLAGS MATCHES -m32)
-    SET(X86_64 1)
-  ENDIF(CMAKE_C_FLAGS MATCHES -m32 OR CMAKE_CXX_FLAGS MATCHES -m32)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES i686.*|i386.*|x86.* OR WIN32)
-  IF(CMAKE_C_FLAGS MATCHES -m64 OR CMAKE_CXX_FLAGS MATCHES -m64)
-    SET(X86_64 1)
-  ELSE(CMAKE_C_FLAGS MATCHES -m64 OR CMAKE_CXX_FLAGS MATCHES -m64)
-    SET(X86 1)
-  ENDIF(CMAKE_C_FLAGS MATCHES -m64 OR CMAKE_CXX_FLAGS MATCHES -m64)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES arm.* AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    SET(ARM 1)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES mips)
-    SET(MIPS 1)
-ENDIF()
-
-IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
-  # using Clang
-  SET(CLANG 1)
-ELSEIF ("${CMAKE_C_COMPILER_ID}" STREQUAL "TinyCC")
-  # using TinyCC
-  SET(TINYCC 1)
-ELSEIF ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
-  # using GCC
-  SET(GCC 1)
-ELSEIF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel")
-  # using Intel C++
-  SET(INTELCC 1)
-ELSEIF ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
-  # using Visual Studio C++
-  SET(MSVC 1)
-ELSEIF ("${CMAKE_C_COMPILER_ID}" STREQUAL "MIPSpro")
-  # using SGI MIPSpro
-  SET(MIPSPRO 1)
-ENDIF()

CMakeModules/ExportDebugSymbols.cmake

@@ -1,26 +0,0 @@
-
-
-# placehodler target for other ones to depend upon
-add_custom_target(
-    debug_symbols
-)
-
-function(export_debug_symbols target)
-
-    if (NOT SIMGEAR_SHARED)
-        return()
-    endif()
-
-    if (APPLE)
-        add_custom_target(${target}.dSYM
-            COMMENT "Generating dSYM files for ${target}"
-            COMMAND dsymutil --out=${target}.dSYM $<TARGET_FILE:${target}>
-            DEPENDS $<TARGET_FILE:${target}>
-        ) 
-
-        install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${target}.dSYM DESTINATION symbols OPTIONAL)
-
-        add_dependencies(debug_symbols ${target}.dSYM)
-    endif()
-
-endfunction()

CMakeModules/FindAAX.cmake

@@ -1,74 +1,48 @@
-# Try to find AAX (AeonWave)
+# Locate AAX
 # This module defines
-#
-# AAX_FOUND - if false, do not try to link to AAX
-# AAX_INCLUDE_DIR - where to find the headers
-# AAX_LIBRARIES - Link these to use AAX
-#
-# Copyright (C) 2016-2018 by Erik Hofman.
-# Copyright (C) 2016-2018 by Adalin B.V.
+# AAX_LIBRARIES
+# AAX_FOUND, if false, do not try to link to AAX 
+# AAX_INCLUDE_DIR, where to find the headers
 #
 # $AAXDIR is an environment variable that would
 # correspond to the ./configure --prefix=$AAXDIR
 # used in building AAX.
 #
-# This file is Public Domain (www.unlicense.org)
-# This is free and unencumbered software released into the public domain.
+# Created by Erik Hofman.
 
-if (AAX_LIBRARY AND AAX_INCLUDE_DIR)
-  # in cache already
-  set(AAX_FOUND TRUE)
-else()
-  find_path(AAX_INCLUDE_DIR aax/aax.h
-    HINTS
-    $ENV{AAXDIR}
-    $ENV{ProgramFiles}/aax
-    $ENV{ProgramFiles}/AeonWave
-    $ENV{ProgramFiles}/Adalin/AeonWave
-    ${CMAKE_SOURCE_DIR}/aax
-    PATH_SUFFIXES include
-    PATHS
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local
-    /usr
-    /opt
-  )
+FIND_PATH(AAX_INCLUDE_DIR aax/aeonwave.hpp
+  HINTS
+  $ENV{AAXDIR}
+  $ENV{ProgramFiles}/aax
+  $ENV{ProgramFiles}/AeonWave
+  $ENV{ProgramFiles}/Adalin/AeonWave
+  PATH_SUFFIXES include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /opt
+)
 
-  find_library(AAX_LIBRARY 
-    NAMES AAX aax libAAX
-    HINTS
-    $ENV{AAXDIR}
-    $ENV{ProgramFiles}/AAX
-    $ENV{ProgramFiles}/AeonWave
-    $ENV{ProgramFiles}/Adalin/AeonWave
-    ${CMAKE_BUILD_DIR}/aax
-    PATH_SUFFIXES lib64 lib lib/${CMAKE_LIBRARY_ARCHITECTURE} libs64 libs libs/Win32 libs/Win64 bin
-    PATHS
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local
-    /usr
-    /opt
-  )
+FIND_LIBRARY(AAX_LIBRARY 
+  NAMES AAX aax AAX32 libAAX32
+  HINTS
+  $ENV{AAXDIR}
+  $ENV{ProgramFiles}/AAX
+  $ENV{ProgramFiles}/AeonWave
+  $ENV{ProgramFiles}/Adalin/AeonWave
+  PATH_SUFFIXES bin lib lib/${CMAKE_LIBRARY_ARCHITECTURE} lib64 libs64 libs libs/Win32 libs/Win64
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr
+  /opt
+  /usr/local
+)
 
-  set(AAX_DEFINITIONS "")
-  if (AAX_LIBRARY AND AAX_INCLUDE_DIR)
-    set(AAX_FOUND TRUE)
-  endif()
-
-  if (AAX_FOUND)
-    if (NOT Udns_FIND_QUIETLY)
-      message(STATUS "Found AeonWave: ${AAX_LIBRARIES}")
-    endif ()
-  else ()
-    if (Udns_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find AeonWave")
-    endif ()
-  endif ()
-
-  # show the AAX_INCLUDE_DIRS and AAX_LIBRARIES variables only in the advanced view
-  mark_as_advanced(AAX_INCLUDE_DIRS AAX_LIBRARIES)
-
-endif()
+SET(AAX_FOUND "NO")
+IF(AAX_LIBRARY AND AAX_INCLUDE_DIR)
+  SET(AAX_FOUND "YES")
+ENDIF(AAX_LIBRARY AND AAX_INCLUDE_DIR)
 

CMakeModules/FindLibLZMA.cmake

@@ -1,124 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindLibLZMA
------------
-
-Find LZMA compression algorithm headers and library.
-
-
-Imported Targets
-^^^^^^^^^^^^^^^^
-
-This module defines :prop_tgt:`IMPORTED` target ``LibLZMA::LibLZMA``, if
-liblzma has been found.
-
-Result variables
-^^^^^^^^^^^^^^^^
-
-This module will set the following variables in your project:
-
-``LIBLZMA_FOUND``
-  True if liblzma headers and library were found.
-``LIBLZMA_INCLUDE_DIRS``
-  Directory where liblzma headers are located.
-``LIBLZMA_LIBRARIES``
-  Lzma libraries to link against.
-``LIBLZMA_HAS_AUTO_DECODER``
-  True if lzma_auto_decoder() is found (required).
-``LIBLZMA_HAS_EASY_ENCODER``
-  True if lzma_easy_encoder() is found (required).
-``LIBLZMA_HAS_LZMA_PRESET``
-  True if lzma_lzma_preset() is found (required).
-``LIBLZMA_VERSION_MAJOR``
-  The major version of lzma
-``LIBLZMA_VERSION_MINOR``
-  The minor version of lzma
-``LIBLZMA_VERSION_PATCH``
-  The patch version of lzma
-``LIBLZMA_VERSION_STRING``
-  version number as a string (ex: "5.0.3")
-#]=======================================================================]
-
-find_path(LIBLZMA_INCLUDE_DIR lzma.h )
-if(NOT LIBLZMA_LIBRARY)
-  find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma liblzma NAMES_PER_DIR PATH_SUFFIXES lib)
-  find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzmad liblzmad NAMES_PER_DIR PATH_SUFFIXES lib)
-  include(SelectLibraryConfigurations)
-  select_library_configurations(LIBLZMA)
-else()
-  file(TO_CMAKE_PATH "${LIBLZMA_LIBRARY}" LIBLZMA_LIBRARY)
-endif()
-
-if(LIBLZMA_INCLUDE_DIR AND EXISTS "${LIBLZMA_INCLUDE_DIR}/lzma/version.h")
-    file(STRINGS "${LIBLZMA_INCLUDE_DIR}/lzma/version.h" LIBLZMA_HEADER_CONTENTS REGEX "#define LZMA_VERSION_[A-Z]+ [0-9]+")
-
-    string(REGEX REPLACE ".*#define LZMA_VERSION_MAJOR ([0-9]+).*" "\\1" LIBLZMA_VERSION_MAJOR "${LIBLZMA_HEADER_CONTENTS}")
-    string(REGEX REPLACE ".*#define LZMA_VERSION_MINOR ([0-9]+).*" "\\1" LIBLZMA_VERSION_MINOR "${LIBLZMA_HEADER_CONTENTS}")
-    string(REGEX REPLACE ".*#define LZMA_VERSION_PATCH ([0-9]+).*" "\\1" LIBLZMA_VERSION_PATCH "${LIBLZMA_HEADER_CONTENTS}")
-
-    set(LIBLZMA_VERSION_STRING "${LIBLZMA_VERSION_MAJOR}.${LIBLZMA_VERSION_MINOR}.${LIBLZMA_VERSION_PATCH}")
-    unset(LIBLZMA_HEADER_CONTENTS)
-endif()
-
-# We're using new code known now as XZ, even library still been called LZMA
-# it can be found in http://tukaani.org/xz/
-# Avoid using old codebase
-if (LIBLZMA_LIBRARY)
-  include(CheckLibraryExists)
-  set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET})
-  set(CMAKE_REQUIRED_QUIET ${LibLZMA_FIND_QUIETLY})
-  if(NOT LIBLZMA_LIBRARY_RELEASE AND NOT LIBLZMA_LIBRARY_DEBUG)
-    set(LIBLZMA_LIBRARY_check ${LIBLZMA_LIBRARY})
-  elseif(LIBLZMA_LIBRARY_RELEASE)
-    set(LIBLZMA_LIBRARY_check ${LIBLZMA_LIBRARY_RELEASE})
-  elseif(LIBLZMA_LIBRARY_DEBUG)
-    set(LIBLZMA_LIBRARY_check ${LIBLZMA_LIBRARY_DEBUG})
-  endif()
-  CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY_check} lzma_auto_decoder "" LIBLZMA_HAS_AUTO_DECODER)
-  CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY_check} lzma_easy_encoder "" LIBLZMA_HAS_EASY_ENCODER)
-  CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY_check} lzma_lzma_preset "" LIBLZMA_HAS_LZMA_PRESET)
-  unset(LIBLZMA_LIBRARY_check)
-  set(CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE})
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LibLZMA  REQUIRED_VARS  LIBLZMA_LIBRARY
-                                                          LIBLZMA_INCLUDE_DIR
-                                                          LIBLZMA_HAS_AUTO_DECODER
-                                                          LIBLZMA_HAS_EASY_ENCODER
-                                                          LIBLZMA_HAS_LZMA_PRESET
-                                           VERSION_VAR    LIBLZMA_VERSION_STRING
-                                 )
-mark_as_advanced( LIBLZMA_INCLUDE_DIR LIBLZMA_LIBRARY )
-
-if (LIBLZMA_FOUND)
-    set(LIBLZMA_LIBRARIES ${LIBLZMA_LIBRARY})
-    set(LIBLZMA_INCLUDE_DIRS ${LIBLZMA_INCLUDE_DIR})
-    if(NOT TARGET LibLZMA::LibLZMA)
-        add_library(LibLZMA::LibLZMA UNKNOWN IMPORTED)
-        set_target_properties(LibLZMA::LibLZMA PROPERTIES
-                              INTERFACE_INCLUDE_DIRECTORIES ${LIBLZMA_INCLUDE_DIR}
-                              IMPORTED_LINK_INTERFACE_LANGUAGES C)
-
-        if(LIBLZMA_LIBRARY_RELEASE)
-            set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY
-                IMPORTED_CONFIGURATIONS RELEASE)
-            set_target_properties(LibLZMA::LibLZMA PROPERTIES
-                IMPORTED_LOCATION_RELEASE "${LIBLZMA_LIBRARY_RELEASE}")
-        endif()
-
-        if(LIBLZMA_LIBRARY_DEBUG)
-            set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY
-                IMPORTED_CONFIGURATIONS DEBUG)
-            set_target_properties(LibLZMA::LibLZMA PROPERTIES
-                IMPORTED_LOCATION_DEBUG "${LIBLZMA_LIBRARY_DEBUG}")
-        endif()
-
-        if(NOT LIBLZMA_LIBRARY_RELEASE AND NOT LIBLZMA_LIBRARY_DEBUG)
-            set_target_properties(LibLZMA::LibLZMA PROPERTIES
-                IMPORTED_LOCATION "${LIBLZMA_LIBRARY}")
-        endif()
-    endif()
-endif ()

CMakeModules/SimGearComponent.cmake

@@ -12,11 +12,6 @@ macro(simgear_component_common name includePath sourcesList sources headers)
 		set_property(GLOBAL
 			APPEND PROPERTY PUBLIC_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/${h}")
         set(fh${sourcesList} "${fh${sourcesList}}#${CMAKE_CURRENT_SOURCE_DIR}/${h}")
-
-        # also append headers to the sources list, so that IDEs find the files
-        # correctly (otherwise they are not in the project)
-        set_property(GLOBAL
-            APPEND PROPERTY ${sourcesList} "${CMAKE_CURRENT_SOURCE_DIR}/${h}")
 	endforeach()
 
     set_property(GLOBAL APPEND PROPERTY FG_GROUPS_${sourcesList}_C "${fc${sourcesList}}@")

DoxygenMain.cxx

@@ -2,10 +2,6 @@
    documentation.  It has a .cxx extension so that emacs will happily
    autoindent correctly. */
 
-/**
- * \namespace simgear
- * \brief \ref index "SimGear" main namespace.
- */
 /** \mainpage SimGear
  * Simulation, Visualization, and Game development libraries.
 

README.OpenAL

@@ -0,0 +1,20 @@
+[This file is mirrored in both the FlightGear and SimGear packages.]
+
+You *must* have the development components of OpenAL installed on your system
+to build FlightGear!"  You can get a copy here:
+
+      http://connect.creativelabs.com/openal/default.aspx
+
+Build notes:
+
+You can download a versioned release of the openal library from 
+http://www.openal.org/downloads.html. Download the openal source,
+release 0.0.8 (dated February 11, 2006) and run:  
+tar xjvf openal-soft-1.5.304.tar.bz2
+cd openal-soft-1.5.304/
+ccmake .
+
+[ While running ccmake: press 'c' to configure, press 'c' once more, and
+  then press 'g' to generate and exit ]
+
+

README.sound

@@ -1,39 +0,0 @@
-[This file is mirrored in both the FlightGear and SimGear packages.]
-
-For Sound support FlightGear requires one of the two following packages:
-- OpenAL
-- AeonWave
-
-== OpenAL ===
-
-You *must* have the development components of OpenAL installed on your system
-to build FlightGear!"  You can get a copy here:
-
-      http://connect.creativelabs.com/openal/default.aspx
-
-Build notes:
-
-You can download a versioned release of the openal library from
-http://www.openal.org/downloads.html. Download the openal source,
-release 0.0.8 (dated February 11, 2006) and run:
-tar xjvf openal-soft-1.5.304.tar.bz2
-cd openal-soft-1.5.304/
-ccmake .
-
-[ While running ccmake: press 'c' to configure, press 'c' once more, and
-  then press 'g' to generate and exit ]
-
-
-== AeonWave ===
-
-For FlightGear AeonWave has a number of advantages over OpenAL:
-* Correct Doppler effect behavior
-* Default distance attenuation frequency filtering
-* Native support for 29 types of audio formats.
-* Native support for wav, mp3, vorbis and raw file formats.
-
-The source code of AeonWave can be found on GitHub:
-https://github.com/adalinbv
-
-Optimized binary packages are available at:
-http://www.adalin.com/

SimGear.spec.in

@@ -0,0 +1,76 @@
+%define ver	@VERSION@
+%define rel	1
+%define prefix	/usr
+
+Summary:	Simulator Construction Gear.
+Name:		@PACKAGE@
+Version:	%ver
+Release:	%rel
+Copyright:	LGPL
+Group:		Libraries/Graphics
+Source:		%{name}-%{version}.tar.gz
+#URL:		
+BuildRoot:	/tmp/%{name}-%{version}-%{rel}-root
+Packager:	Fill In As You Wish
+Docdir:		%{prefix}/doc
+
+%description
+This package contains a tools and libraries useful for constructing 
+simulation and visualization applications such as FlightGear or TerraGear. 
+
+Authors:
+	N/A
+
+%prep
+%setup -n %{name}-%{version}
+
+
+%build
+# Needed for snapshot releases.
+if [ ! -f configure ]; then
+	CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix
+else
+	CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
+fi
+
+if [ "$SMP" != "" ]; then
+	JSMP	= '"MAKE=make -k -j $SMP"'
+fi
+
+make ${JSMP};
+
+
+%install
+[ -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT}
+
+make prefix=${RPM_BUILD_ROOT}%{prefix} install
+
+#
+# Generating file lists and store them in file-lists
+# Starting with the directory listings
+#
+find ${RPM_BUILD_ROOT}%{prefix}/{bin,include,lib} -type d | sed "s#^${RPM_BUILD_ROOT}#\%attr (-\,root\,root) \%dir #" > file-lists
+%{?ETCDR:find ${RPM_BUILD_ROOT}%{!?SYSCF:%{prefix}}/etc -type d | sed "s#^${RPM_BUILD_ROOT}#\%attr (-\,root\,root) \%dir #" >> file-lists}
+
+#
+# Then, the file listings
+#
+echo "%defattr (-, root, root)" >> file-lists
+%{?ETCDR:find ${RPM_BUILD_ROOT}%{!?SYSCF:%{prefix}}/etc/%{name}.conf -type f | sed -e "s#^${RPM_BUILD_ROOT}#%config #g" >> file-lists}
+find ${RPM_BUILD_ROOT}%{prefix} -type f | sed -e "s#^${RPM_BUILD_ROOT}##g" >> file-lists
+
+
+%clean
+(cd ..; rm -rf %{name}-%{version} ${RPM_BUILD_ROOT})
+
+
+%files -f file-lists
+%defattr (-, root, root)
+%doc AUTHORS
+%doc COPYING
+%doc ChangeLog
+%doc INSTALL
+%doc NEWS
+%doc README
+%doc %{name}.spec.in
+

SimGearConfig.cmake.in

@@ -1,37 +1,16 @@
 include(CMakeFindDependencyMacro)
 
 find_dependency(ZLIB)
-find_dependency(LibLZMA)
 find_dependency(Threads)
 
 # OSG
 
 set(SIMGEAR_HEADLESS @SIMGEAR_HEADLESS@)
 set(SIMGEAR_SOUND @ENABLE_SOUND@)
-set(USE_AEONWAVE @USE_AEONWAVE@)
 
 # OpenAL isn't a public dependency, so maybe not needed
 #if (SIMGEAR_SOUND)
 #  find_dependency(OpenAL)
 #endif()
 
-# SSE/SSE2 support
-
-set(ENABLE_SIMD @ENABLE_SIMD@)
-
-# OpenRTI support
-set(ENABLE_RTI @ENABLE_RTI@)
-if(ENABLE_RTI)
-  set(RTI_FOUND @RTI_FOUND@)
-  if(RTI_FOUND)
-    set(RTI_INCLUDE_DIRS @RTI_INCLUDE_DIRS@)
-    set(RTI_LDFLAGS @RTI_LDFLAGS@)
-  endif(RTI_FOUND)
-endif(ENABLE_RTI)
-
-# Alternative terrain engine based on pagedLOD
-
-set(ENABLE_GDAL @ENABLE_GDAL@)
-set(ENABLE_OPENMP @ENABLE_OPENMP@)
-
 include("${CMAKE_CURRENT_LIST_DIR}/SimGearTargets.cmake")

package/RedHat/README

@@ -0,0 +1,13 @@
+Building a SimGear RPM package for Red Hat
+
+Please see the "package/openSUSE" directory for an
+example how to build a SimGear RPM package with
+shared SimGear libraries.
+
+You may need to adapt the names (exact spelling) of some
+of the package dependencies in the openSUSE RPM spec,
+since these may slightly differ for Red Hat.
+
+(If you have a working and tested Red Hat RPM spec,
+you're welcome to contribute it to this project.)
+

package/openSUSE/README

@@ -0,0 +1,23 @@
+Building a SimGear RPM package for openSUSE
+
+(Last tested with openSUSE 11.4+12.1)
+
+This directory contains the files which, along with
+the source code tar files, can be used to build
+an RPM package targeted at an openSUSE Linux system.
+
+To build SimGear from source do the following:
+
+1. obtain simgear-2.8.0.tar.bz2 (adapt version if
+    necessary) and copy it into ~/rpmbuild/SOURCES
+
+2. look in the BuildRequires section of SimGear.spec
+   and check that all the packages referred to are
+   installed (note, some of these packages may be part
+   of openSUSE's "games" repository).
+
+3. run 'rpmbuild -ba simgear.spec' and find the RPM
+   build result in ~/rpmbuild/RPMS
+
+That's all!
+

package/openSUSE/SimGear.spec

@@ -0,0 +1,63 @@
+Summary:    Simulator Construction Gear
+Name:       SimGear
+Version:    2.8.0
+Release:    1
+License:    LGPL
+URL:        http://www.flightgear.org
+Group:      Amusements/Games/3D/Simulation
+Source:     http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/simgear-%{version}.tar.bz2
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+
+BuildRequires: gcc, gcc-c++, cmake
+BuildRequires: libopenal1-soft, openal-soft
+BuildRequires: libOpenSceneGraph-devel >= 3.0
+BuildRequires: zlib, zlib-devel
+BuildRequires: libjpeg62, libjpeg62-devel
+BuildRequires: boost-devel >= 1.37
+BuildRequires: subversion-devel, libapr1-devel
+Requires:      OpenSceneGraph-plugins >= 3.0
+
+%description
+This package contains a tools and libraries useful for constructing
+simulation and visualization applications such as FlightGear or TerraGear.
+
+%package devel
+Group:         Development/Libraries/Other
+Summary:       Development header files for SimGear
+Requires:      SimGear = %{version}
+
+%description devel
+Development headers and libraries for building applications against SimGear.
+
+%prep
+%setup -T -q -n simgear-%{version} -b 0
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+# build SHARED simgear libraries
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DSIMGEAR_SHARED:BOOL=ON -DENABLE_TESTS:BOOL=OFF -DJPEG_FACTORY:BOOL=ON
+make %{?_smp_mflags}
+
+%install
+make DESTDIR=%{buildroot} install
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr (-, root, root, -)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_libdir}/libSimGear*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/simgear
+%{_includedir}/simgear/*
+%{_libdir}/libSimGear*.so
+
+%changelog
+* Mon Jul 02 2012 thorstenb@flightgear.org
+- Initial version
+

simgear-version

@@ -1 +0,0 @@
-2020.3.8

simgear/CMakeLists.txt

@@ -5,8 +5,6 @@ foreach( mylibfolder
         bucket
         bvh
         debug
-        embedded_resources
-        emesary
         ephemeris
         io
         magvar
@@ -16,7 +14,6 @@ foreach( mylibfolder
         nasal/cppbind
         props
         serial
-        std
         structure
         threads
         timing
@@ -65,9 +62,6 @@ if(SIMGEAR_SHARED)
         set_property(TARGET SimGearScene PROPERTY VERSION   ${SIMGEAR_VERSION})
         set_property(TARGET SimGearScene PROPERTY SOVERSION ${SIMGEAR_SOVERSION})
     endif()
-
-    export_debug_symbols(SimGearCore)
-    export_debug_symbols(SimGearScene)
 else()
     message(STATUS "Library building mode: STATIC LIBRARIES")
 
@@ -118,22 +112,11 @@ target_include_directories(SimGearCore BEFORE PUBLIC
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
     $<INSTALL_INTERFACE:include>)
 
-# so simgear/simgear_config.h is found
-target_include_directories(SimGearCore BEFORE PUBLIC
-    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
-    $<INSTALL_INTERFACE:include>)
-
 target_include_directories(SimGearCore PUBLIC
   ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
 target_include_directories(SimGearCore PRIVATE
   ${EXPAT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS})
 
-if (NOT SYSTEM_EXPAT)
-    # XML_STATIC is important to avoid sg_expat_external.h
-    # declaring symbols as declspec(import)
-    target_compile_definitions(SimGearCore PRIVATE HAVE_SIMGEAR_EXPAT_CONFIG_H XML_STATIC)
-endif()
-
     install(TARGETS SimGearCore
             EXPORT SimGearTargets
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -158,46 +141,37 @@ if (NOT SIMGEAR_HEADLESS)
     endif()
 endif()
 
-# we expose ZLib in some of our headers
-target_link_libraries(SimGearCore PUBLIC ${ZLIB_LIBRARY})
 
-target_link_libraries(SimGearCore PRIVATE
+target_link_libraries(SimGearCore
+    ${ZLIB_LIBRARY}
     ${RT_LIBRARY}
     ${DL_LIBRARY}
     ${CMAKE_THREAD_LIBS_INIT}
     ${COCOA_LIBRARY}
     ${CURL_LIBRARIES}
-    ${WINSOCK_LIBRARY}
-    ${SHLWAPI_LIBRARY}
-    LibLZMA::LibLZMA
-)
+    ${WINSOCK_LIBRARY})
 
 if(SYSTEM_EXPAT)
-    target_link_libraries(SimGearCore PRIVATE ${EXPAT_LIBRARIES})
+    target_link_libraries(SimGearCore
+        ${EXPAT_LIBRARIES})
 endif()
 
 if(ENABLE_DNS AND SYSTEM_UDNS)
-    target_link_libraries(SimGearCore PRIVATE ${UDNS_LIBRARIES})
+    target_link_libraries(SimGearCore
+        ${UDNS_LIBRARIES})
 endif()
 
 if(NOT SIMGEAR_HEADLESS)
     target_include_directories(SimGearScene PRIVATE ${PROJECT_SOURCE_DIR}/simgear/canvas/ShivaVG/include)
 
-    target_link_libraries(SimGearScene PUBLIC         
+    target_link_libraries(SimGearScene
         SimGearCore
-        ${OPENSCENEGRAPH_LIBRARIES}
-    )
-
-    target_link_libraries(SimGearScene PRIVATE
         ${ZLIB_LIBRARY}
+        ${OPENSCENEGRAPH_LIBRARIES}
         ${OPENAL_LIBRARY}
         ${OPENGL_LIBRARY}
         ${JPEG_LIBRARY})
 
-    if(ENABLE_GDAL)
-        target_link_libraries(SimGearScene PRIVATE ${GDAL_LIBRARIES})
-    endif()
-
     # only actually needed by canvas/KeyboardEvent.cxx
     target_include_directories(SimGearScene PRIVATE ${PROJECT_SOURCE_DIR}/3rdparty/utf8/source)
 endif()
@@ -207,5 +181,5 @@ if(ENABLE_RTI)
     set_property(SOURCE hla/RTI13InteractionClass.cxx hla/RTI13ObjectClass.cxx
         hla/RTI13ObjectInstance.cxx hla/RTI13Federate.cxx
         hla/RTI13FederateFactory.cxx
-        APPEND PROPERTY COMPILE_FLAGS "-I${RTI_INCLUDE_DIRS}")
+        APPEND PROPERTY COMPILE_FLAGS "-I${RTI_INCLUDE_DIR}")
 endif(ENABLE_RTI)

simgear/bucket/test_bucket.cxx

@@ -35,152 +35,124 @@ using std::endl;
 
 void testBucketSpans()
 {
-    SG_CHECK_EQUAL(sg_bucket_span(0.0), 0.125);
-    SG_CHECK_EQUAL(sg_bucket_span(-20), 0.125);
-    SG_CHECK_EQUAL(sg_bucket_span(-40), 0.25);
-    SG_CHECK_EQUAL(sg_bucket_span(89.9), 12.0);
-    SG_CHECK_EQUAL(sg_bucket_span(88.1), 4.0);
-    SG_CHECK_EQUAL(sg_bucket_span(-89.9), 12.0);
+    COMPARE(sg_bucket_span(0.0), 0.125);
+    COMPARE(sg_bucket_span(-20), 0.125);
+    COMPARE(sg_bucket_span(-40), 0.25);
+    COMPARE(sg_bucket_span(89.9), 12.0);
+    COMPARE(sg_bucket_span(88.1), 4.0);
+    COMPARE(sg_bucket_span(-89.9), 12.0);
 }
 
 void testBasic()
 {
     SGBucket b1(5.1, 55.05);
-    SG_CHECK_EQUAL(b1.get_chunk_lon(), 5);
-    SG_CHECK_EQUAL(b1.get_chunk_lat(), 55);
-    SG_CHECK_EQUAL(b1.get_x(), 0);
-    SG_CHECK_EQUAL(b1.get_y(), 0);
-    SG_CHECK_EQUAL(b1.gen_index(), 3040320);
-    SG_CHECK_EQUAL(b1.gen_base_path(), "e000n50/e005n55");
-    SG_VERIFY(b1.isValid());
-
+    COMPARE(b1.get_chunk_lon(), 5);
+    COMPARE(b1.get_chunk_lat(), 55);
+    COMPARE(b1.get_x(), 0);
+    COMPARE(b1.get_y(), 0);
+    COMPARE(b1.gen_index(), 3040320);
+    COMPARE(b1.gen_base_path(), "e000n50/e005n55");
+    VERIFY(b1.isValid());
+    
     SGBucket b2(-10.1, -43.8);
-    SG_CHECK_EQUAL(b2.get_chunk_lon(), -11);
-    SG_CHECK_EQUAL(b2.get_chunk_lat(), -44);
-    SG_CHECK_EQUAL(b2.get_x(), 3);
-    // Latitude chunks numbered bottom to top, it seems
-    SG_CHECK_EQUAL(b2.get_y(), 1);
-    SG_CHECK_EQUAL(b2.gen_base_path(), "w020s50/w011s44");
-    SG_VERIFY(b2.isValid());
-
+    COMPARE(b2.get_chunk_lon(), -11);
+    COMPARE(b2.get_chunk_lat(), -44);
+    COMPARE(b2.get_x(), 3);
+    COMPARE(b2.get_y(), 1); // latitude chunks numbered bottom to top, it seems
+    COMPARE(b2.gen_base_path(), "w020s50/w011s44");
+    VERIFY(b2.isValid());
+    
     SGBucket b3(123.48, 9.01);
-    SG_CHECK_EQUAL(b3.get_chunk_lon(), 123);
-    SG_CHECK_EQUAL(b3.get_chunk_lat(), 9);
-    SG_CHECK_EQUAL(b3.get_x(), 3);
-    SG_CHECK_EQUAL(b3.get_y(), 0);
-    SG_CHECK_EQUAL(b3.gen_base_path(), "e120n00/e123n09");
-    SG_VERIFY(b3.isValid());
-
+    COMPARE(b3.get_chunk_lon(), 123);
+    COMPARE(b3.get_chunk_lat(), 9);
+    COMPARE(b3.get_x(), 3);
+    COMPARE(b3.get_y(), 0);
+    COMPARE(b3.gen_base_path(), "e120n00/e123n09");
+    VERIFY(b3.isValid());
+    
     SGBucket defBuck;
-    SG_VERIFY(!defBuck.isValid());
-
+    VERIFY(!defBuck.isValid());
+    
     b3.make_bad();
-    SG_VERIFY(!b3.isValid());
+    VERIFY(!b3.isValid());
 
     SGBucket atAntiMeridian(180.0, 12.3);
-    SG_VERIFY(atAntiMeridian.isValid());
-    SG_CHECK_EQUAL(atAntiMeridian.get_chunk_lon(), -180);
-    SG_CHECK_EQUAL(atAntiMeridian.get_x(), 0);
-
+    VERIFY(atAntiMeridian.isValid());
+    COMPARE(atAntiMeridian.get_chunk_lon(), -180);
+    COMPARE(atAntiMeridian.get_x(), 0);
+    
     SGBucket atAntiMeridian2(-180.0, -78.1);
-    SG_VERIFY(atAntiMeridian2.isValid());
-    SG_CHECK_EQUAL(atAntiMeridian2.get_chunk_lon(), -180);
-    SG_CHECK_EQUAL(atAntiMeridian2.get_x(), 0);
-
-    // check comparison operator overload
+    VERIFY(atAntiMeridian2.isValid());
+    COMPARE(atAntiMeridian2.get_chunk_lon(), -180);
+    COMPARE(atAntiMeridian2.get_x(), 0);
+    
+// check comparisom operator overload
     SGBucket b4(5.11, 55.1);
-    SG_VERIFY(b1 == b4); // should be equal
-    SG_VERIFY(b1 == b1);
-    SG_VERIFY(b1 != defBuck);
-    SG_VERIFY(b1 != b2);
-
-    // check wrapping/clipping of inputs
+    VERIFY(b1 == b4); // should be equal
+    VERIFY(b1 == b1);
+    VERIFY(b1 != defBuck);
+    VERIFY(b1 != b2);
+    
+// check wrapping/clipping of inputs
     SGBucket wrapMeridian(-200.0, 45.0);
-    SG_CHECK_EQUAL(wrapMeridian.get_chunk_lon(), 160);
-
+    COMPARE(wrapMeridian.get_chunk_lon(), 160);
+    
     SGBucket clipPole(48.9, 91);
-    SG_CHECK_EQUAL(clipPole.get_chunk_lat(), 89);
-
-    // test override of a bucket's geod
-    auto geod = SGGeod::fromDegFt(-86.678, 36.1248, 599.0);
-#ifndef NO_DEPRECATED_API
-    SGBucket bna_airport;
-    bna_airport.set_bucket(geod);
-#else
-    SGBucket bna_airport(geod);
-#endif
-    SG_VERIFY(bna_airport.isValid());
-    SG_CHECK_EQUAL(bna_airport.get_chunk_lon(), -87);           // left origin of the 1-degree chunk
-    SG_CHECK_EQUAL(bna_airport.get_chunk_lat(), 36);            // bottom origin of the 1-degree chunk
-    SG_CHECK_EQUAL(bna_airport.get_x(), 1);                     // buckets are 0.25 deg wide at the W87 parallel
-                                                                //   we're 0.322 deg from the origin (second bucket)
-    SG_CHECK_EQUAL(bna_airport.get_y(), 0);                     // buckets are always 0.125 deg tall
-                                                                //   we're 0.1248 deg from the origin (first bucket)
-    SG_CHECK_EQUAL(bna_airport.gen_base_path(), "w090n30/w087n36");
-    SG_CHECK_EQUAL_EP2(bna_airport.get_width_m(), 22479.1, 0.1);
-    SG_CHECK_EQUAL_EP2(bna_airport.get_height_m(), 13914.9, 0.1);
-    SG_CHECK_EQUAL(bna_airport.gen_index_str(), "1531777");     // 0x175F81 = b01011101|01111110|000|001
-                                                                //          =   93-180 | 126-90 | 0 | 1
-                                                                //          =      -87 |     36 | 0 | 1
-
-    // test stream output
-    cout << "[TEST] BNA Airport: " << bna_airport << endl;
-    auto center = bna_airport.get_center();
-    cout << "[TEST] BNA lon: " << center.getLongitudeDeg() << endl;
-    cout << "[TEST] BNA lat: " << center.getLatitudeDeg() << endl;
+    COMPARE(clipPole.get_chunk_lat(), 89);
 }
 
 void testPolar()
 {
     SGBucket b1(0.0, 89.92);
     SGBucket b2(10.0, 89.96);
-    SG_CHECK_EQUAL(b1.get_chunk_lat(), 89);
-    SG_CHECK_EQUAL(b1.get_chunk_lon(), 0);
-    SG_CHECK_EQUAL(b1.get_x(), 0);
-    SG_CHECK_EQUAL(b1.get_y(), 7);
-
-    SG_CHECK_EQUAL_EP(b1.get_highest_lat(), 90.0);
-    SG_CHECK_EQUAL_EP(b1.get_width_m(), 10.0);
-
-    SG_CHECK_EQUAL(b2.get_chunk_lat(), 89);
-    SG_CHECK_EQUAL(b2.get_chunk_lon(), 0);
-    SG_CHECK_EQUAL(b2.get_x(), 0);
-    SG_CHECK_EQUAL(b2.get_y(), 7);
-
-    SG_CHECK_EQUAL(b1.gen_index(), b2.gen_index());
-
+    COMPARE(b1.get_chunk_lat(), 89);
+    COMPARE(b1.get_chunk_lon(), 0);
+    COMPARE(b1.get_x(), 0);
+    COMPARE(b1.get_y(), 7);
+    
+    COMPARE_EP(b1.get_highest_lat(), 90.0);
+    COMPARE_EP(b1.get_width_m(), 10.0);
+    
+    COMPARE(b2.get_chunk_lat(), 89);
+    COMPARE(b2.get_chunk_lon(), 0);
+    COMPARE(b2.get_x(), 0);
+    COMPARE(b2.get_y(), 7);
+    
+    COMPARE(b1.gen_index(), b2.gen_index());
+    
     SGGeod actualNorthPole1 = b1.get_corner(2);
     SGGeod actualNorthPole2 = b1.get_corner(3);
-    SG_CHECK_EQUAL_EP(actualNorthPole1.getLatitudeDeg(), 90.0);
-    SG_CHECK_EQUAL_EP(actualNorthPole1.getLongitudeDeg(), 12.0);
-    SG_CHECK_EQUAL_EP(actualNorthPole2.getLatitudeDeg(), 90.0);
-    SG_CHECK_EQUAL_EP(actualNorthPole2.getLongitudeDeg(), 0.0);
+    COMPARE_EP(actualNorthPole1.getLatitudeDeg(), 90.0);
+    COMPARE_EP(actualNorthPole1.getLongitudeDeg(), 12.0);
+    COMPARE_EP(actualNorthPole2.getLatitudeDeg(), 90.0);
+    COMPARE_EP(actualNorthPole2.getLongitudeDeg(), 0.0);
 
     SGBucket b3(-2, 89.88);
     SGBucket b4(-7, 89.88);
-    SG_CHECK_EQUAL(b3.gen_index(), b4.gen_index());
-
+    COMPARE(b3.gen_index(), b4.gen_index());
+    
     // south pole
     SGBucket b5(-170, -89.88);
     SGBucket b6(-179, -89.88);
-
-    SG_CHECK_EQUAL(b5.get_chunk_lat(), -90);
-    SG_CHECK_EQUAL(b5.get_chunk_lon(), -180);
-    SG_CHECK_EQUAL(b5.get_x(), 0);
-    SG_CHECK_EQUAL(b5.get_y(), 0);
-    SG_CHECK_EQUAL(b5.gen_index(), b6.gen_index());
-    SG_CHECK_EQUAL_EP(b5.get_highest_lat(), -90.0);
-    SG_CHECK_EQUAL_EP(b5.get_width_m(), 10.0);
-
+    
+    COMPARE(b5.get_chunk_lat(), -90);
+    COMPARE(b5.get_chunk_lon(), -180);
+    COMPARE(b5.get_x(), 0);
+    COMPARE(b5.get_y(), 0);
+    COMPARE(b5.gen_index(), b6.gen_index());
+    COMPARE_EP(b5.get_highest_lat(), -90.0);
+    COMPARE_EP(b5.get_width_m(), 10.0);
+    
     SGGeod actualSouthPole1 = b5.get_corner(0);
     SGGeod actualSouthPole2 = b5.get_corner(1);
-    SG_CHECK_EQUAL_EP(actualSouthPole1.getLatitudeDeg(), -90.0);
-    SG_CHECK_EQUAL_EP(actualSouthPole1.getLongitudeDeg(), -180);
-    SG_CHECK_EQUAL_EP(actualSouthPole2.getLatitudeDeg(), -90.0);
-    SG_CHECK_EQUAL_EP(actualSouthPole2.getLongitudeDeg(), -168);
-
+    COMPARE_EP(actualSouthPole1.getLatitudeDeg(), -90.0);
+    COMPARE_EP(actualSouthPole1.getLongitudeDeg(), -180);
+    COMPARE_EP(actualSouthPole2.getLatitudeDeg(), -90.0);
+    COMPARE_EP(actualSouthPole2.getLongitudeDeg(), -168);
+    
     SGBucket b7(200, 89.88);
-    SG_CHECK_EQUAL(b7.get_chunk_lon(), -168);
+    COMPARE(b7.get_chunk_lon(), -168);
+
 }
 
 // test the tiles just below the pole (between 86 & 89 degrees N/S)
@@ -188,15 +160,15 @@ void testNearPolar()
 {
     SGBucket b1(1, 88.5);
     SGBucket b2(-1, 88.8);
-    SG_CHECK_EQUAL(b1.get_chunk_lon(), 0);
-    SG_CHECK_EQUAL(b1.get_chunk_lat(), 88);
-    SG_VERIFY(b1.gen_index() != b2.gen_index());
+    COMPARE(b1.get_chunk_lon(), 0);
+    COMPARE(b1.get_chunk_lat(), 88);
+    VERIFY(b1.gen_index() != b2.gen_index());
 
     SGBucket b3(176.1, 88.5);
-    SG_CHECK_EQUAL(b3.get_chunk_lon(), 176);
-
+    COMPARE(b3.get_chunk_lon(), 176);
+    
     SGBucket b4(-178, 88.5);
-    SG_CHECK_EQUAL(b4.get_chunk_lon(), -180);
+    COMPARE(b4.get_chunk_lon(), -180);
 }
 
 void testOffset()
@@ -204,74 +176,74 @@ void testOffset()
     // bucket just below the 22 degree cutoff, so the next tile north
     // is twice the width
     SGBucket b1(-59.8, 21.9);
-    SG_CHECK_EQUAL(b1.get_chunk_lat(), 21);
-    SG_CHECK_EQUAL(b1.get_chunk_lon(), -60);
-    SG_CHECK_EQUAL(b1.get_x(), 1);
-    SG_CHECK_EQUAL(b1.get_y(), 7);
-
+    COMPARE(b1.get_chunk_lat(), 21);
+    COMPARE(b1.get_chunk_lon(), -60);
+    COMPARE(b1.get_x(), 1);
+    COMPARE(b1.get_y(), 7);
+    
     // offset vertically
     SGBucket b2(b1.sibling(0, 1));
-    SG_CHECK_EQUAL(b2.get_chunk_lat(), 22);
-    SG_CHECK_EQUAL(b2.get_chunk_lon(), -60);
-    SG_CHECK_EQUAL(b2.get_x(), 0);
-    SG_CHECK_EQUAL(b2.get_y(), 0);
-
-    SG_CHECK_EQUAL(b2.gen_index(), sgBucketOffset(-59.8, 21.9, 0, 1));
+    COMPARE(b2.get_chunk_lat(), 22);
+    COMPARE(b2.get_chunk_lon(), -60);
+    COMPARE(b2.get_x(), 0);
+    COMPARE(b2.get_y(), 0);
 
+    COMPARE(b2.gen_index(), sgBucketOffset(-59.8, 21.9, 0, 1));
+    
     // offset vertically and horizontally. We compute horizontal (x)
     // movement at the target latitude, so this should move 0.25 * -3 degrees,
     // NOT 0.125 * -3 degrees.
     SGBucket b3(b1.sibling(-3, 1));
-    SG_CHECK_EQUAL(b3.get_chunk_lat(), 22);
-    SG_CHECK_EQUAL(b3.get_chunk_lon(), -61);
-    SG_CHECK_EQUAL(b3.get_x(), 1);
-    SG_CHECK_EQUAL(b3.get_y(), 0);
-
-    SG_CHECK_EQUAL(b3.gen_index(), sgBucketOffset(-59.8, 21.9, -3, 1));
+    COMPARE(b3.get_chunk_lat(), 22);
+    COMPARE(b3.get_chunk_lon(), -61);
+    COMPARE(b3.get_x(), 1);
+    COMPARE(b3.get_y(), 0);
+    
+    COMPARE(b3.gen_index(), sgBucketOffset(-59.8, 21.9, -3, 1));
 }
 
 void testPolarOffset()
 {
     SGBucket b1(-11.7, -89.6);
-    SG_CHECK_EQUAL(b1.get_chunk_lat(), -90);
-    SG_CHECK_EQUAL(b1.get_chunk_lon(), -12);
-    SG_CHECK_EQUAL(b1.get_x(), 0);
-    SG_CHECK_EQUAL(b1.get_y(), 3);
-
+    COMPARE(b1.get_chunk_lat(), -90);
+    COMPARE(b1.get_chunk_lon(), -12);
+    COMPARE(b1.get_x(), 0);
+    COMPARE(b1.get_y(), 3);
+    
     // offset horizontally
     SGBucket b2(b1.sibling(-2, 0));
-    SG_CHECK_EQUAL(b2.get_chunk_lat(), -90);
-    SG_CHECK_EQUAL(b2.get_chunk_lon(), -36);
-    SG_CHECK_EQUAL(b2.get_x(), 0);
-    SG_CHECK_EQUAL(b2.get_y(), 3);
-
-    SG_CHECK_EQUAL(b2.gen_index(), sgBucketOffset(-11.7, -89.6, -2, 0));
-
-    // offset and wrap
+    COMPARE(b2.get_chunk_lat(), -90);
+    COMPARE(b2.get_chunk_lon(), -36);
+    COMPARE(b2.get_x(), 0);
+    COMPARE(b2.get_y(), 3);
+    
+    COMPARE(b2.gen_index(), sgBucketOffset(-11.7, -89.6, -2, 0));
+    
+// offset and wrap
     SGBucket b3(-170, 89.1);
     SGBucket b4(b3.sibling(-1, 0));
-    SG_CHECK_EQUAL(b4.get_chunk_lat(), 89);
-    SG_CHECK_EQUAL(b4.get_chunk_lon(), 168);
-    SG_CHECK_EQUAL(b4.get_x(), 0);
-    SG_CHECK_EQUAL(b4.get_y(), 0);
-
-    SG_CHECK_EQUAL(b4.gen_index(), sgBucketOffset(-170, 89.1, -1, 0));
-
+    COMPARE(b4.get_chunk_lat(), 89);
+    COMPARE(b4.get_chunk_lon(), 168);
+    COMPARE(b4.get_x(), 0);
+    COMPARE(b4.get_y(), 0);
+    
+    COMPARE(b4.gen_index(), sgBucketOffset(-170, 89.1, -1, 0));
 
+    
     SGBucket b5(177, 87.3);
     SGBucket b6(b5.sibling(1, 1));
-    SG_CHECK_EQUAL(b6.get_chunk_lat(), 87);
-    SG_CHECK_EQUAL(b6.get_chunk_lon(), -180);
-    SG_CHECK_EQUAL(b6.get_x(), 0);
-    SG_CHECK_EQUAL(b6.get_y(), 3);
-
-    SG_CHECK_EQUAL(b6.gen_index(), sgBucketOffset(177, 87.3, 1, 1));
+    COMPARE(b6.get_chunk_lat(), 87);
+    COMPARE(b6.get_chunk_lon(), -180);
+    COMPARE(b6.get_x(), 0);
+    COMPARE(b6.get_y(), 3);
+    
+    COMPARE(b6.gen_index(), sgBucketOffset(177, 87.3, 1, 1));
 
     // offset vertically towards the pole
     SGBucket b7(b1.sibling(0, -5));
-    SG_VERIFY(!b7.isValid());
-
-    SG_VERIFY(!SGBucket(0, 90).sibling(0, 1).isValid());
+    VERIFY(!b7.isValid());
+    
+    VERIFY(!SGBucket(0, 90).sibling(0, 1).isValid());
 }
 
 // test behaviour of bucket-offset near the anti-meridian (180-meridian)
@@ -279,84 +251,33 @@ void testOffsetWrap()
 {
     // near the equator
     SGBucket b1(-179.8, 16.8);
-    SG_CHECK_EQUAL(b1.get_chunk_lat(), 16);
-    SG_CHECK_EQUAL(b1.get_chunk_lon(), -180);
-    SG_CHECK_EQUAL(b1.get_x(), 1);
-    SG_CHECK_EQUAL(b1.get_y(), 6);
-
+    COMPARE(b1.get_chunk_lat(), 16);
+    COMPARE(b1.get_chunk_lon(), -180);
+    COMPARE(b1.get_x(), 1);
+    COMPARE(b1.get_y(), 6);
+    
     SGBucket b2(b1.sibling(-2, 0));
-    SG_CHECK_EQUAL(b2.get_chunk_lat(), 16);
-    SG_CHECK_EQUAL(b2.get_chunk_lon(), 179);
-    SG_CHECK_EQUAL(b2.get_x(), 7);
-    SG_CHECK_EQUAL(b2.get_y(), 6);
-    SG_CHECK_EQUAL(b2.gen_index(), sgBucketOffset(-179.8, 16.8, -2, 0));
-}
-
-void testSiblings()
-{
-    SGBucket bna_airport(-86.678, 36.1248);
-    SG_VERIFY(bna_airport.isValid());
-
-    // retrieve the sibling two positions north-east of my position
-    auto sib1 = bna_airport.sibling(2, 2);
-    SG_CHECK_EQUAL(sib1.get_chunk_lon(), bna_airport.get_chunk_lon());
-    SG_CHECK_EQUAL(sib1.get_chunk_lat(), bna_airport.get_chunk_lat());
-    SG_CHECK_EQUAL(sib1.get_x(), 3);        // my x-pos (1) + 2 = 3
-    SG_CHECK_EQUAL(sib1.get_y(), 2);        // my y-pos (0) + 2 = 2
-    SG_CHECK_EQUAL(sib1.gen_base_path(), bna_airport.gen_base_path());
-
-    // retrieve the one sibling two positions to the north-east
-    std::vector<SGBucket> siblings;
-    bna_airport.siblings(2, 2, siblings);
-    SG_CHECK_EQUAL(siblings.size(), static_cast<std::vector<SGBucket>::size_type>(1));
-    siblings.clear();
-
-    // retrieve the one sibling at the chunk origin of sib1
-    sib1.siblings(-2, -2, siblings);
-    SG_CHECK_EQUAL(siblings.size(), static_cast<std::vector<SGBucket>::size_type>(1));
-    siblings.clear();
-
-    // calculate delta between two buckets
-    int dx = 0;
-    int dy = 0;
-    sgBucketDiff(bna_airport, sib1, &dx, &dy);
-    SG_CHECK_EQUAL(dx, 2);
-    SG_CHECK_EQUAL(dy, 2);
-
-    // retrieve all siblings between two geodetic locations
-    auto geod_bna = SGGeod::fromDegFt(-86.678, 36.1248, 599.0);
-    auto geod_m54 = SGGeod::fromDegFt(-86.317, 36.1908, 122.0);
-    sgGetBuckets(geod_bna, geod_m54, siblings);
-    SG_CHECK_EQUAL(siblings.size(), static_cast<std::vector<SGBucket>::size_type>(4));
-    siblings.clear();
-
-    // edge cases
-
-    // ensure you cannot retrieve the sibling of an invalid bucket
-    SGBucket bad;
-    auto bad_sib = bad.sibling(1, 1);
-    SG_CHECK_EQUAL(bad_sib.get_chunk_lon(), -1000);
-    SG_CHECK_EQUAL(bad.siblings(2, 2, siblings), 0);
-
-    // if we drop below the 22nd parallel, the bucket widths are half the size
-    // expect this to retrieve two buckets
-    bna_airport.siblings(0, -160, siblings);
-    SG_CHECK_EQUAL(siblings.size(), static_cast<std::vector<SGBucket>::size_type>(2));
-    siblings.clear();
+    COMPARE(b2.get_chunk_lat(), 16);
+    COMPARE(b2.get_chunk_lon(), 179);
+    COMPARE(b2.get_x(), 7);
+    COMPARE(b2.get_y(), 6);
+    COMPARE(b2.gen_index(), sgBucketOffset(-179.8, 16.8, -2, 0));
+    
+    
 }
 
 int main(int argc, char* argv[])
 {
     testBucketSpans();
-
+    
     testBasic();
     testPolar();
     testNearPolar();
     testOffset();
     testOffsetWrap();
     testPolarOffset();
-    testSiblings();
-
+    
     cout << "all tests passed OK" << endl;
     return 0; // passed
 }
+

simgear/bvh/BVHMaterial.cxx

@@ -15,8 +15,6 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
-#include <simgear_config.h>
-
 #include "BVHMaterial.hxx"
 
 namespace simgear {

simgear/bvh/BVHPageNode.cxx

@@ -15,8 +15,6 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
-#include <simgear_config.h>
-
 #include "BVHPageNode.hxx"
 
 #include "BVHPager.hxx"

simgear/bvh/BVHPageRequest.cxx

@@ -15,8 +15,6 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
-#include <simgear_config.h>
-
 #include "BVHPageRequest.hxx"
 
 namespace simgear {

simgear/bvh/BVHPager.cxx

@@ -15,14 +15,12 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
-#include <simgear_config.h>
-
 #include "BVHPager.hxx"
 
 #include <list>
-#include <mutex>
 
 #include <simgear/threads/SGThread.hxx>
+#include <simgear/threads/SGGuard.hxx>
 
 #include "BVHPageNode.hxx"
 #include "BVHPageRequest.hxx"
@@ -37,12 +35,12 @@ struct BVHPager::_PrivateData : protected SGThread {
     struct _LockedQueue {
         void _push(const _Request& request)
         {
-            std::lock_guard<std::mutex> scopeLock(_mutex);
+            SGGuard<SGMutex> scopeLock(_mutex);
             _requestList.push_back(request);
         }
         _Request _pop()
         {
-            std::lock_guard<std::mutex> scopeLock(_mutex);
+            SGGuard<SGMutex> scopeLock(_mutex);
             if (_requestList.empty())
                 return _Request();
             _Request request;
@@ -51,7 +49,7 @@ struct BVHPager::_PrivateData : protected SGThread {
             return request;
         }
     private:
-        std::mutex _mutex;
+        SGMutex _mutex;
         _RequestList _requestList;
     };
     
@@ -62,7 +60,7 @@ struct BVHPager::_PrivateData : protected SGThread {
         }
         void _push(const _Request& request)
         {
-            std::lock_guard<std::mutex> scopeLock(_mutex);
+            SGGuard<SGMutex> scopeLock(_mutex);
             bool needSignal = _requestList.empty();
             _requestList.push_back(request);
             if (needSignal)
@@ -70,7 +68,7 @@ struct BVHPager::_PrivateData : protected SGThread {
         }
         _Request _pop()
         {
-            std::lock_guard<std::mutex> scopeLock(_mutex);
+            SGGuard<SGMutex> scopeLock(_mutex);
             while (_requestList.empty())
                 _waitCondition.wait(_mutex);
             _Request request;
@@ -79,7 +77,7 @@ struct BVHPager::_PrivateData : protected SGThread {
             return request;
         }
     private:
-        std::mutex _mutex;
+        SGMutex _mutex;
         SGWaitCondition _waitCondition;
         _RequestList _requestList;
     };

simgear/bvh/BVHStaticNode.cxx

@@ -15,8 +15,6 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
-#include <simgear_config.h>
-
 #include "BVHStaticNode.hxx"
 
 namespace simgear {

simgear/bvh/bvhtest.cxx

@@ -15,7 +15,6 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
-#include <simgear_config.h>
 #include <iostream>
 #include <simgear/structure/SGSharedPtr.hxx>
 

simgear/canvas/Canvas.cxx

@@ -1,5 +1,4 @@
-///@file
-/// The canvas for rendering with the 2d API
+// The canvas for rendering with the 2d API
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,16 +16,12 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "Canvas.hxx"
 #include "CanvasEventManager.hxx"
 #include "CanvasEventVisitor.hxx"
 #include "CanvasPlacement.hxx"
-
 #include <simgear/canvas/events/KeyboardEvent.hxx>
 #include <simgear/canvas/events/MouseEvent.hxx>
-#include <simgear/misc/strutils.hxx>
 #include <simgear/scene/util/parse_color.hxx>
 #include <simgear/scene/util/RenderConstants.hxx>
 
@@ -35,79 +30,13 @@
 #include <osgText/Text>
 #include <osgViewer/Viewer>
 
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/foreach.hpp>
+
 namespace simgear
 {
 namespace canvas
 {
-  static int globalinstanceid = 1;
-  /**
-   * Camera Callback for moving completed canvas images to subscribed listener.
-   */
-  class CanvasImageCallback : public osg::Camera::DrawCallback {
-    public:
-    osg::Image *_rawImage;
-
-    CanvasImageCallback(osg::Image *rawImage)
-    : _min_delta_tick(1.0 / 8.0) {
-      _previousFrameTick = osg::Timer::instance()->tick();
-      _rawImage = rawImage;
-      SG_LOG(SG_GENERAL,SG_INFO,"CanvasImageCallback created. instance is " << instanceid);
-    }
-
-    virtual void operator()(osg::RenderInfo& renderInfo) const {
-      osg::Timer_t n = osg::Timer::instance()->tick();
-      double dt = osg::Timer::instance()->delta_s(_previousFrameTick, n);
-      if (dt < _min_delta_tick)
-        return;
-      _previousFrameTick = n;
-      SG_LOG(SG_GENERAL,SG_DEBUG,"CanvasImageCallback " << instanceid << ": image available for " << _subscribers.size() << " subscribers. camera is " << renderInfo.getCurrentCamera());
-
-      bool hasSubscribers = false;
-      {
-        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_lock);
-        hasSubscribers = !_subscribers.empty();
-      }
-      if (hasSubscribers) {
-        //Make sure image can be overwritten by next frame while it is still returned to the client
-        osg::Image* image = new osg::Image(*_rawImage, osg::CopyOp::DEEP_COPY_ALL);
-        {
-          OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_lock);
-          while (!_subscribers.empty()) {
-            try {
-              CanvasImageReadyListener *subs = _subscribers.back();
-              if (subs){
-                subs->imageReady(image);
-              }else{
-                SG_LOG(SG_GENERAL,SG_WARN,"CanvasImageCallback subscriber null");
-              }
-            } catch (...) { }
-            _subscribers.pop_back();
-          }
-        }
-      }
-    }
-
-    void subscribe(CanvasImageReadyListener * subscriber) {
-      OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_lock);
-      _subscribers.push_back(subscriber);
-    }
-
-    void unsubscribe(CanvasImageReadyListener * subscriber) {
-      OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_lock);
-      _subscribers.remove(subscriber);
-    }
-
-    int getSubscriberCount() {
-      return _subscribers.size();
-    }
-
-    private:
-      mutable list<CanvasImageReadyListener*> _subscribers;
-      mutable OpenThreads::Mutex _lock;
-      mutable double _previousFrameTick;
-      double _min_delta_tick;
-      int instanceid = globalinstanceid++;
-  };
 
   //----------------------------------------------------------------------------
   Canvas::CullCallback::CullCallback(const CanvasWeakPtr& canvas):
@@ -133,9 +62,18 @@ namespace canvas
   //----------------------------------------------------------------------------
   Canvas::Canvas(SGPropertyNode* node):
     PropertyBasedElement(node),
+    _canvas_mgr(0),
     _event_manager(new EventManager),
+    _size_x(-1),
+    _size_y(-1),
+    _view_width(-1),
+    _view_height(-1),
     _status(node, "status"),
-    _status_msg(node, "status-msg")
+    _status_msg(node, "status-msg"),
+    _sampling_dirty(false),
+    _render_dirty(true),
+    _visible(true),
+    _render_always(false)
   {
     _status = 0;
     setStatusFlags(MISSING_SIZE_X | MISSING_SIZE_Y);
@@ -296,10 +234,6 @@ namespace canvas
 
     if( _status & STATUS_DIRTY )
     {
-      // Retrieve reference here, to ensure the scene group is not deleted while
-      // creating the new texture and camera
-      osg::ref_ptr<osg::Group> root_scene_group = _root_group->getSceneGroup();
-
       _texture.setSize(_size_x, _size_y);
 
       if( !_texture.serviceable() )
@@ -317,21 +251,6 @@ namespace canvas
 
       osg::Camera* camera = _texture.getCamera();
 
-      string canvasname = _node->getStringValue("name");
-      int renderToImage = _node->getBoolValue("render-to-image");
-
-      if (renderToImage){
-        CanvasImageCallback *_screenshotCallback = dynamic_cast<CanvasImageCallback*> (camera->getFinalDrawCallback());
-        if (!_screenshotCallback) {
-          // no draw callback yet
-          osg::Image* shot = new osg::Image();
-          shot->allocateImage(getSizeX(), getSizeY(), 24, GL_RGB, GL_UNSIGNED_BYTE);
-          camera->attach(osg::Camera::COLOR_BUFFER, shot);
-          camera->setFinalDrawCallback(new CanvasImageCallback(shot));
-          SG_LOG(SG_GENERAL,SG_INFO,"CanvasImage: attached image and draw callback to camera " << camera << " for canvas " << canvasname << ". Ready for subscriber now.");
-        }
-      }
-
       // TODO Allow custom render order? For now just keep in order with
       //      property tree.
       camera->setRenderOrder(osg::Camera::PRE_RENDER, _node->getIndex());
@@ -340,7 +259,7 @@ namespace canvas
       parseColor(_node->getStringValue("background"), clear_color);
       camera->setClearColor(clear_color);
 
-      camera->addChild(root_scene_group);
+      camera->addChild(_root_group->getMatrixTransform());
 
       if( _texture.serviceable() )
       {
@@ -360,7 +279,7 @@ namespace canvas
 
     if( _visible || _render_always )
     {
-      for(auto& canvas_weak: _child_canvases)
+      BOOST_FOREACH(CanvasWeakPtr canvas_weak, _child_canvases)
       {
         // TODO should we check if the image the child canvas is displayed
         //      within is really visible?
@@ -372,7 +291,7 @@ namespace canvas
       if( _render_dirty )
       {
         // Also mark all canvases this canvas is displayed within as dirty
-        for(auto& canvas_weak: _parent_canvases)
+        BOOST_FOREACH(CanvasWeakPtr canvas_weak, _parent_canvases)
         {
           CanvasPtr canvas = canvas_weak.lock();
           if( canvas )
@@ -431,41 +350,6 @@ namespace canvas
     }
   }
 
-  int Canvas::subscribe(CanvasImageReadyListener * subscriber) {
-    osg::Camera* camera = _texture.getCamera();
-    const string canvasname = _node->getStringValue("name");
-
-    SG_LOG(SG_GENERAL,SG_DEBUG,"CanvasImage: subscribe to canvas " << canvasname.c_str() << ", camera ="<< camera);
-
-    if (!_node->getBoolValue("render-to-image")) {
-      SG_LOG(SG_GENERAL,SG_INFO,"CanvasImage: Setting render-to-image");
-      _node->addChild("render-to-image", 0)->setBoolValue(1);
-      setStatusFlags(STATUS_DIRTY, true);
-    }
-
-    CanvasImageCallback *_screenshotCallback = dynamic_cast<CanvasImageCallback*> (camera->getFinalDrawCallback());
-    if (_screenshotCallback) {
-      // Camera ready for subscriber. Otherwise, draw callback is created by canvas thread later.
-      SG_LOG(SG_GENERAL,SG_DEBUG,"CanvasImage: adding subscriber to camera draw callback");
-      _screenshotCallback->subscribe(subscriber);
-      // TODO: check: Is this the correct way to ensure the canvas will be available?
-      enableRendering(true);
-      return 1;
-    }
-    return 0;
-  }
-
-  int Canvas::unsubscribe(CanvasImageReadyListener * subscriber) {
-    osg::Camera* camera = _texture.getCamera();
-    SG_LOG(SG_GENERAL,SG_DEBUG,"CanvasImage: unsubscribe");
-    CanvasImageCallback *cb = dynamic_cast<CanvasImageCallback*> (camera->getFinalDrawCallback());
-    if (cb) {
-      SG_LOG(SG_GENERAL,SG_DEBUG,"CanvasImage: unsubscribe from camera " << camera);
-      cb->unsubscribe(subscriber);
-    }
-    return 0;
-  }
-
   //----------------------------------------------------------------------------
   bool Canvas::addEventListener( const std::string& type,
                                  const EventListener& cb )
@@ -636,8 +520,8 @@ namespace canvas
   {
     const std::string& name = node->getNameString();
 
-    if(    strutils::starts_with(name, "status")
-        || strutils::starts_with(name, "data-") )
+    if(    boost::starts_with(name, "status")
+        || boost::starts_with(name, "data-") )
       return;
     _render_dirty = true;
 
@@ -652,7 +536,7 @@ namespace canvas
         if( !placements.empty() )
         {
           bool placement_dirty = false;
-          for(auto& placement: placements)
+          BOOST_FOREACH(PlacementPtr& placement, placements)
           {
             // check if change can be directly handled by placement
             if(    placement->getProps() == node->getParent()
@@ -691,10 +575,6 @@ namespace canvas
       {
         _sampling_dirty = true;
       }
-      else if( name == "anisotropy" )
-      {
-        _texture.setMaxAnisotropy( node->getFloatValue() );
-      }
       else if( name == "additive-blend" )
       {
         _texture.useAdditiveBlend( node->getBoolValue() );

simgear/canvas/Canvas.hxx

@@ -33,7 +33,7 @@
 #include <osg/NodeCallback>
 #include <osg/observer_ptr>
 
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 #include <string>
 
 namespace simgear
@@ -44,17 +44,6 @@ namespace canvas
   class CanvasMgr;
   class MouseEvent;
 
-  /**
-   * A listener interested in completed canvas drawing.
-   */
-  class CanvasImageReadyListener {
-  public:
-    virtual void imageReady(osg::ref_ptr<osg::Image>) = 0;
-    virtual ~CanvasImageReadyListener()
-    {
-    }
-  };
-
   /**
    * Canvas to draw onto (to an off-screen render target).
    */
@@ -82,18 +71,18 @@ namespace canvas
         public osg::NodeCallback
       {
         public:
-          explicit CullCallback(const CanvasWeakPtr& canvas);
+          CullCallback(const CanvasWeakPtr& canvas);
 
         private:
           CanvasWeakPtr _canvas;
 
-          void operator()(osg::Node* node, osg::NodeVisitor* nv) override;
+          virtual void operator()(osg::Node* node, osg::NodeVisitor* nv);
       };
       typedef osg::ref_ptr<CullCallback> CullCallbackPtr;
 
-      explicit Canvas(SGPropertyNode* node);
+      Canvas(SGPropertyNode* node);
       virtual ~Canvas();
-      void onDestroy() override;
+      virtual void onDestroy();
 
       void setCanvasMgr(CanvasMgr* canvas_mgr);
       CanvasMgr* getCanvasMgr() const;
@@ -171,12 +160,7 @@ namespace canvas
        */
       void enableRendering(bool force = false);
 
-      void update(double delta_time_sec) override;
-
-      osg::Camera* getCamera();
-      int subscribe(CanvasImageReadyListener * subscriber);
-      int unsubscribe(CanvasImageReadyListener * subscriber);
-      int getSubscriberCount();
+      void update(double delta_time_sec);
 
       bool addEventListener(const std::string& type, const EventListener& cb);
       bool dispatchEvent(const EventPtr& event);
@@ -200,9 +184,11 @@ namespace canvas
       bool propagateEvent( EventPtr const& event,
                            EventPropagationPath const& path );
 
-      void childAdded(SGPropertyNode* parent, SGPropertyNode* child) override;
-      void childRemoved(SGPropertyNode* parent, SGPropertyNode* child) override;
-      void valueChanged(SGPropertyNode * node) override;
+      virtual void childAdded( SGPropertyNode * parent,
+                               SGPropertyNode * child );
+      virtual void childRemoved( SGPropertyNode * parent,
+                                 SGPropertyNode * child );
+      virtual void valueChanged (SGPropertyNode * node);
 
       osg::Texture2D* getTexture() const;
 
@@ -225,21 +211,21 @@ namespace canvas
 
     protected:
 
-      CanvasMgr *_canvas_mgr {nullptr};
+      CanvasMgr        *_canvas_mgr;
 
-      std::unique_ptr<EventManager> _event_manager;
+      boost::scoped_ptr<EventManager> _event_manager;
 
-      int _size_x {-1},
-          _size_y {-1},
-          _view_width {-1},
-          _view_height {-1};
+      int _size_x,
+          _size_y,
+          _view_width,
+          _view_height;
 
       PropertyObject<int>           _status;
       PropertyObject<std::string>   _status_msg;
 
-      bool _sampling_dirty {false},
-           _render_dirty {true},
-           _visible {true};
+      bool _sampling_dirty,
+           _render_dirty,
+           _visible;
 
       ODGauge _texture;
 
@@ -249,9 +235,7 @@ namespace canvas
       ElementWeakPtr _focus_element;
 
       CullCallbackPtr _cull_callback;
-
-      /** Used to disable automatic lazy rendering (culling) */
-      bool _render_always {false};
+      bool _render_always; //!< Used to disable automatic lazy rendering (culling)
 
       std::vector<SGPropertyNode*> _dirty_placements;
       std::vector<Placements> _placements;
@@ -268,8 +252,8 @@ namespace canvas
 
       static SystemAdapterPtr _system_adapter;
 
-      Canvas(const Canvas&) = delete;
-      Canvas& operator=(const Canvas&) = delete;
+      Canvas(const Canvas&); // = delete;
+      Canvas& operator=(const Canvas&); // = delete;
   };
 
 } // namespace canvas

simgear/canvas/CanvasEvent.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Canvas Event for event model similar to DOM Level 3 Event Model
+// Canvas Event for event model similar to DOM Level 3 Event Model
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,8 +16,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "CanvasEvent.hxx"
 
 namespace simgear
@@ -126,10 +123,10 @@ namespace canvas
   //----------------------------------------------------------------------------
   std::string Event::typeToStr(int type)
   {
-    auto const& map_by_id = getTypeMap().by<id>();
+    TypeMap const& type_map = getTypeMap();
 
-    auto it = map_by_id.find(type);
-    if( it == map_by_id.end() )
+    TypeMap::map_by<id>::const_iterator it = type_map.by<id>().find(type);
+    if( it == type_map.by<id>().end() )
       return "unknown";
     return it->second;
   }

simgear/canvas/CanvasEvent.hxx

@@ -65,11 +65,6 @@ namespace canvas
       // of the actual event instances.
       virtual ~Event();
 
-      /**
-       * Clone event and set to the given type (Same type if not specified)
-       */
-      virtual Event* clone(int type = 0) const = 0;
-
       /**
        * Get whether this events support bubbling
        */
@@ -115,14 +110,7 @@ namespace canvas
        */
       bool defaultPrevented() const;
 
-      /**
-       * Register a new type string or get the id of an existing type string
-       *
-       * @param type    Type string
-       * @return Id of the given @a type
-       */
       static int getOrRegisterType(const std::string& type);
-
       static int strToType(const std::string& type);
       static std::string typeToStr(int type);
 

simgear/canvas/CanvasEventManager.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Manage event handling inside a Canvas similar to the DOM Level 3 Event Model
+// Manage event handling inside a Canvas similar to the DOM Level 3 Event Model
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,12 +16,9 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "CanvasEventManager.hxx"
-#include "elements/CanvasElement.hxx"
-#include "events/MouseEvent.hxx"
-
+#include <simgear/canvas/events/MouseEvent.hxx>
+#include <simgear/canvas/elements/CanvasElement.hxx>
 #include <cmath>
 
 namespace simgear
@@ -117,8 +113,6 @@ namespace canvas
         return handled;
       }
       case Event::DRAG:
-      case Event::DRAG_START:
-      case Event::DRAG_END:
         if( !_last_mouse_down.valid() )
           return false;
         else

simgear/canvas/CanvasEventManager.hxx

@@ -1,5 +1,4 @@
-///@file
-/// Manage event handling inside a Canvas similar to the DOM Level 3 Event Model
+// Manage event handling inside a Canvas similar to the DOM Level 3 Event Model
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //

simgear/canvas/CanvasEventTypes.hxx

@@ -1,5 +1,4 @@
-///@file
-/// Mapping between canvas gui Event types and their names
+// Mapping between canvas gui Event types and their names
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -26,8 +25,6 @@ ENUM_MAPPING(MOUSE_UP,    "mouseup",    MouseEvent)
 ENUM_MAPPING(CLICK,       "click",      MouseEvent)
 ENUM_MAPPING(DBL_CLICK,   "dblclick",   MouseEvent)
 ENUM_MAPPING(DRAG,        "drag",       MouseEvent)
-ENUM_MAPPING(DRAG_START,  "dragstart",  MouseEvent)
-ENUM_MAPPING(DRAG_END,    "dragend",    MouseEvent)
 ENUM_MAPPING(WHEEL,       "wheel",      MouseEvent)
 ENUM_MAPPING(MOUSE_MOVE,  "mousemove",  MouseEvent)
 ENUM_MAPPING(MOUSE_OVER,  "mouseover",  MouseEvent)

simgear/canvas/CanvasEventVisitor.cxx

@@ -1,6 +1,5 @@
-///@file
-/// Visitor for traversing a canvas element hierarchy similar to the traversal
-/// of the DOM Level 3 Event Model
+// Visitor for traversing a canvas element hierarchy similar to the traversal
+// of the DOM Level 3 Event Model
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -18,11 +17,9 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "CanvasEvent.hxx"
 #include "CanvasEventVisitor.hxx"
-#include "elements/CanvasElement.hxx"
+#include <simgear/canvas/elements/CanvasElement.hxx>
 
 namespace simgear
 {

simgear/canvas/CanvasEventVisitor.hxx

@@ -1,6 +1,5 @@
-///@file
-/// Visitor for traversing a canvas element hierarchy similar to the traversal
-/// of the DOM Level 3 Event Model
+// Visitor for traversing a canvas element hierarchy similar to the traversal
+// of the DOM Level 3 Event Model
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //

simgear/canvas/CanvasMgr.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Canvas with 2D rendering API
+// Canvas with 2D rendering API
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,12 +16,12 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "CanvasMgr.hxx"
 #include "Canvas.hxx"
 #include "CanvasEventManager.hxx"
 
+#include <boost/bind.hpp>
+
 namespace simgear
 {
 namespace canvas

simgear/canvas/CanvasMgr.hxx

@@ -1,5 +1,4 @@
-///@file
-/// Canvas with 2D rendering API
+// Canvas with 2D rendering API
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -28,39 +27,42 @@ namespace simgear
 namespace canvas
 {
 
-class CanvasMgr : public PropertyBasedMgr
-{
-public:
-    /**
-     * @param node    Root node of branch used to control canvasses
-     */
-    CanvasMgr(SGPropertyNode_ptr node);
+  class CanvasMgr:
+    public PropertyBasedMgr
+  {
+    public:
 
-    /**
-     * Create a new canvas
-     *
-     * @param name    Name of the new canvas
-     */
-    CanvasPtr createCanvas(const std::string& name = "");
+      /**
+       * @param node    Root node of branch used to control canvasses
+       */
+      CanvasMgr(SGPropertyNode_ptr node);
 
-    /**
-     * Get ::Canvas by index
-     *
-     * @param index Index of texture node in /canvas/by-index/
-     */
-    CanvasPtr getCanvas(size_t index) const;
+      /**
+       * Create a new canvas
+       *
+       * @param name    Name of the new canvas
+       */
+      CanvasPtr createCanvas(const std::string& name = "");
 
-    /**
-     * Get ::Canvas by name
-     *
-     * @param name Value of child node "name" in
-     *             /canvas/by-index/texture[i]/name
-     */
-    CanvasPtr getCanvas(const std::string& name) const;
+      /**
+       * Get ::Canvas by index
+       *
+       * @param index Index of texture node in /canvas/by-index/
+       */
+      CanvasPtr getCanvas(size_t index) const;
 
-protected:
-    void elementCreated(PropertyBasedElementPtr element) override;
-};
+      /**
+       * Get ::Canvas by name
+       *
+       * @param name Value of child node "name" in
+       *             /canvas/by-index/texture[i]/name
+       */
+      CanvasPtr getCanvas(const std::string& name) const;
+
+    protected:
+
+      virtual void elementCreated(PropertyBasedElementPtr element);
+  };
 
 } // namespace canvas
 } // namespace simgear

simgear/canvas/CanvasObjectPlacement.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Canvas placement for placing a canvas texture onto osg objects
+// Canvas placement for placing a canvas texture onto osg objects.
 //
 // It also provides a SGPickCallback for passing mouse events to the canvas and
 // manages emissive lighting of the placed canvas.
@@ -20,8 +19,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "Canvas.hxx"
 #include "CanvasObjectPlacement.hxx"
 #include <simgear/canvas/events/MouseEvent.hxx>

simgear/canvas/CanvasObjectPlacement.hxx

@@ -1,5 +1,5 @@
 ///@file
-/// Placement for putting a canvas texture onto OpenSceneGraph objects
+/// Placement for putting a canvas texture onto OpenSceneGraph objects.
 ///
 /// It also provides a SGPickCallback for passing mouse events to the canvas and
 /// manages emissive lighting of the placed canvas.
@@ -60,7 +60,7 @@ namespace canvas
        */
       void setCaptureEvents(bool enable);
 
-      bool childChanged(SGPropertyNode* child) override;
+      virtual bool childChanged(SGPropertyNode* child);
 
     protected:
       typedef SGSharedPtr<SGPickCallback> PickCallbackPtr;

simgear/canvas/CanvasPlacement.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Base class for canvas placements
+// Base class for canvas placements
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,7 +16,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
 #include "CanvasPlacement.hxx"
 #include <simgear/props/props.hxx>
 

simgear/canvas/CanvasPlacement.hxx

@@ -1,5 +1,4 @@
-///@file
-/// Base class for canvas placements
+// Base class for canvas placements
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -41,8 +40,9 @@ namespace canvas
     protected:
       SGPropertyNode_ptr _node;
 
-      Placement(const Placement&) = delete;
-      Placement& operator=(const Placement&) = delete;
+    private:
+      Placement(const Placement&) /* = delete */;
+      Placement& operator=(const Placement&) /* = delete */;
   };
 
 } // namespace canvas

simgear/canvas/CanvasSystemAdapter.hxx

@@ -1,5 +1,4 @@
-///@file
-/// Adapter for using the canvas with different applications
+// Adapter for using the canvas with different applications
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -30,10 +29,6 @@ namespace HTTP { class Client; }
 namespace canvas
 {
 
-  /**
-   * Provides access to different required systems of the application to the
-   * Canvas
-   */
   class SystemAdapter
   {
     public:

simgear/canvas/CanvasWindow.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Window for placing a Canvas onto it (for dialogs, menus, etc.)
+// Window for placing a Canvas onto it (for dialogs, menus, etc.)
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,17 +16,18 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
 #include "CanvasMgr.hxx"
 #include "CanvasSystemAdapter.hxx"
 #include "CanvasWindow.hxx"
 
 #include <simgear/canvas/Canvas.hxx>
-#include <simgear/misc/strutils.hxx>
 #include <simgear/scene/util/OsgMath.hxx>
 
 #include <osgGA/GUIEventHandler>
 
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/foreach.hpp>
+
 namespace simgear
 {
 namespace canvas
@@ -42,6 +42,9 @@ namespace canvas
                   const Style& parent_style,
                   Element* parent ):
     Image(canvas, node, parent_style, parent),
+    _attributes_dirty(0),
+    _resizable(false),
+    _capture_events(true),
     _resize_top(node, "resize-top"),
     _resize_right(node, "resize-right"),
     _resize_bottom(node, "resize-bottom"),
@@ -88,7 +91,7 @@ namespace canvas
         _capture_events = node->getBoolValue();
       else if( name == "decoration-border" )
         parseDecorationBorder(node->getStringValue());
-      else if(    strutils::starts_with(name, "shadow-")
+      else if(    boost::starts_with(name, "shadow-")
                || name == "content-size" )
         _attributes_dirty |= DECORATION;
       else
@@ -99,10 +102,16 @@ namespace canvas
       Image::valueChanged(node);
   }
 
+  //----------------------------------------------------------------------------
+  osg::Group* Window::getGroup()
+  {
+    return getMatrixTransform();
+  }
+
   //----------------------------------------------------------------------------
   const SGVec2<float> Window::getPosition() const
   {
-    auto const& m = getMatrix();
+    const osg::Matrix& m = getMatrixTransform()->getMatrix();
     return SGVec2<float>( m(3, 0), m(3, 1) );
   }
 
@@ -213,19 +222,6 @@ namespace canvas
       _resize_left = getRegion().l() + offset.x();
   }
 
-  //----------------------------------------------------------------------------
-  bool Window::handleEvent(const EventPtr& event)
-  {
-    if( auto mouse_event = dynamic_cast<MouseEvent*>(event.get()) )
-    {
-      mouse_event->local_pos =
-      mouse_event->client_pos =
-        mouse_event->screen_pos - toOsg(getPosition());
-    }
-
-    return Image::handleEvent(event);
-  }
-
   //----------------------------------------------------------------------------
   void Window::parseDecorationBorder(const std::string& str)
   {

simgear/canvas/CanvasWindow.hxx

@@ -1,5 +1,4 @@
-///@file
-/// Window for placing a Canvas onto it (for dialogs, menus, etc.)
+// Window for placing a Canvas onto it (for dialogs, menus, etc.)
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -68,9 +67,10 @@ namespace canvas
               Element* parent = 0 );
       virtual ~Window();
 
-      void update(double delta_time_sec) override;
-      void valueChanged(SGPropertyNode* node) override;
+      virtual void update(double delta_time_sec);
+      virtual void valueChanged(SGPropertyNode* node);
 
+      osg::Group* getGroup();
       const SGVec2<float> getPosition() const;
       const SGRect<float>  getScreenRegion() const;
 
@@ -84,8 +84,8 @@ namespace canvas
       bool isResizable() const;
       bool isCapturingEvents() const;
 
-      void setVisible(bool visible) override;
-      bool isVisible() const override;
+      virtual void setVisible(bool visible);
+      virtual bool isVisible() const;
 
       /**
        * Moves window on top of all other windows with the same z-index.
@@ -97,8 +97,6 @@ namespace canvas
       void handleResize( uint8_t mode,
                          const osg::Vec2f& offset = osg::Vec2f() );
 
-      bool handleEvent(const EventPtr& event) override;
-
     protected:
 
       enum Attributes
@@ -106,7 +104,7 @@ namespace canvas
         DECORATION = 1
       };
 
-      uint32_t  _attributes_dirty {0};
+      uint32_t  _attributes_dirty;
 
       CanvasPtr        _canvas_decoration;
       CanvasWeakPtr    _canvas_content;
@@ -115,8 +113,8 @@ namespace canvas
       ImagePtr _image_content,
                _image_shadow;
 
-      bool _resizable {false},
-           _capture_events {true};
+      bool _resizable,
+           _capture_events;
 
       PropertyObject<int> _resize_top,
                           _resize_right,

simgear/canvas/ODGauge.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Owner Drawn Gauge helper class
+// Owner Drawn Gauge helper class
 //
 // Written by Harald JOHNSEN, started May 2005.
 //
@@ -7,9 +6,9 @@
 //
 // Ported to OSG by Tim Moore - Jun 2007
 //
-// Heavily modified to be usable for the 2d Canvas by Thomas Geymayer - April
-// 2012 Supports now multisampling/mipmapping, usage of the stencil buffer and
-// placing the texture in the scene by certain filter criteria.
+// Heavily modified to be usable for the 2d Canvas by Thomas Geymayer - April 2012
+// Supports now multisampling/mipmapping, usage of the stencil buffer and placing
+// the texture in the scene by certain filter criteria
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -202,12 +201,6 @@ namespace canvas
     updateSampling();
   }
 
-  //----------------------------------------------------------------------------
-  void ODGauge::setMaxAnisotropy(float anis)
-  {
-    texture->setMaxAnisotropy(anis);
-  }
-
   //----------------------------------------------------------------------------
   void ODGauge::setRender(bool render)
   {
@@ -256,16 +249,10 @@ namespace canvas
 
     if( !texture )
     {
-      // It shouldn't be necessary to allocate an image for the
-      // texture that is the target of dynamic rendering, but
-      // otherwise OSG won't construct all the mipmaps for the texture
-      // and dynamic mipmap generation doesn't work.
-      osg::Image* image = new osg::Image;
-      image->allocateImage(_size_x, _size_y, 1, GL_RGBA, GL_UNSIGNED_BYTE);
       texture = new osg::Texture2D;
       texture->setResizeNonPowerOfTwoHint(false);
-      texture->setImage(image);
-      texture->setUnRefImageDataAfterApply(true);
+      texture->setTextureSize(_size_x, _size_y);
+      texture->setInternalFormat(GL_RGBA);
     }
 
     updateSampling();

simgear/canvas/ODGauge.hxx

@@ -1,5 +1,4 @@
-///@file
-/// Owner Drawn Gauge helper class
+// Owner Drawn Gauge helper class
 //
 // Written by Harald JOHNSEN, started May 2005.
 //
@@ -7,9 +6,9 @@
 //
 // Ported to OSG by Tim Moore - Jun 2007
 //
-// Heavily modified to be usable for the 2d Canvas by Thomas Geymayer - April
-// 2012 Supports now multisampling/mipmapping, usage of the stencil buffer and
-// placing the texture in the scene by certain filter criteria.
+// Heavily modified to be usable for the 2d Canvas by Thomas Geymayer - April 2012
+// Supports now multisampling/mipmapping, usage of the stencil buffer and placing
+// the texture in the scene by certain filter criteria
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -109,8 +108,6 @@ namespace canvas
                         int coverage_samples = 0,
                         int color_samples = 0 );
 
-      void setMaxAnisotropy(float anis);
-
       /**
        * Enable/Disable updating the texture (If disabled the contents of the
        * texture remains with the outcome of the last rendering pass)

simgear/canvas/ShivaVG/src/shConfig.h

@@ -31,11 +31,6 @@
     // FreeBSD
     #define VG_API_FREEBSD
 
-#elif defined(__OpenBSD__)
-
-    // FreeBSD
-    #define VG_API_OPENBSD
-
 #else
 
     // Unsupported system

simgear/canvas/ShivaVG/src/shDefs.h

@@ -34,7 +34,7 @@
 #include <math.h>
 #include <float.h>
 
-#if !defined(VG_API_MACOSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#if !defined(VG_API_MACOSX) && !defined(__FreeBSD__)
 #  include <malloc.h>
 #endif
 
@@ -44,11 +44,6 @@
 #if defined(_MSC_VER)
 #  pragma warning(disable:4311)
 #  pragma warning(disable:4312)
-#  define ALIGN16 __declspec(align(16))
-#  define ALIGN16C
-#elif defined(__GNUC__)
-#  define ALIGN16
-#  define ALIGN16C __attribute__((aligned(16)))
 #endif
 
 /* Type definitions */
@@ -161,7 +156,7 @@ SHfloat getMaxFloat();
 
 /* OpenGL headers */
 
-#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD) || defined(VG_API_OPENBSD)
+#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD)
     #include <GL/gl.h>
     #include <GL/glx.h>
 #elif defined(VG_API_MACOSX)

simgear/canvas/ShivaVG/src/shPath.c

@@ -1193,7 +1193,7 @@ VG_API_CALL VGboolean vgInterpolatePath(VGPath dstPath, VGPath startPath,
   SHfloat *procData1, *procData2;
   SHint procSegCount1=0, procSegCount2=0;
   SHint procDataCount1=0, procDataCount2=0;
-  SHuint8 *newSegs, *newData=0;
+  SHuint8 *newSegs, *newData;
   void *userData[4];
   SHint segment1, segment2;
   SHint segindex, s,d,i;

simgear/canvas/ShivaVG/src/shVectors.c

@@ -35,33 +35,21 @@ void SHVector2_dtor(SHVector2 *v) {
 }
 
 void SHVector3_ctor(SHVector3 *v) {
-#ifdef SHIVA_USE_SIMD
-  v->vec = _mm_setzero_ps();
-#else
   v->x=0.0f; v->y=0.0f; v->z=0.0f;
-#endif
 }
 
 void SHVector3_dtor(SHVector3 *v) {
 }
 
 void SHVector4_ctor(SHVector4 *v) {
-#ifdef SHIVA_USE_SIMD
-  v->vec = _mm_setzero_ps();
-#else
   v->x=0.0f; v->y=0.0f; v->z=0.0f; v->w=0.0f;
-#endif
 }
 
 void SHVector4_dtor(SHVector4 *v) {
 }
 
 void SHRectangle_ctor(SHRectangle *r) {
-#ifdef SHIVA_USE_SIMD
-  r->vec = _mm_setzero_ps();
-#else
   r->x=0.0f; r->y=0.0f; r->w=0.0f; r->h=0.0f;
-#endif
 }
 
 void SHRectangle_dtor(SHRectangle *r) {
@@ -147,24 +135,3 @@ int shLineLineXsection(SHVector2 *o1, SHVector2 *v1,
   xsection->y = o1->y + t1*v1->y;
   return 1;
 }
-
-#ifdef SHIVA_USE_SIMD
-# ifdef __SSE3__
-# include <pmmintrin.h>
-inline float hsum_ps_sse(__m128 v) {
-  __m128 shuf = _mm_movehdup_ps(v);
-  __m128 sums = _mm_add_ps(v, shuf);
-  shuf        = _mm_movehl_ps(shuf, sums);
-  sums        = _mm_add_ss(sums, shuf);
-  return        _mm_cvtss_f32(sums);
-}
-# else
-inline float hsum_ps_sse(__m128 v) {
-  __m128 shuf   = _mm_shuffle_ps(v, v, _MM_SHUFFLE(2, 3, 0, 1));
-  __m128 sums   = _mm_add_ps(v, shuf);
-  shuf          = _mm_movehl_ps(shuf, sums);
-  sums          = _mm_add_ss(sums, shuf);
-  return          _mm_cvtss_f32(sums);
-}
-# endif
-#endif

simgear/canvas/ShivaVG/src/shVectors.h

@@ -21,21 +21,6 @@
 #ifndef __SHVECTORS_H
 #define __SHVECTORS_H
 
-#ifdef HAVE_CONFIG_H
-# include <simgear/simgear_config.h>
-#endif
-
-#ifdef ENABLE_SIMD
-# ifdef __SSE__
-// #  define SHIVA_USE_SIMD
-# endif
-# endif
-
-#ifdef SHIVA_USE_SIMD
-# include <xmmintrin.h>
-float hsum_ps_sse(__m128 v);
-#endif
-
 #include "shDefs.h"
 
 /* Vector structures
@@ -48,17 +33,9 @@ typedef struct
 void SHVector2_ctor(SHVector2 *v);
 void SHVector2_dtor(SHVector2 *v);
 
-
 typedef struct
 {
-#ifdef SHIVA_USE_SIMD
-  union ALIGN16 {
-    __m128 vec;
-    struct { SHfloat x,y,z,w; };
-  } ALIGN16C;
-#else
   SHfloat x,y,z;
-#endif
 } SHVector3;
 
 void SHVector3_ctor(SHVector3 *v);
@@ -66,14 +43,7 @@ void SHVector3_dtor(SHVector3 *v);
 
 typedef struct
 {
-#ifdef SHIVA_USE_SIMD
-  union ALIGN16 {
-    __m128 vec;
-    struct { SHfloat x,y,z,w; };
-  } ALIGN16C;
-#else
   SHfloat x,y,z,w;
-#endif
 } SHVector4;
 
 void SHVector4_ctor(SHVector4 *v);
@@ -81,14 +51,7 @@ void SHVector4_dtor(SHVector4 *v);
 
 typedef struct
 {
-#ifdef SHIVA_USE_SIMD
-  union ALIGN16 {
-    __m128 vec;
-    struct { SHfloat x,y,w,h; };
-  } ALIGN16C;
-#else
   SHfloat x,y,w,h;
-#endif
 } SHRectangle;
 
 void SHRectangle_ctor(SHRectangle *r);
@@ -98,14 +61,7 @@ void shRectangleSet(SHRectangle *r, SHfloat x,
 
 typedef struct
 {
-#ifdef SHIVA_USE_SIMD
-  union ALIGN16 {
-    __m128 mtx[4];
-    SHfloat m[4][4];
-  } ALIGN16C;
-#else
   SHfloat m[3][3];
-#endif
 } SHMatrix3x3;
 
 void SHMatrix3x3_ctor(SHMatrix3x3 *m);
@@ -127,22 +83,12 @@ void SHMatrix3x3_dtor(SHMatrix3x3 *m);
  *--------------------------------------------------------- */
 
 #define SET2(v,xs,ys) { v.x=xs; v.y=ys; }
-#ifdef SHIVA_USE_SIMD
-# define SET3(v,xs,ys,zs,ws) { v.vec=_mm_set_ps(0,zs,ys,xs); }
-# define SET4(v,xs,ys,zs,ws) { v.vec=_mm_set_ps(ws,zs,ys,xs); }
-#else
-# define SET3(v,xs,ys,zs) { v.x=xs; v.y=ys; v.z=zs; }
-# define SET4(v,xs,ys,zs,ws) { v.x=xs; v.y=ys; v.z=zs; v.w=ws; }
-#endif
+#define SET3(v,xs,ys,zs) { v.x=xs; v.y=ys; v.z=zs; }
+#define SET4(v,xs,ys,zs,ws) { v.x=xs; v.y=ys; v.z=zs; v.w=ws; }
 
 #define SET2V(v1,v2) { v1.x=v2.x; v1.y=v2.y; }
-#ifdef SHIVA_USE_SIMD
-# define SET3V(v1,v2) { v1.vec=v2.vec; }
-# define SET4V(v1,v2) { v1.vec=v2.vec; }
-#else
-# define SET3V(v1,v2) { v1.x=v2.x; v1.y=v2.y; v1.z=v2.z; }
-# define SET4V(v1,v2) { v1.x=v2.x; v1.y=v2.y; v1.z=v2.z; v1.w=v2.w; }
-#endif
+#define SET3V(v1,v2) { v1.x=v2.x; v1.y=v2.y; v1.z=v2.z; }
+#define SET4V(v1,v2) { v1.x=v2.x; v1.y=v2.y; v1.z=v2.z; v1.w=v2.w; }
 
 #define EQ2(v,xx,yy)       ( v.x==xx && v.y==yy )
 #define EQ3(v,xx,yy,zz)    ( v.x==xx && v.y==yy && v.z==zz )
@@ -157,89 +103,48 @@ void SHMatrix3x3_dtor(SHMatrix3x3 *m);
 #define EQ4V(v1,v2) ( v1.x==v2.x && v1.y==v2.y && v1.z==v2.z && v1.w==v2.w )
 
 #define ADD2(v,xx,yy)       { v.x+=xx; v.y+=yy; }
-#ifdef SHIVA_USE_SIMD
-# define ADD3(v,xx,yy,zz,ww) { v.vec=_mm_add_ps(v.vec,_mm_set_ps(0,zz,yy,xx)); }
-# define ADD4(v,xx,yy,zz,ww) { v.vec=_mm_add_ps(v.vec,_mm_set_ps(ww,zz,yy,xx)); }
-#else
-# define ADD3(v,xx,yy,zz)    { v.x+=xx; v.y+=yy; v.z+=zz; }
-# define ADD4(v,xx,yy,zz,ww) { v.x+=xx; v.y+=yy; v.z+=zz; v.w+=ww; }
-#endif
+#define ADD3(v,xx,yy,zz)    { v.x+=xx; v.y+=yy; v.z+=zz; }
+#define ADD4(v,xx,yy,zz,ww) { v.x+=xx; v.y+=yy; v.z+=zz; v.w+=ww; }
 
 #define ADD2V(v1,v2) { v1.x+=v2.x; v1.y+=v2.y; }
-#ifdef SHIVA_USE_SIMD
-# define ADD3V(v1,v2) { v1.vec=_mm_add_ps(v1.vec,v2.vec); }
-# define ADD4V(v1,v2) { v1.vec=_mm_add_ps(v1.vec,v2.vec); }
-#else
-# define ADD3V(v1,v2) { v1.x+=v2.x; v1.y+=v2.y; v1.z+=v2.z; }
-# define ADD4V(v1,v2) { v1.x+=v2.x; v1.y+=v2.y; v1.z+=v2.z; v1.w+=v2.w; }
-#endif
+#define ADD3V(v1,v2) { v1.x+=v2.x; v1.y+=v2.y; v1.z+=v2.z; }
+#define ADD4V(v1,v2) { v1.x+=v2.x; v1.y+=v2.y; v1.z+=v2.z; v1.w+=v2.w; }
 
 #define SUB2(v,xx,yy)       { v.x-=xx; v.y-=yy; }
-#ifdef SHIVA_USE_SIMD
-# define SUB3(v,xx,yy,zz,ww) { v.vec=_mm_sub_ps(v.vec,_mm_set_ps(0,zz,yy,xx)); }
-# define SUB4(v,xx,yy,zz,ww) { v.vec=_mm_sub_ps(v.vec,_mm_set_ps(ww,zz,yy,xx)); }
-#else
-# define SUB3(v,xx,yy,zz)    { v.x-=xx; v.y-=yy; v.z-=zz; }
-# define SUB4(v,xx,yy,zz,ww) { v.x-=xx; v.y-=yy; v.z-=zz; v.w-=v2.w; }
-#endif
+#define SUB3(v,xx,yy,zz)    { v.x-=xx; v.y-=yy; v.z-=zz; }
+#define SUB4(v,xx,yy,zz,ww) { v.x-=xx; v.y-=yy; v.z-=zz; v.w-=v2.w; }
 
 #define SUB2V(v1,v2) { v1.x-=v2.x; v1.y-=v2.y; }
-#ifdef SHIVA_USE_SIMD
-# define SUB3V(v1,v2) { v1.vec=_mm_sub_ps(v1.vec,v2.vec); }
-# define SUB4V(v1,v2) { v1.vec=_mm_sub_ps(v1.vec,v2.vec); }
-#else
-# define SUB3V(v1,v2) { v1.x-=v2.x; v1.y-=v2.y; v1.z-=v2.z; }
-# define SUB4V(v1,v2) { v1.x-=v2.x; v1.y-=v2.y; v1.z-=v2.z; v1.w-=v2.w; }
-#endif
+#define SUB3V(v1,v2) { v1.x-=v2.x; v1.y-=v2.y; v1.z-=v2.z; }
+#define SUB4V(v1,v2) { v1.x-=v2.x; v1.y-=v2.y; v1.z-=v2.z; v1.w-=v2.w; }
 
 #define MUL2(v,f) { v.x*=f; v.y*=f; }
-#ifdef SHIVA_USE_SIMD
-# define MUL3(v,f) { v.vec=_mm_mul_ps(v.vec,_mm_set1_ps(f)); }
-# define MUL4(v,f) { v.vec=_mm_mul_ps(v.vec,_mm_set1_ps(f)); }
-#else
-# define MUL3(v,f) { v.x*=f; v.y*=f; v.z*=z; }
-# define MUL4(v,f) { v.x*=f; v.y*=f; v.z*=z; v.w*=w; }
-#endif
+#define MUL3(v,f) { v.x*=f; v.y*=f; v.z*=z; }
+#define MUL4(v,f) { v.x*=f; v.y*=f; v.z*=z; v.w*=w; }
 
 #define DIV2(v,f) { v.x/=f; v.y/=f; }
-#ifdef SHIVA_USE_SIMD
-# define DIV3(v,f) { v.vec=_mm_div_ps(v.vec,_mm_set1_ps(f)); }
-# define DIV4(v,f) { v.vec=_mm_div_ps(v.vec,_mm_set1_ps(f)); }
-#else
-# define DIV3(v,f) { v.x/=f; v.y/=f; v.z/=z; }
-# define DIV4(v,f) { v.x/=f; v.y/=f; v.z/=z; v.w/=w; }
-#endif
+#define DIV3(v,f) { v.x/=f; v.y/=f; v.z/=z; }
+#define DIV4(v,f) { v.x/=f; v.y/=f; v.z/=z; v.w/=w; }
 
 #define ABS2(v) { v.x=SH_ABS(v.x); v.y=SH_ABS(v.y); }
-#ifdef SHIVA_USE_SIMD
-# define ABS_MASK _mm_set1_ps(-0.f)
-# define ABS3(v) { v.vec=_mm_andnot_ps(ABS_MASK, v.vec); }
-# define ABS4(v) { v.vec=_mm_andnot_ps(ABS_MASK, v.vec); }
-#else
-# define ABS3(v) { v.x=SH_ABS(v.x); v.y=SH_ABS(v.y); v.z=SH_ABS(v.z); }
-# define ABS4(v) { v.x=SH_ABS(v.x); v.y=SH_ABS(v.y); v.z=SH_ABS(v.z); v.w=SH_ABS(v.w); }
-#endif
+#define ABS3(v) { v.x=SH_ABS(v.x); v.y=SH_ABS(v.y); v.z=SH_ABS(v.z); }
+#define ABS4(v) { v.x=SH_ABS(v.x); v.y=SH_ABS(v.y); v.z=SH_ABS(v.z); v.w=SH_ABS(v.w); }
 
-#define NORMSQ2(v) DOT2(v,v)
-#define NORMSQ3(v) DOT3(v,v)
-#define NORMSQ4(v) DOT4(v,v)
+#define NORMSQ2(v) (v.x*v.x + v.y*v.y)
+#define NORMSQ3(v) (v.x*v.x + v.y*v.y + v.z*v.z)
+#define NORMSQ4(v) (v.x*v.x + v.y*v.y + v.z*v.z + v.w*v.w)
 
 #define NORM2(v) SH_SQRT(NORMSQ2(v))
 #define NORM3(v) SH_SQRT(NORMSQ3(v))
 #define NORM4(v) SH_SQRT(NORMSQ4(v))
 
-#define NORMALIZE2(v) { SHfloat n=NORM2(v); DIV2(v,n); }
-#define NORMALIZE3(v) { SHfloat n=NORM3(v); DIV3(v,n); }
-#define NORMALIZE4(v) { SHfloat n=NORM4(v); DIV4(v,n); }
+#define NORMALIZE2(v) { SHfloat n=NORM2(v); v.x/=n; v.y/=n; }
+#define NORMALIZE3(v) { SHfloat n=NORM3(v); v.x/=n; v.y/=n; v.z/=n; }
+#define NORMALIZE4(v) { SHfloat n=NORM4(v); v.x/=n; v.y/=n; v.z/=n; v.w/=w; }
 
 #define DOT2(v1,v2) (v1.x*v2.x + v1.y*v2.y)
-#ifdef SHIVA_USE_SIMD
-# define DOT4(v1,v2) hsum_ps_sse(_mm_mul_ps(v1.vec,v2.vec))
-# define DOT4(v1,v2) hsum_ps_sse(_mm_mul_ps(v1.vec,v2.vec))
-#else
-# define DOT3(v1,v2) (v1.x*v2.x + v1.y*v2.y + v1.z*v2.z)
-# define DOT4(v1,v2) (v1.x*v2.x + v1.y*v2.y + v1.z*v2.z + v1.w*v2.w)
-#endif
+#define DOT3(v1,v2) (v1.x*v2.x + v1.y*v2.y + v1.z*v2.z)
+#define DOT4(v1,v2) (v1.x*v2.x + v1.y*v2.y + v1.z*v2.z + v1.w*v2.w)
 
 #define CROSS2(v1,v2) (v1.x*v2.y - v2.x*v1.y)
 
@@ -247,84 +152,37 @@ void SHMatrix3x3_dtor(SHMatrix3x3 *m);
 #define ANGLE2N(v1,v2) (SH_ACOS( DOT2(v1,v2) ))
 
 #define OFFSET2V(v, o, s) { v.x += o.x*s; v.y += o.y*s; }
-#ifdef SHIVA_USE_SIMD
-# define OFFSET4V(v, o, s) { v.vec=_mm_add_ps(v.vec,_mm_mul_ps(o.vec,_mm_set1_ps(s))); }
-# define OFFSET4V(v, o, s) { v.vec=_mm_add_ps(v.vec,_mm_mul_ps(o.vec,_mm_set1_ps(s))); }
-#else
-# define OFFSET3V(v, o, s) { v.x += o.x*s; v.y += o.y*s; v.z += o.z*s; }
-# define OFFSET4V(v, o, s) { v.x += o.x*s; v.y += o.y*s; v.z += o.z*s; v.w += o.w*s; }
-#endif
+#define OFFSET3V(v, o, s) { v.x += o.x*s; v.y += o.y*s; v.z += o.z*s; }
+#define OFFSET4V(v, o, s) { v.x += o.x*s; v.y += o.y*s; v.z += o.z*s; v.w += o.w*s; }
 
 /*-----------------------------------------------------
  * Macros for matrix operations
  *-----------------------------------------------------*/
 
-#ifdef SHIVA_USE_SIMD
-# define SETMAT(mat, m00, m01, m02, m10, m11, m12, m20, m21, m22) { \
-  mat.mtx[0] = _mm_set_ps(0,m02,m01,m00); \
-  mat.mtx[1] = _mm_set_ps(0,m12,m11,m10); \
-  mat.mtx[2] = _mm_set_ps(0,m22,m21,m20); \
-  mat.mtx[3] = _mm_setzero_ps(); }
-#else
-# define SETMAT(mat, m00, m01, m02, m10, m11, m12, m20, m21, m22) { \
-  mat.m[0][0] = m00; mat.m[0][1] = m01; mat.m[0][2] = m02; \
+#define SETMAT(mat, m00, m01, m02, m10, m11, m12, m20, m21, m22) { \
+mat.m[0][0] = m00; mat.m[0][1] = m01; mat.m[0][2] = m02; \
   mat.m[1][0] = m10; mat.m[1][1] = m11; mat.m[1][2] = m12; \
   mat.m[2][0] = m20; mat.m[2][1] = m21; mat.m[2][2] = m22; }
-#endif
 
-#ifdef SHIVA_USE_SIMD
-# define SETMATMAT(m1, m2) { \
-  m1.mtx[0] = m2.mtx[0]; \
-  m1.mtx[1] = m2.mtx[1]; \
-  m1.mtx[2] = m2.mtx[2]; }
-#else
-# define SETMATMAT(m1, m2) { \
+#define SETMATMAT(m1, m2) { \
 int i,j; \
   for(i=0;i<3;i++) \
   for(j=0;j<3;j++) \
     m1.m[i][j] = m2.m[i][j]; }
-#endif
 
-#ifdef SHIVA_USE_SIMD
-# define MULMATS(mat, s) { \
-  mat.mtx[0] = _mm_mul_ps(mat.mtx[0],_mm_set1_ps(s)); \
-  mat.mtx[1] = _mm_mul_ps(mat.mtx[1],_mm_set1_ps(s)); \
-  mat.mtx[2] = _mm_mul_ps(mat.mtx[2],_mm_set1_ps(s)); }
-#else
-# define MULMATS(mat, s) { \
+#define MULMATS(mat, s) { \
 int i,j; \
   for(i=0;i<3;i++) \
   for(j=0;j<3;j++) \
     mat.m[i][j] *= s; }
-#endif
 
-#ifdef SHIVA_USE_SIMD
-# define DIVMATS(mat, s) { \
-  mat.mtx[0] = _mm_mul_ps(mat.mtx[0],_mm_set1_ps(1/s)); \
-  mat.mtx[1] = _mm_mul_ps(mat.mtx[1],_mm_set1_ps(1/s)); \
-  mat.mtx[2] = _mm_mul_ps(mat.mtx[2],_mm_set1_ps(1/s)); }
-#else
-# define DIVMATS(mat, s) { \
+#define DIVMATS(mat, s) { \
 int i,j; \
   for(i=0;i<3;i++) \
   for(j=0;j<3;j++) \
     mat.m[i][j] /= s; }
-#endif
 
-#ifdef SHIVA_USE_SIMD
-# define MULMATMAT(m2, m1, mout) { \
-  int i,j; \
-  for (i=0;i<4;i++) { \
-    __m128 a = m1.mtx[0]; \
-    __m128 b = _mm_set1_ps(m2.m[i][0]); \
-    mout.mtx[i] = a*b; \
-    for (j=1;j<4;j++) { \
-      a = m1.mtx[j]; \
-      b = _mm_set1_ps(m2.m[i][j]); \
-      mout.mtx[i] += a*b; } } }
-
-#else
-# define MULMATMAT(m1, m2, mout) { \
+#define MULMATMAT(m1, m2, mout) { \
 int i,j; \
   for(i=0;i<3;i++) \
   for(j=0;j<3;j++) \
@@ -332,7 +190,6 @@ int i,j; \
       m1.m[i][0] * m2.m[0][j] + \
       m1.m[i][1] * m2.m[1][j] + \
       m1.m[i][2] * m2.m[2][j]; }
-#endif
 
 #define IDMAT(mat) SETMAT(mat, 1,0,0, 0,1,0, 0,0,1)
 

simgear/canvas/VGInitOperation.cxx

@@ -1,5 +1,4 @@
-///@file
-/// osg::Operation to initialize the OpenVG context used for path rendering
+// osg::Operation to initialize the OpenVG context used for path rendering
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //

simgear/canvas/VGInitOperation.hxx

@@ -1,5 +1,4 @@
-///@file
-/// osg::Operation to initialize the OpenVG context used for path rendering
+// osg::Operation to initialize the OpenVG context used for path rendering
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //

simgear/canvas/canvas_fwd.hxx

@@ -1,5 +1,4 @@
-///@file
-/// Canvas forward declarations
+// Canvas forward declarations
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -26,9 +25,11 @@
 #include <osg/ref_ptr>
 #include <osgText/Font>
 
-#include <functional>
+#include <boost/function.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
+
 #include <map>
-#include <memory>
 #include <vector>
 
 namespace simgear
@@ -60,8 +61,8 @@ namespace canvas
 
 #define SG_FWD_DECL(name)\
   class name;\
-  typedef std::shared_ptr<name> name##Ptr;\
-  typedef std::weak_ptr<name> name##WeakPtr;
+  typedef boost::shared_ptr<name> name##Ptr;\
+  typedef boost::weak_ptr<name> name##WeakPtr;
 
   SG_FWD_DECL(Placement)
   SG_FWD_DECL(SystemAdapter)
@@ -83,10 +84,10 @@ namespace canvas
   typedef osg::ref_ptr<osgText::Font> FontPtr;
 
   typedef std::vector<PlacementPtr> Placements;
-  typedef std::function<Placements( SGPropertyNode*,
-                                    CanvasPtr )> PlacementFactory;
+  typedef boost::function<Placements( SGPropertyNode*,
+                                      CanvasPtr )> PlacementFactory;
 
-  typedef std::function<void(const EventPtr&)> EventListener;
+  typedef boost::function<void(const EventPtr&)> EventListener;
 
 } // namespace canvas
 } // namespace simgear

simgear/canvas/elements/CMakeLists.txt

@@ -9,6 +9,10 @@ set(HEADERS
   CanvasText.hxx
 )
 
+set(DETAIL_HEADERS
+  detail/add_segment_variadic.hxx
+)
+
 set(SOURCES
   CanvasElement.cxx
   CanvasGroup.cxx
@@ -19,6 +23,7 @@ set(SOURCES
 )
 
 simgear_scene_component(canvas-elements canvas/elements "${SOURCES}" "${HEADERS}")
+simgear_component(canvas-elements/detail canvas/elements/detail "" "${DETAIL_HEADERS}")
 
 add_boost_test(canvas_element
   SOURCES canvas_element_test.cpp

simgear/canvas/elements/CanvasElement.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Interface for 2D Canvas element
+// Interface for 2D Canvas element
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,8 +16,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "CanvasElement.hxx"
 #include <simgear/canvas/Canvas.hxx>
 #include <simgear/canvas/CanvasEventVisitor.hxx>
@@ -32,6 +29,10 @@
 #include <osg/StateAttribute>
 #include <osg/Version>
 
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
+
 #include <cassert>
 #include <cmath>
 #include <cstring>
@@ -211,22 +212,22 @@ namespace canvas
   //----------------------------------------------------------------------------
   void Element::onDestroy()
   {
-    if( !_scene_group.valid() )
+    if( !_transform.valid() )
       return;
 
     // The transform node keeps a reference on this element, so ensure it is
     // deleted.
-    for(osg::Group* parent: _scene_group->getParents())
+    BOOST_FOREACH(osg::Group* parent, _transform->getParents())
     {
-      parent->removeChild(_scene_group.get());
+      parent->removeChild(_transform.get());
     }
 
     // Hide in case someone still holds a reference
     setVisible(false);
     removeListener();
 
-    _parent = nullptr;
-    _scene_group = nullptr;
+    _parent = 0;
+    _transform = 0;
   }
 
   //----------------------------------------------------------------------------
@@ -244,8 +245,29 @@ namespace canvas
   //----------------------------------------------------------------------------
   void Element::update(double dt)
   {
-    if( isVisible() )
-      updateImpl(dt);
+    if( !isVisible() )
+      return;
+
+    // Trigger matrix update
+    getMatrix();
+
+    // Update bounding box on manual update (manual updates pass zero dt)
+    if( dt == 0 && _drawable )
+      _drawable->getBound();
+
+    if( (_attributes_dirty & BLEND_FUNC) && _transform.valid() )
+    {
+      parseBlendFunc(
+        _transform->getOrCreateStateSet(),
+        _node->getChild("blend-source"),
+        _node->getChild("blend-destination"),
+        _node->getChild("blend-source-rgb"),
+        _node->getChild("blend-destination-rgb"),
+        _node->getChild("blend-source-alpha"),
+        _node->getChild("blend-destination-alpha")
+      );
+      _attributes_dirty &= ~BLEND_FUNC;
+    }
   }
 
   //----------------------------------------------------------------------------
@@ -272,7 +294,8 @@ namespace canvas
   //----------------------------------------------------------------------------
   void Element::setFocus()
   {
-    if( auto canvas = _canvas.lock() )
+    CanvasPtr canvas = _canvas.lock();
+    if( canvas )
       canvas->setFocusElement(this);
   }
 
@@ -316,8 +339,7 @@ namespace canvas
     if( listeners == _listener.end() )
       return false;
 
-    for(auto const& listener: listeners->second)
-    {
+    BOOST_FOREACH(EventListener const& listener, listeners->second)
       try
       {
         listener(event);
@@ -330,7 +352,6 @@ namespace canvas
           "canvas::Element: event handler error: '" << ex.what() << "'"
         );
       }
-    }
 
     return true;
   }
@@ -372,9 +393,9 @@ namespace canvas
       getBoundingBox()
 #endif
       .contains(osg::Vec3f(local_pos, 0));
-    else if( _scene_group.valid() )
+    else if( _transform.valid() )
       // ... for other elements, i.e. groups only a bounding sphere is available
-      return _scene_group->getBound().contains(osg::Vec3f(parent_pos, 0));
+      return _transform->getBound().contains(osg::Vec3f(parent_pos, 0));
     else
       return false;
   }
@@ -383,32 +404,34 @@ namespace canvas
   //----------------------------------------------------------------------------
   void Element::setVisible(bool visible)
   {
-    if( _scene_group.valid() )
+    if( _transform.valid() )
       // TODO check if we need another nodemask
-      _scene_group->setNodeMask(visible ? 0xffffffff : 0);
+      _transform->setNodeMask(visible ? 0xffffffff : 0);
   }
 
   //----------------------------------------------------------------------------
   bool Element::isVisible() const
   {
-    return _scene_group.valid() && _scene_group->getNodeMask() != 0;
+    return _transform.valid() && _transform->getNodeMask() != 0;
   }
 
   //----------------------------------------------------------------------------
-  osg::MatrixTransform* Element::getSceneGroup() const
+  osg::MatrixTransform* Element::getMatrixTransform()
   {
-    return _scene_group.get();
+    return _transform.get();
+  }
+
+  //----------------------------------------------------------------------------
+  osg::MatrixTransform const* Element::getMatrixTransform() const
+  {
+    return _transform.get();
   }
 
   //----------------------------------------------------------------------------
   osg::Vec2f Element::posToLocal(const osg::Vec2f& pos) const
   {
-    if( !_scene_group )
-      // TODO log warning?
-      return pos;
-
-    updateMatrix();
-    const osg::Matrix& m = _scene_group->getInverseMatrix();
+    getMatrix();
+    const osg::Matrix& m = _transform->getInverseMatrix();
     return osg::Vec2f
     (
       m(0, 0) * pos[0] + m(1, 0) * pos[1] + m(3, 0),
@@ -461,6 +484,9 @@ namespace canvas
     {
       if( child->getNameString() == NAME_TRANSFORM )
       {
+        if( !_transform.valid() )
+          return;
+
         if( child->getIndex() >= static_cast<int>(_transform_types.size()) )
         {
           SG_LOG
@@ -497,7 +523,7 @@ namespace canvas
     if( parent == _node )
     {
       const std::string& name = child->getNameString();
-      if( strutils::starts_with(name, "data-") )
+      if( boost::starts_with(name, "data-") )
         return;
       else if( StyleInfo const* style_info = getStyleInfo(name) )
       {
@@ -512,7 +538,7 @@ namespace canvas
       }
       else if( name == "update" )
         return update(0);
-      else if( strutils::starts_with(name, "blend-") )
+      else if( boost::starts_with(name, "blend-") )
         return (void)(_attributes_dirty |= BLEND_FUNC);
     }
     else if(   parent
@@ -536,10 +562,6 @@ namespace canvas
   //----------------------------------------------------------------------------
   void Element::setClip(const std::string& clip)
   {
-    if( !_scene_group )
-      // TODO warn?
-      return;
-
     osg::StateSet* ss = getOrCreateStateSet();
     if( !ss )
       return;
@@ -553,8 +575,8 @@ namespace canvas
 
     // TODO generalize CSS property parsing
     const std::string RECT("rect(");
-    if(    !strutils::ends_with(clip, ")")
-        || !strutils::starts_with(clip, RECT) )
+    if(    !boost::ends_with(clip, ")")
+        || !boost::starts_with(clip, RECT) )
     {
       SG_LOG(SG_GENERAL, SG_WARN, "Canvas: invalid clip: " << clip);
       return;
@@ -594,7 +616,7 @@ namespace canvas
     }
 
     if( !_scissor )
-      _scissor = new RelativeScissor(_scene_group.get());
+      _scissor = new RelativeScissor(_transform.get());
 
     // <top>, <right>, <bottom>, <left>
     _scissor->x() = values[3];
@@ -618,27 +640,6 @@ namespace canvas
       _scissor->_coord_reference = rf;
   }
 
-  //----------------------------------------------------------------------------
-  void Element::setRotation(unsigned int index, double r)
-  {
-    _node->getChild(NAME_TRANSFORM, index, true)->setDoubleValue("rot", r);
-  }
-
-  //----------------------------------------------------------------------------
-  void Element::setTranslation(unsigned int index, double x, double y)
-  {
-    SGPropertyNode* tf = _node->getChild(NAME_TRANSFORM, index, true);
-    tf->getChild("t", 0, true)->setDoubleValue(x);
-    tf->getChild("t", 1, true)->setDoubleValue(y);
-  }
-
-  //----------------------------------------------------------------------------
-  void Element::setTransformEnabled(unsigned int index, bool enabled)
-  {
-    SGPropertyNode* tf = _node->getChild(NAME_TRANSFORM, index, true);
-    tf->setBoolValue("enabled", enabled);
-  }
-
   //----------------------------------------------------------------------------
   osg::BoundingBox Element::getBoundingBox() const
   {
@@ -651,8 +652,8 @@ namespace canvas
 
     osg::BoundingBox bb;
 
-    if( _scene_group.valid() )
-      bb.expandBy( _scene_group->getBound() );
+    if( _transform.valid() )
+      bb.expandBy(_transform->getBound());
 
     return bb;
   }
@@ -686,11 +687,70 @@ namespace canvas
   //----------------------------------------------------------------------------
   osg::Matrix Element::getMatrix() const
   {
-    if( !_scene_group )
+    if( !_transform )
       return osg::Matrix::identity();
 
-    updateMatrix();
-    return _scene_group->getMatrix();
+    if( !(_attributes_dirty & TRANSFORM) )
+      return _transform->getMatrix();
+
+    osg::Matrix m;
+    for( size_t i = 0; i < _transform_types.size(); ++i )
+    {
+      // Skip unused indizes...
+      if( _transform_types[i] == TT_NONE )
+        continue;
+
+      SGPropertyNode* tf_node = _node->getChild("tf", i, true);
+
+      // Build up the matrix representation of the current transform node
+      osg::Matrix tf;
+      switch( _transform_types[i] )
+      {
+        case TT_MATRIX:
+          tf = osg::Matrix( tf_node->getDoubleValue("m[0]", 1),
+                            tf_node->getDoubleValue("m[1]", 0),
+                            0,
+                            tf_node->getDoubleValue("m[6]", 0),
+
+                            tf_node->getDoubleValue("m[2]", 0),
+                            tf_node->getDoubleValue("m[3]", 1),
+                            0,
+                            tf_node->getDoubleValue("m[7]", 0),
+
+                            0,
+                            0,
+                            1,
+                            0,
+
+                            tf_node->getDoubleValue("m[4]", 0),
+                            tf_node->getDoubleValue("m[5]", 0),
+                            0,
+                            tf_node->getDoubleValue("m[8]", 1) );
+          break;
+        case TT_TRANSLATE:
+          tf.makeTranslate( osg::Vec3f( tf_node->getDoubleValue("t[0]", 0),
+                                        tf_node->getDoubleValue("t[1]", 0),
+                                        0 ) );
+          break;
+        case TT_ROTATE:
+          tf.makeRotate( tf_node->getDoubleValue("rot", 0), 0, 0, 1 );
+          break;
+        case TT_SCALE:
+        {
+          float sx = tf_node->getDoubleValue("s[0]", 1);
+          // sy defaults to sx...
+          tf.makeScale( sx, tf_node->getDoubleValue("s[1]", sx), 1 );
+          break;
+        }
+        default:
+          break;
+      }
+      m.postMult( tf );
+    }
+    _transform->setMatrix(m);
+    _attributes_dirty &= ~TRANSFORM;
+
+    return m;
   }
 
   //----------------------------------------------------------------------------
@@ -704,8 +764,11 @@ namespace canvas
     PropertyBasedElement(node),
     _canvas( canvas ),
     _parent( parent ),
-    _scene_group( new osg::MatrixTransform ),
-    _style( parent_style )
+    _attributes_dirty( 0 ),
+    _transform( new osg::MatrixTransform ),
+    _style( parent_style ),
+    _scissor( 0 ),
+    _drawable( 0 )
   {
     staticInit();
 
@@ -717,15 +780,15 @@ namespace canvas
     );
 
     // Ensure elements are drawn in order they appear in the element tree
-    _scene_group
-      ->getOrCreateStateSet()
-      ->setRenderBinDetails(
-        0,
-        "PreOrderBin",
-        osg::StateSet::OVERRIDE_RENDERBIN_DETAILS
-      );
+    _transform->getOrCreateStateSet()
+              ->setRenderBinDetails
+              (
+                0,
+                "PreOrderBin",
+                osg::StateSet::OVERRIDE_RENDERBIN_DETAILS
+              );
 
-    _scene_group->setUserData( new OSGUserData(this) );
+    _transform->setUserData( new OSGUserData(this) );
   }
 
   //----------------------------------------------------------------------------
@@ -813,21 +876,11 @@ namespace canvas
   void Element::setDrawable( osg::Drawable* drawable )
   {
     _drawable = drawable;
+    assert( _drawable );
 
-    if( !_drawable )
-    {
-      SG_LOG(SG_GL, SG_WARN, "canvas::Element::setDrawable: NULL drawable");
-      return;
-    }
-    if( !_scene_group )
-    {
-      SG_LOG(SG_GL, SG_WARN, "canvas::Element::setDrawable: NULL scenegroup");
-      return;
-    }
-
-    auto geode = new osg::Geode;
+    osg::ref_ptr<osg::Geode> geode = new osg::Geode;
     geode->addDrawable(_drawable);
-    _scene_group->addChild(geode);
+    _transform->addChild(geode);
   }
 
   //----------------------------------------------------------------------------
@@ -835,109 +888,18 @@ namespace canvas
   {
     if( _drawable.valid() )
       return _drawable->getOrCreateStateSet();
-    else if( _scene_group.valid() )
-      return _scene_group->getOrCreateStateSet();
-    else
-      return nullptr;
+    if( _transform.valid() )
+      return _transform->getOrCreateStateSet();
+
+    return 0;
   }
 
   //----------------------------------------------------------------------------
   void Element::setupStyle()
   {
-    for(auto const& style: _style)
+    BOOST_FOREACH( Style::value_type style, _style )
       setStyle(style.second);
   }
 
-  //----------------------------------------------------------------------------
-  void Element::updateMatrix() const
-  {
-    if( !(_attributes_dirty & TRANSFORM) || !_scene_group )
-      return;
-
-    osg::Matrix m;
-    for( size_t i = 0; i < _transform_types.size(); ++i )
-    {
-      // Skip unused indizes...
-      if( _transform_types[i] == TT_NONE )
-        continue;
-
-      SGPropertyNode* tf_node = _node->getChild("tf", i, true);
-      if (!tf_node->getBoolValue("enabled", true)) {
-        continue; // skip disabled transforms
-      }
-
-      // Build up the matrix representation of the current transform node
-      osg::Matrix tf;
-      switch( _transform_types[i] )
-      {
-        case TT_MATRIX:
-          tf = osg::Matrix( tf_node->getDoubleValue("m[0]", 1),
-                            tf_node->getDoubleValue("m[1]", 0),
-                            0,
-                            tf_node->getDoubleValue("m[6]", 0),
-
-                            tf_node->getDoubleValue("m[2]", 0),
-                            tf_node->getDoubleValue("m[3]", 1),
-                            0,
-                            tf_node->getDoubleValue("m[7]", 0),
-
-                            0,
-                            0,
-                            1,
-                            0,
-
-                            tf_node->getDoubleValue("m[4]", 0),
-                            tf_node->getDoubleValue("m[5]", 0),
-                            0,
-                            tf_node->getDoubleValue("m[8]", 1) );
-          break;
-        case TT_TRANSLATE:
-          tf.makeTranslate( osg::Vec3f( tf_node->getDoubleValue("t[0]", 0),
-                                        tf_node->getDoubleValue("t[1]", 0),
-                                        0 ) );
-          break;
-        case TT_ROTATE:
-          tf.makeRotate( tf_node->getDoubleValue("rot", 0), 0, 0, 1 );
-          break;
-        case TT_SCALE:
-        {
-          float sx = tf_node->getDoubleValue("s[0]", 1);
-          // sy defaults to sx...
-          tf.makeScale( sx, tf_node->getDoubleValue("s[1]", sx), 1 );
-          break;
-        }
-        default:
-          break;
-      }
-      m.postMult( tf );
-    }
-    _scene_group->setMatrix(m);
-    _attributes_dirty &= ~TRANSFORM;
-  }
-
-  //----------------------------------------------------------------------------
-  void Element::updateImpl(double dt)
-  {
-    updateMatrix();
-
-    // Update bounding box on manual update (manual updates pass zero dt)
-    if( dt == 0 && _drawable )
-      _drawable->getBound();
-
-    if( (_attributes_dirty & BLEND_FUNC) )
-    {
-      parseBlendFunc(
-        _scene_group->getOrCreateStateSet(),
-        _node->getChild("blend-source"),
-        _node->getChild("blend-destination"),
-        _node->getChild("blend-source-rgb"),
-        _node->getChild("blend-destination-rgb"),
-        _node->getChild("blend-source-alpha"),
-        _node->getChild("blend-destination-alpha")
-      );
-      _attributes_dirty &= ~BLEND_FUNC;
-    }
-  }
-
 } // namespace canvas
 } // namespace simgear

simgear/canvas/elements/CanvasElement.hxx

@@ -24,11 +24,14 @@
 #include <simgear/canvas/CanvasEvent.hxx>
 #include <simgear/props/PropertyBasedElement.hxx>
 #include <simgear/misc/stdint.hxx> // for uint32_t
-#include <simgear/std/type_traits.hxx>
 
 #include <osg/BoundingBox>
 #include <osg/MatrixTransform>
 
+#include <boost/bind.hpp>
+#include <boost/function.hpp>
+#include <boost/type_traits/is_base_of.hpp>
+
 namespace osg
 {
   class Drawable;
@@ -46,7 +49,6 @@ namespace canvas
     public PropertyBasedElement
   {
     public:
-      using SceneGroupWeakPtr = osg::observer_ptr<osg::MatrixTransform>;
 
       /**
        * Store pointer to window as user data
@@ -59,9 +61,9 @@ namespace canvas
           OSGUserData(ElementPtr element);
       };
 
-      typedef std::function<bool(Element&, const SGPropertyNode*)>
+      typedef boost::function<bool(Element&, const SGPropertyNode*)>
               StyleSetterFunc;
-      typedef std::function<void(Element&, const SGPropertyNode*)>
+      typedef boost::function<void(Element&, const SGPropertyNode*)>
               StyleSetterFuncUnchecked;
       struct StyleSetter:
         public SGReferenced
@@ -92,7 +94,7 @@ namespace canvas
        *
        */
       virtual ~Element() = 0;
-      void onDestroy() override;
+      virtual void onDestroy();
 
       ElementPtr getParent() const;
       CanvasWeakPtr getCanvas() const;
@@ -102,7 +104,7 @@ namespace canvas
        *
        * @param dt  Frame time in seconds
        */
-      void update(double dt) override;
+      virtual void update(double dt);
 
       bool addEventListener(const std::string& type, const EventListener& cb);
       virtual void clearEventListener();
@@ -140,20 +142,19 @@ namespace canvas
        */
       virtual bool isVisible() const;
 
-      /**
-       * Get the according group in the OSG scene graph
-       */
-      // TODO ref_ptr
-      osg::MatrixTransform* getSceneGroup() const;
+      osg::MatrixTransform* getMatrixTransform();
+      osg::MatrixTransform const* getMatrixTransform() const;
 
       /**
        * Transform position to local coordinages.
        */
       osg::Vec2f posToLocal(const osg::Vec2f& pos) const;
 
-      void childAdded(SGPropertyNode* parent, SGPropertyNode* child) override;
-      void childRemoved(SGPropertyNode* parent, SGPropertyNode* child) override;
-      void valueChanged(SGPropertyNode* child) override;
+      virtual void childAdded( SGPropertyNode * parent,
+                               SGPropertyNode * child );
+      virtual void childRemoved( SGPropertyNode * parent,
+                                 SGPropertyNode * child );
+      virtual void valueChanged(SGPropertyNode * child);
 
       virtual bool setStyle( const SGPropertyNode* child,
                              const StyleInfo* style_info = 0 );
@@ -171,22 +172,6 @@ namespace canvas
        */
       void setClipFrame(ReferenceFrame rf);
 
-      /**
-       *
-       */
-      void setRotation(unsigned int index, double r);
-
-      /**
-       *
-       */
-      void setTranslation(unsigned int index, double x, double y);
-
-      /**
-       *
-       *
-       */
-      void setTransformEnabled(unsigned int index, bool enabled);
-
       /**
        * Get bounding box (may not be as tight as bounding box returned by
        * #getTightBoundingBox)
@@ -216,14 +201,13 @@ namespace canvas
        */
       template<typename Derived>
       static
-      std::enable_if_t<
-        std::is_base_of<Element, Derived>::value,
+      typename boost::enable_if<
+        boost::is_base_of<Element, Derived>,
         ElementPtr
-      >
-      create( const CanvasWeakPtr& canvas,
-              const SGPropertyNode_ptr& node,
-              const Style& style = Style(),
-              Element* parent = NULL )
+      >::type create( const CanvasWeakPtr& canvas,
+                      const SGPropertyNode_ptr& node,
+                      const Style& style = Style(),
+                      Element* parent = NULL )
       {
         return ElementPtr( new Derived(canvas, node, style, parent) );
       }
@@ -251,13 +235,13 @@ namespace canvas
       CanvasWeakPtr   _canvas;
       ElementWeakPtr  _parent;
 
-      mutable uint32_t _attributes_dirty = 0;
+      mutable uint32_t _attributes_dirty;
 
-      SceneGroupWeakPtr             _scene_group;
-      std::vector<TransformType>    _transform_types;
+      osg::observer_ptr<osg::MatrixTransform> _transform;
+      std::vector<TransformType>              _transform_types;
 
       Style             _style;
-      RelativeScissor  *_scissor = nullptr;
+      RelativeScissor  *_scissor;
 
       typedef std::vector<EventListener> Listener;
       typedef std::map<int, Listener> ListenerMap;
@@ -316,7 +300,7 @@ namespace canvas
       StyleSetter
       addStyle( const std::string& name,
                 const std::string& type,
-                const std::function<void (Derived&, T2)>& setter,
+                const boost::function<void (Derived&, T2)>& setter,
                 bool inheritable = true )
       {
         StyleInfo& style_info = _style_setters[ name ];
@@ -342,10 +326,13 @@ namespace canvas
         if( style->func )
           style = style->next = new StyleSetter;
 
-        style->func = std::bind(&type_match<Derived>::call,
-                                std::placeholders::_1,
-                                std::placeholders::_2,
-                                bindStyleSetter<T1>(name, setter));
+        style->func = boost::bind
+        (
+          &type_match<Derived>::call,
+          _1,
+          _2,
+          bindStyleSetter<T1>(name, setter)
+        );
         return *style;
       }
 
@@ -357,7 +344,7 @@ namespace canvas
       StyleSetter
       addStyle( const std::string& name,
                 const std::string& type,
-                const std::function<void (Derived&, T)>& setter,
+                const boost::function<void (Derived&, T)>& setter,
                 bool inheritable = true )
       {
         return addStyle<T, T>(name, type, setter, inheritable);
@@ -378,7 +365,7 @@ namespace canvas
         (
           name,
           type,
-          std::function<void (Derived&, T)>(setter),
+          boost::function<void (Derived&, T)>(setter),
           inheritable
         );
       }
@@ -399,7 +386,7 @@ namespace canvas
         (
           name,
           type,
-          std::function<void (Derived&, T2)>(setter),
+          boost::function<void (Derived&, T2)>(setter),
           inheritable
         );
       }
@@ -418,7 +405,7 @@ namespace canvas
         (
           name,
           type,
-          std::function<void (Derived&, const std::string&)>(setter),
+          boost::function<void (Derived&, const std::string&)>(setter),
           inheritable
         );
       }
@@ -481,7 +468,7 @@ namespace canvas
       StyleSetter
       addStyle( const std::string& name,
                 const std::string& type,
-                const std::function<void (Other&, T2)>& setter,
+                const boost::function<void (Other&, T2)>& setter,
                 OtherRef Derived::*instance_ref,
                 bool inheritable = true )
       {
@@ -511,7 +498,7 @@ namespace canvas
         (
           name,
           type,
-          std::function<void (Other&, const std::string&)>(setter),
+          boost::function<void (Other&, const std::string&)>(setter),
           instance_ref,
           inheritable
         );
@@ -519,37 +506,44 @@ namespace canvas
 
       template<typename T, class Derived, class Other, class OtherRef>
       static
-      std::function<void (Derived&, T)>
+      boost::function<void (Derived&, T)>
       bindOther( void (Other::*setter)(T), OtherRef Derived::*instance_ref )
       {
-        return std::bind(setter,
-                         std::bind(instance_ref, std::placeholders::_1),
-                         std::placeholders::_2);
+        return boost::bind(setter, boost::bind(instance_ref, _1), _2);
       }
 
       template<typename T, class Derived, class Other, class OtherRef>
       static
-      std::function<void (Derived&, T)>
-      bindOther( const std::function<void (Other&, T)>& setter,
+      boost::function<void (Derived&, T)>
+      bindOther( const boost::function<void (Other&, T)>& setter,
                  OtherRef Derived::*instance_ref )
       {
-        return std::bind(setter,
-                         std::bind(&reference_from_pointer<Other, OtherRef>,
-                                   std::bind(instance_ref, std::placeholders::_1)),
-                         std::placeholders::_2);
+        return boost::bind
+        (
+          setter,
+          boost::bind
+          (
+            &reference_from_pointer<Other, OtherRef>,
+            boost::bind(instance_ref, _1)
+          ),
+          _2
+        );
       }
 
       template<typename T1, typename T2, class Derived>
       static
       StyleSetterFuncUnchecked
       bindStyleSetter( const std::string& name,
-                       const std::function<void (Derived&, T2)>& setter )
+                       const boost::function<void (Derived&, T2)>& setter )
       {
-        return std::bind(setter,
-                         // We will only call setters with Derived instances, so we can safely
-                         // cast here.
-                         std::bind(&derived_cast<Derived>, std::placeholders::_1),
-                         std::bind(&getValue<T1>, std::placeholders::_2));
+        return boost::bind
+        (
+          setter,
+          // We will only call setters with Derived instances, so we can safely
+          // cast here.
+          boost::bind(&derived_cast<Derived>, _1),
+          boost::bind(&getValue<T1>, _2)
+        );
       }
 
       bool isStyleEmpty(const SGPropertyNode* child) const;
@@ -574,15 +568,11 @@ namespace canvas
 
       void setupStyle();
 
-      void updateMatrix() const;
-
-      virtual void updateImpl(double dt);
-
     private:
 
       osg::ref_ptr<osg::Drawable> _drawable;
 
-      Element(const Element&) = delete;
+      Element(const Element&);// = delete
 
       template<class Derived>
       static Derived& derived_cast(Element& el)

simgear/canvas/elements/CanvasGroup.cxx

@@ -1,5 +1,4 @@
-///@file
-/// A group of 2D Canvas elements
+// A group of 2D Canvas elements
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,17 +16,18 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "CanvasGroup.hxx"
 #include "CanvasImage.hxx"
 #include "CanvasMap.hxx"
 #include "CanvasPath.hxx"
 #include "CanvasText.hxx"
-
 #include <simgear/canvas/CanvasEventVisitor.hxx>
 #include <simgear/canvas/events/MouseEvent.hxx>
 
+#include <boost/bind.hpp>
+#include <boost/foreach.hpp>
+#include <boost/lambda/core.hpp>
+
 namespace simgear
 {
 namespace canvas
@@ -46,7 +46,7 @@ namespace canvas
   ElementFactories Group::_child_factories;
   const std::string Group::TYPE_NAME = "group";
 
-  void warnSceneGroupExpired(const char* member_name)
+  void warnTransformExpired(const char* member_name)
   {
     SG_LOG( SG_GENERAL,
             SG_WARN,
@@ -133,58 +133,63 @@ namespace canvas
   //----------------------------------------------------------------------------
   ElementPtr Group::getElementById(const std::string& id)
   {
-    if( !_scene_group.valid() )
+    if( !_transform.valid() )
     {
-      warnSceneGroupExpired("getElementById");
-      return {};
+      warnTransformExpired("getElementById");
+      return ElementPtr();
     }
 
-    // TODO check search algorithm. Not completely breadth-first and might be
-    //      possible with using less dynamic memory
-    std::vector<GroupPtr> child_groups;
-    for(size_t i = 0; i < _scene_group->getNumChildren(); ++i)
+    std::vector<GroupPtr> groups;
+    for(size_t i = 0; i < _transform->getNumChildren(); ++i)
     {
       const ElementPtr& el = getChildByIndex(i);
       if( el->get<std::string>("id") == id )
         return el;
 
-      if( Group* child_group = dynamic_cast<Group*>(el.get()) )
-        child_groups.push_back(child_group);
+      Group* group = dynamic_cast<Group*>(el.get());
+      if( group )
+        groups.push_back(group);
     }
 
-    for(auto group: child_groups)
+    BOOST_FOREACH( GroupPtr group, groups )
     {
-      if( ElementPtr el = group->getElementById(id) )
+      ElementPtr el = group->getElementById(id);
+      if( el )
         return el;
     }
 
-    return {};
+    return ElementPtr();
   }
 
   //----------------------------------------------------------------------------
   void Group::clearEventListener()
   {
-    Element::clearEventListener();
+    if( !_transform.valid() )
+      return warnTransformExpired("clearEventListener");
 
-    if( !_scene_group.valid() )
-      return warnSceneGroupExpired("clearEventListener");
-
-    // TODO should this be recursive?
-    for(size_t i = 0; i < _scene_group->getNumChildren(); ++i)
+    for(size_t i = 0; i < _transform->getNumChildren(); ++i)
       getChildByIndex(i)->clearEventListener();
+
+    Element::clearEventListener();
+  }
+
+  //----------------------------------------------------------------------------
+  void Group::update(double dt)
+  {
+    for(size_t i = 0; i < _transform->getNumChildren(); ++i)
+      getChildByIndex(i)->update(dt);
+
+    Element::update(dt);
   }
 
   //----------------------------------------------------------------------------
   bool Group::traverse(EventVisitor& visitor)
   {
-    if( _scene_group.valid() )
+    // Iterate in reverse order as last child is displayed on top
+    for(size_t i = _transform->getNumChildren(); i --> 0;)
     {
-      // Iterate in reverse order as last child is displayed on top
-      for(size_t i = _scene_group->getNumChildren(); i --> 0;)
-      {
-        if( getChildByIndex(i)->accept(visitor) )
-          return true;
-      }
+      if( getChildByIndex(i)->accept(visitor) )
+        return true;
     }
     return false;
   }
@@ -199,13 +204,13 @@ namespace canvas
     bool handled = setStyleImpl(style, style_info);
     if( style_info->inheritable )
     {
-      if( !_scene_group.valid() )
+      if( !_transform.valid() )
       {
-        warnSceneGroupExpired("setStyle");
+        warnTransformExpired("setStyle");
         return false;
       }
 
-      for(size_t i = 0; i < _scene_group->getNumChildren(); ++i)
+      for(size_t i = 0; i < _transform->getNumChildren(); ++i)
         handled |= getChildByIndex(i)->setStyle(style, style_info);
     }
 
@@ -215,20 +220,26 @@ namespace canvas
   //----------------------------------------------------------------------------
   osg::BoundingBox Group::getTransformedBounds(const osg::Matrix& m) const
   {
-    if( !_scene_group.valid() )
+    osg::BoundingBox bb;
+    if( !_transform.valid() )
     {
-      warnSceneGroupExpired("getTransformedBounds");
-      return {};
+      warnTransformExpired("getTransformedBounds");
+      return bb;
     }
 
-    osg::BoundingBox bb;
-    for(size_t i = 0; i < _scene_group->getNumChildren(); ++i)
+    for(size_t i = 0; i < _transform->getNumChildren(); ++i)
     {
-      auto child = getChildByIndex(i);
-      if( !child || !child->isVisible() )
+      const ElementPtr& child = getChildByIndex(i);
+      if( !child->getMatrixTransform()->getNodeMask() )
         continue;
 
-      bb.expandBy( child->getTransformedBounds(child->getMatrix() * m) );
+      bb.expandBy
+      (
+        child->getTransformedBounds
+        (
+          child->getMatrixTransform()->getMatrix() * m
+        )
+      );
     }
 
     return bb;
@@ -244,15 +255,6 @@ namespace canvas
     return ElementFactory();
   }
 
-  //----------------------------------------------------------------------------
-  void Group::updateImpl(double dt)
-  {
-    Element::updateImpl(dt);
-
-    for(size_t i = 0; i < _scene_group->getNumChildren(); ++i)
-      getChildByIndex(i)->update(dt);
-  }
-
   //----------------------------------------------------------------------------
   void Group::childAdded(SGPropertyNode* child)
   {
@@ -262,13 +264,13 @@ namespace canvas
     ElementFactory child_factory = getChildFactory( child->getNameString() );
     if( child_factory )
     {
-      if( !_scene_group.valid() )
-        return warnSceneGroupExpired("childAdded");
+      if( !_transform.valid() )
+        return warnTransformExpired("childAdded");
 
       ElementPtr element = child_factory(_canvas, child, _style, this);
 
       // Add to osg scene graph...
-      _scene_group->addChild(element->getSceneGroup());
+      _transform->addChild( element->getMatrixTransform() );
 
       // ...and ensure correct ordering
       handleZIndexChanged(element);
@@ -289,7 +291,7 @@ namespace canvas
 
     if( getChildFactory(node->getNameString()) )
     {
-      if( !_scene_group.valid() )
+      if( !_transform.valid() )
         // If transform is destroyed also all children are destroyed, so we can
         // not do anything here.
         return;
@@ -319,7 +321,7 @@ namespace canvas
   void Group::childChanged(SGPropertyNode* node)
   {
     SGPropertyNode* parent = node->getParent();
-    SGPropertyNode* grand_parent = parent ? parent->getParent() : nullptr;
+    SGPropertyNode* grand_parent = parent ? parent->getParent() : NULL;
 
     if(    grand_parent == _node
         && node->getNameString() == "z-index" )
@@ -329,18 +331,16 @@ namespace canvas
   //----------------------------------------------------------------------------
   void Group::handleZIndexChanged(ElementPtr child, int z_index)
   {
-    if( !child || !_scene_group.valid() )
+    if( !child || !_transform.valid() )
       return;
 
-    // Keep reference to prevent deleting while removing and re-inserting later
-    osg::ref_ptr<osg::MatrixTransform> tf = child->getSceneGroup();
-
-    size_t index = _scene_group->getChildIndex(tf),
+    osg::ref_ptr<osg::MatrixTransform> tf = child->getMatrixTransform();
+    size_t index = _transform->getChildIndex(tf),
            index_new = index;
 
     for(;; ++index_new)
     {
-      if( index_new + 1 == _scene_group->getNumChildren() )
+      if( index_new + 1 == _transform->getNumChildren() )
         break;
 
       // Move to end of block with same index (= move upwards until the next
@@ -367,13 +367,13 @@ namespace canvas
         return;
     }
 
-    _scene_group->removeChild(index);
-    _scene_group->insertChild(index_new, tf);
+    _transform->removeChild(index);
+    _transform->insertChild(index_new, tf);
 
     SG_LOG
     (
       SG_GENERAL,
-      SG_DEBUG,
+      SG_INFO,
       "canvas::Group: Moved element " << index << " to position " << index_new
     );
   }
@@ -381,27 +381,24 @@ namespace canvas
   //----------------------------------------------------------------------------
   ElementPtr Group::getChildByIndex(size_t index) const
   {
-    assert( _scene_group.valid() );
-
-    auto child = _scene_group->getChild(index);
-    if( !child )
-      return {};
-
-    auto ud = static_cast<OSGUserData*>(child->getUserData());
-    return ud ? ud->element : ElementPtr();
+    assert(_transform.valid());
+    OSGUserData* ud =
+      static_cast<OSGUserData*>(_transform->getChild(index)->getUserData());
+    assert(ud);
+    return ud->element;
   }
 
   //----------------------------------------------------------------------------
   ElementPtr Group::findChild( const SGPropertyNode* node,
                                const std::string& id ) const
   {
-    if( !_scene_group.valid() )
+    if( !_transform.valid() )
     {
-      warnSceneGroupExpired("findChild");
-      return {};
+      warnTransformExpired("findChild");
+      return ElementPtr();
     }
 
-    for(size_t i = 0; i < _scene_group->getNumChildren(); ++i)
+    for(size_t i = 0; i < _transform->getNumChildren(); ++i)
     {
       ElementPtr el = getChildByIndex(i);
 
@@ -417,7 +414,7 @@ namespace canvas
       }
     }
 
-    return {};
+    return ElementPtr();
   }
 
 } // namespace canvas

simgear/canvas/elements/CanvasGroup.hxx

@@ -1,5 +1,4 @@
-///@file
-/// A group of 2D Canvas elements
+// A group of 2D Canvas elements
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -87,15 +86,16 @@ namespace canvas
        */
       ElementPtr getElementById(const std::string& id);
 
-      void clearEventListener() override;
+      virtual void clearEventListener();
 
-      bool traverse(EventVisitor& visitor) override;
+      virtual void update(double dt);
 
-      bool setStyle( const SGPropertyNode* child,
-                     const StyleInfo* style_info = 0 ) override;
+      virtual bool traverse(EventVisitor& visitor);
 
-      osg::BoundingBox
-      getTransformedBounds(const osg::Matrix& m) const override;
+      virtual bool setStyle( const SGPropertyNode* child,
+                             const StyleInfo* style_info = 0 );
+
+      virtual osg::BoundingBox getTransformedBounds(const osg::Matrix& m) const;
 
     protected:
 
@@ -107,11 +107,9 @@ namespace canvas
        */
       virtual ElementFactory getChildFactory(const std::string& type) const;
 
-      void updateImpl(double dt) override;
-
-      void childAdded(SGPropertyNode * child) override;
-      void childRemoved(SGPropertyNode * child) override;
-      void childChanged(SGPropertyNode * child) override;
+      virtual void childAdded(SGPropertyNode * child);
+      virtual void childRemoved(SGPropertyNode * child);
+      virtual void childChanged(SGPropertyNode * child);
 
       void handleZIndexChanged(ElementPtr child, int z_index = 0);
 

simgear/canvas/elements/CanvasImage.cxx

@@ -1,5 +1,4 @@
-///@file
-/// An image on the Canvas
+// An image on the Canvas
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,8 +16,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "CanvasImage.hxx"
 
 #include <simgear/canvas/Canvas.hxx>
@@ -118,7 +115,9 @@ namespace canvas
                 ElementWeakPtr parent ):
     Element(canvas, node, parent_style, parent),
     _texture(new osg::Texture2D),
-    _node_src_rect( node->getNode("source", 0, true) )
+    _node_src_rect( node->getNode("source", 0, true) ),
+    _src_rect(0,0),
+    _region(0,0)
   {
     staticInit();
 
@@ -156,207 +155,22 @@ namespace canvas
   //----------------------------------------------------------------------------
   Image::~Image()
   {
-    if( _http_request )
-    {
-      Canvas::getSystemAdapter()
-        ->getHTTPClient()
-        ->cancelRequest(_http_request, "image destroyed");
-    }
-  }
-
-  //----------------------------------------------------------------------------
-  void Image::valueChanged(SGPropertyNode* child)
-  {
-    // If the image is switched from invisible to visible, and it shows a
-    // canvas, we need to delay showing it by one frame to ensure the canvas is
-    // updated before the image is displayed.
-    //
-    // As canvas::Element handles and filters changes to the "visible" property
-    // we can not check this in Image::childChanged but instead have to override
-    // Element::valueChanged.
-    if(    !isVisible()
-        && child->getParent() == _node
-        && child->getNameString() == "visible"
-        && child->getBoolValue() )
-    {
-      CullCallback* cb =
-#if OSG_VERSION_LESS_THAN(3,3,2)
-        static_cast<CullCallback*>
-#else
-        dynamic_cast<CullCallback*>
-#endif
-        ( _geom->getCullCallback() );
-
-      if( cb )
-        cb->cullNextFrame();
-    }
-
-    Element::valueChanged(child);
-  }
-
-  //----------------------------------------------------------------------------
-  void Image::setSrcCanvas(CanvasPtr canvas)
-  {
-    CanvasPtr src_canvas = _src_canvas.lock(),
-              self_canvas = _canvas.lock();
-
-    if( src_canvas )
-      src_canvas->removeParentCanvas(self_canvas);
-    if( self_canvas )
-      self_canvas->removeChildCanvas(src_canvas);
-
-    _src_canvas = src_canvas = canvas;
-    _attributes_dirty |= SRC_CANVAS;
-    _geom->setCullCallback(canvas ? new CullCallback(canvas) : 0);
-
-    if( src_canvas )
-    {
-      setupDefaultDimensions();
-
-      if( self_canvas )
-      {
-        self_canvas->addChildCanvas(src_canvas);
-        src_canvas->addParentCanvas(self_canvas);
+      if( _http_request ) {
+          Canvas::getSystemAdapter()->getHTTPClient()->cancelRequest(_http_request, "image destroyed");
       }
-    }
   }
 
   //----------------------------------------------------------------------------
-  CanvasWeakPtr Image::getSrcCanvas() const
+  void Image::update(double dt)
   {
-    return _src_canvas;
-  }
-
-  //----------------------------------------------------------------------------
-  void Image::setImage(osg::ref_ptr<osg::Image> img)
-  {
-    // remove canvas...
-    setSrcCanvas( CanvasPtr() );
-
-    _texture->setResizeNonPowerOfTwoHint(false);
-    _texture->setImage(img);
-    _texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
-    _texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
-    _geom->getOrCreateStateSet()
-         ->setTextureAttributeAndModes(0, _texture);
-
-    if( img )
-      setupDefaultDimensions();
-  }
-
-  //----------------------------------------------------------------------------
-  void Image::setFill(const std::string& fill)
-  {
-    osg::Vec4 color(1,1,1,1);
-    if(    !fill.empty() // If no color is given default to white
-        && !parseColor(fill, color) )
-      return;
-    setFill(color);
-  }
-
-    //----------------------------------------------------------------------------
-    void Image::setFill(const osg::Vec4& color)
-    {
-        _colors->front() = color;
-        _colors->dirty();
-    }
-
-
-  //----------------------------------------------------------------------------
-  void Image::setOutset(const std::string& outset)
-  {
-    _outset = CSSBorder::parse(outset);
-    _attributes_dirty |= DEST_SIZE;
-  }
-
-  //----------------------------------------------------------------------------
-  void Image::setPreserveAspectRatio(const std::string& scale)
-  {
-    _preserve_aspect_ratio = SVGpreserveAspectRatio::parse(scale);
-    _attributes_dirty |= SRC_RECT;
-  }
-
-  //----------------------------------------------------------------------------
-  void Image::setSourceRect(const SGRect<float>& sourceRect)
-  {
-      _attributes_dirty |= SRC_RECT;
-      _src_rect = sourceRect;
-  }
-
-  //----------------------------------------------------------------------------
-  void Image::setSlice(const std::string& slice)
-  {
-    _slice = CSSBorder::parse(slice);
-    _attributes_dirty |= SRC_RECT | DEST_SIZE;
-  }
-
-  //----------------------------------------------------------------------------
-  void Image::setSliceWidth(const std::string& width)
-  {
-    _slice_width = CSSBorder::parse(width);
-    _attributes_dirty |= DEST_SIZE;
-  }
-
-  //----------------------------------------------------------------------------
-  const SGRect<float>& Image::getRegion() const
-  {
-    return _region;
-  }
-
-  //----------------------------------------------------------------------------
-  bool Image::handleEvent(const EventPtr& event)
-  {
-    bool handled = Element::handleEvent(event);
-
-    CanvasPtr src_canvas = _src_canvas.lock();
-    if( !src_canvas )
-      return handled;
-
-    if( MouseEventPtr mouse_event = dynamic_cast<MouseEvent*>(event.get()) )
-    {
-      mouse_event.reset( new MouseEvent(*mouse_event) );
-
-      mouse_event->client_pos = mouse_event->local_pos
-                              - toOsg(_region.getMin());
-
-      osg::Vec2f size(_region.width(), _region.height());
-      if( _outset.isValid() )
-      {
-        CSSBorder::Offsets outset =
-          _outset.getAbsOffsets(getTextureDimensions());
-
-        mouse_event->client_pos += osg::Vec2f(outset.l, outset.t);
-        size.x() += outset.l + outset.r;
-        size.y() += outset.t + outset.b;
-      }
-
-      // Scale event pos according to canvas view size vs. displayed/screen size
-      mouse_event->client_pos.x() *= src_canvas->getViewWidth() / size.x();
-      mouse_event->client_pos.y() *= src_canvas->getViewHeight()/ size.y();
-      mouse_event->local_pos = mouse_event->client_pos;
-
-      handled |= src_canvas->handleMouseEvent(mouse_event);
-    }
-    else if( KeyboardEventPtr keyboard_event =
-               dynamic_cast<KeyboardEvent*>(event.get()) )
-    {
-      handled |= src_canvas->handleKeyboardEvent(keyboard_event);
-    }
-
-    return handled;
-  }
-
-  //----------------------------------------------------------------------------
-  void Image::updateImpl(double dt)
-  {
-    Element::updateImpl(dt);
+    Element::update(dt);
 
     osg::Texture2D* texture = dynamic_cast<osg::Texture2D*>
     (
       _geom->getOrCreateStateSet()
            ->getTextureAttribute(0, osg::StateAttribute::TEXTURE)
     );
-    auto canvas = _src_canvas.lock();
+    simgear::canvas::CanvasPtr canvas = _src_canvas.lock();
 
     if(    (_attributes_dirty & SRC_CANVAS)
            // check if texture has changed (eg. due to resizing)
@@ -586,6 +400,175 @@ namespace canvas
     }
   }
 
+  //----------------------------------------------------------------------------
+  void Image::valueChanged(SGPropertyNode* child)
+  {
+    // If the image is switched from invisible to visible, and it shows a
+    // canvas, we need to delay showing it by one frame to ensure the canvas is
+    // updated before the image is displayed.
+    //
+    // As canvas::Element handles and filters changes to the "visible" property
+    // we can not check this in Image::childChanged but instead have to override
+    // Element::valueChanged.
+    if(    !isVisible()
+        && child->getParent() == _node
+        && child->getNameString() == "visible"
+        && child->getBoolValue() )
+    {
+      CullCallback* cb =
+#if OSG_VERSION_LESS_THAN(3,3,2)
+        static_cast<CullCallback*>
+#else
+        dynamic_cast<CullCallback*>
+#endif
+        ( _geom->getCullCallback() );
+
+      if( cb )
+        cb->cullNextFrame();
+    }
+
+    Element::valueChanged(child);
+  }
+
+  //----------------------------------------------------------------------------
+  void Image::setSrcCanvas(CanvasPtr canvas)
+  {
+    CanvasPtr src_canvas = _src_canvas.lock(),
+              self_canvas = _canvas.lock();
+
+    if( src_canvas )
+      src_canvas->removeParentCanvas(self_canvas);
+    if( self_canvas )
+      self_canvas->removeChildCanvas(src_canvas);
+
+    _src_canvas = src_canvas = canvas;
+    _attributes_dirty |= SRC_CANVAS;
+    _geom->setCullCallback(canvas ? new CullCallback(canvas) : 0);
+
+    if( src_canvas )
+    {
+      setupDefaultDimensions();
+
+      if( self_canvas )
+      {
+        self_canvas->addChildCanvas(src_canvas);
+        src_canvas->addParentCanvas(self_canvas);
+      }
+    }
+  }
+
+  //----------------------------------------------------------------------------
+  CanvasWeakPtr Image::getSrcCanvas() const
+  {
+    return _src_canvas;
+  }
+
+  //----------------------------------------------------------------------------
+  void Image::setImage(osg::ref_ptr<osg::Image> img)
+  {
+    // remove canvas...
+    setSrcCanvas( CanvasPtr() );
+
+    _texture->setResizeNonPowerOfTwoHint(false);
+    _texture->setImage(img);
+    _texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+    _texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+    _geom->getOrCreateStateSet()
+         ->setTextureAttributeAndModes(0, _texture);
+
+    if( img )
+      setupDefaultDimensions();
+  }
+
+  //----------------------------------------------------------------------------
+  void Image::setFill(const std::string& fill)
+  {
+    osg::Vec4 color(1,1,1,1);
+    if(    !fill.empty() // If no color is given default to white
+        && !parseColor(fill, color) )
+      return;
+
+    _colors->front() = color;
+    _colors->dirty();
+  }
+
+  //----------------------------------------------------------------------------
+  void Image::setOutset(const std::string& outset)
+  {
+    _outset = CSSBorder::parse(outset);
+    _attributes_dirty |= DEST_SIZE;
+  }
+
+  //----------------------------------------------------------------------------
+  void Image::setPreserveAspectRatio(const std::string& scale)
+  {
+    _preserve_aspect_ratio = SVGpreserveAspectRatio::parse(scale);
+    _attributes_dirty |= SRC_RECT;
+  }
+
+  //----------------------------------------------------------------------------
+  void Image::setSlice(const std::string& slice)
+  {
+    _slice = CSSBorder::parse(slice);
+    _attributes_dirty |= SRC_RECT | DEST_SIZE;
+  }
+
+  //----------------------------------------------------------------------------
+  void Image::setSliceWidth(const std::string& width)
+  {
+    _slice_width = CSSBorder::parse(width);
+    _attributes_dirty |= DEST_SIZE;
+  }
+
+  //----------------------------------------------------------------------------
+  const SGRect<float>& Image::getRegion() const
+  {
+    return _region;
+  }
+
+  //----------------------------------------------------------------------------
+  bool Image::handleEvent(const EventPtr& event)
+  {
+    bool handled = Element::handleEvent(event);
+
+    CanvasPtr src_canvas = _src_canvas.lock();
+    if( !src_canvas )
+      return handled;
+
+    if( MouseEventPtr mouse_event = dynamic_cast<MouseEvent*>(event.get()) )
+    {
+      mouse_event.reset( new MouseEvent(*mouse_event) );
+
+      mouse_event->client_pos = mouse_event->local_pos
+                              - toOsg(_region.getMin());
+
+      osg::Vec2f size(_region.width(), _region.height());
+      if( _outset.isValid() )
+      {
+        CSSBorder::Offsets outset =
+          _outset.getAbsOffsets(getTextureDimensions());
+
+        mouse_event->client_pos += osg::Vec2f(outset.l, outset.t);
+        size.x() += outset.l + outset.r;
+        size.y() += outset.t + outset.b;
+      }
+
+      // Scale event pos according to canvas view size vs. displayed/screen size
+      mouse_event->client_pos.x() *= src_canvas->getViewWidth() / size.x();
+      mouse_event->client_pos.y() *= src_canvas->getViewHeight()/ size.y();
+      mouse_event->local_pos = mouse_event->client_pos;
+
+      handled |= src_canvas->handleMouseEvent(mouse_event);
+    }
+    else if( KeyboardEventPtr keyboard_event =
+               dynamic_cast<KeyboardEvent*>(event.get()) )
+    {
+      handled |= src_canvas->handleKeyboardEvent(keyboard_event);
+    }
+
+    return handled;
+  }
+
   //----------------------------------------------------------------------------
   void Image::childChanged(SGPropertyNode* child)
   {
@@ -636,9 +619,7 @@ namespace canvas
       // Abort pending request
       if( _http_request )
       {
-        Canvas::getSystemAdapter()
-          ->getHTTPClient()
-          ->cancelRequest(_http_request, "setting new image");
+          Canvas::getSystemAdapter()->getHTTPClient()->cancelRequest(_http_request, "setting new image");
         _http_request.reset();
       }
 
@@ -838,143 +819,5 @@ namespace canvas
     return false;
   }
 
-  void Image::fillRect(const SGRect<int>& rect, const std::string& c)
-  {
-    osg::Vec4 color(1,1,1,1);
-    if(!c.empty() && !parseColor(c, color))
-      return;
-    
-    fillRect(rect, color);
-  }
-
-void fillRow(GLubyte* row, GLuint pixel, GLuint width, GLuint pixelBytes)
-{
-  GLubyte* dst = row;
-  for (GLuint x = 0; x < width; ++x) {
-    memcpy(dst, &pixel, pixelBytes);
-    dst += pixelBytes;
-  }
-}
-
-SGRect<int> intersectRect(const SGRect<int>& a, const SGRect<int>& b)
-{
-  SGVec2<int> m1 = max(a.getMin(), b.getMin());
-  SGVec2<int> m2 = min(a.getMax(), b.getMax());
-  return SGRect<int>(m1, m2);
-}
-
-  void Image::fillRect(const SGRect<int>& rect, const osg::Vec4& color)
-  {
-    osg::ref_ptr<osg::Image> image = _texture->getImage();
-    if (!image) {
-      allocateImage();
-      image = _texture->getImage();
-    }
-      
-      if (image->getDataVariance() != osg::Object::DYNAMIC) {
-          image->setDataVariance(osg::Object::DYNAMIC);
-      }
-      
-    const auto format = image->getInternalTextureFormat();
-    
-    auto clippedRect = intersectRect(rect, SGRect<int>(0, 0, image->s(), image->t()));
-    if ((clippedRect.width() == 0) || (clippedRect.height() == 0)) {
-      return;
-    }
-    
-    GLubyte* rowData = nullptr;
-    size_t rowByteSize = 0;
-    GLuint pixelWidth = clippedRect.width();
-    GLuint pixel = 0;
-    GLuint pixelBytes = 0;
-    
-    switch (format) {
-    case GL_RGBA8:
-    case GL_RGBA:
-        rowByteSize = pixelWidth * 4;
-        rowData = static_cast<GLubyte*>(alloca(rowByteSize));
-        
-        // assume litte-endian, so read out backwards, hence when we memcpy
-        // the data, it ends up in RGBA order
-        pixel = color.asABGR();
-        pixelBytes = 4;
-        fillRow(rowData, pixel, pixelWidth, pixelBytes);
-        break;
-    
-    case GL_RGB8:
-    case GL_RGB:
-        rowByteSize = pixelWidth * 3;
-        rowData = static_cast<GLubyte*>(alloca(rowByteSize));
-        pixel = color.asABGR();
-        pixelBytes = 3;
-        fillRow(rowData, pixel, pixelWidth, pixelBytes);
-        break;
-        
-    default:
-      SG_LOG(SG_IO, SG_WARN, "Image::fillRect: unsupported internal image format:" << format);
-      return;
-    }
-    
-    for (int row=clippedRect.t(); row < clippedRect.b(); ++row) {
-      GLubyte* imageData = image->data(clippedRect.l(), row);
-      memcpy(imageData, rowData, rowByteSize);
-    }
-      
-    image->dirty();
-    auto c = getCanvas().lock();
-    c->enableRendering(true); // force a repaint
-  }
-
-  void Image::setPixel(int x, int y, const std::string& c)
-  {
-    osg::Vec4 color(1,1,1,1);
-    if(!c.empty() && !parseColor(c, color))
-      return;
-    
-    setPixel(x, y, color);
-  }
-
-  void Image::setPixel(int x, int y, const osg::Vec4& color)
-  {
-    osg::ref_ptr<osg::Image> image = _texture->getImage();
-    if (!image) {
-        allocateImage();
-        image = _texture->getImage();
-    }
-     
-    if (image->getDataVariance() != osg::Object::DYNAMIC) {
-      image->setDataVariance(osg::Object::DYNAMIC);
-    }
-      
-    image->setColor(color, x, y);
-  }
-
-    void Image::dirtyPixels()
-    {
-        osg::ref_ptr<osg::Image> image = _texture->getImage();
-        if (!image)
-            return;
-        image->dirty();
-        auto c = getCanvas().lock();
-        c->enableRendering(true); // force a repaint
-    }
-
-  void Image::allocateImage()
-  {
-    osg::Image* image = new osg::Image;
-    // default to RGBA
-    image->allocateImage(_node->getIntValue("size[0]"), _node->getIntValue("size[1]"), 1, GL_RGBA, GL_UNSIGNED_BYTE);
-    image->setInternalTextureFormat(GL_RGBA);
-    _texture->setImage(image);
-  }
-
-
-osg::ref_ptr<osg::Image> Image::getImage() const
-{
-    if (!_texture)
-        return {};
-    return _texture->getImage();
-}
-
 } // namespace canvas
 } // namespace simgear

simgear/canvas/elements/CanvasImage.hxx

@@ -1,5 +1,4 @@
-///@file
-/// An image on the Canvas
+// An image on the Canvas
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -54,14 +53,14 @@ namespace canvas
              ElementWeakPtr parent = 0 );
       virtual ~Image();
 
-      void valueChanged(SGPropertyNode* child) override;
+      virtual void update(double dt);
+      virtual void valueChanged(SGPropertyNode* child);
 
       void setSrcCanvas(CanvasPtr canvas);
       CanvasWeakPtr getSrcCanvas() const;
 
       void setImage(osg::ref_ptr<osg::Image> img);
       void setFill(const std::string& fill);
-      void setFill(const osg::Vec4& color);
 
       /**
        * @see http://www.w3.org/TR/css3-background/#border-image-outset
@@ -94,36 +93,10 @@ namespace canvas
 
       const SGRect<float>& getRegion() const;
 
-      bool handleEvent(const EventPtr& event) override;
+      bool handleEvent(const EventPtr& event);
 
-      /**
-       *
-       */
-      void setSourceRect(const SGRect<float>& sourceRect);
-
-      /**
-       * fill the specified rectangle of the image, with an RGB value
-       */
-      void fillRect(const SGRect<int>& rect, const std::string& color);
-      
-      /**
-       * fill the specified rectangle of the image, with an RGB value
-       */
-      void fillRect(const SGRect<int>& rect, const osg::Vec4& color);
-      
-      void setPixel(int x, int y, const std::string& color);
-      
-      void setPixel(int x, int y, const osg::Vec4& color);
-
-      /**
-        * mark the image pixels as modified, so the canvas is re-painted
-       */
-      void dirtyPixels();
-      
-      osg::ref_ptr<osg::Image> getImage() const;
-      
-    //  void setRow(int row, int offset, )
     protected:
+
       enum ImageAttributes
       {
         SRC_RECT       = LAST_ATTRIBUTE << 1, // Source image rectangle
@@ -131,9 +104,7 @@ namespace canvas
         SRC_CANVAS     = DEST_SIZE << 1
       };
 
-      void updateImpl(double dt) override;
-
-      void childChanged(SGPropertyNode * child) override;
+      virtual void childChanged(SGPropertyNode * child);
 
       void setupDefaultDimensions();
       SGRect<int> getTextureDimensions() const;
@@ -147,8 +118,6 @@ namespace canvas
                       HTTP::Request& request,
                       const std::string& type );
 
-      void allocateImage();
-      
       osg::ref_ptr<osg::Texture2D> _texture;
       // TODO optionally forward events to canvas
       CanvasWeakPtr _src_canvas;
@@ -160,9 +129,9 @@ namespace canvas
       osg::ref_ptr<osg::Vec2Array> _texCoords;
       osg::ref_ptr<osg::Vec4Array> _colors;
 
-      SGPropertyNode *_node_src_rect = nullptr;
-      SGRect<float>   _src_rect {0, 0},
-                      _region   {0, 0};
+      SGPropertyNode *_node_src_rect;
+      SGRect<float>   _src_rect,
+                      _region;
 
       SVGpreserveAspectRatio _preserve_aspect_ratio;
 

simgear/canvas/elements/CanvasMap.cxx

@@ -1,6 +1,5 @@
-///@file
-/// A group of 2D Canvas elements which get automatically transformed according
-/// to the map parameters.
+// A group of 2D Canvas elements which get automatically transformed according
+// to the map parameters.
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -18,16 +17,14 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "CanvasMap.hxx"
 #include "map/geo_node_pair.hxx"
 #include "map/projection.hxx"
 
-#include <simgear/misc/strutils.hxx>
-
 #include <cmath>
 
+#include <boost/algorithm/string/predicate.hpp>
+
 #define LOG_GEO_RET(msg) \
   {\
     SG_LOG\
@@ -49,12 +46,6 @@ namespace canvas
   const std::string GEO = "-geo";
   const std::string HDG = "hdg";
   const std::string Map::TYPE_NAME = "map";
-  const std::string WEB_MERCATOR = "webmercator";
-  const std::string REF_LAT = "ref-lat";
-  const std::string REF_LON = "ref-lon";
-  const std::string SCREEN_RANGE = "screen-range";
-  const std::string RANGE = "range";
-  const std::string PROJECTION = "projection";
 
   //----------------------------------------------------------------------------
   void Map::staticInit()
@@ -72,11 +63,12 @@ namespace canvas
             const SGPropertyNode_ptr& node,
             const Style& parent_style,
             ElementWeakPtr parent ):
-    Group(canvas, node, parent_style, parent)
+    Group(canvas, node, parent_style, parent),
+    // TODO make projection configurable
+    _projection(new SansonFlamsteedProjection),
+    _projection_dirty(true)
   {
     staticInit();
-
-    projectionNodeChanged(node->getChild(PROJECTION));
   }
 
   //----------------------------------------------------------------------------
@@ -86,49 +78,42 @@ namespace canvas
   }
 
   //----------------------------------------------------------------------------
-  void Map::updateImpl(double dt)
+  void Map::update(double dt)
   {
-    Group::updateImpl(dt);
-
-    for(auto& it: _geo_nodes)
+    for( GeoNodes::iterator it = _geo_nodes.begin();
+         it != _geo_nodes.end();
+         ++it )
     {
-      GeoNodePair* geo_node = it.second.get();
+      GeoNodePair* geo_node = it->second.get();
       if(    !geo_node->isComplete()
           || (!geo_node->isDirty() && !_projection_dirty) )
         continue;
 
-      double latD = -9999.0, lonD = -9999.0;
-      if (geo_node->isDirty()) {
-        GeoCoord lat = parseGeoCoord(geo_node->getLat());
-        if( lat.type != GeoCoord::LATITUDE )
-          continue;
-        
-        GeoCoord lon = parseGeoCoord(geo_node->getLon());
-        if( lon.type != GeoCoord::LONGITUDE )
-          continue;
-        
-        // save the parsed values so we can re-use them if only projection
-        // is changed (very common case for moving vehicle)
-        latD = lat.value;
-        lonD = lon.value;
-        geo_node->setCachedLatLon(std::make_pair(latD, lonD));
-      } else {
-        std::tie(latD, lonD) = geo_node->getCachedLatLon();
-      }
-      
-      Projection::ScreenPosition pos = _projection->worldToScreen(latD, lonD);
+      GeoCoord lat = parseGeoCoord(geo_node->getLat());
+      if( lat.type != GeoCoord::LATITUDE )
+        continue;
+
+      GeoCoord lon = parseGeoCoord(geo_node->getLon());
+      if( lon.type != GeoCoord::LONGITUDE )
+        continue;
+
+      Projection::ScreenPosition pos =
+        _projection->worldToScreen(lat.value, lon.value);
+
       geo_node->setScreenPos(pos.x, pos.y);
 
 //      geo_node->print();
       geo_node->setDirty(false);
     }
     _projection_dirty = false;
+
+    Group::update(dt);
   }
 
   //----------------------------------------------------------------------------
   void Map::childAdded(SGPropertyNode* parent, SGPropertyNode* child)
   {
-    if( strutils::ends_with(child->getNameString(), GEO) )
+    if( boost::ends_with(child->getNameString(), GEO) )
       _geo_nodes[child].reset(new GeoNodePair());
     else if( parent != _node && child->getNameString() == HDG )
       _hdg_nodes.insert(child);
@@ -139,7 +124,7 @@ namespace canvas
   //----------------------------------------------------------------------------
   void Map::childRemoved(SGPropertyNode* parent, SGPropertyNode* child)
   {
-    if( strutils::ends_with(child->getNameString(), GEO) )
+    if( boost::ends_with(child->getNameString(), GEO) )
       // TODO remove from other node
       _geo_nodes.erase(child);
     else if( parent != _node && child->getName() == HDG )
@@ -161,7 +146,7 @@ namespace canvas
     {
       const std::string& name = child->getNameString();
 
-      if( strutils::ends_with(name, GEO) )
+      if( boost::ends_with(name, GEO) )
         return geoNodeChanged(child);
       else if( name == HDG )
         return hdgNodeChanged(child);
@@ -176,10 +161,10 @@ namespace canvas
     if( child->getParent() != _node )
       return Group::childChanged(child);
 
-    if(    child->getNameString() == REF_LAT
-        || child->getNameString() == REF_LON )
-      _projection->setWorldPosition( _node->getDoubleValue(REF_LAT),
-                                     _node->getDoubleValue(REF_LON) );
+    if(    child->getNameString() == "ref-lat"
+        || child->getNameString() == "ref-lon" )
+      _projection->setWorldPosition( _node->getDoubleValue("ref-lat"),
+                                     _node->getDoubleValue("ref-lon") );
     else if( child->getNameString() == HDG )
     {
       _projection->setOrientation(child->getFloatValue());
@@ -188,43 +173,16 @@ namespace canvas
                            ++it )
         hdgNodeChanged(*it);
     }
-    else if( child->getNameString() == RANGE )
+    else if( child->getNameString() == "range" )
       _projection->setRange(child->getDoubleValue());
-    else if( child->getNameString() == SCREEN_RANGE )
+    else if( child->getNameString() == "screen-range" )
       _projection->setScreenRange(child->getDoubleValue());
-    else if( child->getNameString() == PROJECTION )
-      projectionNodeChanged(child);
     else
       return Group::childChanged(child);
 
     _projection_dirty = true;
   }
 
-  //----------------------------------------------------------------------------
-  void Map::projectionNodeChanged(SGPropertyNode* child)
-  {
-    if(child && child->getStringValue() == WEB_MERCATOR)
-      _projection = std::make_shared<WebMercatorProjection>();
-    else
-      _projection = std::make_shared<SansonFlamsteedProjection>();
-
-    _projection->setWorldPosition(_node->getDoubleValue(REF_LAT),
-                                  _node->getDoubleValue(REF_LON));
-
-    // Only set existing properties to prevent using 0 instead of default values
-
-    if( auto heading = _node->getChild(HDG) )
-      _projection->setOrientation(heading->getFloatValue());
-
-    if( auto screen_range = _node->getChild(SCREEN_RANGE) )
-      _projection->setScreenRange(screen_range->getDoubleValue());
-
-    if( auto range = _node->getChild(RANGE) )
-      _projection->setRange(range->getDoubleValue());
-
-    _projection_dirty = true;
-  }
-
   //----------------------------------------------------------------------------
   void Map::geoNodeChanged(SGPropertyNode* child)
   {

simgear/canvas/elements/CanvasMap.hxx

@@ -1,6 +1,5 @@
-///@file
-/// A group of 2D Canvas elements which get automatically transformed according
-/// to the map parameters.
+// A group of 2D Canvas elements which get automatically transformed according
+// to the map parameters.
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -23,9 +22,9 @@
 
 #include "CanvasGroup.hxx"
 
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
+#include <boost/shared_ptr.hpp>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
 
 namespace simgear
 {
@@ -46,39 +45,45 @@ namespace canvas
            ElementWeakPtr parent = 0 );
       virtual ~Map();
 
+      virtual void update(double dt);
+
+      virtual void childAdded( SGPropertyNode * parent,
+                               SGPropertyNode * child );
+      virtual void childRemoved( SGPropertyNode * parent,
+                                 SGPropertyNode * child );
+      virtual void valueChanged(SGPropertyNode * child);
+
     protected:
-      void updateImpl(double dt) override;
 
-      void updateProjection(SGPropertyNode* type_node);
+      virtual void childChanged(SGPropertyNode * child);
 
-      void childAdded(SGPropertyNode* parent, SGPropertyNode* child) override;
-      void childRemoved(SGPropertyNode* parent, SGPropertyNode* child) override;
-      void valueChanged(SGPropertyNode* child) override;
-      void childChanged(SGPropertyNode* child) override;
-
-      using GeoNodes =
-        std::unordered_map<SGPropertyNode*, std::shared_ptr<GeoNodePair>>;
-      using NodeSet = std::unordered_set<SGPropertyNode*>;
+      typedef boost::unordered_map< SGPropertyNode*,
+                                    boost::shared_ptr<GeoNodePair>
+                                  > GeoNodes;
+      typedef boost::unordered_set<SGPropertyNode*> NodeSet;
 
       GeoNodes _geo_nodes;
       NodeSet  _hdg_nodes;
-      std::shared_ptr<HorizontalProjection> _projection;
-      bool _projection_dirty = false;
+      boost::shared_ptr<HorizontalProjection> _projection;
+      bool _projection_dirty;
 
       struct GeoCoord
       {
+        GeoCoord():
+          type(INVALID),
+          value(0)
+        {}
         enum
         {
           INVALID,
           LATITUDE,
           LONGITUDE
-        } type = INVALID;
-        double value = 0;
+        } type;
+        double value;
       };
 
-      void projectionNodeChanged(SGPropertyNode* child);
-      void geoNodeChanged(SGPropertyNode* child);
-      void hdgNodeChanged(SGPropertyNode* child);
+      void geoNodeChanged(SGPropertyNode * child);
+      void hdgNodeChanged(SGPropertyNode * child);
 
       GeoCoord parseGeoCoord(const std::string& val) const;
   };

simgear/canvas/elements/CanvasPath.cxx

@@ -1,5 +1,4 @@
-///@file
-/// An OpenVG path on the Canvas
+// An OpenVG path on the Canvas
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,18 +16,14 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "CanvasPath.hxx"
 #include <simgear/scene/util/parse_color.hxx>
-#include <simgear/misc/strutils.hxx>
 
 #include <osg/Drawable>
 #include <osg/Version>
 
 #include <vg/openvg.h>
 #include <cassert>
-#include <cctype>
 
 namespace simgear
 {
@@ -62,158 +57,21 @@ namespace canvas
    */
   std::vector<float> splitAndConvert(const char del[], const std::string& str);
 
-    static float parseCSSNumber(const std::string& s)
-    {
-        if (strutils::ends_with(s, "px")) {
-            return std::stof(s.substr(0, s.length() - 2));
-        } else if (s.back() == '%') {
-            float f = std::stof(s.substr(0, s.length() - 1));
-            return f / 100.0f;
-        }
-        return std::stof(s);
-    }
-
-    //----------------------------------------------------------------------------
-    static bool parseSVGPathToVGPath(const std::string& svgPath, CmdList& commands, CoordList& coords)
-    {
-        const string_list& tokens = simgear::strutils::split_on_any_of(svgPath, "\t \n\r,");
-        char activeSVGCommand = 0;
-        bool isRelative = false;
-        int tokensNeeded = 0;
-
-        for (auto it = tokens.begin(); it != tokens.end(); ) {
-            // set up the new command data
-            if ((it->size() == 1) && std::isalpha(it->at(0))) {
-                const char svgCommand = std::toupper(it->at(0));
-                isRelative = std::islower(it->at(0));
-                switch (svgCommand) {
-                case 'Z':
-                        tokensNeeded = 0;
-                        break;
-                case 'M':
-                case 'L':
-                case 'T':
-                        tokensNeeded = 2;
-                        break;
-                case 'H':
-                case 'V':
-                        tokensNeeded = 1;
-                        break;
-                case 'C':
-                        tokensNeeded = 6;
-                        break;
-                case 'S':
-                case 'Q':
-                        tokensNeeded = 4;
-                        break;
-                case 'A':
-                        tokensNeeded = 7;
-                        break;
-                default:
-                    SG_LOG(SG_GENERAL, SG_WARN, "unrecognized SVG path command: "
-                           << *it << " at token " <<  std::distance(tokens.begin(), it));
-                    return false;
-                }
-
-                activeSVGCommand = svgCommand;
-                ++it; // advance to first coordinate token
-            }
-
-            const int numTokensRemaining = std::distance(it, tokens.end());
-            if (numTokensRemaining < tokensNeeded) {
-                SG_LOG(SG_GENERAL, SG_WARN, "insufficent SVG path tokens");
-                return false;
-            }
-
-            bool pushTokensDirectly = true;
-            if (activeSVGCommand == 'Z') {
-                commands.push_back(VG_CLOSE_PATH);
-                activeSVGCommand = 0;
-            } else if (activeSVGCommand == 'M') {
-                commands.push_back(VG_MOVE_TO | isRelative);
-                activeSVGCommand = 'L';
-            } else if (activeSVGCommand == 'L') {
-                commands.push_back(VG_LINE_TO | isRelative);
-            } else if (activeSVGCommand == 'H') {
-                commands.push_back(VG_HLINE_TO | isRelative);
-            } else if (activeSVGCommand == 'V') {
-                commands.push_back(VG_HLINE_TO | isRelative);
-            } else if (activeSVGCommand == 'C') {
-                commands.push_back(VG_CUBIC_TO | isRelative);
-            } else if (activeSVGCommand == 'S') {
-                commands.push_back(VG_SCUBIC_TO | isRelative);
-            } else if (activeSVGCommand == 'Q') {
-                commands.push_back(VG_SCUBIC_TO | isRelative);
-            } else if (activeSVGCommand == 'T') {
-                commands.push_back(VG_SCUBIC_TO | isRelative);
-            } else if (activeSVGCommand == 'A') {
-                pushTokensDirectly = false; // deal with tokens manually
-                coords.push_back(parseCSSNumber(*it++)); // rx
-                coords.push_back(parseCSSNumber(*it++)); // ry
-                coords.push_back(parseCSSNumber(*it++)); // x-axis rotation
-
-                const bool isLargeArc = std::stoi(*it++); // large-angle
-                const bool isCCW = std::stoi(*it++); // sweep-flag
-
-                int vgCmd = isLargeArc ? (isCCW ? VG_LCCWARC_TO : VG_LCWARC_TO) :
-                    (isCCW ? VG_SCCWARC_TO : VG_SCWARC_TO);
-
-                coords.push_back(parseCSSNumber(*it++));
-                coords.push_back(parseCSSNumber(*it++));
-                commands.push_back(vgCmd | isRelative);
-            } else {
-                SG_LOG(SG_GENERAL, SG_WARN, "malformed SVG path string: expected a command at token:"
-                       << std::distance(tokens.begin(), it) << " :" << *it);
-                return false;
-            }
-
-            if (pushTokensDirectly) {
-                for (int i=0; i<tokensNeeded;++i) {
-                    coords.push_back(parseCSSNumber(*it++));
-                }
-            }
-        } // of tokens iteration
-
-        return true;
-    }
-
-
-    //---------------------------------------------------------------------------
-
-    static SGVec2f parseRectCornerRadius(SGPropertyNode* node, const std::string& xDir, const std::string& yDir, bool& haveCorner)
-    {
-        haveCorner = false;
-        std::string propName = "border-" + yDir + "-" + xDir + "-radius";
-        if (!node->hasChild(propName)) {
-            propName = "border-" + yDir + "-radius";
-            if (!node->hasChild(propName)) {
-                propName = "border-radius";
-            }
-        }
-
-        PropertyList props = node->getChildren(propName);
-        if (props.size() == 1) {
-            double r = props.at(0)->getDoubleValue(propName);
-            haveCorner = true;
-            return SGVec2f(r, r);
-        }
-
-        if (props.size() >= 2 ) {
-            haveCorner = true;
-            return SGVec2f(props.at(0)->getDoubleValue(),
-                           props.at(1)->getDoubleValue());
-        }
-
-        return SGVec2f(-1.0f, -1.0f);
-    }
-
-  //----------------------------------------------------------------------------
   class Path::PathDrawable:
     public osg::Drawable
   {
     public:
       PathDrawable(Path* path):
-        _path_element(path)
+        _path_element(path),
+        _path(VG_INVALID_HANDLE),
+        _paint(VG_INVALID_HANDLE),
+        _paint_fill(VG_INVALID_HANDLE),
+        _attributes_dirty(~0),
+        _mode(0),
+        _fill_rule(VG_EVEN_ODD),
+        _stroke_width(1),
+        _stroke_linecap(VG_CAP_BUTT),
+        _stroke_linejoin(VG_JOIN_MITER)
       {
         setSupportsDisplayList(false);
         setDataVariance(Object::DYNAMIC);
@@ -231,12 +89,9 @@ namespace canvas
           vgDestroyPaint(_paint_fill);
       }
 
-      const char* className() const override
-      { return "PathDrawable"; }
-      osg::Object* cloneType() const override
-      { return new PathDrawable(_path_element); }
-      osg::Object* clone(const osg::CopyOp&) const override
-      { return new PathDrawable(_path_element); }
+      virtual const char* className() const { return "PathDrawable"; }
+      virtual osg::Object* cloneType() const { return new PathDrawable(_path_element); }
+      virtual osg::Object* clone(const osg::CopyOp&) const { return new PathDrawable(_path_element); }
 
       /**
        * Replace the current path segments with the new ones
@@ -277,16 +132,6 @@ namespace canvas
         }
       }
 
-      /**
-       * Set path fill opacity (Only used if fill is not "none")
-       */
-      void setFillOpacity(float opacity)
-      {
-        _fill_opacity =
-          static_cast<uint8_t>(SGMiscf::clip(opacity, 0.f, 1.f) * 255);
-        _attributes_dirty |= FILL_COLOR;
-      }
-
       /**
        * Set path fill rule ("pseudo-nonzero" or "evenodd")
        *
@@ -314,7 +159,7 @@ namespace canvas
         else if( parseColor(stroke, _stroke_color) )
         {
           _mode |= VG_STROKE_PATH;
-          _attributes_dirty |= STROKE_COLOR;
+                    _attributes_dirty |= STROKE_COLOR;
         }
         else
         {
@@ -327,16 +172,6 @@ namespace canvas
         }
       }
 
-      /**
-       * Set path stroke opacity (only used if stroke is not "none")
-       */
-      void setStrokeOpacity(float opacity)
-      {
-        _stroke_opacity =
-          static_cast<uint8_t>(SGMiscf::clip(opacity, 0.f, 1.f) * 255);
-        _attributes_dirty |= STROKE_COLOR;
-      }
-
       /**
        * Set stroke width
        */
@@ -387,7 +222,7 @@ namespace canvas
       /**
        * Draw callback
        */
-      void drawImplementation(osg::RenderInfo& renderInfo) const override
+      virtual void drawImplementation(osg::RenderInfo& renderInfo) const
       {
         if( _attributes_dirty & PATH )
           return;
@@ -404,22 +239,31 @@ namespace canvas
         osg::StateAttribute const* blend_func =
           state->getLastAppliedAttribute(osg::StateAttribute::BLENDFUNC);
 
+        // Initialize/Update the paint
+        if( _attributes_dirty & STROKE_COLOR )
+        {
+          if( _paint == VG_INVALID_HANDLE )
+            _paint = vgCreatePaint();
+
+          vgSetParameterfv(_paint, VG_PAINT_COLOR, 4, _stroke_color._v);
+
+          _attributes_dirty &= ~STROKE_COLOR;
+        }
+
+        // Initialize/update fill paint
+        if( _attributes_dirty & FILL_COLOR )
+        {
+          if( _paint_fill == VG_INVALID_HANDLE )
+            _paint_fill = vgCreatePaint();
+
+          vgSetParameterfv(_paint_fill, VG_PAINT_COLOR, 4, _fill_color._v);
+
+          _attributes_dirty &= ~FILL_COLOR;
+        }
+
         // Setup paint
         if( _mode & VG_STROKE_PATH )
         {
-          // Initialize/Update the paint
-          if( _attributes_dirty & STROKE_COLOR )
-          {
-            if( _paint == VG_INVALID_HANDLE )
-              _paint = vgCreatePaint();
-
-            auto color = _stroke_color;
-            color.a() *= _stroke_opacity / 255.f;
-            vgSetParameterfv(_paint, VG_PAINT_COLOR, 4, color._v);
-
-            _attributes_dirty &= ~STROKE_COLOR;
-          }
-
           vgSetPaint(_paint, VG_STROKE_PATH);
 
           vgSetf(VG_STROKE_LINE_WIDTH, _stroke_width);
@@ -431,19 +275,6 @@ namespace canvas
         }
         if( _mode & VG_FILL_PATH )
         {
-          // Initialize/update fill paint
-          if( _attributes_dirty & FILL_COLOR )
-          {
-            if( _paint_fill == VG_INVALID_HANDLE )
-              _paint_fill = vgCreatePaint();
-
-            auto color = _fill_color;
-            color.a() *= _fill_opacity / 255.f;
-            vgSetParameterfv(_paint_fill, VG_PAINT_COLOR, 4, color._v);
-
-            _attributes_dirty &= ~FILL_COLOR;
-          }
-
           vgSetPaint(_paint_fill, VG_FILL_PATH);
 
           vgSeti(VG_FILL_RULE, _fill_rule);
@@ -559,13 +390,13 @@ namespace canvas
       /**
        * Compute the bounding box
        */
-      osg::BoundingBox
+      virtual osg::BoundingBox
 #if OSG_VERSION_LESS_THAN(3,3,2)
       computeBound()
 #else
       computeBoundingBox()
 #endif
-      const override
+      const
       {
         if( _path == VG_INVALID_HANDLE || (_attributes_dirty & PATH) )
           return osg::BoundingBox();
@@ -597,24 +428,22 @@ namespace canvas
 
       Path *_path_element;
 
-      mutable VGPath    _path {VG_INVALID_HANDLE};
-      mutable VGPaint   _paint {VG_INVALID_HANDLE};
-      mutable VGPaint   _paint_fill {VG_INVALID_HANDLE};
-      mutable uint32_t  _attributes_dirty {~0u};
+      mutable VGPath    _path;
+      mutable VGPaint   _paint;
+      mutable VGPaint   _paint_fill;
+      mutable uint32_t  _attributes_dirty;
 
       CmdList   _cmds;
       CoordList _coords;
 
-      VGbitfield            _mode {0};
+      VGbitfield            _mode;
       osg::Vec4f            _fill_color;
-      uint8_t               _fill_opacity {255};
-      VGFillRule            _fill_rule {VG_EVEN_ODD};
+      VGFillRule            _fill_rule;
       osg::Vec4f            _stroke_color;
-      uint8_t               _stroke_opacity {255};
-      VGfloat               _stroke_width {1};
+      VGfloat               _stroke_width;
       std::vector<VGfloat>  _stroke_dash;
-      VGCapStyle            _stroke_linecap {VG_CAP_BUTT};
-      VGJoinStyle           _stroke_linejoin {VG_JOIN_MITER};
+      VGCapStyle            _stroke_linecap;
+      VGJoinStyle            _stroke_linejoin;
 
       osg::Vec3f transformPoint( const osg::Matrix& m,
                                  osg::Vec2f pos ) const
@@ -671,7 +500,7 @@ namespace canvas
       struct PathUpdateCallback:
         public osg::Drawable::UpdateCallback
       {
-        void update(osg::NodeVisitor*, osg::Drawable* drawable) override
+        virtual void update(osg::NodeVisitor*, osg::Drawable* drawable)
         {
           static_cast<PathDrawable*>(drawable)->update();
         }
@@ -690,10 +519,8 @@ namespace canvas
     PathDrawableRef Path::*path = &Path::_path;
 
     addStyle("fill", "color", &PathDrawable::setFill, path);
-    addStyle("fill-opacity", "numeric", &PathDrawable::setFillOpacity, path);
     addStyle("fill-rule", "", &PathDrawable::setFillRule, path);
     addStyle("stroke", "color", &PathDrawable::setStroke, path);
-    addStyle("stroke-opacity", "numeric", &PathDrawable::setStrokeOpacity, path);
     addStyle("stroke-width", "numeric", &PathDrawable::setStrokeWidth, path);
     addStyle("stroke-dasharray", "", &PathDrawable::setStrokeDashArray, path);
     addStyle("stroke-linecap", "", &PathDrawable::setStrokeLinecap, path);
@@ -706,9 +533,7 @@ namespace canvas
               const Style& parent_style,
               ElementWeakPtr parent ):
     Element(canvas, node, parent_style, parent),
-    _path( new PathDrawable(this) ),
-    _hasSVG(false),
-    _hasRect(false)
+    _path( new PathDrawable(this) )
   {
     staticInit();
 
@@ -722,69 +547,75 @@ namespace canvas
 
   }
 
+  //----------------------------------------------------------------------------
+  void Path::update(double dt)
+  {
+    if( _attributes_dirty & (CMDS | COORDS) )
+    {
+      _path->setSegments
+      (
+        _node->getChildValues<VGubyte, int>("cmd"),
+        _node->getChildValues<VGfloat, float>("coord")
+      );
+
+      _attributes_dirty &= ~(CMDS | COORDS);
+    }
+
+    Element::update(dt);
+  }
+
   //----------------------------------------------------------------------------
   osg::BoundingBox Path::getTransformedBounds(const osg::Matrix& m) const
   {
     return _path->getTransformedBounds(m);
   }
 
-  //----------------------------------------------------------------------------
-  Path& Path::addSegment(uint8_t cmd, std::initializer_list<float> coords)
-  {
-    _node->addChild("cmd")->setIntValue(cmd);
-
-    for(float coord: coords)
-      _node->addChild("coord")->setFloatValue(coord);
-
-    return *this;
-  }
-
   //----------------------------------------------------------------------------
   Path& Path::moveTo(float x_abs, float y_abs)
   {
-    return addSegment(VG_MOVE_TO_ABS, {x_abs, y_abs});
+    return addSegment(VG_MOVE_TO_ABS, x_abs, y_abs);
   }
 
   //----------------------------------------------------------------------------
   Path& Path::move(float x_rel, float y_rel)
   {
-    return addSegment(VG_MOVE_TO_REL, {x_rel, y_rel});
+    return addSegment(VG_MOVE_TO_REL, x_rel, y_rel);
   }
 
   //----------------------------------------------------------------------------
   Path& Path::lineTo(float x_abs, float y_abs)
   {
-    return addSegment(VG_LINE_TO_ABS, {x_abs, y_abs});
+    return addSegment(VG_LINE_TO_ABS, x_abs, y_abs);
   }
 
   //----------------------------------------------------------------------------
   Path& Path::line(float x_rel, float y_rel)
   {
-    return addSegment(VG_LINE_TO_REL, {x_rel, y_rel});
+    return addSegment(VG_LINE_TO_REL, x_rel, y_rel);
   }
 
   //----------------------------------------------------------------------------
   Path& Path::horizTo(float x_abs)
   {
-    return addSegment(VG_HLINE_TO_ABS, {x_abs});
+    return addSegment(VG_HLINE_TO_ABS, x_abs);
   }
 
   //----------------------------------------------------------------------------
   Path& Path::horiz(float x_rel)
   {
-    return addSegment(VG_HLINE_TO_REL, {x_rel});
+    return addSegment(VG_HLINE_TO_REL, x_rel);
   }
 
   //----------------------------------------------------------------------------
   Path& Path::vertTo(float y_abs)
   {
-    return addSegment(VG_VLINE_TO_ABS, {y_abs});
+    return addSegment(VG_VLINE_TO_ABS, y_abs);
   }
 
   //----------------------------------------------------------------------------
   Path& Path::vert(float y_rel)
   {
-    return addSegment(VG_VLINE_TO_REL, {y_rel});
+    return addSegment(VG_VLINE_TO_REL, y_rel);
   }
 
   //----------------------------------------------------------------------------
@@ -799,111 +630,16 @@ namespace canvas
     childChanged(child);
   }
 
-  //----------------------------------------------------------------------------
-  void Path::setSVGPath(const std::string& svgPath)
-  {
-    _node->setStringValue("svg", svgPath);
-    _hasSVG = true;
-    _attributes_dirty |= SVG;
-  }
-
-  //----------------------------------------------------------------------------
-  void Path::setRect(const SGRect<float> &r)
-  {
-    _rect = r;
-    _hasRect = true;
-    _attributes_dirty |= RECT;
-  }
-
-  //----------------------------------------------------------------------------
-  void Path::setRoundRect(const SGRect<float> &r, float radiusX, float radiusY)
-  {
-    if (radiusY < 0.0) {
-        radiusY = radiusX;
-    }
-
-    setRect(r);
-    _node->getChild("border-radius", 0, true)->setDoubleValue(radiusX);
-    _node->getChild("border-radius", 1, true)->setDoubleValue(radiusY);
-  }
-
-  //----------------------------------------------------------------------------
-  void Path::updateImpl(double dt)
-  {
-    Element::updateImpl(dt);
-
-    if( _attributes_dirty & (CMDS | COORDS) )
-    {
-      _path->setSegments
-      (
-        _node->getChildValues<VGubyte, int>("cmd"),
-        _node->getChildValues<VGfloat, float>("coord")
-      );
-
-      _attributes_dirty &= ~(CMDS | COORDS);
-    }
-
-    // SVG path overrides manual cmd/coord specification
-    if( _hasSVG && (_attributes_dirty & SVG) )
-    {
-      CmdList cmds;
-      CoordList coords;
-      parseSVGPathToVGPath(_node->getStringValue("svg"), cmds, coords);
-      _path->setSegments(cmds, coords);
-      _attributes_dirty &= ~SVG;
-    }
-
-    if( _hasRect &&(_attributes_dirty & RECT) )
-    {
-      parseRectToVGPath();
-      _attributes_dirty &= ~RECT;
-    }
-  }
-
   //----------------------------------------------------------------------------
   void Path::childChanged(SGPropertyNode* child)
   {
     if( child->getParent() != _node )
       return;
-      
-    const std::string& name = child->getNameString();
-    const std::string &prName = child->getParent()->getNameString();
 
-    if( strutils::starts_with(name, "border-") )
-    {
-      _attributes_dirty |= RECT;
-      return;
-    }
-
-    if (prName == "rect")
-    {
-      _hasRect = true;
-      if (name == "left") {
-          _rect.setLeft(child->getDoubleValue());
-      } else if (name == "top") {
-          _rect.setTop(child->getDoubleValue());
-      } else if (name == "right") {
-          _rect.setRight(child->getDoubleValue());
-      } else if (name == "bottom") {
-          _rect.setBottom(child->getDoubleValue());
-      } else if (name == "width") {
-          _rect.setWidth(child->getDoubleValue());
-      } else if (name == "height") {
-          _rect.setHeight(child->getDoubleValue());
-      }
-      _attributes_dirty |= RECT;
-      return;
-    }
-
-    if( name == "cmd" )
+    if( child->getNameString() == "cmd" )
       _attributes_dirty |= CMDS;
-    else if( name == "coord" )
+    else if( child->getNameString() == "coord" )
       _attributes_dirty |= COORDS;
-    else if ( name == "svg")
-    {
-      _hasSVG = true;
-      _attributes_dirty |= SVG;
-    }
   }
 
   //----------------------------------------------------------------------------
@@ -928,68 +664,5 @@ namespace canvas
     return values;
   }
 
-  //----------------------------------------------------------------------------
-  void operator+=(CoordList& base, const std::initializer_list<VGfloat>& other)
-  {
-    base.insert(base.end(), other.begin(), other.end());
-  }
-
-  //----------------------------------------------------------------------------
-  void Path::parseRectToVGPath()
-  {
-    CmdList commands;
-    CoordList coords;
-    commands.reserve(4);
-    coords.reserve(8);
-
-    bool haveCorner = false;
-    SGVec2f topLeft = parseRectCornerRadius(_node, "left", "top", haveCorner);
-    if (haveCorner) {
-        commands.push_back(VG_MOVE_TO_ABS);
-        coords += {_rect.l(), _rect.t() + topLeft.y()};
-        commands.push_back(VG_SCCWARC_TO_REL);
-        coords += {topLeft.x(), topLeft.y(), 0.0, topLeft.x(), -topLeft.y()};
-    } else {
-        commands.push_back(VG_MOVE_TO_ABS);
-        coords += {_rect.l(), _rect.t()};
-    }
-
-    SGVec2f topRight = parseRectCornerRadius(_node, "right", "top", haveCorner);
-    if (haveCorner) {
-        commands.push_back(VG_HLINE_TO_ABS);
-        coords += {_rect.r() - topRight.x()};
-        commands.push_back(VG_SCCWARC_TO_REL);
-        coords += {topRight.x(), topRight.y(), 0.0, topRight.x(), topRight.y()};
-    } else {
-        commands.push_back(VG_HLINE_TO_ABS);
-        coords += {_rect.r()};
-    }
-
-    SGVec2f bottomRight = parseRectCornerRadius(_node, "right", "bottom", haveCorner);
-    if (haveCorner) {
-        commands.push_back(VG_VLINE_TO_ABS);
-        coords += {_rect.b() - bottomRight.y()};
-        commands.push_back(VG_SCCWARC_TO_REL);
-        coords += {bottomRight.x(), bottomRight.y(), 0.0, -bottomRight.x(), bottomRight.y()};
-    } else {
-        commands.push_back(VG_VLINE_TO_ABS);
-        coords += {_rect.b()};
-    }
-
-    SGVec2f bottomLeft = parseRectCornerRadius(_node, "left", "bottom", haveCorner);
-    if (haveCorner) {
-        commands.push_back(VG_HLINE_TO_ABS);
-        coords += {_rect.l() + bottomLeft.x()};
-        commands.push_back(VG_SCCWARC_TO_REL);
-        coords += {bottomLeft.x(), bottomLeft.y(), 0.0, -bottomLeft.x(), -bottomLeft.y()};
-    } else {
-        commands.push_back(VG_HLINE_TO_ABS);
-        coords += {_rect.l()};
-    }
-
-    commands.push_back(VG_CLOSE_PATH);
-    _path->setSegments(commands, coords);
-  }
-
 } // namespace canvas
 } // namespace simgear

simgear/canvas/elements/CanvasPath.hxx

@@ -1,5 +1,4 @@
-///@file
-/// An OpenVG path on the Canvas
+// An OpenVG path on the Canvas
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -21,8 +20,7 @@
 #define CANVAS_PATH_HXX_
 
 #include "CanvasElement.hxx"
-#include <simgear/math/SGRect.hxx>
-#include <initializer_list>
+#include <boost/preprocessor/iteration/iterate.hpp>
 
 namespace simgear
 {
@@ -41,11 +39,14 @@ namespace canvas
             ElementWeakPtr parent = 0 );
       virtual ~Path();
 
-      osg::BoundingBox
-      getTransformedBounds(const osg::Matrix& m) const override;
+      virtual void update(double dt);
 
-      /** Add a segment with the given command and coordinates */
-      Path& addSegment(uint8_t cmd, std::initializer_list<float> coords = {});
+      virtual osg::BoundingBox getTransformedBounds(const osg::Matrix& m) const;
+
+#define BOOST_PP_ITERATION_LIMITS (0, 6)
+#define BOOST_PP_FILENAME_1 \
+        <simgear/canvas/elements/detail/add_segment_variadic.hxx>
+#include BOOST_PP_ITERATE()
 
       /** Move path cursor */
       Path& moveTo(float x_abs, float y_abs);
@@ -66,34 +67,20 @@ namespace canvas
       /** Close the path (implicit lineTo to first point of path) */
       Path& close();
 
-      void setSVGPath(const std::string& svgPath);
-
-      void setRect(const SGRectf& r);
-      void setRoundRect(const SGRectf& r, float radiusX, float radiusY = -1.0);
-
     protected:
+
       enum PathAttributes
       {
         CMDS       = LAST_ATTRIBUTE << 1,
-        COORDS     = CMDS << 1,
-        SVG        = COORDS << 1,
-        RECT       = SVG << 1
+        COORDS     = CMDS << 1
       };
 
       class PathDrawable;
       typedef osg::ref_ptr<PathDrawable> PathDrawableRef;
       PathDrawableRef _path;
 
-      bool _hasSVG : 1;
-      bool _hasRect : 1;
-      SGRectf _rect;
-
-      void updateImpl(double dt) override;
-
-      void childRemoved(SGPropertyNode * child) override;
-      void childChanged(SGPropertyNode * child) override;
-
-      void parseRectToVGPath();
+      virtual void childRemoved(SGPropertyNode * child);
+      virtual void childChanged(SGPropertyNode * child);
   };
 
 } // namespace canvas

simgear/canvas/elements/CanvasText.cxx

@@ -1,5 +1,4 @@
-///@file
-/// A text on the Canvas
+// A text on the Canvas
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,8 +16,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "CanvasText.hxx"
 #include <simgear/canvas/Canvas.hxx>
 #include <simgear/canvas/CanvasSystemAdapter.hxx>
@@ -53,31 +50,27 @@ namespace canvas
       TextLine lineAt(size_t i) const;
 
       /// Get nearest line to given y-coordinate
-#if OSG_VERSION_LESS_THAN(3,6,5)
       TextLine nearestLine(float pos_y) const;
-      SGVec2i sizeForWidth(int w) const;
-#else
-      TextLine nearestLine(float pos_y);
-      SGVec2i sizeForWidth(int w);
-#endif
 
+
+      SGVec2i sizeForWidth(int w) const;
+
+      virtual osg::BoundingBox
 #if OSG_VERSION_LESS_THAN(3,3,2)
-      osg::BoundingBox computeBound() const override;
+      computeBound()
 #else
-      osg::BoundingBox computeBoundingBox() const override;
+      computeBoundingBox()
 #endif
+      const;
 
     protected:
+
       friend class TextLine;
 
       canvas::Text *_text_element;
 
-#if OSG_VERSION_LESS_THAN(3,5,6)
-     void computePositions(unsigned int contextID) const override;
-#else
-     void computePositionsImplementation() override;
-#endif
-};
+      virtual void computePositions(unsigned int contextID) const;
+  };
 
   class TextLine
   {
@@ -127,7 +120,6 @@ namespace canvas
 
     _quads = &text->_textureGlyphQuadMap.begin()->second;
 
-#if OSG_VERSION_LESS_THAN(3,5,6)
     GlyphQuads::LineNumbers const& line_numbers = _quads->_lineNumbers;
     GlyphQuads::LineNumbers::const_iterator begin_it =
       std::lower_bound(line_numbers.begin(), line_numbers.end(), _line);
@@ -139,9 +131,6 @@ namespace canvas
     _begin = begin_it - line_numbers.begin();
     _end = std::upper_bound(begin_it, line_numbers.end(), _line)
          - line_numbers.begin();
-#else
-  // TODO: Need 3.5.6 version of this
-#endif
   }
 
   //----------------------------------------------------------------------------
@@ -170,40 +159,34 @@ namespace canvas
 
     if( empty() )
       return pos;
-
-#if OSG_VERSION_GREATER_OR_EQUAL(3,5,6)
-    // TODO: need 3.5.6 version of this.
-#else
 #if OSG_VERSION_LESS_THAN(3,3,5)
-      GlyphQuads::Coords2 const& coords = _quads->_coords;
+    GlyphQuads::Coords2 const& coords = _quads->_coords;
 #else
-      GlyphQuads::Coords2 refCoords = _quads->_coords;
-      GlyphQuads::Coords2::element_type &coords = *refCoords.get();
+    GlyphQuads::Coords2 refCoords = _quads->_coords;
+    GlyphQuads::Coords2::element_type &coords = *refCoords.get();
 #endif
+    size_t global_i = _begin + i;
 
-      size_t global_i = _begin + i;
+    if( global_i == _begin )
+      // before first character of line
+      pos.x() = coords[_begin * 4].x();
+    else if( global_i == _end )
+      // After Last character of line
+      pos.x() = coords[(_end - 1) * 4 + 2].x();
+    else
+    {
+      float prev_l = coords[(global_i - 1) * 4].x(),
+            prev_r = coords[(global_i - 1) * 4 + 2].x(),
+            cur_l = coords[global_i * 4].x();
 
-      if (global_i == _begin)
-          // before first character of line
-          pos.x() = coords[_begin * 4].x();
-      else if (global_i == _end)
-          // After Last character of line
-          pos.x() = coords[(_end - 1) * 4 + 2].x();
+      if( prev_l == prev_r )
+        // If previous character width is zero set to begin of next character
+        // (Happens eg. with spaces)
+        pos.x() = cur_l;
       else
-      {
-          float prev_l = coords[(global_i - 1) * 4].x(),
-              prev_r = coords[(global_i - 1) * 4 + 2].x(),
-              cur_l = coords[global_i * 4].x();
-
-          if (prev_l == prev_r)
-              // If previous character width is zero set to begin of next character
-              // (Happens eg. with spaces)
-              pos.x() = cur_l;
-          else
-              // position at center between characters
-              pos.x() = 0.5 * (prev_r + cur_l);
-      }
-#endif
+        // position at center between characters
+        pos.x() = 0.5 * (prev_r + cur_l);
+    }
 
     return pos;
   }
@@ -211,22 +194,17 @@ namespace canvas
   //----------------------------------------------------------------------------
   osg::Vec2 TextLine::nearestCursor(float x) const
   {
-    if (empty())
+    if( empty() )
       return cursorPos(0);
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,5,6)
-  // TODO: need 3.5.7 version of this.
-	return cursorPos(0);
-#else
-#if OSG_VERSION_LESS_THAN(3,3,5)
+    GlyphQuads::Glyphs const& glyphs = _quads->_glyphs;
+    #if OSG_VERSION_LESS_THAN(3,3,5)
     GlyphQuads::Coords2 const& coords = _quads->_coords;
 #else
     GlyphQuads::Coords2 refCoords = _quads->_coords;
     GlyphQuads::Coords2::element_type &coords = *refCoords.get();
 #endif
 
-    GlyphQuads::Glyphs const& glyphs = _quads->_glyphs;
-
     float const HIT_FRACTION = 0.6;
     float const character_width = _text->getCharacterHeight()
                                 * _text->getCharacterAspectRatio();
@@ -245,7 +223,6 @@ namespace canvas
     }
 
     return cursorPos(i - _begin);
-#endif
   }
 
   //----------------------------------------------------------------------------
@@ -324,16 +301,9 @@ namespace canvas
   }
 
   //----------------------------------------------------------------------------
-#if OSG_VERSION_LESS_THAN(3,6,5)
   TextLine Text::TextOSG::nearestLine(float pos_y) const
   {
     osgText::Font const* font = getActiveFont();
-#else
-  TextLine Text::TextOSG::nearestLine(float pos_y)
-  {
-    auto font = getActiveFont();
-#endif
-
     if( !font || lineCount() <= 0 )
       return TextLine(0, this);
 
@@ -355,21 +325,12 @@ namespace canvas
   // simplified version of osgText::Text::computeGlyphRepresentation() to
   // just calculate the size for a given weight. Glpyh calculations/creating
   // is not necessary for this...
-#if OSG_VERSION_LESS_THAN(3,6,5)
   SGVec2i Text::TextOSG::sizeForWidth(int w) const
-#else
-  SGVec2i Text::TextOSG::sizeForWidth(int w)
-#endif
   {
     if( _text.empty() )
       return SGVec2i(0, 0);
 
-#if OSG_VERSION_LESS_THAN(3,6,5)
     osgText::Font* activefont = const_cast<osgText::Font*>(getActiveFont());
-#else
-    auto activefont = getActiveFont();
-#endif
-
     if( !activefont )
       return SGVec2i(-1, -1);
 
@@ -535,31 +496,18 @@ namespace canvas
               {
                 case LEFT_TO_RIGHT:
                 {
-#if OSG_VERSION_LESS_THAN(3,5,2)
-                    osg::Vec2 delta(activefont->getKerning(previous_charcode,
-                        charcode,
-                        _kerningType));
-#else
-                    osg::Vec2 delta(activefont->getKerning(_fontSize,
-                        previous_charcode,
-                        charcode,
-                        _kerningType));
-#endif
+                  osg::Vec2 delta( activefont->getKerning( previous_charcode,
+                                                           charcode,
+                                                           _kerningType ) );
                   cursor.x() += delta.x() * wr;
                   cursor.y() += delta.y() * hr;
                   break;
                 }
                 case RIGHT_TO_LEFT:
                 {
-#if OSG_VERSION_LESS_THAN(3,5,2)
-                    osg::Vec2 delta(activefont->getKerning(charcode,
-                        previous_charcode,
-                        _kerningType));
-#else
-                    osg::Vec2 delta(activefont->getKerning(_fontSize, charcode,
-                        previous_charcode,
-                        _kerningType));
-#endif
+                  osg::Vec2 delta( activefont->getKerning( charcode,
+                                                           previous_charcode,
+                                                           _kerningType ) );
                   cursor.x() -= delta.x() * wr;
                   cursor.y() -= delta.y() * hr;
                   break;
@@ -649,16 +597,19 @@ namespace canvas
   }
 
   //----------------------------------------------------------------------------
+  osg::BoundingBox
 #if OSG_VERSION_LESS_THAN(3,3,2)
-  osg::BoundingBox Text::TextOSG::computeBound() const
+  Text::TextOSG::computeBound()
 #else
-  osg::BoundingBox Text::TextOSG::computeBoundingBox() const
+  Text::TextOSG::computeBoundingBox()
 #endif
+  const
   {
+    osg::BoundingBox bb =
 #if OSG_VERSION_LESS_THAN(3,3,2)
-      osg::BoundingBox bb = osgText::Text::computeBound();
+      osgText::Text::computeBound();
 #else
-      osg::BoundingBox bb = osgText::Text::computeBoundingBox();
+      osgText::Text::computeBoundingBox();
 #endif
 
 #if OSG_VERSION_LESS_THAN(3,1,0)
@@ -674,7 +625,7 @@ namespace canvas
     return bb;
   }
 
-#if OSG_VERSION_LESS_THAN(3,5,6)
+  //----------------------------------------------------------------------------
   void Text::TextOSG::computePositions(unsigned int contextID) const
   {
     if( _textureGlyphQuadMap.empty() || _layout == VERTICAL )
@@ -744,14 +695,6 @@ namespace canvas
     return osgText::Text::computePositions(contextID);
   }
 
-#else
-  void Text::TextOSG::computePositionsImplementation()
-  {
-    TextBase::computePositionsImplementation();
-  }
-#endif
- //----------------------------------------------------------------------------
-
   //----------------------------------------------------------------------------
   const std::string Text::TYPE_NAME = "text";
 
@@ -908,12 +851,12 @@ namespace canvas
   //----------------------------------------------------------------------------
   osg::StateSet* Text::getOrCreateStateSet()
   {
-    if( !_scene_group.valid() )
-      return nullptr;
+    if( !_transform.valid() )
+      return 0;
 
     // Only check for StateSet on Transform, as the text stateset is shared
     // between all text instances using the same font (texture).
-    return _scene_group->getOrCreateStateSet();
+    return _transform->getOrCreateStateSet();
   }
 
 } // namespace canvas

simgear/canvas/elements/CanvasText.hxx

@@ -1,5 +1,4 @@
-///@file
-/// A text on the Canvas
+// A text on the Canvas
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //

simgear/canvas/elements/detail/add_segment_variadic.hxx

@@ -0,0 +1,21 @@
+#ifndef CANVAS_PATH_HXX_
+# error Canvas - do not include this file!
+#endif
+
+#define n BOOST_PP_ITERATION()
+
+Path& addSegment( uint8_t cmd
+                  BOOST_PP_COMMA_IF(n)
+                  BOOST_PP_ENUM_PARAMS(n, float coord) )
+{
+  _node->addChild("cmd")->setIntValue(cmd);
+
+#define SG_CANVAS_PATH_SET_COORD(z, n, dummy)\
+  _node->addChild("coord")->setFloatValue(coord##n);
+
+  BOOST_PP_REPEAT(n, SG_CANVAS_PATH_SET_COORD, 0)
+#undef SG_CANVAS_PATH_SET_COORD
+  return *this;
+}
+
+#undef n

simgear/canvas/elements/map/geo_node_pair.hxx

@@ -67,8 +67,7 @@ namespace canvas
       {
         _node_lat = node;
         _status &= ~LAT_MISSING;
-        _xNode.reset();
-          
+
         if( node == _node_lon )
         {
           _node_lon = 0;
@@ -80,8 +79,7 @@ namespace canvas
       {
         _node_lon = node;
         _status &= ~LON_MISSING;
-        _yNode.reset();
-          
+
         if( node == _node_lat )
         {
           _node_lat = 0;
@@ -99,34 +97,19 @@ namespace canvas
         return _node_lon ? _node_lon->getStringValue() : "";
       }
 
-      void setCachedLatLon(const std::pair<double, double>& latLon)
-      { _cachedLatLon = latLon; }
-      
-      std::pair<double, double> getCachedLatLon()
-      { return _cachedLatLon; }
-      
       void setTargetName(const std::string& name)
       {
         _target_name = name;
-        _xNode.reset();
-        _yNode.reset();
       }
 
       void setScreenPos(float x, float y)
       {
         assert( isComplete() );
-        if (!_xNode) {
-          SGPropertyNode *parent = _node_lat->getParent();
-          _xNode = parent->getChild(_target_name, _node_lat->getIndex(), true);
-        }
-          
-        if (!_yNode) {
-          SGPropertyNode *parent = _node_lat->getParent();
-          _yNode = parent->getChild(_target_name, _node_lon->getIndex(), true);
-        }
-          
-        _xNode->setDoubleValue(x);
-        _yNode->setDoubleValue(y);
+        SGPropertyNode *parent = _node_lat->getParent();
+        parent->getChild(_target_name, _node_lat->getIndex(), true)
+              ->setDoubleValue(x);
+        parent->getChild(_target_name, _node_lon->getIndex(), true)
+              ->setDoubleValue(y);
       }
 
       void print()
@@ -142,9 +125,6 @@ namespace canvas
       SGPropertyNode *_node_lat,
                      *_node_lon;
       std::string   _target_name;
-      SGPropertyNode_ptr _xNode,
-          _yNode;
-      std::pair<double, double> _cachedLatLon;
 
   };
 

simgear/canvas/elements/map/projection.hxx

@@ -1,5 +1,4 @@
-///@file
-/// Geographic projections for Canvas map element
+// Geographic projections for Canvas map element
 //
 // Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -191,32 +190,6 @@ namespace canvas
       }
   };
 
-  /**
-   * WebMercator projection, relative to the projection center.
-   * Required for Slippy Maps - i.e. openstreetmap
-   */
-  class WebMercatorProjection:
-    public HorizontalProjection
-  {
-    protected:
-
-      virtual ScreenPosition project(double lat, double lon) const
-      {
-        double d_lat = lat - _ref_lat,
-               d_lon = lon - _ref_lon;
-        double r = 6378137.f / 1852; // Equatorial radius divided by ?
-
-        ScreenPosition pos;
-
-        pos.x = r * d_lon;
-        pos.y = r * (log(tan(d_lat) + 1.0 / cos(d_lat)));
-        //pos.x = lon;
-        //pos.y = log(tan(lat) + 1.0 / cos(lat));
-        return pos;
-      }
-  };
-
-
 } // namespace canvas
 } // namespace simgear
 

simgear/canvas/events/CustomEvent.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Canvas user defined event
+// Canvas user defined event
 //
 // Copyright (C) 2014  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,7 +16,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
 #include "CustomEvent.hxx"
 
 namespace simgear
@@ -47,14 +45,6 @@ namespace canvas
 //    assert( type_map.find(type_id) != type_map.end() );
   }
 
-  //----------------------------------------------------------------------------
-  CustomEvent* CustomEvent::clone(int type) const
-  {
-    auto event = new CustomEvent(*this);
-    event->type = type;
-    return event;
-  }
-
   //----------------------------------------------------------------------------
   void CustomEvent::setDetail(StringMap const& data)
   {

simgear/canvas/events/CustomEvent.hxx

@@ -38,7 +38,6 @@ namespace canvas
     public:
 
       /**
-       * @brief Construct a user defined event from a type string
        *
        * @param type_str    Event type name (if name does not exist yet it will
        *                    be registered as new event type)
@@ -50,10 +49,6 @@ namespace canvas
                    StringMap const& data = StringMap() );
 
       /**
-       * @brief Construct a user defined event from a (previously registered)
-       *        type id
-       *
-       * @see getOrRegisterType()
        *
        * @param type_id     Event type id
        * @param bubbles     If this event should take part in the bubbling phase
@@ -63,8 +58,6 @@ namespace canvas
                    bool bubbles = false,
                    StringMap const& data = StringMap() );
 
-      CustomEvent* clone(int type = 0) const override;
-
       /**
        * Set user data
        */
@@ -81,7 +74,7 @@ namespace canvas
        * @see #bubbles
        * @see CustomEvent()
        */
-      bool canBubble() const override { return bubbles; }
+      virtual bool canBubble() const { return bubbles; }
 
       StringMap detail; //!< User data map
       bool bubbles;     //!< Whether the event supports bubbling

simgear/canvas/events/DeviceEvent.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Input device event
+// Input device event
 //
 // Copyright (C) 2014  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,8 +16,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "DeviceEvent.hxx"
 #include <osgGA/GUIEventAdapter>
 

simgear/canvas/events/KeyboardEvent.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Keyboard event
+// Keyboard event
 //
 // Copyright (C) 2014  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,9 +16,8 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "KeyboardEvent.hxx"
+#include "utf8.h"
 
 #include <osgGA/GUIEventAdapter>
 
@@ -42,7 +40,6 @@ namespace canvas
 
   // TODO check Win/Mac keycode for altgr/ISO Level3 Shift
   const uint32_t KEY_AltGraph = 0xfe03;
-  
 
   //----------------------------------------------------------------------------
   KeyboardEvent::KeyboardEvent():
@@ -70,14 +67,6 @@ namespace canvas
 //      // TODO what to do with wrong event type?
   }
 
-  //----------------------------------------------------------------------------
-  KeyboardEvent* KeyboardEvent::clone(int type) const
-  {
-    auto event = new KeyboardEvent(*this);
-    event->type = type;
-    return event;
-  }
-
   //----------------------------------------------------------------------------
   void KeyboardEvent::setKey(uint32_t key)
   {
@@ -278,24 +267,10 @@ namespace canvas
     // Empty or no mapping -> convert UTF-32 key value to UTF-8
     if( _name.empty() )
     {
-      if (( _key >= 0xd800u && _key <= 0xdfffu ) || _key > 0x10ffffu )
+      if( !utf8::internal::is_code_point_valid(_key) )
         _name = "Unidentified";
       else
-        if ( _key <= 0x7f ) {
-            _name.push_back(static_cast<uint8_t>(_key));
-        } else if ( _key <= 0x7ff ) {
-            _name.push_back(static_cast<uint8_t>((_key >> 6) | 0xc0));
-            _name.push_back(static_cast<uint8_t>((_key & 0x3f) | 0x80));
-        } else if ( _key <= 0xffff ) {
-            _name.push_back(static_cast<uint8_t>((_key >> 12) | 0xe0));
-            _name.push_back(static_cast<uint8_t>(((_key >> 6) & 0x3f) | 0x80));
-            _name.push_back(static_cast<uint8_t>((_key & 0x3f) | 0x80));
-        } else {
-            _name.push_back(static_cast<uint8_t>((_key >> 18) | 0xf0));
-            _name.push_back(static_cast<uint8_t>(((_key >> 12) & 0x3f) | 0x80));
-            _name.push_back(static_cast<uint8_t>(((_key >> 6) & 0x3f) | 0x80));
-            _name.push_back(static_cast<uint8_t>((_key & 0x3f) | 0x80));
-        }
+        utf8::unchecked::append(_key, std::back_inserter(_name));
     }
 
     // Keys on the numpad with NumLock enabled are reported just like their
@@ -330,30 +305,11 @@ namespace canvas
     if( key_name.empty() )
       return false;
 
-    // Convert the key name to the corresponding code point by checking the
-    // sequence length (the first bits of the first byte) and performing the
-    // conversion accordingly.
-    uint32_t cp = key_name[0] & 0xff;
-    size_t len;
-    if (cp < 0x80) {
-      len = 1;
-    } else if ((cp >> 5) == 0x6) {
-      cp = ((cp << 6) & 0x7ff) + (key_name[1] & 0x3f);
-      len = 2;
-    } else if ((cp >> 4) == 0xe) {
-      cp = ((cp << 12) & 0xffff) + (((key_name[1] & 0xff) << 6) & 0xfff)
-        + (key_name[2] & 0x3f);
-      len = 3;
-    } else if ((cp >> 3) == 0x1e) {
-      cp = ((cp << 18) & 0x1fffff) + (((key_name[1] & 0xff) << 12) & 0x3ffff)
-        + (((key_name[2] & 0xff) << 6) & 0xfff) + (key_name[3] & 0x3f);
-      len = 4;
-    } else {
-      return false;
-    }
+    std::string::const_iterator it = key_name.begin();
+    uint32_t cp = utf8::next(it, key_name.end());
 
     // Check if _name contains exactly one (UTF-8 encoded) character.
-    if (key_name.length() > len)
+    if( it != key_name.end() )
       return false;
 
     // C0 and C1 control characters are not printable.

simgear/canvas/events/KeyboardEvent.hxx

@@ -45,7 +45,6 @@ namespace canvas
 
       KeyboardEvent();
       KeyboardEvent(const osgGA::GUIEventAdapter& ea);
-      KeyboardEvent* clone(int type = 0) const override;
 
       void setKey(uint32_t key);
       void setUnmodifiedKey(uint32_t key);

simgear/canvas/events/MouseEvent.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Mouse event
+// Mouse event
 //
 // Copyright (C) 2014  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,8 +16,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "MouseEvent.hxx"
 #include <osgGA/GUIEventAdapter>
 
@@ -49,14 +46,6 @@ namespace canvas
       button += 1;
   }
 
-  //----------------------------------------------------------------------------
-  MouseEvent* MouseEvent::clone(int type) const
-  {
-    auto event = new MouseEvent(*this);
-    event->type = type;
-    return event;
-  }
-
   //----------------------------------------------------------------------------
   bool MouseEvent::canBubble() const
   {

simgear/canvas/events/MouseEvent.hxx

@@ -36,9 +36,8 @@ namespace canvas
     public:
       MouseEvent();
       MouseEvent(const osgGA::GUIEventAdapter& ea);
-      MouseEvent* clone(int type = 0) const override;
 
-      bool canBubble() const override;
+      virtual bool canBubble() const;
 
       osg::Vec2f getScreenPos() const { return screen_pos; }
       osg::Vec2f getClientPos() const { return client_pos; }

simgear/canvas/events/input_event_demo.cxx

@@ -1,5 +1,4 @@
-///@file
-/// Keyboard event demo. Press some keys and get some info...
+// Keyboard event demo. Press some keys and get some info...
 //
 // Copyright (C) 2014  Thomas Geymayer <tomgey@gmail.com>
 //
@@ -17,8 +16,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "KeyboardEvent.hxx"
 
 #include <osgViewer/Viewer>

simgear/canvas/layout/BoxLayout.cxx

@@ -16,8 +16,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "BoxLayout.hxx"
 #include "SpacerItem.hxx"
 #include <simgear/canvas/Canvas.hxx>
@@ -73,7 +71,7 @@ namespace canvas
                               int stretch,
                               uint8_t alignment )
   {
-    ItemData item_data = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    ItemData item_data = {0};
     item_data.layout_item = item;
     item_data.stretch = std::max(0, stretch);
 

simgear/canvas/layout/Layout.cxx

@@ -16,11 +16,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
 #include "Layout.hxx"
-
-#include <algorithm>
-
 #include <simgear/debug/logstream.hxx>
 
 namespace simgear

simgear/canvas/layout/LayoutItem.cxx

@@ -16,7 +16,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
 #include "LayoutItem.hxx"
 #include <simgear/canvas/Canvas.hxx>
 

simgear/canvas/layout/NasalWidget.cxx

@@ -16,8 +16,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-#include <simgear_config.h>
-
 #include "NasalWidget.hxx"
 
 #include <simgear/canvas/Canvas.hxx>
@@ -45,7 +43,7 @@ namespace canvas
   //----------------------------------------------------------------------------
   NasalWidget::~NasalWidget()
   {
-
+    onRemove();
   }
 
   //----------------------------------------------------------------------------
@@ -150,7 +148,7 @@ namespace canvas
   //----------------------------------------------------------------------------
   bool NasalWidget::hasHeightForWidth() const
   {
-    return _height_for_width || _min_height_for_width;
+    return !_height_for_width.empty() || !_min_height_for_width.empty();
   }
 
   //----------------------------------------------------------------------------
@@ -186,13 +184,13 @@ namespace canvas
   int NasalWidget::callHeightForWidthFunc( const HeightForWidthFunc& hfw,
                                            int w ) const
   {
-    if( !hfw )
+    if( hfw.empty() )
       return -1;
 
+    naContext c = naNewContext();
     try
     {
-      nasal::Context ctx;
-      return hfw(ctx.to_me(const_cast<NasalWidget*>(this)), w);
+      return hfw(nasal::to_nasal(c, const_cast<NasalWidget*>(this)), w);
     }
     catch( std::exception const& ex )
     {
@@ -202,6 +200,7 @@ namespace canvas
         "NasalWidget.heightForWidth: callback error: '" << ex.what() << "'"
       );
     }
+    naFreeContext(c);
 
     return -1;
   }
@@ -239,17 +238,17 @@ namespace canvas
   //----------------------------------------------------------------------------
   int NasalWidget::heightForWidthImpl(int w) const
   {
-    return callHeightForWidthFunc( _height_for_width
-                                 ? _height_for_width
-                                 : _min_height_for_width, w );
+    return callHeightForWidthFunc( _height_for_width.empty()
+                                 ? _min_height_for_width
+                                 : _height_for_width, w );
   }
 
   //----------------------------------------------------------------------------
   int NasalWidget::minimumHeightForWidthImpl(int w) const
   {
-    return callHeightForWidthFunc( _min_height_for_width
-                                 ? _min_height_for_width
-                                 : _height_for_width, w );
+    return callHeightForWidthFunc( _min_height_for_width.empty()
+                                 ? _height_for_width
+                                 : _min_height_for_width, w );
   }
 
 
@@ -261,8 +260,8 @@ namespace canvas
 
     try
     {
-      nasal::Context ctx;
-      _set_geometry(ctx.to_me(this), rect);
+      nasal::Context c;
+      _set_geometry(nasal::to_nasal(c, this), rect);
       _flags &= ~LAYOUT_DIRTY;
     }
     catch( std::exception const& ex )

simgear/canvas/layout/NasalWidget.hxx

@@ -40,8 +40,8 @@ namespace canvas
   {
     public:
 
-      typedef std::function<void (nasal::Me, const SGRecti&)> SetGeometryFunc;
-      typedef std::function<int (nasal::Me, int)> HeightForWidthFunc;
+      typedef boost::function<void (nasal::Me, const SGRecti&)> SetGeometryFunc;
+      typedef boost::function<int (nasal::Me, int)> HeightForWidthFunc;
 
       /**
        *