chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

More pbuffer stuff

Browse Source
This commit is contained in:
Mark Watkins 2011-06-14 06:25:18 +10:00
parent aa3e916eb2
commit 92fa12dc22
5 changed files with 101 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8215,7 +8215,7 @@
<wx/wx.h>
"GUIFrame.h"
1307861037 /home/mark/projects/git/sleepyhead/src/GUIFrame.h
1307995741 /home/mark/projects/git/sleepyhead/src/GUIFrame.h
<wx/intl.h>
<wx/string.h>
<wx/bitmap.h>
@ -8306,7 +8306,7 @@
<sleeplib/machine.h>
<list>
1307995152 /home/mark/projects/git/sleepyhead/src/version.h
1307996397 /home/mark/projects/git/sleepyhead/src/version.h
1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h"
@ -8344,7 +8344,7 @@
"sleeplib/profiles.h"
"sleeplib/machine_loader.h"
1307994893 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
1307996365 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h>
<wx/dcbuffer.h>
<wx/graphics.h>

2
src/GUIFrame.h
View File

@ -75,7 +75,7 @@ class GUIFrame : public wxFrame
public:
wxAuiNotebook* main_auinotebook;
GUIFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("SleepyHead"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1157,703 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
GUIFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("SleepyHead"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1280,773 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
wxAuiManager m_mgr;
~GUIFrame();

2
src/WxWizFrame.fbp
View File

@ -69,7 +69,7 @@
<property name="resize">Resizable</property>
<property name="row"></property>
<property name="show">1</property>
<property name="size">1157,703</property>
<property name="size">1280,773</property>
<property name="style">wxDEFAULT_FRAME_STYLE</property>
<property name="subclass"></property>
<property name="title">SleepyHead</property>

95
src/graphs/graph.cpp
View File

@ -133,7 +133,7 @@ void DrawText2(wxString text, float x, float y,TextureFont *font)
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
glEnable( GL_TEXTURE_2D );
glColor4f(1,1,1,1);
vbuffer->Render(GL_TRIANGLES, "vtc" );
vbuffer->Render(GL_TRIANGLES, (char *)"vtc" );
glDisable(GL_BLEND);
}
@ -810,13 +810,85 @@ void gGraphWindow::SetMargins(float top, float right, float bottom, float left)
m_marginLeft=left;
m_marginRight=right;
}
#if defined (__UNIX__)
GLXContext real_shared_context=0;
#endif
wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
{
//pBuffers are evil.. but I need to use them here.
#if defined(__WXMSW__)
/* HDC hDC = wglGetCurrentDC();
// Get ready to query for a suitable pixel format that meets our minimum requirements.
int iAttributes[2*MAX_ATTRIBS];
float fAttributes[2*MAX_ATTRIBS];
int nfAttribs = 0;
int niAttribs = 0;
// Attribute arrays must be "0" terminated - for simplicity, first
// just zero-out the array then fill from left to right.
for (i=0; i<2*MAX_ATTRIBS; i++ ){
iAttributes[i] = 0;
fAttributes[i] = 0;
}
// Since we are trying to create a pbuffer, the pixel format we
//request (and subsequently use) must be "p-buffer capable".
iAttributes[2*niAttribs]=WGL_DRAW_TO_PBUFFER_ARB;
iAttributes[2*niAttribs+1]=true;
niAttribs++;
// We require a minimum of 24-bit depth.
iAttributes[2*niAttribs ]=WGL_DEPTH_BITS_ARB;
iAttributes[2*niAttribs+1]=24;
niAttribs++;
// We require a minimum of 8-bits for each R, G, B, and A.
iAttributes[2*niAttribs]=WGL_RED_BITS_ARB;
iAttributes[2*niAttribs+1]=8;
niAttribs++;
iAttributes[2*niAttribs]=WGL_GREEN_BITS_ARB;
iAttributes[2*niAttribs+1]=8;
niAttribs++;
iAttributes[2*niAttribs]=WGL_BLUE_BITS_ARB;
iAttributes[2*niAttribs+1]=8;
niAttribs++;
iAttributes[2*niAttribs]=WGL_ALPHA_BITS_ARB;
iAttributes[2*niAttribs+1]=8;
niAttribs++;
// Now obtain a list of pixel formats that meet these minimum requirements.
int pformat;
unsigned int nformats;
if(!wglChoosePixelFormatARB( hDC, iAttributes, fAttributes, 1, &pformat, &nformats)){
printf("pbuffer creation error: Couldn't find a suitable pixel format.\n" );
return false;
}
for (i=0; i<2*MAX_ATTRIBS; i++ )iAttributes[i] = 0;
g_hPBuffer=wglCreatePbufferARB( hDC, pformat, PBUFFERSIZE, PBUFFERSIZE, iAttributes );
g_hPBufDC=wglGetPbufferDCARB( g_hPBuffer );
int w,h;
wglQueryPbufferARB( g_hPBuffer, WGL_PBUFFER_WIDTH_ARB, &w );
wglQueryPbufferARB( g_hPBuffer, WGL_PBUFFER_HEIGHT_ARB, &h );
printf("PBuffer size: %d x %d\n",w,h);
g_hPBufRC=wglCreateContext(g_hPBufDC);
return true; */
// WGL pBuffer Implementation
return &wxNullBitmap;
#elif defined(__DARWIN__)
@ -850,10 +922,21 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
wxLogError(wxT("pBuffer not availble"));
}
//real_shared_context =
//GLXContext cx= shared_context->GetGLXContext();
GLXContext cx=0,gx=0;
// This function is not in WX sourcecode yet :(
//cx=shared_context->GetGLXContext();
if (!cx && real_shared_context) cx=real_shared_context; // Only available after redraw.. :(
else {
// First render screws up unless we do this..
gx=cx = glXCreateNewContext(display,fbc[0],GLX_RGBA_TYPE, NULL, True);
}
//real_shared_context =
GLXContext cx = glXCreateNewContext(display,fbc[0],GLX_RGBA_TYPE, real_shared_context, True);
//GLXContext cx=real_shared_context;
if (cx == 0) {
wxLogError(wxT("CX not availble"));
@ -888,7 +971,7 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
glFlush();
#if defined(__UNIX__)
glXDestroyContext(display,cx);
if (gx) glXDestroyContext(display,gx);
glXDestroyPbuffer(display, pBuffer);
#endif
@ -948,7 +1031,9 @@ void gGraphWindow::OnPaint(wxPaintEvent& event)
//#endif
#if defined(__UNIX__)
real_shared_context = glXGetCurrentContext();
#endif
GetClientSize(&m_scrX, &m_scrY);

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 7;
static const long BUILD = 5555;
static const long REVISION = 13616;
static const long BUILD = 5568;
static const long REVISION = 13703;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 5661;
#define RC_FILEVERSION 0,7,5555,13616
#define RC_FILEVERSION_STRING "0, 7, 5555, 13616\0"
static const char FULLVERSION_STRING[] = "0.7.5555.13616";
static const long BUILDS_COUNT = 5690;
#define RC_FILEVERSION 0,7,5568,13703
#define RC_FILEVERSION_STRING "0, 7, 5568, 13703\0"
static const char FULLVERSION_STRING[] = "0.7.5568.13703";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0;