new version: 2020.1.2

This should give a bit of speed boost to macOS official builds.

CMakeLists.txt

@@ -165,6 +165,11 @@ 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)
@@ -440,15 +445,18 @@ if (CLANG)
     # fix Boost compilation :(
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-      set(CMAKE_C_FLAGS
-        "${CMAKE_C_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions")
-      set(CMAKE_CXX_FLAGS
-        "${CMAKE_CXX_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions")
-    elseif (ENABLE_SIMD)
+    # override CMake default RelWithDebInfo flags.
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO  "-O3 -g -DNDEBUG")
+
+    if (ENABLE_SIMD)
       if (X86 OR X86_64)
         set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
         set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
+
+        # propogate to the RelWithDebInfo flags
+        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -g -DNDEBUG")
+        set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g -DNDEBUG")
       endif()
     endif()
 endif()

simgear/canvas/elements/CanvasImage.cxx

@@ -947,10 +947,18 @@ SGRect<int> intersectRect(const SGRect<int>& a, const SGRect<int>& b)
     }
       
     image->setColor(color, x, y);
-    auto c = getCanvas().lock();
-    c->enableRendering(true); // force a repaint
   }
 
+    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;

simgear/canvas/elements/CanvasImage.hxx

@@ -115,6 +115,11 @@ namespace canvas
       
       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, )

simgear/nasal/code.c

@@ -503,7 +503,7 @@ static void setMember(naContext ctx, naRef obj, naRef fld, naRef value)
         return;
     }
     
-    if(!IS_HASH(obj)) ERR(ctx, "non-objects have no members");
+    if(!IS_HASH(obj)) naRuntimeError(ctx, "non-object does not have member: %s", naStr_data(fld));
     naHash_set(obj, fld, value);
     ctx->opTop -= 2;
 }

simgear/scene/model/ModelRegistry.cxx

@@ -113,9 +113,6 @@ protected:
     }
 };
 
-// disabling old-syle texture compression in favour of the 
-// texture-cache
-#if 0
 class SGTexCompressionVisitor : public SGTextureStateAttributeVisitor {
 public:
   virtual void apply(int, StateSet::RefAttributePair& refAttr)
@@ -146,7 +143,6 @@ public:
     }
   }
 };
-#endif
 
 class SGTexDataVarianceVisitor : public SGTextureStateAttributeVisitor {
 public:
@@ -644,12 +640,8 @@ osg::Node* OptimizeModelPolicy::optimize(osg::Node* node,
     SGTexDataVarianceVisitor dataVarianceVisitor;
     node->accept(dataVarianceVisitor);
 
-// disabling old-syle texture compression in favour of the 
-// texture-cache
-#if 0
     SGTexCompressionVisitor texComp;
     node->accept(texComp);
-#endif
     return node;
 }
 

simgear/scene/util/SGSceneFeatures.cxx

@@ -69,29 +69,29 @@ SGSceneFeatures::instance()
 void
 SGSceneFeatures::applyTextureCompression(osg::Texture* texture) const
 {
-  // disable older texture-compression, since it interacts confusingly
-  // with the the runtime texture-cache. We always want to use 
-  // 'USE_IMAGE_DATA_FORMAT' when the texture-cache is active, since we
-  // decided whether to compress (or not) prior to this point.
-#if 0
-  switch (_textureCompression) {
-  case UseARBCompression:
-    texture->setInternalFormatMode(osg::Texture::USE_ARB_COMPRESSION);
-    break;
-  case UseDXT1Compression:
-    texture->setInternalFormatMode(osg::Texture::USE_S3TC_DXT1_COMPRESSION);
-    break;
-  case UseDXT3Compression:
-    texture->setInternalFormatMode(osg::Texture::USE_S3TC_DXT3_COMPRESSION);
-    break;
-  case UseDXT5Compression:
-    texture->setInternalFormatMode(osg::Texture::USE_S3TC_DXT5_COMPRESSION);
-    break;
-  default:
-    texture->setInternalFormatMode(osg::Texture::USE_IMAGE_DATA_FORMAT);
-    break;
-  }
-#endif
+    // if the texture cache is active, always use the file data format
+    if (_TextureCacheActive && _TextureCacheCompressionActive) {
+        texture->setInternalFormatMode(osg::Texture::USE_IMAGE_DATA_FORMAT);
+    } else {
+        // keep the older texture compression working, some people need it
+        switch (_textureCompression) {
+        case UseARBCompression:
+          texture->setInternalFormatMode(osg::Texture::USE_ARB_COMPRESSION);
+          break;
+        case UseDXT1Compression:
+          texture->setInternalFormatMode(osg::Texture::USE_S3TC_DXT1_COMPRESSION);
+          break;
+        case UseDXT3Compression:
+          texture->setInternalFormatMode(osg::Texture::USE_S3TC_DXT3_COMPRESSION);
+          break;
+        case UseDXT5Compression:
+          texture->setInternalFormatMode(osg::Texture::USE_S3TC_DXT5_COMPRESSION);
+          break;
+        default:
+          texture->setInternalFormatMode(osg::Texture::USE_IMAGE_DATA_FORMAT);
+          break;
+        }
+    }
 }
 
 bool

version

@@ -1 +1 @@
-2020.1.1
+2020.1.2