fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'fgpanel' of 10.101.2.62:~/FlightGear/fg-osg/FlightGear into next

Browse source
This commit is contained in:
Torsten Dreyer 2011-05-27 20:56:09 +02:00
commit 60b6dcdae3
12 changed files with 74 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
utils/fgpanel/.cvsignore Normal file
View file

@ -0,0 +1,4 @@
.deps
Makefile
Makefile.in
fgpanel

13
utils/fgpanel/FGFontCache.cxx
View file

@ -17,7 +17,12 @@
# include <config.h>
#endif
using namespace std;
#include "FGGLApplication.hxx"
#ifdef HAVE_WINDOWS_H
#include <windows.h>
#endif
#include <map>
#include <algorithm>
#include "ApplicationProperties.hxx"
@ -93,7 +98,7 @@ inline bool FGFontCache::FntParamsLess::operator()(const FntParams& f1,
struct FGFontCache::fnt *
FGFontCache::getfnt(const char *name, float size, float slant)
{
string fontName(name);
std::string fontName(name);
FntParams fntParams(fontName, size, slant);
PuFontMap::iterator i = _puFonts.find(fntParams);
if (i != _puFonts.end())
@ -183,7 +188,7 @@ FGFontCache::getfntpath(const char *name)
bool FGFontCache::initializeFonts()
{
static string fontext("txf");
static std::string fontext("txf");
init();
ulDir* fontdir = ulOpenDir(_path.c_str());
if (!fontdir)
@ -195,7 +200,7 @@ bool FGFontCache::initializeFonts()
if (path.extension() == fontext) {
fntTexFont* f = new fntTexFont;
if (f->load((char *)path.c_str()))
_texFonts[string(dirEntry->d_name)] = f;
_texFonts[std::string(dirEntry->d_name)] = f;
else
delete f;
}

5
utils/fgpanel/FGFontCache.hxx
View file

@ -14,6 +14,7 @@
//
#ifndef __FGFONTCACHE_HXX
#define __FGFONTCACHE_HXX
#include <simgear/math/SGMath.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/props/props.hxx>
#include <plib/pu.h>
@ -55,8 +56,8 @@ private:
// Path to the font directory
SGPath _path;
typedef map<const string, fntTexFont*> TexFontMap;
typedef map<const FntParams, fnt*, FntParamsLess> PuFontMap;
typedef std::map<const std::string, fntTexFont*> TexFontMap;
typedef std::map<const FntParams, fnt*, FntParamsLess> PuFontMap;
TexFontMap _texFonts;
PuFontMap _puFonts;

13
utils/fgpanel/FGGLApplication.cxx
View file

@ -15,9 +15,18 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "FGGLApplication.hxx"
#include "GL/gl.h"
#include "GL/glut.h"
#ifdef HAVE_WINDOWS_H
#include <windows.h>
#define snprintf sprintf_s
#endif
#include <GL/gl.h>
#include <GL/glut.h>
#include <iostream>
#include <exception>

7
utils/fgpanel/FGPNGTextureLoader.cxx
View file

@ -13,6 +13,13 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_WINDOWS_H
#include <windows.h>
#endif
#include "FGPNGTextureLoader.hxx"
#include <GL/glu.h>

17
utils/fgpanel/FGPanelApplication.cxx
View file

@ -15,6 +15,16 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_WINDOWS_H
#include <windows.h>
#endif
#include "FGGLApplication.hxx"
#include "FGPanelApplication.hxx"
#include <GL/gl.h>
#include <GL/glut.h>
@ -172,8 +182,7 @@ void FGPanelApplication::Key( unsigned char key, int x, int y )
{
switch( key ) {
case 0x1b:
if( gameMode ) glutLeaveGameMode();
else glutDestroyWindow( windowId );
exit(0);
break;
}
}
@ -226,7 +235,11 @@ double FGPanelApplication::Sleep()
double elapsed_us = (current_time_stamp - last_time_stamp).toUSecs();
if ( elapsed_us < frame_us ) {
double requested_us = frame_us - elapsed_us;
#ifdef _WIN32
::Sleep ((int)(requested_us / 1000.0)) ;
#else
usleep ( (useconds_t)(requested_us ) ) ;
#endif
}
// busy wait timing loop.
//

1
utils/fgpanel/FGPanelApplication.hxx
View file

@ -21,6 +21,7 @@
#include "FGGLApplication.hxx"
#include "FGPanelProtocol.hxx"
#include <simgear/math/SGMath.hxx>
#include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/props/props.hxx>

12
utils/fgpanel/FGPanelProtocol.cxx
View file

@ -15,6 +15,18 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_WINDOWS_H
#include <windows.h>
#endif
#ifdef WIN32
#define strtof strtod
#endif
#include "FGPanelProtocol.hxx"
#include "ApplicationProperties.hxx"
#include <simgear/io/sg_socket.hxx>

1
utils/fgpanel/FGPanelProtocol.hxx
View file

@ -17,6 +17,7 @@
//
#ifndef __FGPANELPROTOCOL_HXX
#define __FGPANELPROTOCOL_HXX
#include <simgear/math/SGMath.hxx>
#include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/props/props.hxx>
#include <simgear/io/iochannel.hxx>

8
utils/fgpanel/FGRGBTextureLoader.cxx
View file

@ -17,6 +17,14 @@
// Reader for sgi's .rgb format.
// specification can be found at http://local.wasp.uwa.edu.au/~pbourke/dataformats/sgirgb/sgiversion.html
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_WINDOWS_H
#include <windows.h>
#endif
#include "FGRGBTextureLoader.hxx"
#include <GL/gl.h>
#include <GL/glu.h>

1
utils/fgpanel/panel.cxx
View file

@ -36,6 +36,7 @@
#include <plib/fnt.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/math/SGMath.hxx>
#include <simgear/misc/sg_path.hxx>
#include "panel.hxx"

1
utils/fgpanel/panel_io.cxx
View file

@ -29,6 +29,7 @@
#include <string.h> // for strcmp()
#include <simgear/compiler.h>
#include <simgear/math/SGMath.hxx>
#include <simgear/structure/exception.hxx>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sg_path.hxx>