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

FreeSans Stuff

Browse Source
This commit is contained in:
Mark Watkins 2011-06-17 19:59:10 +10:00
parent e4c891af09
commit b5425d708e
8 changed files with 38417 additions and 38395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Projects/CodeBlocks/SleepyHead.cbp
View File

@ -121,9 +121,8 @@
<Unit filename="../../src/SleepyHeadMain.cpp" /> <Unit filename="../../src/SleepyHeadMain.cpp" />
<Unit filename="../../src/SleepyHeadMain.h" /> <Unit filename="../../src/SleepyHeadMain.h" />
<Unit filename="../../src/WxWizFrame.fbp" /> <Unit filename="../../src/WxWizFrame.fbp" />
<Unit filename="../../src/graphs/freesans.c"> <Unit filename="../../src/graphs/freesans.cpp" />
<Option compilerVar="CC" /> <Unit filename="../../src/graphs/freesans.h" />
</Unit>
<Unit filename="../../src/graphs/gl_pbuffer.cpp" /> <Unit filename="../../src/graphs/gl_pbuffer.cpp" />
<Unit filename="../../src/graphs/gl_pbuffer.h" /> <Unit filename="../../src/graphs/gl_pbuffer.h" />
<Unit filename="../../src/graphs/graph.cpp" /> <Unit filename="../../src/graphs/graph.cpp" />

18
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8300,7 +8300,7 @@
<map> <map>
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1308258943 /home/mark/projects/git/sleepyhead/src/graphs/graph.h 1308302313 /home/mark/projects/git/sleepyhead/src/graphs/graph.h
"gl_pbuffer.h" "gl_pbuffer.h"
<wx/glcanvas.h> <wx/glcanvas.h>
<wx/geometry.h> <wx/geometry.h>
@ -8309,7 +8309,7 @@
1308026543 D 1308026543 D
1308301986 /home/mark/projects/git/sleepyhead/src/version.h 1308304657 /home/mark/projects/git/sleepyhead/src/version.h
1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed 1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed
<wx/dcbuffer.h> <wx/dcbuffer.h>
@ -8362,7 +8362,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1308291326 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1308304488 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
"freetype-gl/font-manager.h" "freetype-gl/font-manager.h"
"freetype-gl/texture-font.h" "freetype-gl/texture-font.h"
"graph.h" "graph.h"
@ -8375,7 +8375,7 @@
<wx/log.h> <wx/log.h>
<math.h> <math.h>
"sleeplib/profiles.h" "sleeplib/profiles.h"
"freesans.c" "graphs/freesans.h"
1308010945 > 1308010945 >
@ -11062,7 +11062,7 @@
<string.h> <string.h>
"freetype-gl/vector.h" "freetype-gl/vector.h"
1308281312 /home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.h 1308302350 /home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.h
<wx/log.h> <wx/log.h>
<GL/glew.h> <GL/glew.h>
<GL/wglew.h> <GL/wglew.h>
@ -11071,7 +11071,7 @@
<GL/gl.h> <GL/gl.h>
<GL/glx.h> <GL/glx.h>
1308284539 source:/home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.cpp 1308304655 source:/home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.cpp
"gl_pbuffer.h" "gl_pbuffer.h"
<wx/utils.h> <wx/utils.h>
@ -11127,3 +11127,9 @@
"wx/app.h" "wx/app.h"
"wx/icon.h" "wx/icon.h"
1307847400 source:/home/mark/projects/git/sleepyhead/src/graphs/freesans.h
1308303716 /home/mark/projects/git/sleepyhead/src/graphs/freesans.h
1308304529 source:/home/mark/projects/git/sleepyhead/src/graphs/freesans.cpp

11
Projects/CodeBlocks/SleepyHead.layout
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<ActiveTarget name="Windows" /> <ActiveTarget name="Debug-wx29" />
<File name="../../src/GUIFrame.cpp" open="1" top="0" tabpos="9"> <File name="../../src/GUIFrame.cpp" open="0" top="0" tabpos="9">
<Cursor position="6211" topLine="144" /> <Cursor position="6211" topLine="144" />
</File> </File>
<File name="../../src/GUIFrame.h" open="1" top="0" tabpos="8"> <File name="../../src/GUIFrame.h" open="0" top="0" tabpos="8">
<Cursor position="3128" topLine="100" /> <Cursor position="3128" topLine="100" />
</File> </File>
<File name="../../src/SleepyHeadApp.cpp" open="0" top="0" tabpos="1"> <File name="../../src/SleepyHeadApp.cpp" open="0" top="0" tabpos="1">
@ -16,9 +16,6 @@
<File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="2"> <File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="2">
<Cursor position="2035" topLine="47" /> <Cursor position="2035" topLine="47" />
</File> </File>
<File name="../../src/graphs/freesans.c" open="0" top="0" tabpos="10">
<Cursor position="0" topLine="0" />
</File>
<File name="../../src/graphs/gl_pbuffer.cpp" open="1" top="0" tabpos="5"> <File name="../../src/graphs/gl_pbuffer.cpp" open="1" top="0" tabpos="5">
<Cursor position="8152" topLine="220" /> <Cursor position="8152" topLine="220" />
</File> </File>
@ -26,7 +23,7 @@
<Cursor position="644" topLine="58" /> <Cursor position="644" topLine="58" />
</File> </File>
<File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="3"> <File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="3">
<Cursor position="54702" topLine="2014" /> <Cursor position="454" topLine="0" />
</File> </File>
<File name="../../src/graphs/graph.h" open="1" top="0" tabpos="4"> <File name="../../src/graphs/graph.h" open="1" top="0" tabpos="4">
<Cursor position="10808" topLine="297" /> <Cursor position="10808" topLine="297" />

38370
src/graphs/freesans.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

38378
src/graphs/freesans.h
View File

File diff suppressed because it is too large Load Diff

13
src/graphs/gl_pbuffer.cpp
View File

@ -237,8 +237,17 @@ GLXContext real_shared_context=NULL;
pBufferGLX::pBufferGLX(int width, int height) pBufferGLX::pBufferGLX(int width, int height)
:pBuffer() :pBuffer()
{ {
m_width=width;
m_height=height; int ms=MAX(width,height);
int j;
for (int i=4;i<32;i++) { // min size 16x16.. probably a usless size.
j=1 << i;
if (j >= ms) break;
}
j <<= 2;
m_width=j;
m_height=j;
int attrib[]={ int attrib[]={
GLX_PBUFFER_WIDTH,m_width, GLX_PBUFFER_WIDTH,m_width,

5
src/graphs/graph.cpp
View File

@ -23,7 +23,7 @@ License: GPL
#include "sleeplib/profiles.h" #include "sleeplib/profiles.h"
#include "freesans.h" #include "graphs/freesans.h"
//#include <wx/dcbuffer.h> //#include <wx/dcbuffer.h>
@ -99,8 +99,7 @@ void GraphInit()
if (!wxFileExists(fontfile)) { if (!wxFileExists(fontfile)) {
wxFFile f; wxFFile f;
f.Open(fontfile,wxT("wb")); f.Open(fontfile,wxT("wb"));
long size=sizeof(FreeSans_ttf); if (!f.Write(FreeSans_ttf,FreeSans_length)) {
if (!f.Write(FreeSans_ttf,size)) {
wxLogError(wxT("Couldn't Write Font file.. Sorry.. need it to run")); wxLogError(wxT("Couldn't Write Font file.. Sorry.. need it to run"));
return; return;
} }

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 = 6509; static const long _BUILD = 6515;
static const long _REVISION = 18811; static const long _REVISION = 18840;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long _BUILDS_COUNT = 7751; static const long _BUILDS_COUNT = 7759;
#define _RC_FILEVERSION 0,7,6509,18811 #define _RC_FILEVERSION 0,7,6515,18840
#define _RC_FILEVERSION_STRING "0, 7, 6509, 18811\0" #define _RC_FILEVERSION_STRING "0, 7, 6515, 18840\0"
static const char _FULLVERSION_STRING[] = "0.7.6509.18811"; static const char _FULLVERSION_STRING[] = "0.7.6515.18840";
//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;