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

Hopefully a fix for mac's dodgy wxGLContext

Browse Source
This commit is contained in:
Mark Watkins 2011-06-12 13:47:10 +10:00
parent d0f4269ee6
commit e38dd65dd0
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8306,7 +8306,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307848442 /home/mark/projects/git/sleepyhead/src/version.h 1307850405 /home/mark/projects/git/sleepyhead/src/version.h
1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"

24
src/graphs/graph.cpp
View File

@ -12,6 +12,14 @@ License: LGPL
#include <wx/log.h> #include <wx/log.h>
#include <FTGL/ftgl.h> #include <FTGL/ftgl.h>
#include <math.h> #include <math.h>
#ifdef __DARWIN__
#include <OpenGL/gl.h>
#include <AGL/agl.h>
#endif
#include "graph.h" #include "graph.h"
#include "sleeplib/profiles.h" #include "sleeplib/profiles.h"
#include "freesans.c" #include "freesans.c"
@ -46,6 +54,7 @@ wxFont *smallfont=NULL,*bigfont=NULL,*boldfont=NULL;
bool gfont_init=false; bool gfont_init=false;
FTGLPixmapFont *normalfont=NULL; FTGLPixmapFont *normalfont=NULL;
FTGLPixmapFont *largefont=NULL;
FTGLTextureFont *rotfont=NULL; FTGLTextureFont *rotfont=NULL;
list<wxString> font_paths; list<wxString> font_paths;
@ -65,17 +74,24 @@ void GraphInit()
} }
f.Close(); f.Close();
} }
normalfont=new FTGLPixmapFont(fontfile.mb_str()); normalfont=new FTGLPixmapFont(fontfile.mb_str());
largefont=new FTGLPixmapFont(fontfile.mb_str());
rotfont=new FTGLTextureFont(fontfile.mb_str()); rotfont=new FTGLTextureFont(fontfile.mb_str());
if (normalfont->Error()) { if (normalfont->Error()) {
delete normalfont; delete normalfont;
normalfont=NULL; normalfont=NULL;
} }
if (largefont->Error()) {
delete largefont;
largefont=NULL;
}
if (rotfont->Error()) { if (rotfont->Error()) {
delete rotfont; delete rotfont;
rotfont=NULL; rotfont=NULL;
} }
rotfont->FaceSize(14); rotfont->FaceSize(14);
largefont->FaceSize(30);
normalfont->FaceSize(14); normalfont->FaceSize(14);
bigfont=new wxFont(32,wxFONTFAMILY_ROMAN,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL); bigfont=new wxFont(32,wxFONTFAMILY_ROMAN,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL);
boldfont=new wxFont(12,wxFONTFAMILY_ROMAN,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD); boldfont=new wxFont(12,wxFONTFAMILY_ROMAN,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD);
@ -275,7 +291,13 @@ gGraphWindow::gGraphWindow(wxWindow *parent, wxWindowID id,const wxString & titl
m_foobar_moved=0; m_foobar_moved=0;
gtitle=foobar=xaxis=yaxis=NULL; gtitle=foobar=xaxis=yaxis=NULL;
#if defined(__DARWIN__)
// Screw you apple..
AGLPixelFormat aglpf=ChoosePixelFormat(NULL);
gl_context=new wxGLContext(aglpf,this,wxNullPalette,NULL);
#else
gl_context=new wxGLContext(this,NULL); gl_context=new wxGLContext(this,NULL);
#endif
rotfont->FaceSize(14); rotfont->FaceSize(14);
AddLayer(new gGraphTitle(title,wxVERTICAL,boldfont)); AddLayer(new gGraphTitle(title,wxVERTICAL,boldfont));
@ -806,7 +828,7 @@ void gGraphWindow::OnPaint(wxPaintEvent& event)
//#endif //#endif
GetClientSize(&m_scrX, &m_scrY); GetClientSize(&m_scrX, &m_scrY);
#if !defined(__WXMAC__) #if !defined(__DARWIN__)
gl_context->SetCurrent(*this); // A generic Context needs to be used.. Not one per graph window gl_context->SetCurrent(*this); // A generic Context needs to be used.. Not one per graph window
#else #else
gl_context->SetCurrent(); gl_context->SetCurrent();

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 5012; static const long BUILD = 5015;
static const long REVISION = 10657; static const long REVISION = 10677;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 4422; static const long BUILDS_COUNT = 4428;
#define RC_FILEVERSION 0,7,5012,10657 #define RC_FILEVERSION 0,7,5015,10677
#define RC_FILEVERSION_STRING "0, 7, 5012, 10657\0" #define RC_FILEVERSION_STRING "0, 7, 5015, 10677\0"
static const char FULLVERSION_STRING[] = "0.7.5012.10657"; static const char FULLVERSION_STRING[] = "0.7.5015.10677";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0; static const long BUILD_HISTORY = 0;