mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-02 10:26:45 +02:00
Code Issues Projects Releases Wiki Activity

- ported bugfixes for 3.6.0.3 release:

Browse Source 
- CMake build system fixes applied during debian testing (like checking for compiler SSE support etc)
 - Windows client fix for headless server operation
 - Crash for some systems when trying to use VBO's
 - Fixed AZERTY keyboard support
 - Enhanced support for screenshots in g3d viewer
 - Updated particle code from titi
 - Bugfix for custom data path override causing compiler error
 - Bugfix for fontconfig to properly find fonts on systems that support and have fontconfig installed (fixes numerous non debian based systems that reported null font errors)
 - Minor UI fix on battle end screen when playing 8 players (last player was sometimes chopped off)
This commit is contained in:
Mark Vejvoda
2012-01-23 07:22:43 +00:00
parent 2224d75d10
commit f40c37f5e8
63 changed files with 948 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/shared_lib/include/graphics/font.h
View File

@@ -101,7 +101,7 @@ public:
string getType() const;
//set
void setType(string typeX11, string typeGeneric);
void setType(string typeX11, string typeGeneric, string typeGenericFamily);
void setWidth(int width);
int getSize() const;
@@ -139,7 +139,7 @@ public:
Font3D *ConvertFont2DTo3D(Font2D *font);
const char* findFont(const char *firstFontToTry=NULL);
const char* findFont(const char *firstFontToTry=NULL,const char *firstFontFamilyToTry=NULL);
}}//end namespace

2
source/shared_lib/include/graphics/font_text.h
View File

@@ -36,7 +36,7 @@ public:
Text(FontTextHandlerType type);
virtual ~Text();
virtual void init(string fontName, int fontSize);
virtual void init(string fontName, string fontFamilyName, int fontSize);
virtual void SetFaceSize(int);
virtual int GetFaceSize();

2
source/shared_lib/include/graphics/gl/font_textFTGL.h
View File

@@ -33,7 +33,7 @@ public:
TextFTGL(FontTextHandlerType type);
virtual ~TextFTGL();
virtual void init(string fontName, int fontSize);
virtual void init(string fontName, string fontFamilyName, int fontSize);
virtual void SetFaceSize(int);
virtual int GetFaceSize();

3
source/shared_lib/include/graphics/gl/font_text_freetypegl.h
View File

@@ -41,7 +41,7 @@ public:
TextFreetypeGL(FontTextHandlerType type);
virtual ~TextFreetypeGL();
virtual void init(string fontName, int fontSize);
virtual void init(string fontName, string fontFamilyName, int fontSize);
virtual void SetFaceSize(int);
virtual int GetFaceSize();
@@ -66,6 +66,7 @@ private:
int fontFaceSize;
string fontName;
string fontFamilyName;
const char* fontFile;
void cleanupFont();

7
source/shared_lib/include/graphics/md5/Image.h
View File

@@ -43,10 +43,11 @@
#endif // _WIN32
#include <GL/glew.h>
#ifndef _WIN32
//#include <boost/shared_ptr.hpp>
#if !defined(_WIN32) || defined(__MINGW32__)
#include <tr1/memory>
#endif
#include <stdexcept>
#include <iostream>
#include <fstream>
@@ -61,7 +62,7 @@ using std::cout;
using std::endl;
using std::string;
#ifdef _WIN32
#if defined(_WIN32)
using std::tr1::shared_ptr;
#endif

8
source/shared_lib/include/graphics/md5/Md5Model.h
View File

@@ -48,7 +48,11 @@
#include <map>
#include <fstream>
#include <stdexcept>
//#include <tr1/memory>
#if !defined(_WIN32) || defined(__MINGW32__)
#include <tr1/memory>
#endif
#include <GL/glew.h>
#include "Mathlib.h"
@@ -60,7 +64,7 @@ using std::string;
using std::vector;
using std::map;
#ifdef _WIN32
#if defined(_WIN32)
using std::tr1::shared_ptr;
#endif

5
source/shared_lib/include/graphics/particle.h
View File

@@ -132,6 +132,7 @@ protected:
bool teamcolorNoEnergy;
bool teamcolorEnergy;
int alternations;
int particleSystemStartDelay;
ParticleObserver *particleObserver;
public:
@@ -173,6 +174,7 @@ public:
void setTeamcolorNoEnergy(bool teamcolorNoEnergy) {this->teamcolorNoEnergy= teamcolorNoEnergy;}
void setTeamcolorEnergy(bool teamcolorEnergy) {this->teamcolorEnergy= teamcolorEnergy;}
void setAlternations(int alternations) {this->alternations= alternations;}
void setParticleSystemStartDelay(int delay) {this->particleSystemStartDelay= delay;}
virtual void setFactionColor(Vec3f factionColor);
static BlendMode strToBlendMode(const string &str);
@@ -269,6 +271,7 @@ protected:
class UnitParticleSystem: public GameParticleSystem{
public:
static bool isNight;
static Vec3f lightColor;
private:
float radius;
float minRadius;
@@ -296,6 +299,7 @@ public:
float rotation;
bool isVisibleAtNight;
bool isVisibleAtDay;
bool isDaylightAffected;
bool radiusBasedStartenergy;
int staticParticleCount;
int delay;
@@ -339,6 +343,7 @@ public:
void setPrimitive(Primitive primitive) {this->primitive= primitive;}
void setStaticParticleCount(int staticParticleCount){this->staticParticleCount= staticParticleCount;}
void setIsVisibleAtNight(bool value) {this->isVisibleAtNight= value;}
void setIsDaylightAffected(bool value) {this->isDaylightAffected= value;}
void setIsVisibleAtDay(bool value) {this->isVisibleAtDay= value;}
void setRadiusBasedStartenergy(bool value) {this->radiusBasedStartenergy= value;}
void setShape(Shape shape) {this->shape= shape;}