Mercurial > hg > orthanc-stone

diff Framework/Scene2D/Internals/OpenGLFloatTextureProgram.h @ 947:1091b2adeb5a toa2019081001

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed animation frame stopping when returning false + big work on the OpenGL objects to make them lost context-safe + debug code to forcefully tag a context as lost + debug macros
author Benjamin Golinvaux <bgo@osimis.io>
date Sat, 10 Aug 2019 13:07:31 +0200
parents 4d1f57773b5b
children 2d8ab34c8c91
line wrap: on
line diff
--- a/Framework/Scene2D/Internals/OpenGLFloatTextureProgram.h	Tue Aug 06 15:07:23 2019 +0200
+++ b/Framework/Scene2D/Internals/OpenGLFloatTextureProgram.h	Sat Aug 10 13:07:31 2019 +0200
@@ -38,7 +38,7 @@
         float                  slope_;
 
       public:
-        Data(const Orthanc::ImageAccessor& texture,
+        Data(OpenGL::IOpenGLContext& context, const Orthanc::ImageAccessor& texture,
              bool isLinearInterpolation);
 
         float GetOffset() const
@@ -57,9 +57,6 @@
         }
       };
 
-    private:
-      OpenGLTextureProgram  program_;
-
     public:
       OpenGLFloatTextureProgram(OpenGL::IOpenGLContext&  context);
 
@@ -68,6 +65,9 @@
                  float windowCenter,
                  float windowWidth,
                  bool  invert);
+    private:
+      OpenGLTextureProgram  program_;
+      OpenGL::IOpenGLContext& context_;
     };
   }
 }