Skip to content

Commit 7d19aa8

Browse files
committed
added parameter for parent GLFW window pointer to OpenGLPacketPipeline
1 parent 23a9d71 commit 7d19aa8

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

examples/protonect/include/libfreenect2/packet_pipeline.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,11 @@ class LIBFREENECT2_API CpuPacketPipeline : public BasePacketPipeline
8585
class LIBFREENECT2_API OpenGLPacketPipeline : public BasePacketPipeline
8686
{
8787
protected:
88+
void *parent_opengl_context_;
8889
bool debug_;
8990
virtual DepthPacketProcessor *createDepthPacketProcessor();
9091
public:
91-
OpenGLPacketPipeline(bool debug = false);
92+
OpenGLPacketPipeline(void *parent_opengl_context = 0, bool debug = false);
9293
virtual ~OpenGLPacketPipeline();
9394
};
9495

examples/protonect/src/packet_pipeline.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ DepthPacketProcessor *CpuPacketPipeline::createDepthPacketProcessor()
9696
return depth_processor;
9797
}
9898

99-
OpenGLPacketPipeline::OpenGLPacketPipeline(bool debug) : debug_(debug)
99+
OpenGLPacketPipeline::OpenGLPacketPipeline(void *parent_opengl_context, bool debug) : parent_opengl_context_(parent_opengl_context), debug_(debug)
100100
{
101101
initialize();
102102
}
@@ -105,7 +105,7 @@ OpenGLPacketPipeline::~OpenGLPacketPipeline() { }
105105

106106
DepthPacketProcessor *OpenGLPacketPipeline::createDepthPacketProcessor()
107107
{
108-
OpenGLDepthPacketProcessor *depth_processor = new OpenGLDepthPacketProcessor(0, debug_);
108+
OpenGLDepthPacketProcessor *depth_processor = new OpenGLDepthPacketProcessor(parent_opengl_context_, debug_);
109109
depth_processor->load11To16LutFromFile("11to16.bin");
110110
depth_processor->loadXTableFromFile("xTable.bin");
111111
depth_processor->loadZTableFromFile("zTable.bin");

0 commit comments

Comments
 (0)