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

Yet another try at AGL fix

Browse Source
This commit is contained in:
Mark Watkins 2011-06-12 15:58:21 +10:00
parent ab1c5431b1
commit 7cbde1615d
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8306,7 +8306,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307857376 /home/mark/projects/git/sleepyhead/src/version.h 1307858279 /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"
@ -8344,7 +8344,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1307856797 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307857375 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/graphics.h> <wx/graphics.h>

13
src/graphs/graph.cpp
View File

@ -143,6 +143,7 @@ void DrawText(wxString text, float x, float y, float angle=0, const wxColor & co
float w,h; float w,h;
GetTextExtent(text, w, h, font); GetTextExtent(text, w, h, font);
//glPushAttrib(GL_LIST_BIT|GL_CURRENT_BIT|GL_ENABLE_BIT|GL_TRANSFORM_BIT);
glPushMatrix(); glPushMatrix();
//glEnable(GL_BLEND); //glEnable(GL_BLEND);
@ -150,18 +151,24 @@ void DrawText(wxString text, float x, float y, float angle=0, const wxColor & co
//glPixelTransferf(GL_GREEN_BIAS, -1.0f); //glPixelTransferf(GL_GREEN_BIAS, -1.0f);
//glPixelTransferf(GL_BLUE_BIAS, -1.0f); //glPixelTransferf(GL_BLUE_BIAS, -1.0f);
//glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glColor4ub(color.Red(),color.Green(),color.Blue(),color.Alpha()); glColor4ub(color.Red(),color.Green(),color.Blue(),color.Alpha());
//glBlendFuncSeparate(GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ZERO);
glDisable(GL_BLEND);
glDisable(GL_LIGHTING);
glDisable(GL_DEPTH_TEST);
//glDisable(GL_TEXTURE_2D);
//glBlendFunc(GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ZERO);
// glBlendFunc(GL_ONE, GL_ZERO); // glBlendFunc(GL_ONE, GL_ZERO);
//glLoadIdentity(); //glLoadIdentity();
glTranslatef(x,y,0); glTranslatef(x,y,0);
glRotatef(90.0, 0.0f, 0.0f, 1.0f); glRotatef(90.0, 0.0f, 0.0f, 1.0f);
glEnable(GL_TEXTURE_2D);
font->Render(text.mb_str(),-1,FTPoint(-w/2.0,-h/2.0)); font->Render(text.mb_str(),-1,FTPoint(-w/2.0,-h/2.0));
glTranslatef(-x,-y,0); glTranslatef(-x,-y,0);
//glDisable(GL_BLEND); //glDisable(GL_BLEND);
//glEnable(GL_TEXTURE_2D); //glEnable(GL_TEXTURE_2D);
glPopMatrix(); glPopMatrix();
//glPopAttrib();
} }
@ -295,7 +302,7 @@ gGraphWindow::gGraphWindow(wxWindow *parent, wxWindowID id,const wxString & titl
#if defined(__DARWIN__) #if defined(__DARWIN__)
// Screw you apple.. // Screw you apple..
int *attribList = (int*) NULL; int *attribList = (int*) NULL;
AGLPixelFormat aglpf=aglChoosePixelFormat(attribList); AGLPixelFormat aglpf=aglChoosePixelFormat(NULL,0,attribList);
gl_context=new wxGLContext(aglpf,this,wxNullPalette,NULL); gl_context=new wxGLContext(aglpf,this,wxNullPalette,NULL);
// Mmmmm.. Platform incosistency with wx.. // Mmmmm.. Platform incosistency with wx..

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 = 5067; static const long BUILD = 5075;
static const long REVISION = 10967; static const long REVISION = 11002;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 4555; static const long BUILDS_COUNT = 4576;
#define RC_FILEVERSION 0,7,5067,10967 #define RC_FILEVERSION 0,7,5075,11002
#define RC_FILEVERSION_STRING "0, 7, 5067, 10967\0" #define RC_FILEVERSION_STRING "0, 7, 5075, 11002\0"
static const char FULLVERSION_STRING[] = "0.7.5067.10967"; static const char FULLVERSION_STRING[] = "0.7.5075.11002";
//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;