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

Hopefully last of the current build errors

Browse Source
This commit is contained in:
Mark Watkins 2011-06-14 16:15:57 +10:00
parent 1cee803476
commit abd0a0cff7
7 changed files with 161 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8240,7 +8240,7 @@
<wx/datectrl.h> <wx/datectrl.h>
<wx/dateevt.h> <wx/dateevt.h>
1307528196 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadApp.cpp 1308031885 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadApp.cpp
"wx_pch.h" "wx_pch.h"
<iostream> <iostream>
<wx/log.h> <wx/log.h>
@ -8308,7 +8308,7 @@
1308026543 D 1308026543 D
1308030963 /home/mark/projects/git/sleepyhead/src/version.h 1308032101 /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>
@ -8340,7 +8340,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1308026543 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp 1308031975 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>
@ -11037,7 +11037,7 @@
<GL/glew.h> <GL/glew.h>
"texture-atlas.h" "texture-atlas.h"
1308030624 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-font.cpp 1308031681 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-font.cpp
<ft2build.h> <ft2build.h>
<wx/log.h> <wx/log.h>
<math.h> <math.h>
@ -11056,7 +11056,7 @@
<stdio.h> <stdio.h>
"vertex-buffer.h" "vertex-buffer.h"
1308030960 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vector.cpp 1308031619 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vector.cpp
<assert.h> <assert.h>
<stdlib.h> <stdlib.h>
<string.h> <string.h>

2
src/SleepyHeadApp.cpp
View File

@ -63,7 +63,7 @@ bool SleepyHeadApp::OnInit()
//loader_progress->Show(); //loader_progress->Show();
pref["AppName"]=wxT("Awesome Sleep Application"); pref["AppName"]=wxT("Awesome Sleep Application");
pref["Version"]=wxString(AutoVersion::FULLVERSION_STRING,wxConvUTF8); pref["Version"]=wxString(AutoVersion::_FULLVERSION_STRING,wxConvUTF8);
pref["Profile"]=wxGetUserId(); pref["Profile"]=wxGetUserId();
profile=Profiles::Get(pref["Profile"]); profile=Profiles::Get(pref["Profile"]);

10
src/SleepyHeadMain.cpp
View File

@ -78,7 +78,7 @@ SleepyHeadFrame::SleepyHeadFrame(wxFrame *frame)
{ {
//GraphInit(); // Don't do this here: The first gGraphWindow must do it. //GraphInit(); // Don't do this here: The first gGraphWindow must do it.
wxString title=wxTheApp->GetAppName()+wxT(" v")+wxString(AutoVersion::FULLVERSION_STRING,wxConvUTF8); wxString title=wxTheApp->GetAppName()+wxT(" v")+wxString(AutoVersion::_FULLVERSION_STRING,wxConvUTF8);
SetTitle(title); SetTitle(title);
profile=Profiles::Get(); profile=Profiles::Get();
@ -288,11 +288,11 @@ void SleepyHeadFrame::OnAntiAliasing( wxCommandEvent& event )
void SleepyHeadFrame::OnAbout(wxCommandEvent &event) void SleepyHeadFrame::OnAbout(wxCommandEvent &event)
{ {
// wxAboutBox is fairly useless. // wxAboutBox is fairly useless.
wxString day=wxString(AutoVersion::DATE,wxConvUTF8); wxString day=wxString(AutoVersion::_DATE,wxConvUTF8);
wxString month=wxString(AutoVersion::MONTH,wxConvUTF8); wxString month=wxString(AutoVersion::_MONTH,wxConvUTF8);
wxString year=wxString(AutoVersion::YEAR,wxConvUTF8); wxString year=wxString(AutoVersion::_YEAR,wxConvUTF8);
wxString date=day+wxT("/")+month+wxT("/")+year; wxString date=day+wxT("/")+month+wxT("/")+year;
wxString msg=wxTheApp->GetAppName()+wxT(" v")+wxString(AutoVersion::FULLVERSION_STRING,wxConvUTF8)+_(" alpha preview ")+date+_("\n\n")+wxT("\u00a9")+_("2011 Mark Watkins & Troy Schultz\n\n"); wxString msg=wxTheApp->GetAppName()+wxT(" v")+wxString(AutoVersion::_FULLVERSION_STRING,wxConvUTF8)+_(" alpha preview ")+date+_("\n\n")+wxT("\u00a9")+_("2011 Mark Watkins & Troy Schultz\n\n");
msg+=_("Website: http://sleepyhead.sourceforge.net\n\n"); msg+=_("Website: http://sleepyhead.sourceforge.net\n\n");
msg+=_("License: GNU Public License (GPL)\n\n"); msg+=_("License: GNU Public License (GPL)\n\n");
msg+=_("This software is under active development, and is guaranteed to break and change regularly! Use at your own risk.\n\n"); msg+=_("This software is under active development, and is guaranteed to break and change regularly! Use at your own risk.\n\n");

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(float(c)/255.0, (float)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;
} }
} }

116
src/libs/freetype-gl/vector.cpp
View File

@ -25,14 +25,12 @@
//#include <stdio.h> //#include <stdio.h>
#include "freetype-gl/vector.h" #include "freetype-gl/vector.h"
Vector * Vector * vector_new( size_t item_size )
vector_new( size_t item_size )
{ {
assert( item_size ); assert( item_size );
Vector *self = (Vector *) malloc( sizeof(Vector) ); Vector *self = (Vector *) malloc( sizeof(Vector) );
if( !self ) if( !self ) {
{
return NULL; return NULL;
} }
self->item_size = item_size; self->item_size = item_size;
@ -44,8 +42,7 @@ vector_new( size_t item_size )
void void vector_delete( Vector *self )
vector_delete( Vector *self )
{ {
assert( self ); assert( self );
free( self->items ); free( self->items );
@ -54,9 +51,7 @@ vector_delete( Vector *self )
const void * const void * vector_get( const Vector *self, size_t index )
vector_get( const Vector *self,
size_t index )
{ {
assert( self ); assert( self );
assert( self->size ); assert( self->size );
@ -67,8 +62,7 @@ vector_get( const Vector *self,
const void * const void * vector_front( const Vector *self )
vector_front( const Vector *self )
{ {
assert( self ); assert( self );
assert( self->size ); assert( self->size );
@ -77,8 +71,7 @@ vector_front( const Vector *self )
const void * const void * vector_back( const Vector *self )
vector_back( const Vector *self )
{ {
assert( self ); assert( self );
assert( self->size ); assert( self->size );
@ -87,17 +80,12 @@ vector_back( const Vector *self )
int int vector_contains( const Vector *self, const void *item, int (*cmp)(const void *, const void *) )
vector_contains( const Vector *self,
const void *item,
int (*cmp)(const void *, const void *) )
{ {
size_t i; size_t i;
assert( self ); assert( self );
for( i=0; i<self->size; ++i ) for( i=0; i<self->size; ++i ) {
{ if( (*cmp)(item, vector_get(self,i) ) == 0 ) {
if( (*cmp)(item, vector_get(self,i) ) == 0 )
{
return 1; return 1;
} }
} }
@ -106,8 +94,7 @@ vector_contains( const Vector *self,
int int vector_empty( const Vector *self )
vector_empty( const Vector *self )
{ {
assert( self ); assert( self );
return self->size == 0; return self->size == 0;
@ -115,8 +102,7 @@ vector_empty( const Vector *self )
size_t size_t vector_size( const Vector *self )
vector_size( const Vector *self )
{ {
assert( self ); assert( self );
return self->size; return self->size;
@ -124,9 +110,7 @@ vector_size( const Vector *self )
void void vector_reserve( Vector *self, const size_t size )
vector_reserve( Vector *self,
const size_t size )
{ {
assert( self ); assert( self );
if( self->capacity < size); if( self->capacity < size);
@ -138,8 +122,7 @@ vector_reserve( Vector *self,
size_t size_t vector_capacity( const Vector *self )
vector_capacity( const Vector *self )
{ {
assert( self ); assert( self );
return self->capacity; return self->capacity;
@ -147,12 +130,10 @@ vector_capacity( const Vector *self )
void void vector_shrink( Vector *self )
vector_shrink( Vector *self )
{ {
assert( self ); assert( self );
if( self->capacity > self->size ) if( self->capacity > self->size ) {
{
self->items = realloc( self->items, self->size * self->item_size ); self->items = realloc( self->items, self->size * self->item_size );
} }
self->capacity = self->size; self->capacity = self->size;
@ -160,18 +141,14 @@ vector_shrink( Vector *self )
void void vector_clear( Vector *self )
vector_clear( Vector *self )
{ {
assert( self ); assert( self );
self->size = 0; self->size = 0;
} }
void void vector_set( Vector *self, const size_t index, const void *item )
vector_set( Vector *self,
const size_t index,
const void *item )
{ {
assert( self ); assert( self );
assert( self->size ); assert( self->size );
@ -181,20 +158,15 @@ vector_set( Vector *self,
void void vector_insert( Vector *self, const size_t index, const void *item )
vector_insert( Vector *self,
const size_t index,
const void *item )
{ {
assert( self ); assert( self );
assert( index <= self->size); assert( index <= self->size);
if( self->capacity <= self->size ) if( self->capacity <= self->size ) {
{
vector_reserve(self, 2 * self->capacity ); vector_reserve(self, 2 * self->capacity );
} }
if( index < self->size ) if( index < self->size ) {
{
memmove( (unsigned char *)self->items + (index + 1) * self->item_size, memmove( (unsigned char *)self->items + (index + 1) * self->item_size,
(unsigned char *)self->items + (index + 0) * self->item_size, (unsigned char *)self->items + (index + 0) * self->item_size,
(self->size - index) * self->item_size); (self->size - index) * self->item_size);
@ -205,10 +177,7 @@ vector_insert( Vector *self,
void void vector_erase_range( Vector *self, const size_t first, const size_t last )
vector_erase_range( Vector *self,
const size_t first,
const size_t last )
{ {
assert( self ); assert( self );
assert( first < self->size ); assert( first < self->size );
@ -222,9 +191,7 @@ vector_erase_range( Vector *self,
void void vector_erase( Vector *self, const size_t index )
vector_erase( Vector *self,
const size_t index )
{ {
assert( self ); assert( self );
assert( index < self->size ); assert( index < self->size );
@ -234,17 +201,14 @@ vector_erase( Vector *self,
void void vector_push_back( Vector *self, const void *item )
vector_push_back( Vector *self,
const void *item )
{ {
vector_insert( self, self->size, item ); vector_insert( self, self->size, item );
} }
void void vector_pop_back( Vector *self )
vector_pop_back( Vector *self )
{ {
assert( self ); assert( self );
assert( self->size ); assert( self->size );
@ -253,35 +217,26 @@ vector_pop_back( Vector *self )
void void vector_resize( Vector *self, const size_t size )
vector_resize( Vector *self,
const size_t size )
{ {
assert( self ); assert( self );
if( size > self->capacity) if( size > self->capacity) {
{
vector_reserve( self, size ); vector_reserve( self, size );
self->size = self->capacity; self->size = self->capacity;
} } else {
else
{
self->size = size; self->size = size;
} }
} }
void void vector_push_back_data( Vector *self, const void * data, const size_t count )
vector_push_back_data( Vector *self,
const void * data,
const size_t count )
{ {
assert( self ); assert( self );
assert( data ); assert( data );
assert( count ); assert( count );
if( self->capacity < (self->size+count) ) if (self->capacity < (self->size+count)) {
{
vector_reserve(self, self->size+count); vector_reserve(self, self->size+count);
} }
memmove( (unsigned char *)self->items + self->size * self->item_size, data, count*self->item_size ); memmove( (unsigned char *)self->items + self->size * self->item_size, data, count*self->item_size );
@ -290,19 +245,14 @@ vector_push_back_data( Vector *self,
void void vector_insert_data(Vector *self, const size_t index, const void * data, const size_t count)
vector_insert_data( Vector *self,
const size_t index,
const void * data,
const size_t count )
{ {
assert( self ); assert( self );
assert( index < self->size ); assert( index < self->size );
assert( data ); assert( data );
assert( count ); assert( count );
if( self->capacity < (self->size+count) ) if (self->capacity < (self->size+count)) {
{
vector_reserve(self, self->size+count); vector_reserve(self, self->size+count);
} }
memmove( (unsigned char *)self->items + (index + count ) * self->item_size, memmove( (unsigned char *)self->items + (index + count ) * self->item_size,
@ -313,9 +263,7 @@ vector_insert_data( Vector *self,
void void vector_sort(Vector *self, int (*cmp)(const void *, const void *))
vector_sort( Vector *self,
int (*cmp)(const void *, const void *) )
{ {
assert( self ); assert( self );
assert( self->size ); assert( self->size );

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

@ -52,7 +52,7 @@ void VertexBuffer::__init(char *_format)
p = (char *)(strchr(p, ':')); p = (char *)(strchr(p, ':'));
attribute->m_pointer = pointer; attribute->m_pointer = pointer;
stride += attribute->m_size*GL_TYPE_SIZE(attribute->m_type); stride += attribute->m_size*GL_TYPE_SIZE(attribute->m_type);
pointer+= attribute->m_size*GL_TYPE_SIZE(attribute->m_type); pointer=(unsigned char *)pointer+ attribute->m_size*GL_TYPE_SIZE(attribute->m_type);
attributes[index] = attribute; attributes[index] = attribute;
index++; index++;
} }

30
src/version.h
View File

@ -4,29 +4,29 @@
namespace AutoVersion{ namespace AutoVersion{
//Date Version Types //Date Version Types
static const char DATE[] = "14"; static const char _DATE[] = "14";
static const char MONTH[] = "06"; static const char _MONTH[] = "06";
static const char YEAR[] = "2011"; static const char _YEAR[] = "2011";
static const char UBUNTU_VERSION_STYLE[] = "11.06"; static const char _UBUNTU_VERSION_STYLE[] = "11.06";
//Software Status //Software Status
static const char STATUS[] = "Alpha"; static const char _STATUS[] = "Alpha";
static const char STATUS_SHORT[] = "a"; static const char _STATUS_SHORT[] = "a";
//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 = 5653; static const long _BUILD = 5659;
static const long REVISION = 14197; static const long _REVISION = 14237;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 5867; static const long _BUILDS_COUNT = 5892;
#define RC_FILEVERSION 0,7,5653,14197 #define _RC_FILEVERSION 0,7,5659,14237
#define RC_FILEVERSION_STRING "0, 7, 5653, 14197\0" #define _RC_FILEVERSION_STRING "0, 7, 5659, 14237\0"
static const char FULLVERSION_STRING[] = "0.7.5653.14197"; static const char _FULLVERSION_STRING[] = "0.7.5659.14237";
//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;
} }