Changed from downstream.

CMakeLists.txt

@@ -17,8 +17,9 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${PANGOLIN_VERSION_MINOR})
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 include(CPack)
 
-option( BUILD_EXAMPLES "Build Examples" ON )
 option( BUILD_TESTS "Build Tests" ON )
+option( BUILD_TOOLS "Build Examples" ON )
+option( BUILD_EXAMPLES "Build Tools" ON )
 
 set (CMAKE_CXX_STANDARD 14)
 
@@ -93,12 +94,16 @@ add_subdirectory("external")
 add_subdirectory("src")
 
 if(BUILD_TESTS)
-  set(Pangolin_DIR ${Pangolin_BINARY_DIR}/src)
-  add_subdirectory("test")
+    set(Pangolin_DIR ${Pangolin_BINARY_DIR}/src)
+    add_subdirectory("test")
+endif()
+
+if(BUILD_TOOLS)
+    set(Pangolin_DIR ${Pangolin_BINARY_DIR}/src)
+    add_subdirectory(tools)
 endif()
 
 if(BUILD_EXAMPLES)
-  set(Pangolin_DIR ${Pangolin_BINARY_DIR}/src)
-  add_subdirectory(examples)
-  add_subdirectory(tools)
+    set(Pangolin_DIR ${Pangolin_BINARY_DIR}/src)
+    add_subdirectory(examples)
 endif()

include/pangolin/display/opengl_render_state.h

@@ -222,6 +222,9 @@ class PANGOLIN_EXPORT OpenGlRenderState
 PANGOLIN_EXPORT
 OpenGlMatrixSpec ProjectionMatrixRUB_BottomLeft(int w, int h, GLprecision fu, GLprecision fv, GLprecision u0, GLprecision v0, GLprecision zNear, GLprecision zFar );
 
+PANGOLIN_EXPORT
+OpenGlMatrixSpec ProjectionMatrixRUB_TopLeft(int w, int h, GLprecision fu, GLprecision fv, GLprecision u0, GLprecision v0, GLprecision zNear, GLprecision zFar );
+
 PANGOLIN_EXPORT
 OpenGlMatrixSpec ProjectionMatrixRDF_TopLeft(int w, int h, GLprecision fu, GLprecision fv, GLprecision u0, GLprecision v0, GLprecision zNear, GLprecision zFar );
 

include/pangolin/display/widgets/widgets.h

@@ -132,6 +132,7 @@ struct PANGOLIN_EXPORT TextInput : public Widget<std::string>
     void ResizeChildren();
     GlText gltext;
     GLfloat raster[2];
+    bool can_edit;
     bool do_edit;
     int sel[2];
 };

include/pangolin/factory/factory_registry.h

@@ -41,6 +41,7 @@ struct FactoryInterface
 {
     typedef T FactoryItem;
 
+    virtual ~FactoryInterface() = default;
     virtual std::unique_ptr<T> Open(const Uri& uri) = 0;
 };
 

include/pangolin/geometry/glgeometry.h

@@ -37,6 +37,7 @@ struct GlGeometry
 {
     GlGeometry() = default;
     GlGeometry(GlGeometry&&) = default;
+    GlGeometry& operator=(GlGeometry&&) = default;
 
     struct Element : public GlBufferData
     {

include/pangolin/gl/gl.h

@@ -61,7 +61,7 @@ class PANGOLIN_EXPORT GlTexture
 
     //! Move Constructor / asignment
     GlTexture(GlTexture&& tex);
-    void operator=(GlTexture&& tex);
+    GlTexture& operator=(GlTexture&& tex);
 
     //! Default constructor represents 'no texture'
     GlTexture();
@@ -149,7 +149,9 @@ struct PANGOLIN_EXPORT GlFramebuffer
 
     GlFramebuffer(GlTexture& colour, GlRenderBuffer& depth);
     GlFramebuffer(GlTexture& colour0, GlTexture& colour1, GlRenderBuffer& depth);
-
+    GlFramebuffer(GlTexture& colour0, GlTexture& colour1, GlTexture& colour2, GlRenderBuffer& depth);
+    GlFramebuffer(GlTexture& colour0, GlTexture& colour1, GlTexture& colour2, GlTexture& colour3, GlRenderBuffer& depth);
+
     void Bind() const;
     void Unbind() const;
 

include/pangolin/gl/gl.hpp

@@ -122,13 +122,19 @@ inline GlTexture::GlTexture(GlTexture&& tex)
 {
     *this = std::move(tex);
 }
-inline void GlTexture::operator=(GlTexture&& tex)
-{
-    internal_format = tex.internal_format;
-    tid = tex.tid;
 
-    tex.internal_format = 0;
-    tex.tid = 0;
+inline GlTexture& GlTexture::operator=(GlTexture&& tex)
+{
+    if (&tex != this) {
+        internal_format = tex.internal_format;
+        tid = tex.tid;
+        width = tex.width;
+        height = tex.height;
+
+        tex.internal_format = 0;
+        tex.tid = 0;
+    }
+    return *this;
 }
 
 inline bool GlTexture::IsValid() const
@@ -553,6 +559,29 @@ inline GlFramebuffer::GlFramebuffer(GlTexture& colour0, GlTexture& colour1, GlRe
     CheckGlDieOnError();
 }
 
+inline GlFramebuffer::GlFramebuffer(GlTexture& colour0, GlTexture& colour1, GlTexture& colour2, GlRenderBuffer& depth)
+    : attachments(0)
+{
+    glGenFramebuffersEXT(1, &fbid);
+    AttachColour(colour0);
+    AttachColour(colour1);
+    AttachColour(colour2);
+    AttachDepth(depth);
+    CheckGlDieOnError();
+}
+
+inline GlFramebuffer::GlFramebuffer(GlTexture& colour0, GlTexture& colour1, GlTexture& colour2, GlTexture& colour3, GlRenderBuffer& depth)
+    : attachments(0)
+{
+    glGenFramebuffersEXT(1, &fbid);
+    AttachColour(colour0);
+    AttachColour(colour1);
+    AttachColour(colour2);
+    AttachColour(colour3);
+    AttachDepth(depth);
+    CheckGlDieOnError();
+}
+
 inline void GlFramebuffer::Bind() const
 {
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbid);

include/pangolin/handler/handler_image.h

@@ -83,6 +83,8 @@ class ImageViewHandler : public Handler
 
     bool& UseNN();
 
+    bool& FlipTextureX();
+
     bool& FlipTextureY();
 
     pangolin::XYRangef& GetViewToRender();
@@ -153,6 +155,7 @@ class ImageViewHandler : public Handler
     int last_mouse_pos[2];
 
     bool use_nn;
+    bool flipTextureX;
     bool flipTextureY;
 };
 

include/pangolin/tools/video_viewer.h

@@ -55,8 +55,8 @@ class VideoViewer
     void SetDiscardBufferedFrames(bool new_state);
     void SetWaitForFrames(bool new_state);
     void Skip(int frames);
-    void ChangeExposure(int delta_us);
-    void ChangeGain(float delta);
+    bool ChangeExposure(int delta_us);
+    bool ChangeGain(float delta);
     void SetActiveCamera(int delta);
     void DrawEveryNFrames(int n);
 

include/pangolin/utils/file_extension.h

@@ -46,6 +46,7 @@ enum ImageFileType
     ImageFileTypePvn,
     ImageFileTypeZstd,
     ImageFileTypeLz4,
+    ImageFileTypeP12b,
     ImageFileTypePly,
     ImageFileTypeObj,
     ImageFileTypeUnknown

include/pangolin/var/var.h

@@ -49,7 +49,7 @@ inline void InitialiseNewVarMetaGeneric(
     v.Meta().range[0] = 0.0;
     v.Meta().range[1] = 0.0;
     v.Meta().increment = 0.0;
-    v.Meta().flags = 0;
+    v.Meta().flags = META_FLAG_NONE;
     v.Meta().logscale = false;
     v.Meta().generic = true;
 
@@ -59,7 +59,8 @@ inline void InitialiseNewVarMetaGeneric(
 template<typename T>
 inline void InitialiseNewVarMeta(
     VarValue<T>& v, const std::string& name,
-    double min = 0, double max = 0, int flags = 1, bool logscale = false
+    double min = 0, double max = 0, int flags = META_FLAG_TOGGLE,
+    bool logscale = false
 ) {
     // Initialise meta parameters
     const std::vector<std::string> parts = pangolin::Split(name,'.');
@@ -99,16 +100,16 @@ class Var
                 if (min <= 0 || max <= 0) {
                     throw std::runtime_error("LogScale: range of numbers must be positive!");
                 }
-                InitialiseNewVarMeta(*nv, name, std::log(min), std::log(max), 1, logscale);
+                InitialiseNewVarMeta<T&>(*nv, name, std::log(min), std::log(max), META_FLAG_TOGGLE, logscale);
             }else{
-                InitialiseNewVarMeta(*nv, name, min, max, 1, logscale);
+                InitialiseNewVarMeta<T&>(*nv, name, min, max, META_FLAG_TOGGLE, logscale);
             }
         }
         return variable;
     }
 
     static T& Attach(
-        const std::string& name, T& variable, bool toggle = false
+        const std::string& name, T& variable, int flags = META_FLAG_NONE
         ) {
         // Find name in VarStore
         VarValueGeneric*& v = VarState::I()[name];
@@ -119,11 +120,17 @@ class Var
             // new VarRef<T> (owned by VarStore)
             VarValue<T&>* nv = new VarValue<T&>(variable);
             v = nv;
-            InitialiseNewVarMeta<T&>(*nv, name, 0.0, 0.0, toggle);
+            InitialiseNewVarMeta<T&>(*nv, name, 0.0, 0.0, flags);
         }
         return variable;
     }
 
+    static T& Attach(
+        const std::string& name, T& variable, bool toggle
+        ) {
+        return Attach(name, variable, toggle ? META_FLAG_TOGGLE : META_FLAG_NONE);
+    }
+
     ~Var()
     {
         delete ptr;
@@ -159,7 +166,7 @@ class Var
         }
     }
 
-    Var( const std::string& name, const T& value, bool toggle = false )
+    Var(const std::string& name, const T& value, int flags = META_FLAG_NONE)
         : ptr(0)
     {
         // Find name in VarStore
@@ -178,10 +185,15 @@ class Var
             }
             v = nv;
             var = nv;
-            InitialiseNewVarMeta(*nv, name, 0, 1, toggle);
+            InitialiseNewVarMeta(*nv, name, 0, 1, flags);
         }
     }
 
+    Var(const std::string& name, const T& value, bool toggle)
+        : Var(name, value, toggle ? META_FLAG_TOGGLE : META_FLAG_NONE)
+    {
+    }
+
     Var(
         const std::string& name, const T& value,
         double min, double max, bool logscale = false
@@ -207,7 +219,7 @@ class Var
                 if (min <= 0 || max <= 0) {
                     throw std::runtime_error("LogScale: range of numbers must be positive!");
                 }
-                InitialiseNewVarMeta(*nv, name, std::log(min), std::log(max), 1, true);
+                InitialiseNewVarMeta(*nv, name, std::log(min), std::log(max), META_FLAG_TOGGLE, true);
             }else{
                 InitialiseNewVarMeta(*nv, name, min, max);
             }
@@ -223,7 +235,7 @@ class Var
     {
         try{
             return var->Get();
-        }catch(BadInputException)
+        }catch(const BadInputException &e)
         {
             const_cast<Var<T> *>(this)->Reset();
             return var->Get();

include/pangolin/var/varvaluegeneric.h

@@ -31,12 +31,15 @@
 
 namespace pangolin
 {
+constexpr int META_FLAG_NONE      = 0x0000;
+constexpr int META_FLAG_TOGGLE    = 0x0001;
+constexpr int META_FLAG_READONLY  = 0x0002;
 
 struct VarMeta
 {
     VarMeta() :
         increment(0.),
-        flags(0),
+        flags(META_FLAG_NONE),
         gui_changed(false),
         logscale(false),
         generic(false)

include/pangolin/var/varwrapper.h

@@ -77,7 +77,7 @@ class VarWrapper : public VarValueT<T>
         cache = val;
         try {
             src.Set( Convert<VarS, T>::Do(val) );
-        }catch(BadInputException) {
+        }catch(const BadInputException &e) {
             pango_print_warn("Unable to set variable with type %s from %s. Resetting.", typeid(VarS).name(), typeid(T).name() );
             Reset();
         }

include/pangolin/video/drivers/pack.h

@@ -0,0 +1,84 @@
+/* This file is part of the Pangolin Project.
+ * http://github.com/stevenlovegrove/Pangolin
+ *
+ * Copyright (c) 2014 Steven Lovegrove
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * 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 AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#pragma once
+
+#include <pangolin/pangolin.h>
+#include <pangolin/video/video.h>
+
+namespace pangolin
+{
+
+// Video class that packs its video input using the given method.
+class PANGOLIN_EXPORT PackVideo :
+    public VideoInterface,
+    public VideoFilterInterface,
+    public BufferAwareVideoInterface
+{
+public:
+    PackVideo(std::unique_ptr<VideoInterface>& videoin, PixelFormat new_fmt);
+    ~PackVideo();
+
+    //! Implement VideoInput::Start()
+    void Start();
+
+    //! Implement VideoInput::Stop()
+    void Stop();
+
+    //! Implement VideoInput::SizeBytes()
+    size_t SizeBytes() const;
+
+    //! Implement VideoInput::Streams()
+    const std::vector<StreamInfo>& Streams() const;
+
+    //! Implement VideoInput::GrabNext()
+    bool GrabNext( unsigned char* image, bool wait = true );
+
+    //! Implement VideoInput::GrabNewest()
+    bool GrabNewest( unsigned char* image, bool wait = true );
+
+    //! Implement VideoFilterInterface method
+    std::vector<VideoInterface*>& InputStreams();
+
+    uint32_t AvailableFrames() const;
+
+    bool DropNFrames(uint32_t n);
+
+protected:
+    void Process(unsigned char* image, const unsigned char* buffer);
+
+    std::unique_ptr<VideoInterface> src;
+    std::vector<VideoInterface*> videoin;
+    std::vector<StreamInfo> streams;
+    size_t size_bytes;
+    unsigned char* buffer;
+
+    picojson::value device_properties;
+    picojson::value frame_properties;
+};
+
+}