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

Mac Pow Fix

Browse Source
This commit is contained in:
Mark Watkins 2011-06-14 14:41:38 +10:00
parent cb2ab33991
commit 2cc546b30a
9 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8306,7 +8306,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1308007178 /home/mark/projects/git/sleepyhead/src/version.h 1308025958 /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"
@ -8324,7 +8324,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1307991977 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp 1308010361 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
"wx_pch.h" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>
@ -8344,14 +8344,14 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1308007178 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1308010945 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<OpenGL/gl.h> <OpenGL/gl.h>
<AGL/agl.h> <AGL/agl.h>
<GL/wglew.h> <GL/glew.h>
<wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/graphics.h>
<wx/glcanvas.h> <wx/glcanvas.h>
<wx/settings.h>
<wx/graphics.h>
<wx/image.h> <wx/image.h>
<wx/log.h> <wx/log.h>
<math.h> <math.h>
@ -10931,9 +10931,9 @@
"text-markup.h" "text-markup.h"
"vertex-buffer.h" "vertex-buffer.h"
1308003215 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.h 1308009703 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.h
<Glut/glut.h> <Glut/glut.h>
<GL/glu.h> <GL/glew.h>
<GL/gl.h> <GL/gl.h>
<GL/glext.h> <GL/glext.h>
"freetype-gl/vector.h" "freetype-gl/vector.h"
@ -11014,9 +11014,9 @@
"font-manager.h" "font-manager.h"
"text-markup.h" "text-markup.h"
1308000368 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-atlas.cpp 1308009126 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-atlas.cpp
<Glut/glut.h> <Glut/glut.h>
<GL/gl.h> <GL/glew.h>
"texture-atlas.h" "texture-atlas.h"
1307999961 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-font.cpp 1307999961 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-font.cpp
@ -11025,13 +11025,13 @@
<math.h> <math.h>
"texture-font.h" "texture-font.h"
1308003216 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.cpp 1308009682 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.cpp
<Glut/glut.h> <Glut/glut.h>
<GL/glu.h> <GL/glew.h>
<GL/gl.h> <GL/gl.h>
"texture-glyph.h" "texture-glyph.h"
1308002517 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.cpp 1308011216 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.cpp
<assert.h> <assert.h>
<string.h> <string.h>
<stdlib.h> <stdlib.h>

10
src/SleepyHeadMain.cpp
View File

@ -947,17 +947,19 @@ void Daily::RefreshData()
} }
wxRect r=HTMLInfo->GetRect(); wxRect r=HTMLInfo->GetRect();
int w=r.width-27; int w=r.width-27;
ahi_bmp=G_AHI->RenderBitmap(w,25); /* ahi_bmp=G_AHI->RenderBitmap(w,25);
tap_bmp=TAP->RenderBitmap(w,25); tap_bmp=TAP->RenderBitmap(w,25);
wxMemoryFSHandler::AddFile(_T("ahi.png"), *ahi_bmp, wxBITMAP_TYPE_PNG); if (ahi_bmp)
wxMemoryFSHandler::AddFile(_T("tap.png"), *tap_bmp, wxBITMAP_TYPE_PNG); wxMemoryFSHandler::AddFile(_T("ahi.png"), *ahi_bmp, wxBITMAP_TYPE_PNG);
if (tap_bmp)
wxMemoryFSHandler::AddFile(_T("tap.png"), *tap_bmp, wxBITMAP_TYPE_PNG);
if (mode==MODE_BIPAP) { if (mode==MODE_BIPAP) {
teap_bmp=TAP_EAP->RenderBitmap(w,25); teap_bmp=TAP_EAP->RenderBitmap(w,25);
tiap_bmp=TAP_IAP->RenderBitmap(w,25); tiap_bmp=TAP_IAP->RenderBitmap(w,25);
wxMemoryFSHandler::AddFile(_T("teap.png"), *teap_bmp, wxBITMAP_TYPE_PNG); wxMemoryFSHandler::AddFile(_T("teap.png"), *teap_bmp, wxBITMAP_TYPE_PNG);
wxMemoryFSHandler::AddFile(_T("tiap.png"), *tiap_bmp, wxBITMAP_TYPE_PNG); wxMemoryFSHandler::AddFile(_T("tiap.png"), *tiap_bmp, wxBITMAP_TYPE_PNG);
} } */
pr=(PRTypes)cpap->summary_max(CPAP_PressureReliefType); pr=(PRTypes)cpap->summary_max(CPAP_PressureReliefType);
if (pr==PR_NONE) if (pr==PR_NONE)

26
src/graphs/graph.cpp
View File

@ -5,17 +5,22 @@ Author: Mark Watkins <jedimark64@users.sourceforge.net>
License: LGPL License: LGPL
*/ */
#define GL_GLEXT_PROTOTYPES
#ifdef __DARWIN__ #ifdef __DARWIN__
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <AGL/agl.h> #include <AGL/agl.h>
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
#include <GL/wglew.h> #define GLEW_STATIC
#include <GL/glew.h>
#endif #endif
#include <wx/settings.h>
#include <wx/dcbuffer.h> #include <wx/dcbuffer.h>
#include <wx/graphics.h>
#include <wx/glcanvas.h> #include <wx/glcanvas.h>
#include <wx/settings.h>
#include <wx/graphics.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/log.h> #include <wx/log.h>
#include <math.h> #include <math.h>
@ -123,6 +128,7 @@ void DrawText2(wxString text, float x, float y,TextureFont *font)
TextureGlyph *glyph; TextureGlyph *glyph;
glyph=font->GetGlyph((wchar_t)text[0]); glyph=font->GetGlyph((wchar_t)text[0]);
if (!glyph) return; if (!glyph) return;
assert(vbuffer!=NULL);
vbuffer->Clear(); vbuffer->Clear();
glyph->AddToVertexBuffer(vbuffer, markup, &pen); glyph->AddToVertexBuffer(vbuffer, markup, &pen);
@ -149,13 +155,7 @@ void DrawText(wxString text, float x, float y, float angle=0, const wxColor & co
return; return;
} }
if (angle==0) { if (angle==0) {
// Colourizing this just plain sucks.. DrawText2(text,x,y,font);
DrawText2(text,x,y,font); //
/*glPixelTransferf(GL_RED_BIAS, -1.0f);
glPixelTransferf(GL_GREEN_BIAS, -1.0f);
glPixelTransferf(GL_BLUE_BIAS, -1.0f);
glColor4ub(color.Red(),color.Green(),color.Blue(),color.Alpha());
font->Render(text.mb_str(),-1,FTPoint(x,y)); //,x,y);*/
return; return;
} }
@ -169,7 +169,6 @@ void DrawText(wxString text, float x, float y, float angle=0, const wxColor & co
glTranslatef(x,y,0); glTranslatef(x,y,0);
glRotatef(angle, 0.0f, 0.0f, 1.0f); glRotatef(angle, 0.0f, 0.0f, 1.0f);
DrawText2(text,-w/2.0,-h/2.0,font); DrawText2(text,-w/2.0,-h/2.0,font);
//font->Render(text.mb_str(),-1,FTPoint(-w/2.0,-h/2.0));
glTranslatef(-x,-y,0); glTranslatef(-x,-y,0);
glPopMatrix(); glPopMatrix();
@ -824,11 +823,12 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
//pBuffers are evil.. but I need to use them here. //pBuffers are evil.. but I need to use them here.
#if defined(__WXMSW__) #if defined(__WXMSW__)
/* HDC hDC = wglGetCurrentDC(); HDC hDC = wglGetCurrentDC();
// Get ready to query for a suitable pixel format that meets our minimum requirements. // Get ready to query for a suitable pixel format that meets our minimum requirements.
int iAttributes[2*MAX_ATTRIBS];
/*int iAttributes[2*MAX_ATTRIBS];
float fAttributes[2*MAX_ATTRIBS]; float fAttributes[2*MAX_ATTRIBS];
int nfAttribs = 0; int nfAttribs = 0;
int niAttribs = 0; int niAttribs = 0;

6
src/libs/freetype-gl/texture-atlas.cpp
View File

@ -22,8 +22,10 @@
* ========================================================================= */ * ========================================================================= */
#if defined(__APPLE__) #if defined(__APPLE__)
#include <Glut/glut.h> #include <Glut/glut.h>
#else #else
#include <GL/gl.h> #define GL_GLEXT_PROTOTYPES
#include <GL/glew.h>
#endif #endif
//#include <stdlib.h> //#include <stdlib.h>
//#include <limits.h> //#include <limits.h>

2
src/libs/freetype-gl/texture-font.cpp
View File

@ -145,7 +145,7 @@ int TextureFont::CacheGlyphs(wchar_t * charcodes)
for( x=0; x<slot->bitmap.width; ++x ) { for( x=0; x<slot->bitmap.width; ++x ) {
for( y=0; y<slot->bitmap.rows; ++y ){ for( y=0; y<slot->bitmap.rows; ++y ){
c = *(unsigned char *)(slot->bitmap.buffer + y*slot->bitmap.pitch + x ); c = *(unsigned char *)(slot->bitmap.buffer + y*slot->bitmap.pitch + x );
c = (unsigned char) ( pow(c/255.0, m_gamma) * 255); c = (unsigned char) ( pow((float)c/255.0, (float)m_gamma) * 255);
*(unsigned char *)(slot->bitmap.buffer + y*slot->bitmap.pitch + x ) = c; *(unsigned char *)(slot->bitmap.buffer + y*slot->bitmap.pitch + x ) = c;
} }
} }

4
src/libs/freetype-gl/texture-glyph.cpp
View File

@ -23,7 +23,9 @@
#if defined(__APPLE__) #if defined(__APPLE__)
#include <Glut/glut.h> #include <Glut/glut.h>
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
#include <GL/glu.h> #define GL_GLEXT_PROTOTYPES
#define GLEW_STATIC
#include <GL/glew.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#endif #endif

8
src/libs/freetype-gl/vertex-buffer.cpp
View File

@ -114,14 +114,10 @@ void VertexBuffer::Upload()
glGenBuffers(1, &indices_id ); glGenBuffers(1, &indices_id );
} }
glBindBuffer(GL_ARRAY_BUFFER, vertices_id); glBindBuffer(GL_ARRAY_BUFFER, vertices_id);
glBufferData(GL_ARRAY_BUFFER, glBufferData(GL_ARRAY_BUFFER, vertices->size * vertices->item_size, vertices->items, GL_DYNAMIC_DRAW);
vertices->size * vertices->item_size,
vertices->items, GL_DYNAMIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indices_id); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indices_id);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices->size * indices->item_size, indices->items, GL_DYNAMIC_DRAW);
indices->size * indices->item_size,
indices->items, GL_DYNAMIC_DRAW);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
} }

6
src/libs/freetype-gl/vertex-buffer.h
View File

@ -25,15 +25,15 @@
#ifndef __VERTEX_BUFFER_H__ #ifndef __VERTEX_BUFFER_H__
#define __VERTEX_BUFFER_H__ #define __VERTEX_BUFFER_H__
#define GL_GLEXT_PROTOTYPES
#if defined(__APPLE__) #if defined(__APPLE__)
#include <Glut/glut.h> #include <Glut/glut.h>
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
#define GLEW_STATIC
#include <GL/glu.h> #include <GL/glew.h>
#else #else
#define GL_GLEXT_PROTOTYPES 1
//#include <GL/glut.h> //#include <GL/glut.h>
//#include <GL/gl.h> //#include <GL/gl.h>
#include <GL/gl.h> #include <GL/gl.h>

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 = 5609; static const long BUILD = 5640;
static const long REVISION = 13956; static const long REVISION = 14116;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 5788; static const long BUILDS_COUNT = 5842;
#define RC_FILEVERSION 0,7,5609,13956 #define RC_FILEVERSION 0,7,5640,14116
#define RC_FILEVERSION_STRING "0, 7, 5609, 13956\0" #define RC_FILEVERSION_STRING "0, 7, 5640, 14116\0"
static const char FULLVERSION_STRING[] = "0.7.5609.13956"; static const char FULLVERSION_STRING[] = "0.7.5640.14116";
//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;