mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 08:13:04 +04:00
refactored opengl functionality
* removed OpenGLFuncTab, now extensions are loaded internally * renamed GlTexture -> GlTexture2D * added support of GlBuffer and GlTexture2D to InputArray/OutputArray * added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets * added copyFrom/copyTo method for GlBuffer and GlTexture2D * removed GlFont * removed pointCloudShow * removed OpenGLCleanCallback
This commit is contained in:
Vladislav Vinogradov
@@ -125,16 +125,13 @@ CV_EXPORTS_W void setTrackbarPos(const string& trackbarname, const string& winna
|
||||
|
||||
// OpenGL support
|
||||
|
||||
typedef void (*OpenGlDrawCallback)(void* userdata);
|
||||
typedef void (CV_CDECL *OpenGlDrawCallback)(void* userdata);
|
||||
CV_EXPORTS void setOpenGlDrawCallback(const string& winname, OpenGlDrawCallback onOpenGlDraw, void* userdata = 0);
|
||||
|
||||
CV_EXPORTS void setOpenGlContext(const string& winname);
|
||||
|
||||
CV_EXPORTS void updateWindow(const string& winname);
|
||||
|
||||
CV_EXPORTS void pointCloudShow(const string& winname, const GlCamera& camera, const GlArrays& arr);
|
||||
CV_EXPORTS void pointCloudShow(const string& winname, const GlCamera& camera, InputArray points, InputArray colors = noArray());
|
||||
|
||||
//Only for Qt
|
||||
|
||||
CV_EXPORTS CvFont fontQt(const string& nameFont, int pointSize=-1,
|
||||
|
||||
@@ -206,9 +206,6 @@ void cvSetRatioWindow_QT(const char* name,double prop_value);
|
||||
double cvGetOpenGlProp_QT(const char* name);
|
||||
#endif
|
||||
|
||||
// OpenGL
|
||||
typedef void (CV_CDECL *CvOpenGlCleanCallback)(void* userdata);
|
||||
void icvSetOpenGlCleanCallback(const char* window_name, CvOpenGlCleanCallback callback, void* userdata);
|
||||
|
||||
|
||||
/*namespace cv
|
||||
|
||||
+32
-215
@@ -40,6 +40,7 @@
|
||||
//M*/
|
||||
|
||||
#include "precomp.hpp"
|
||||
#include <map>
|
||||
#include "opencv2/core/opengl_interop.hpp"
|
||||
|
||||
// in later times, use this file as a dispatcher to implementations like cvcap.cpp
|
||||
@@ -240,94 +241,15 @@ void cv::updateWindow(const string& windowName)
|
||||
#ifdef HAVE_OPENGL
|
||||
namespace
|
||||
{
|
||||
const int CV_TEXTURE_MAGIC_VAL = 0x00287653;
|
||||
const int CV_POINT_CLOUD_MAGIC_VAL = 0x00287654;
|
||||
|
||||
struct GlObjBase
|
||||
{
|
||||
int flag;
|
||||
GlObjBase* next;
|
||||
GlObjBase* prev;
|
||||
std::string winname;
|
||||
|
||||
virtual ~GlObjBase() {}
|
||||
};
|
||||
|
||||
GlObjBase* g_glObjs = 0;
|
||||
|
||||
GlObjBase* findGlObjByName(const std::string& winname)
|
||||
{
|
||||
GlObjBase* obj = g_glObjs;
|
||||
|
||||
while(obj && obj->winname != winname)
|
||||
obj = obj->next;
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
||||
void addGlObj(GlObjBase* glObj)
|
||||
{
|
||||
glObj->next = g_glObjs;
|
||||
glObj->prev = 0;
|
||||
if (g_glObjs)
|
||||
g_glObjs->prev = glObj;
|
||||
g_glObjs = glObj;
|
||||
}
|
||||
|
||||
void removeGlObj(GlObjBase* glObj)
|
||||
{
|
||||
if (glObj->prev)
|
||||
glObj->prev->next = glObj->next;
|
||||
else
|
||||
g_glObjs = glObj->next;
|
||||
|
||||
if (glObj->next)
|
||||
glObj->next->prev = glObj->prev;
|
||||
|
||||
delete glObj;
|
||||
}
|
||||
|
||||
struct GlObjTex : GlObjBase
|
||||
{
|
||||
cv::GlTexture tex;
|
||||
};
|
||||
std::map<std::string, cv::GlTexture2D> wndTexs;
|
||||
std::map<std::string, cv::GlTexture2D> ownWndTexs;
|
||||
std::map<std::string, cv::GlBuffer> ownWndBufs;
|
||||
|
||||
void CV_CDECL glDrawTextureCallback(void* userdata)
|
||||
{
|
||||
GlObjTex* texObj = static_cast<GlObjTex*>(userdata);
|
||||
cv::GlTexture2D* texObj = static_cast<cv::GlTexture2D*>(userdata);
|
||||
|
||||
CV_DbgAssert(texObj->flag == CV_TEXTURE_MAGIC_VAL);
|
||||
|
||||
static cv::GlCamera glCamera;
|
||||
|
||||
glCamera.setupProjectionMatrix();
|
||||
|
||||
cv::render(texObj->tex);
|
||||
}
|
||||
|
||||
struct GlObjPointCloud : GlObjBase
|
||||
{
|
||||
cv::GlArrays arr;
|
||||
cv::GlCamera camera;
|
||||
};
|
||||
|
||||
void CV_CDECL glDrawPointCloudCallback(void* userdata)
|
||||
{
|
||||
GlObjPointCloud* pointCloudObj = static_cast<GlObjPointCloud*>(userdata);
|
||||
|
||||
CV_DbgAssert(pointCloudObj->flag == CV_POINT_CLOUD_MAGIC_VAL);
|
||||
|
||||
pointCloudObj->camera.setupProjectionMatrix();
|
||||
pointCloudObj->camera.setupModelViewMatrix();
|
||||
|
||||
cv::render(pointCloudObj->arr);
|
||||
}
|
||||
|
||||
void CV_CDECL glCleanCallback(void* userdata)
|
||||
{
|
||||
GlObjBase* glObj = static_cast<GlObjBase*>(userdata);
|
||||
|
||||
removeGlObj(glObj);
|
||||
cv::render(*texObj);
|
||||
}
|
||||
}
|
||||
#endif // HAVE_OPENGL
|
||||
@@ -339,7 +261,8 @@ void cv::imshow( const string& winname, InputArray _img )
|
||||
CvMat c_img = img;
|
||||
cvShowImage(winname.c_str(), &c_img);
|
||||
#else
|
||||
double useGl = getWindowProperty(winname, WND_PROP_OPENGL);
|
||||
const double useGl = getWindowProperty(winname, WND_PROP_OPENGL);
|
||||
|
||||
if (useGl <= 0)
|
||||
{
|
||||
Mat img = _img.getMat();
|
||||
@@ -348,7 +271,7 @@ void cv::imshow( const string& winname, InputArray _img )
|
||||
}
|
||||
else
|
||||
{
|
||||
double autoSize = getWindowProperty(winname, WND_PROP_AUTOSIZE);
|
||||
const double autoSize = getWindowProperty(winname, WND_PROP_AUTOSIZE);
|
||||
|
||||
if (autoSize > 0)
|
||||
{
|
||||
@@ -358,145 +281,44 @@ void cv::imshow( const string& winname, InputArray _img )
|
||||
|
||||
setOpenGlContext(winname);
|
||||
|
||||
GlObjBase* glObj = findGlObjByName(winname);
|
||||
|
||||
if (glObj && glObj->flag != CV_TEXTURE_MAGIC_VAL)
|
||||
if (_img.kind() == _InputArray::OPENGL_TEXTURE2D)
|
||||
{
|
||||
icvSetOpenGlCleanCallback(winname.c_str(), 0, 0);
|
||||
glObj = 0;
|
||||
}
|
||||
cv::GlTexture2D& tex = wndTexs[winname];
|
||||
|
||||
if (glObj)
|
||||
{
|
||||
GlObjTex* texObj = static_cast<GlObjTex*>(glObj);
|
||||
texObj->tex.copyFrom(_img);
|
||||
tex = _img.getGlTexture2D();
|
||||
|
||||
tex.setAutoRelease(false);
|
||||
|
||||
setOpenGlDrawCallback(winname, glDrawTextureCallback, &tex);
|
||||
}
|
||||
else
|
||||
{
|
||||
GlObjTex* texObj = new GlObjTex;
|
||||
texObj->tex.copyFrom(_img);
|
||||
cv::GlTexture2D& tex = ownWndTexs[winname];
|
||||
|
||||
glObj = texObj;
|
||||
glObj->flag = CV_TEXTURE_MAGIC_VAL;
|
||||
glObj->winname = winname;
|
||||
if (_img.kind() == _InputArray::GPU_MAT)
|
||||
{
|
||||
cv::GlBuffer& buf = ownWndBufs[winname];
|
||||
buf.copyFrom(_img);
|
||||
buf.setAutoRelease(false);
|
||||
|
||||
addGlObj(glObj);
|
||||
tex.copyFrom(buf);
|
||||
tex.setAutoRelease(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
tex.copyFrom(_img);
|
||||
}
|
||||
|
||||
icvSetOpenGlCleanCallback(winname.c_str(), glCleanCallback, glObj);
|
||||
tex.setAutoRelease(false);
|
||||
|
||||
setOpenGlDrawCallback(winname, glDrawTextureCallback, &tex);
|
||||
}
|
||||
|
||||
setOpenGlDrawCallback(winname, glDrawTextureCallback, glObj);
|
||||
|
||||
updateWindow(winname);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void cv::pointCloudShow(const string& winname, const GlCamera& camera, const GlArrays& arr)
|
||||
{
|
||||
#ifndef HAVE_OPENGL
|
||||
CV_Error(CV_OpenGlNotSupported, "The library is compiled without OpenGL support");
|
||||
(void)winname;
|
||||
(void)camera;
|
||||
(void)arr;
|
||||
#else
|
||||
namedWindow(winname, WINDOW_OPENGL);
|
||||
|
||||
setOpenGlContext(winname);
|
||||
|
||||
GlObjBase* glObj = findGlObjByName(winname);
|
||||
|
||||
if (glObj && glObj->flag != CV_POINT_CLOUD_MAGIC_VAL)
|
||||
{
|
||||
icvSetOpenGlCleanCallback(winname.c_str(), 0, 0);
|
||||
glObj = 0;
|
||||
}
|
||||
|
||||
if (glObj)
|
||||
{
|
||||
GlObjPointCloud* pointCloudObj = static_cast<GlObjPointCloud*>(glObj);
|
||||
pointCloudObj->arr = arr;
|
||||
pointCloudObj->camera = camera;
|
||||
}
|
||||
else
|
||||
{
|
||||
GlObjPointCloud* pointCloudObj = new GlObjPointCloud;
|
||||
pointCloudObj->arr = arr;
|
||||
pointCloudObj->camera = camera;
|
||||
|
||||
glObj = pointCloudObj;
|
||||
glObj->flag = CV_POINT_CLOUD_MAGIC_VAL;
|
||||
glObj->winname = winname;
|
||||
|
||||
addGlObj(glObj);
|
||||
|
||||
icvSetOpenGlCleanCallback(winname.c_str(), glCleanCallback, glObj);
|
||||
}
|
||||
|
||||
setOpenGlDrawCallback(winname, glDrawPointCloudCallback, glObj);
|
||||
|
||||
updateWindow(winname);
|
||||
#endif
|
||||
}
|
||||
|
||||
void cv::pointCloudShow(const std::string& winname, const cv::GlCamera& camera, InputArray points, InputArray colors)
|
||||
{
|
||||
#ifndef HAVE_OPENGL
|
||||
(void)winname;
|
||||
(void)camera;
|
||||
(void)points;
|
||||
(void)colors;
|
||||
CV_Error(CV_OpenGlNotSupported, "The library is compiled without OpenGL support");
|
||||
#else
|
||||
namedWindow(winname, WINDOW_OPENGL);
|
||||
|
||||
setOpenGlContext(winname);
|
||||
|
||||
GlObjBase* glObj = findGlObjByName(winname);
|
||||
|
||||
if (glObj && glObj->flag != CV_POINT_CLOUD_MAGIC_VAL)
|
||||
{
|
||||
icvSetOpenGlCleanCallback(winname.c_str(), 0, 0);
|
||||
glObj = 0;
|
||||
}
|
||||
|
||||
if (glObj)
|
||||
{
|
||||
GlObjPointCloud* pointCloudObj = static_cast<GlObjPointCloud*>(glObj);
|
||||
|
||||
pointCloudObj->arr.setVertexArray(points);
|
||||
if (colors.empty())
|
||||
pointCloudObj->arr.resetColorArray();
|
||||
else
|
||||
pointCloudObj->arr.setColorArray(colors);
|
||||
|
||||
pointCloudObj->camera = camera;
|
||||
}
|
||||
else
|
||||
{
|
||||
GlObjPointCloud* pointCloudObj = new GlObjPointCloud;
|
||||
|
||||
pointCloudObj->arr.setVertexArray(points);
|
||||
if (!colors.empty())
|
||||
pointCloudObj->arr.setColorArray(colors);
|
||||
|
||||
pointCloudObj->camera = camera;
|
||||
|
||||
glObj = pointCloudObj;
|
||||
glObj->flag = CV_POINT_CLOUD_MAGIC_VAL;
|
||||
glObj->winname = winname;
|
||||
|
||||
addGlObj(glObj);
|
||||
|
||||
icvSetOpenGlCleanCallback(winname.c_str(), glCleanCallback, glObj);
|
||||
}
|
||||
|
||||
setOpenGlDrawCallback(winname, glDrawPointCloudCallback, glObj);
|
||||
|
||||
updateWindow(winname);
|
||||
#endif
|
||||
}
|
||||
|
||||
// Without OpenGL
|
||||
|
||||
#ifndef HAVE_OPENGL
|
||||
@@ -516,11 +338,6 @@ CV_IMPL void cvUpdateWindow(const char*)
|
||||
CV_Error(CV_OpenGlNotSupported, "The library is compiled without OpenGL support");
|
||||
}
|
||||
|
||||
void icvSetOpenGlCleanCallback(const char*, CvOpenGlCleanCallback, void*)
|
||||
{
|
||||
CV_Error(CV_OpenGlNotSupported, "The library is compiled without OpenGL support");
|
||||
}
|
||||
|
||||
#endif // !HAVE_OPENGL
|
||||
|
||||
#if defined (HAVE_QT)
|
||||
|
||||
@@ -685,20 +685,6 @@ CV_IMPL void cvSetOpenGlDrawCallback(const char* window_name, CvOpenGlDrawCallba
|
||||
}
|
||||
|
||||
|
||||
void icvSetOpenGlCleanCallback(const char* window_name, CvOpenGlCleanCallback callback, void* userdata)
|
||||
{
|
||||
if (!guiMainThread)
|
||||
CV_Error( CV_StsNullPtr, "NULL guiReceiver (please create a window)" );
|
||||
|
||||
QMetaObject::invokeMethod(guiMainThread,
|
||||
"setOpenGlCleanCallback",
|
||||
Qt::AutoConnection,
|
||||
Q_ARG(QString, QString(window_name)),
|
||||
Q_ARG(void*, (void*)callback),
|
||||
Q_ARG(void*, userdata));
|
||||
}
|
||||
|
||||
|
||||
CV_IMPL void cvSetOpenGlContext(const char* window_name)
|
||||
{
|
||||
if (!guiMainThread)
|
||||
@@ -1175,14 +1161,6 @@ void GuiReceiver::setOpenGlDrawCallback(QString name, void* callback, void* user
|
||||
w->setOpenGlDrawCallback((CvOpenGlDrawCallback) callback, userdata);
|
||||
}
|
||||
|
||||
void GuiReceiver::setOpenGlCleanCallback(QString name, void* callback, void* userdata)
|
||||
{
|
||||
QPointer<CvWindow> w = icvFindWindowByName(name);
|
||||
|
||||
if (w)
|
||||
w->setOpenGlCleanCallback((CvOpenGlCleanCallback) callback, userdata);
|
||||
}
|
||||
|
||||
void GuiReceiver::setOpenGlContext(QString name)
|
||||
{
|
||||
QPointer<CvWindow> w = icvFindWindowByName(name);
|
||||
@@ -1828,12 +1806,6 @@ void CvWindow::setOpenGlDrawCallback(CvOpenGlDrawCallback callback, void* userda
|
||||
}
|
||||
|
||||
|
||||
void CvWindow::setOpenGlCleanCallback(CvOpenGlCleanCallback callback, void* userdata)
|
||||
{
|
||||
myView->setOpenGlCleanCallback(callback, userdata);
|
||||
}
|
||||
|
||||
|
||||
void CvWindow::makeCurrentOpenGlContext()
|
||||
{
|
||||
myView->makeCurrentOpenGlContext();
|
||||
@@ -2420,12 +2392,6 @@ void DefaultViewPort::setOpenGlDrawCallback(CvOpenGlDrawCallback /*callback*/, v
|
||||
}
|
||||
|
||||
|
||||
void DefaultViewPort::setOpenGlCleanCallback(CvOpenGlCleanCallback /*callback*/, void* /*userdata*/)
|
||||
{
|
||||
CV_Error(CV_OpenGlNotSupported, "Window doesn't support OpenGL");
|
||||
}
|
||||
|
||||
|
||||
void DefaultViewPort::makeCurrentOpenGlContext()
|
||||
{
|
||||
CV_Error(CV_OpenGlNotSupported, "Window doesn't support OpenGL");
|
||||
@@ -3074,19 +3040,10 @@ OpenGlViewPort::OpenGlViewPort(QWidget* _parent) : QGLWidget(_parent), size(-1,
|
||||
|
||||
glDrawCallback = 0;
|
||||
glDrawData = 0;
|
||||
|
||||
glCleanCallback = 0;
|
||||
glCleanData = 0;
|
||||
|
||||
glFuncTab = 0;
|
||||
}
|
||||
|
||||
OpenGlViewPort::~OpenGlViewPort()
|
||||
{
|
||||
if (glFuncTab)
|
||||
delete glFuncTab;
|
||||
|
||||
setOpenGlCleanCallback(0, 0);
|
||||
}
|
||||
|
||||
QWidget* OpenGlViewPort::getWidget()
|
||||
@@ -3131,21 +3088,9 @@ void OpenGlViewPort::setOpenGlDrawCallback(CvOpenGlDrawCallback callback, void*
|
||||
glDrawData = userdata;
|
||||
}
|
||||
|
||||
void OpenGlViewPort::setOpenGlCleanCallback(CvOpenGlCleanCallback callback, void* userdata)
|
||||
{
|
||||
makeCurrentOpenGlContext();
|
||||
|
||||
if (glCleanCallback)
|
||||
glCleanCallback(glCleanData);
|
||||
|
||||
glCleanCallback = callback;
|
||||
glCleanData = userdata;
|
||||
}
|
||||
|
||||
void OpenGlViewPort::makeCurrentOpenGlContext()
|
||||
{
|
||||
makeCurrent();
|
||||
icvSetOpenGlFuncTab(glFuncTab);
|
||||
}
|
||||
|
||||
void OpenGlViewPort::updateGl()
|
||||
@@ -3153,255 +3098,9 @@ void OpenGlViewPort::updateGl()
|
||||
QGLWidget::updateGL();
|
||||
}
|
||||
|
||||
#ifndef APIENTRY
|
||||
#define APIENTRY
|
||||
#endif
|
||||
|
||||
#ifndef APIENTRYP
|
||||
#define APIENTRYP APIENTRY *
|
||||
#endif
|
||||
|
||||
#ifndef GL_VERSION_1_5
|
||||
/* GL types for handling large vertex buffer objects */
|
||||
typedef ptrdiff_t GLintptr;
|
||||
typedef ptrdiff_t GLsizeiptr;
|
||||
#endif
|
||||
|
||||
typedef void (APIENTRYP PFNGLGENBUFFERSPROC ) (GLsizei n, GLuint *buffers);
|
||||
typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
|
||||
|
||||
typedef void (APIENTRYP PFNGLBUFFERDATAPROC ) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
|
||||
typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data);
|
||||
|
||||
typedef void (APIENTRYP PFNGLBINDBUFFERPROC ) (GLenum target, GLuint buffer);
|
||||
|
||||
typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
|
||||
typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
|
||||
|
||||
class GlFuncTab_QT : public CvOpenGlFuncTab
|
||||
{
|
||||
public:
|
||||
#ifdef Q_WS_WIN
|
||||
GlFuncTab_QT(HDC hDC);
|
||||
#else
|
||||
GlFuncTab_QT();
|
||||
#endif
|
||||
|
||||
void genBuffers(int n, unsigned int* buffers) const;
|
||||
void deleteBuffers(int n, const unsigned int* buffers) const;
|
||||
|
||||
void bufferData(unsigned int target, ptrdiff_t size, const void* data, unsigned int usage) const;
|
||||
void bufferSubData(unsigned int target, ptrdiff_t offset, ptrdiff_t size, const void* data) const;
|
||||
|
||||
void bindBuffer(unsigned int target, unsigned int buffer) const;
|
||||
|
||||
void* mapBuffer(unsigned int target, unsigned int access) const;
|
||||
void unmapBuffer(unsigned int target) const;
|
||||
|
||||
void generateBitmapFont(const std::string& family, int height, int weight, bool italic, bool underline, int start, int count, int base) const;
|
||||
|
||||
bool isGlContextInitialized() const;
|
||||
|
||||
PFNGLGENBUFFERSPROC glGenBuffersExt;
|
||||
PFNGLDELETEBUFFERSPROC glDeleteBuffersExt;
|
||||
|
||||
PFNGLBUFFERDATAPROC glBufferDataExt;
|
||||
PFNGLBUFFERSUBDATAPROC glBufferSubDataExt;
|
||||
|
||||
PFNGLBINDBUFFERPROC glBindBufferExt;
|
||||
|
||||
PFNGLMAPBUFFERPROC glMapBufferExt;
|
||||
PFNGLUNMAPBUFFERPROC glUnmapBufferExt;
|
||||
|
||||
bool initialized;
|
||||
|
||||
#ifdef Q_WS_WIN
|
||||
HDC hDC;
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef Q_WS_WIN
|
||||
GlFuncTab_QT::GlFuncTab_QT(HDC hDC_) : hDC(hDC_)
|
||||
#else
|
||||
GlFuncTab_QT::GlFuncTab_QT()
|
||||
#endif
|
||||
{
|
||||
glGenBuffersExt = 0;
|
||||
glDeleteBuffersExt = 0;
|
||||
|
||||
glBufferDataExt = 0;
|
||||
glBufferSubDataExt = 0;
|
||||
|
||||
glBindBufferExt = 0;
|
||||
|
||||
glMapBufferExt = 0;
|
||||
glUnmapBufferExt = 0;
|
||||
|
||||
initialized = false;
|
||||
}
|
||||
|
||||
void GlFuncTab_QT::genBuffers(int n, unsigned int* buffers) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_QT::genBuffers" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glGenBuffersExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glGenBuffersExt(n, buffers);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_QT::deleteBuffers(int n, const unsigned int* buffers) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_QT::deleteBuffers" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glDeleteBuffersExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glDeleteBuffersExt(n, buffers);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_QT::bufferData(unsigned int target, ptrdiff_t size, const void* data, unsigned int usage) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_QT::bufferData" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glBufferDataExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glBufferDataExt(target, size, data, usage);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_QT::bufferSubData(unsigned int target, ptrdiff_t offset, ptrdiff_t size, const void* data) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_QT::bufferSubData" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glBufferSubDataExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glBufferSubDataExt(target, offset, size, data);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_QT::bindBuffer(unsigned int target, unsigned int buffer) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_QT::bindBuffer" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glBindBufferExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glBindBufferExt(target, buffer);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void* GlFuncTab_QT::mapBuffer(unsigned int target, unsigned int access) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_QT::mapBuffer" );
|
||||
|
||||
void* res = 0;
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glMapBufferExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
res = glMapBufferExt(target, access);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
void GlFuncTab_QT::unmapBuffer(unsigned int target) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_QT::unmapBuffer" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glUnmapBufferExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glUnmapBufferExt(target);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_QT::generateBitmapFont(const std::string& family, int height, int weight, bool italic, bool /*underline*/, int start, int count, int base) const
|
||||
{
|
||||
#ifdef Q_WS_WIN
|
||||
CV_FUNCNAME( "GlFuncTab_QT::generateBitmapFont" );
|
||||
#endif
|
||||
|
||||
QFont font(QString(family.c_str()), height, weight, italic);
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
#ifndef Q_WS_WIN
|
||||
font.setStyleStrategy(QFont::OpenGLCompatible);
|
||||
if (font.handle())
|
||||
glXUseXFont(font.handle(), start, count, base);
|
||||
#else
|
||||
SelectObject(hDC, font.handle());
|
||||
if (!wglUseFontBitmaps(hDC, start, count, base))
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Can't create font");
|
||||
#endif
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
bool GlFuncTab_QT::isGlContextInitialized() const
|
||||
{
|
||||
return initialized;
|
||||
}
|
||||
|
||||
void OpenGlViewPort::initializeGL()
|
||||
{
|
||||
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
|
||||
|
||||
#ifdef Q_WS_WIN
|
||||
std::auto_ptr<GlFuncTab_QT> qglFuncTab(new GlFuncTab_QT(getDC()));
|
||||
#else
|
||||
std::auto_ptr<GlFuncTab_QT> qglFuncTab(new GlFuncTab_QT);
|
||||
#endif
|
||||
|
||||
// Load extensions
|
||||
|
||||
qglFuncTab->glGenBuffersExt = (PFNGLGENBUFFERSPROC)context()->getProcAddress("glGenBuffers");
|
||||
qglFuncTab->glDeleteBuffersExt = (PFNGLDELETEBUFFERSPROC)context()->getProcAddress("glDeleteBuffers");
|
||||
qglFuncTab->glBufferDataExt = (PFNGLBUFFERDATAPROC)context()->getProcAddress("glBufferData");
|
||||
qglFuncTab->glBufferSubDataExt = (PFNGLBUFFERSUBDATAPROC)context()->getProcAddress("glBufferSubData");
|
||||
qglFuncTab->glBindBufferExt = (PFNGLBINDBUFFERPROC)context()->getProcAddress("glBindBuffer");
|
||||
qglFuncTab->glMapBufferExt = (PFNGLMAPBUFFERPROC)context()->getProcAddress("glMapBuffer");
|
||||
qglFuncTab->glUnmapBufferExt = (PFNGLUNMAPBUFFERPROC)context()->getProcAddress("glUnmapBuffer");
|
||||
|
||||
qglFuncTab->initialized = true;
|
||||
|
||||
glFuncTab = qglFuncTab.release();
|
||||
|
||||
icvSetOpenGlFuncTab(glFuncTab);
|
||||
}
|
||||
|
||||
void OpenGlViewPort::resizeGL(int w, int h)
|
||||
@@ -3411,14 +3110,10 @@ void OpenGlViewPort::resizeGL(int w, int h)
|
||||
|
||||
void OpenGlViewPort::paintGL()
|
||||
{
|
||||
icvSetOpenGlFuncTab(glFuncTab);
|
||||
|
||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||
|
||||
if (glDrawCallback)
|
||||
glDrawCallback(glDrawData);
|
||||
|
||||
CV_CheckGlError();
|
||||
}
|
||||
|
||||
void OpenGlViewPort::mousePressEvent(QMouseEvent* evnt)
|
||||
|
||||
@@ -141,7 +141,6 @@ public slots:
|
||||
void enablePropertiesButtonEachWindow();
|
||||
|
||||
void setOpenGlDrawCallback(QString name, void* callback, void* userdata);
|
||||
void setOpenGlCleanCallback(QString name, void* callback, void* userdata);
|
||||
void setOpenGlContext(QString name);
|
||||
void updateWindow(QString name);
|
||||
double isOpenGl(QString name);
|
||||
@@ -312,7 +311,6 @@ public:
|
||||
static void addSlider2(CvWindow* w, QString name, int* value, int count, CvTrackbarCallback2 on_change CV_DEFAULT(NULL), void* userdata CV_DEFAULT(0));
|
||||
|
||||
void setOpenGlDrawCallback(CvOpenGlDrawCallback callback, void* userdata);
|
||||
void setOpenGlCleanCallback(CvOpenGlCleanCallback callback, void* userdata);
|
||||
void makeCurrentOpenGlContext();
|
||||
void updateGl();
|
||||
bool isOpenGl();
|
||||
@@ -397,7 +395,6 @@ public:
|
||||
virtual void startDisplayInfo(QString text, int delayms) = 0;
|
||||
|
||||
virtual void setOpenGlDrawCallback(CvOpenGlDrawCallback callback, void* userdata) = 0;
|
||||
virtual void setOpenGlCleanCallback(CvOpenGlCleanCallback callback, void* userdata) = 0;
|
||||
virtual void makeCurrentOpenGlContext() = 0;
|
||||
virtual void updateGl() = 0;
|
||||
|
||||
@@ -429,7 +426,6 @@ public:
|
||||
void startDisplayInfo(QString text, int delayms);
|
||||
|
||||
void setOpenGlDrawCallback(CvOpenGlDrawCallback callback, void* userdata);
|
||||
void setOpenGlCleanCallback(CvOpenGlCleanCallback callback, void* userdata);
|
||||
void makeCurrentOpenGlContext();
|
||||
void updateGl();
|
||||
|
||||
@@ -456,11 +452,6 @@ private:
|
||||
CvOpenGlDrawCallback glDrawCallback;
|
||||
void* glDrawData;
|
||||
|
||||
CvOpenGlCleanCallback glCleanCallback;
|
||||
void* glCleanData;
|
||||
|
||||
CvOpenGlFuncTab* glFuncTab;
|
||||
|
||||
void icvmouseHandler(QMouseEvent* event, type_mouse_event category, int& cv_event, int& flags);
|
||||
void icvmouseProcessing(QPointF pt, int cv_event, int flags);
|
||||
};
|
||||
@@ -491,7 +482,6 @@ public:
|
||||
void startDisplayInfo(QString text, int delayms);
|
||||
|
||||
void setOpenGlDrawCallback(CvOpenGlDrawCallback callback, void* userdata);
|
||||
void setOpenGlCleanCallback(CvOpenGlCleanCallback callback, void* userdata);
|
||||
void makeCurrentOpenGlContext();
|
||||
void updateGl();
|
||||
|
||||
|
||||
@@ -417,9 +417,6 @@ typedef struct CvWindow
|
||||
|
||||
CvOpenGlDrawCallback glDrawCallback;
|
||||
void* glDrawData;
|
||||
|
||||
CvOpenGlCleanCallback glCleanCallback;
|
||||
void* glCleanData;
|
||||
#endif
|
||||
}
|
||||
CvWindow;
|
||||
@@ -692,238 +689,6 @@ double cvGetOpenGlProp_GTK(const char* name)
|
||||
|
||||
namespace
|
||||
{
|
||||
class GlFuncTab_GTK : public CvOpenGlFuncTab
|
||||
{
|
||||
public:
|
||||
GlFuncTab_GTK();
|
||||
|
||||
void genBuffers(int n, unsigned int* buffers) const;
|
||||
void deleteBuffers(int n, const unsigned int* buffers) const;
|
||||
|
||||
void bufferData(unsigned int target, ptrdiff_t size, const void* data, unsigned int usage) const;
|
||||
void bufferSubData(unsigned int target, ptrdiff_t offset, ptrdiff_t size, const void* data) const;
|
||||
|
||||
void bindBuffer(unsigned int target, unsigned int buffer) const;
|
||||
|
||||
void* mapBuffer(unsigned int target, unsigned int access) const;
|
||||
void unmapBuffer(unsigned int target) const;
|
||||
|
||||
void generateBitmapFont(const std::string& family, int height, int weight, bool italic, bool underline, int start, int count, int base) const;
|
||||
|
||||
bool isGlContextInitialized() const;
|
||||
|
||||
PFNGLGENBUFFERSPROC glGenBuffersExt;
|
||||
PFNGLDELETEBUFFERSPROC glDeleteBuffersExt;
|
||||
|
||||
PFNGLBUFFERDATAPROC glBufferDataExt;
|
||||
PFNGLBUFFERSUBDATAPROC glBufferSubDataExt;
|
||||
|
||||
PFNGLBINDBUFFERPROC glBindBufferExt;
|
||||
|
||||
PFNGLMAPBUFFERPROC glMapBufferExt;
|
||||
PFNGLUNMAPBUFFERPROC glUnmapBufferExt;
|
||||
|
||||
bool initialized;
|
||||
};
|
||||
|
||||
GlFuncTab_GTK::GlFuncTab_GTK()
|
||||
{
|
||||
glGenBuffersExt = 0;
|
||||
glDeleteBuffersExt = 0;
|
||||
|
||||
glBufferDataExt = 0;
|
||||
glBufferSubDataExt = 0;
|
||||
|
||||
glBindBufferExt = 0;
|
||||
|
||||
glMapBufferExt = 0;
|
||||
glUnmapBufferExt = 0;
|
||||
|
||||
initialized = false;
|
||||
}
|
||||
|
||||
void GlFuncTab_GTK::genBuffers(int n, unsigned int* buffers) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_GTK::genBuffers" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glGenBuffersExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glGenBuffersExt(n, buffers);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_GTK::deleteBuffers(int n, const unsigned int* buffers) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_GTK::deleteBuffers" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glDeleteBuffersExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glDeleteBuffersExt(n, buffers);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_GTK::bufferData(unsigned int target, ptrdiff_t size, const void* data, unsigned int usage) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_GTK::bufferData" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glBufferDataExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glBufferDataExt(target, size, data, usage);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_GTK::bufferSubData(unsigned int target, ptrdiff_t offset, ptrdiff_t size, const void* data) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_GTK::bufferSubData" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glBufferSubDataExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glBufferSubDataExt(target, offset, size, data);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_GTK::bindBuffer(unsigned int target, unsigned int buffer) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_GTK::bindBuffer" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glBindBufferExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glBindBufferExt(target, buffer);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void* GlFuncTab_GTK::mapBuffer(unsigned int target, unsigned int access) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_GTK::mapBuffer" );
|
||||
|
||||
void* res = 0;
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glMapBufferExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
res = glMapBufferExt(target, access);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
void GlFuncTab_GTK::unmapBuffer(unsigned int target) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_GTK::unmapBuffer" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glUnmapBufferExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glUnmapBufferExt(target);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_GTK::generateBitmapFont(const std::string& family, int height, int weight, bool italic, bool /*underline*/, int start, int count, int base) const
|
||||
{
|
||||
PangoFontDescription* fontDecr;
|
||||
PangoFont* pangoFont;
|
||||
|
||||
CV_FUNCNAME( "GlFuncTab_GTK::generateBitmapFont" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
fontDecr = pango_font_description_new();
|
||||
|
||||
pango_font_description_set_size(fontDecr, height);
|
||||
|
||||
pango_font_description_set_family_static(fontDecr, family.c_str());
|
||||
|
||||
pango_font_description_set_weight(fontDecr, static_cast<PangoWeight>(weight));
|
||||
|
||||
pango_font_description_set_style(fontDecr, italic ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL);
|
||||
|
||||
pangoFont = gdk_gl_font_use_pango_font(fontDecr, start, count, base);
|
||||
|
||||
pango_font_description_free(fontDecr);
|
||||
|
||||
if (!pangoFont)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Can't create font");
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
bool GlFuncTab_GTK::isGlContextInitialized() const
|
||||
{
|
||||
return initialized;
|
||||
}
|
||||
|
||||
void initGl()
|
||||
{
|
||||
static GlFuncTab_GTK glFuncTab;
|
||||
static bool first = true;
|
||||
|
||||
if (first)
|
||||
{
|
||||
// Load extensions
|
||||
GdkGLProc func;
|
||||
|
||||
func = gdk_gl_get_proc_address("glGenBuffers");
|
||||
glFuncTab.glGenBuffersExt = (PFNGLGENBUFFERSPROC)func;
|
||||
|
||||
func = gdk_gl_get_proc_address("glDeleteBuffers");
|
||||
glFuncTab.glDeleteBuffersExt = (PFNGLDELETEBUFFERSPROC)func;
|
||||
|
||||
func = gdk_gl_get_proc_address("glBufferData");
|
||||
glFuncTab.glBufferDataExt = (PFNGLBUFFERDATAPROC)func;
|
||||
|
||||
func = gdk_gl_get_proc_address("glBufferSubData");
|
||||
glFuncTab.glBufferSubDataExt = (PFNGLBUFFERSUBDATAPROC)func;
|
||||
|
||||
func = gdk_gl_get_proc_address("glBindBuffer");
|
||||
glFuncTab.glBindBufferExt = (PFNGLBINDBUFFERPROC)func;
|
||||
|
||||
func = gdk_gl_get_proc_address("glMapBuffer");
|
||||
glFuncTab.glMapBufferExt = (PFNGLMAPBUFFERPROC)func;
|
||||
|
||||
func = gdk_gl_get_proc_address("glUnmapBuffer");
|
||||
glFuncTab.glUnmapBufferExt = (PFNGLUNMAPBUFFERPROC)func;
|
||||
|
||||
glFuncTab.initialized = true;
|
||||
|
||||
icvSetOpenGlFuncTab(&glFuncTab);
|
||||
|
||||
first = false;
|
||||
}
|
||||
}
|
||||
|
||||
void createGlContext(CvWindow* window)
|
||||
{
|
||||
GdkGLConfig* glconfig;
|
||||
@@ -932,8 +697,6 @@ namespace
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
window->useGl = false;
|
||||
|
||||
// Try double-buffered visual
|
||||
glconfig = gdk_gl_config_new_by_mode((GdkGLConfigMode)(GDK_GL_MODE_RGB | GDK_GL_MODE_DEPTH | GDK_GL_MODE_DOUBLE));
|
||||
if (!glconfig)
|
||||
@@ -943,24 +706,11 @@ namespace
|
||||
if (!gtk_widget_set_gl_capability(window->widget, glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE))
|
||||
CV_ERROR( CV_OpenGlApiCallError, "Can't Create A GL Device Context" );
|
||||
|
||||
initGl();
|
||||
|
||||
window->useGl = true;
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void releaseGlContext(CvWindow* window)
|
||||
{
|
||||
//CV_FUNCNAME( "releaseGlContext" );
|
||||
|
||||
//__BEGIN__;
|
||||
|
||||
window->useGl = false;
|
||||
|
||||
//__END__;
|
||||
}
|
||||
|
||||
void drawGl(CvWindow* window)
|
||||
{
|
||||
CV_FUNCNAME( "drawGl" );
|
||||
@@ -980,8 +730,6 @@ namespace
|
||||
if (window->glDrawCallback)
|
||||
window->glDrawCallback(window->glDrawData);
|
||||
|
||||
CV_CheckGlError();
|
||||
|
||||
if (gdk_gl_drawable_is_double_buffered (gldrawable))
|
||||
gdk_gl_drawable_swap_buffers(gldrawable);
|
||||
else
|
||||
@@ -1101,9 +849,6 @@ CV_IMPL int cvNamedWindow( const char* name, int flags )
|
||||
|
||||
window->glDrawCallback = 0;
|
||||
window->glDrawData = 0;
|
||||
|
||||
window->glCleanCallback = 0;
|
||||
window->glCleanData = 0;
|
||||
#endif
|
||||
|
||||
//
|
||||
@@ -1233,40 +978,6 @@ CV_IMPL void cvSetOpenGlDrawCallback(const char* name, CvOpenGlDrawCallback call
|
||||
__END__;
|
||||
}
|
||||
|
||||
void icvSetOpenGlCleanCallback(const char* name, CvOpenGlCleanCallback callback, void* userdata)
|
||||
{
|
||||
CvWindow* window;
|
||||
GdkGLContext* glcontext;
|
||||
GdkGLDrawable* gldrawable;
|
||||
|
||||
CV_FUNCNAME( "icvSetOpenGlCleanCallback" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!name)
|
||||
CV_ERROR(CV_StsNullPtr, "NULL name string");
|
||||
|
||||
window = icvFindWindowByName(name);
|
||||
if (!window)
|
||||
EXIT;
|
||||
|
||||
if (!window->useGl)
|
||||
CV_ERROR( CV_OpenGlNotSupported, "Window doesn't support OpenGL" );
|
||||
|
||||
glcontext = gtk_widget_get_gl_context(window->widget);
|
||||
gldrawable = gtk_widget_get_gl_drawable(window->widget);
|
||||
|
||||
gdk_gl_drawable_make_current(gldrawable, glcontext);
|
||||
|
||||
if (window->glCleanCallback)
|
||||
window->glCleanCallback(window->glCleanData);
|
||||
|
||||
window->glCleanCallback = callback;
|
||||
window->glCleanData = userdata;
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
#endif // HAVE_OPENGL
|
||||
|
||||
|
||||
@@ -1276,25 +987,6 @@ static void icvDeleteWindow( CvWindow* window )
|
||||
{
|
||||
CvTrackbar* trackbar;
|
||||
|
||||
#ifdef HAVE_OPENGL
|
||||
if (window->useGl)
|
||||
{
|
||||
GdkGLContext* glcontext = gtk_widget_get_gl_context(window->widget);
|
||||
GdkGLDrawable* gldrawable = gtk_widget_get_gl_drawable(window->widget);
|
||||
|
||||
gdk_gl_drawable_make_current(gldrawable, glcontext);
|
||||
|
||||
if (window->glCleanCallback)
|
||||
{
|
||||
window->glCleanCallback(window->glCleanData);
|
||||
window->glCleanCallback = 0;
|
||||
window->glCleanData = 0;
|
||||
}
|
||||
|
||||
releaseGlContext(window);
|
||||
}
|
||||
#endif
|
||||
|
||||
if( window->prev )
|
||||
window->prev->next = window->next;
|
||||
else
|
||||
|
||||
@@ -192,11 +192,6 @@ typedef struct CvWindow
|
||||
|
||||
CvOpenGlDrawCallback glDrawCallback;
|
||||
void* glDrawData;
|
||||
|
||||
CvOpenGlCleanCallback glCleanCallback;
|
||||
void* glCleanData;
|
||||
|
||||
CvOpenGlFuncTab* glFuncTab;
|
||||
#endif
|
||||
}
|
||||
CvWindow;
|
||||
@@ -580,272 +575,8 @@ double cvGetOpenGlProp_W32(const char* name)
|
||||
|
||||
#ifdef HAVE_OPENGL
|
||||
|
||||
#ifndef APIENTRY
|
||||
#define APIENTRY
|
||||
#endif
|
||||
|
||||
#ifndef APIENTRYP
|
||||
#define APIENTRYP APIENTRY *
|
||||
#endif
|
||||
|
||||
#ifndef GL_VERSION_1_5
|
||||
/* GL types for handling large vertex buffer objects */
|
||||
typedef ptrdiff_t GLintptr;
|
||||
typedef ptrdiff_t GLsizeiptr;
|
||||
#endif
|
||||
|
||||
namespace
|
||||
{
|
||||
typedef void (APIENTRYP PFNGLGENBUFFERSPROC ) (GLsizei n, GLuint *buffers);
|
||||
typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
|
||||
|
||||
typedef void (APIENTRYP PFNGLBUFFERDATAPROC ) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
|
||||
typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data);
|
||||
|
||||
typedef void (APIENTRYP PFNGLBINDBUFFERPROC ) (GLenum target, GLuint buffer);
|
||||
|
||||
typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
|
||||
typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
|
||||
|
||||
class GlFuncTab_W32 : public CvOpenGlFuncTab
|
||||
{
|
||||
public:
|
||||
GlFuncTab_W32(HDC hDC);
|
||||
|
||||
void genBuffers(int n, unsigned int* buffers) const;
|
||||
void deleteBuffers(int n, const unsigned int* buffers) const;
|
||||
|
||||
void bufferData(unsigned int target, ptrdiff_t size, const void* data, unsigned int usage) const;
|
||||
void bufferSubData(unsigned int target, ptrdiff_t offset, ptrdiff_t size, const void* data) const;
|
||||
|
||||
void bindBuffer(unsigned int target, unsigned int buffer) const;
|
||||
|
||||
void* mapBuffer(unsigned int target, unsigned int access) const;
|
||||
void unmapBuffer(unsigned int target) const;
|
||||
|
||||
void generateBitmapFont(const std::string& family, int height, int weight, bool italic, bool underline, int start, int count, int base) const;
|
||||
|
||||
bool isGlContextInitialized() const;
|
||||
|
||||
PFNGLGENBUFFERSPROC glGenBuffersExt;
|
||||
PFNGLDELETEBUFFERSPROC glDeleteBuffersExt;
|
||||
|
||||
PFNGLBUFFERDATAPROC glBufferDataExt;
|
||||
PFNGLBUFFERSUBDATAPROC glBufferSubDataExt;
|
||||
|
||||
PFNGLBINDBUFFERPROC glBindBufferExt;
|
||||
|
||||
PFNGLMAPBUFFERPROC glMapBufferExt;
|
||||
PFNGLUNMAPBUFFERPROC glUnmapBufferExt;
|
||||
|
||||
bool initialized;
|
||||
|
||||
HDC hDC;
|
||||
};
|
||||
|
||||
GlFuncTab_W32::GlFuncTab_W32(HDC hDC_)
|
||||
{
|
||||
glGenBuffersExt = 0;
|
||||
glDeleteBuffersExt = 0;
|
||||
|
||||
glBufferDataExt = 0;
|
||||
glBufferSubDataExt = 0;
|
||||
|
||||
glBindBufferExt = 0;
|
||||
|
||||
glMapBufferExt = 0;
|
||||
glUnmapBufferExt = 0;
|
||||
|
||||
initialized = false;
|
||||
|
||||
hDC = hDC_;
|
||||
}
|
||||
|
||||
void GlFuncTab_W32::genBuffers(int n, unsigned int* buffers) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_W32::genBuffers" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glGenBuffersExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glGenBuffersExt(n, buffers);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_W32::deleteBuffers(int n, const unsigned int* buffers) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_W32::deleteBuffers" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glDeleteBuffersExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glDeleteBuffersExt(n, buffers);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_W32::bufferData(unsigned int target, ptrdiff_t size, const void* data, unsigned int usage) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_W32::bufferData" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glBufferDataExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glBufferDataExt(target, size, data, usage);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_W32::bufferSubData(unsigned int target, ptrdiff_t offset, ptrdiff_t size, const void* data) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_W32::bufferSubData" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glBufferSubDataExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glBufferSubDataExt(target, offset, size, data);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_W32::bindBuffer(unsigned int target, unsigned int buffer) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_W32::bindBuffer" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glBindBufferExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glBindBufferExt(target, buffer);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void* GlFuncTab_W32::mapBuffer(unsigned int target, unsigned int access) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_W32::mapBuffer" );
|
||||
|
||||
void* res = 0;
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glMapBufferExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
res = glMapBufferExt(target, access);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
void GlFuncTab_W32::unmapBuffer(unsigned int target) const
|
||||
{
|
||||
CV_FUNCNAME( "GlFuncTab_W32::unmapBuffer" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
if (!glUnmapBufferExt)
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Current OpenGL implementation doesn't support required extension");
|
||||
|
||||
glUnmapBufferExt(target);
|
||||
CV_CheckGlError();
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
void GlFuncTab_W32::generateBitmapFont(const std::string& family, int height, int weight, bool italic, bool underline, int start, int count, int base) const
|
||||
{
|
||||
HFONT font;
|
||||
|
||||
CV_FUNCNAME( "GlFuncTab_W32::generateBitmapFont" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
font = CreateFont
|
||||
(
|
||||
-height, // height
|
||||
0, // cell width
|
||||
0, // Angle of Escapement
|
||||
0, // Orientation Angle
|
||||
weight, // font weight
|
||||
italic ? TRUE : FALSE, // Italic
|
||||
underline ? TRUE : FALSE, // Underline
|
||||
FALSE, // StrikeOut
|
||||
ANSI_CHARSET, // CharSet
|
||||
OUT_TT_PRECIS, // OutPrecision
|
||||
CLIP_DEFAULT_PRECIS, // ClipPrecision
|
||||
ANTIALIASED_QUALITY, // Quality
|
||||
FF_DONTCARE | DEFAULT_PITCH, // PitchAndFamily
|
||||
family.c_str() // FaceName
|
||||
);
|
||||
|
||||
SelectObject(hDC, font);
|
||||
|
||||
if (!wglUseFontBitmaps(hDC, start, count, base))
|
||||
CV_ERROR(CV_OpenGlApiCallError, "Can't create font");
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
bool GlFuncTab_W32::isGlContextInitialized() const
|
||||
{
|
||||
return initialized;
|
||||
}
|
||||
|
||||
void initGl(CvWindow* window)
|
||||
{
|
||||
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
|
||||
|
||||
std::auto_ptr<GlFuncTab_W32> glFuncTab(new GlFuncTab_W32(window->dc));
|
||||
|
||||
// Load extensions
|
||||
PROC func;
|
||||
|
||||
func = wglGetProcAddress("glGenBuffers");
|
||||
glFuncTab->glGenBuffersExt = (PFNGLGENBUFFERSPROC)func;
|
||||
|
||||
func = wglGetProcAddress("glDeleteBuffers");
|
||||
glFuncTab->glDeleteBuffersExt = (PFNGLDELETEBUFFERSPROC)func;
|
||||
|
||||
func = wglGetProcAddress("glBufferData");
|
||||
glFuncTab->glBufferDataExt = (PFNGLBUFFERDATAPROC)func;
|
||||
|
||||
func = wglGetProcAddress("glBufferSubData");
|
||||
glFuncTab->glBufferSubDataExt = (PFNGLBUFFERSUBDATAPROC)func;
|
||||
|
||||
func = wglGetProcAddress("glBindBuffer");
|
||||
glFuncTab->glBindBufferExt = (PFNGLBINDBUFFERPROC)func;
|
||||
|
||||
func = wglGetProcAddress("glMapBuffer");
|
||||
glFuncTab->glMapBufferExt = (PFNGLMAPBUFFERPROC)func;
|
||||
|
||||
func = wglGetProcAddress("glUnmapBuffer");
|
||||
glFuncTab->glUnmapBufferExt = (PFNGLUNMAPBUFFERPROC)func;
|
||||
|
||||
glFuncTab->initialized = true;
|
||||
|
||||
window->glFuncTab = glFuncTab.release();
|
||||
|
||||
icvSetOpenGlFuncTab(window->glFuncTab);
|
||||
}
|
||||
|
||||
void createGlContext(HWND hWnd, HDC& hGLDC, HGLRC& hGLRC, bool& useGl)
|
||||
{
|
||||
CV_FUNCNAME( "createGlContext" );
|
||||
@@ -907,8 +638,6 @@ namespace
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
delete window->glFuncTab;
|
||||
|
||||
if (window->hGLRC)
|
||||
{
|
||||
wglDeleteContext(window->hGLRC);
|
||||
@@ -940,8 +669,6 @@ namespace
|
||||
if (window->glDrawCallback)
|
||||
window->glDrawCallback(window->glDrawData);
|
||||
|
||||
CV_CheckGlError();
|
||||
|
||||
if (!SwapBuffers(window->dc))
|
||||
CV_ERROR( CV_OpenGlApiCallError, "Can't swap OpenGL buffers" );
|
||||
|
||||
@@ -1042,7 +769,6 @@ CV_IMPL int cvNamedWindow( const char* name, int flags )
|
||||
#ifndef HAVE_OPENGL
|
||||
window->dc = CreateCompatibleDC(0);
|
||||
#else
|
||||
window->glFuncTab = 0;
|
||||
if (!useGl)
|
||||
{
|
||||
window->dc = CreateCompatibleDC(0);
|
||||
@@ -1054,14 +780,10 @@ CV_IMPL int cvNamedWindow( const char* name, int flags )
|
||||
window->dc = hGLDC;
|
||||
window->hGLRC = hGLRC;
|
||||
window->useGl = true;
|
||||
initGl(window);
|
||||
}
|
||||
|
||||
window->glDrawCallback = 0;
|
||||
window->glDrawData = 0;
|
||||
|
||||
window->glCleanCallback = 0;
|
||||
window->glCleanData = 0;
|
||||
#endif
|
||||
|
||||
window->last_key = 0;
|
||||
@@ -1112,8 +834,6 @@ CV_IMPL void cvSetOpenGlContext(const char* name)
|
||||
if (!wglMakeCurrent(window->dc, window->hGLRC))
|
||||
CV_ERROR( CV_OpenGlApiCallError, "Can't Activate The GL Rendering Context" );
|
||||
|
||||
icvSetOpenGlFuncTab(window->glFuncTab);
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
@@ -1161,30 +881,6 @@ CV_IMPL void cvSetOpenGlDrawCallback(const char* name, CvOpenGlDrawCallback call
|
||||
__END__;
|
||||
}
|
||||
|
||||
void icvSetOpenGlCleanCallback(const char* name, CvOpenGlCleanCallback callback, void* userdata)
|
||||
{
|
||||
CV_FUNCNAME( "icvSetOpenGlCleanCallback" );
|
||||
|
||||
__BEGIN__;
|
||||
|
||||
CvWindow* window;
|
||||
|
||||
if (!name)
|
||||
CV_ERROR(CV_StsNullPtr, "NULL name string");
|
||||
|
||||
window = icvFindWindowByName(name);
|
||||
if (!window)
|
||||
EXIT;
|
||||
|
||||
if (window->glCleanCallback)
|
||||
window->glCleanCallback(window->glCleanData);
|
||||
|
||||
window->glCleanCallback = callback;
|
||||
window->glCleanData = userdata;
|
||||
|
||||
__END__;
|
||||
}
|
||||
|
||||
#endif // HAVE_OPENGL
|
||||
|
||||
static void icvRemoveWindow( CvWindow* window )
|
||||
@@ -1194,18 +890,7 @@ static void icvRemoveWindow( CvWindow* window )
|
||||
|
||||
#ifdef HAVE_OPENGL
|
||||
if (window->useGl)
|
||||
{
|
||||
wglMakeCurrent(window->dc, window->hGLRC);
|
||||
|
||||
if (window->glCleanCallback)
|
||||
{
|
||||
window->glCleanCallback(window->glCleanData);
|
||||
window->glCleanCallback = 0;
|
||||
window->glCleanData = 0;
|
||||
}
|
||||
|
||||
releaseGlContext(window);
|
||||
}
|
||||
#endif
|
||||
|
||||
if( window->frame )
|
||||
|
||||
Reference in New Issue
Block a user