← Back to branch summary

~ubuntu-branches/ubuntu/precise/flightgear/precise

« back to all changes in this revision

Viewing changes to src/Cockpit/panel.cxx

  • Committer: Bazaar Package Importer
  • Author(s): Ove Kaaven
  • Date: 2011-01-30 15:46:35 UTC
  • mfrom: (3.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110130154635-rlynmg9n5hzxq5xe
Tags: 2.0.0-3
* Recommend fgfs-aircraft-base and fgfs-models-base.
  Closes. #610276.
* Added note about scenery SharedModels.tgz to README.Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Cockpit/panel.cxx
31
31
#  include <config.h>
32
32
#endif
33
33
 
 
34
#include "panel.hxx"
 
35
 
34
36
#include <stdio.h>      // sprintf
35
37
#include <string.h>
36
38
#include <iostream>
55
57
#include <Main/viewmgr.hxx>
56
58
#include <Time/light.hxx>
57
59
#include <GUI/new_gui.hxx>      // FGFontCache
 
60
#include <Main/viewer.hxx>
 
61
#include <Instrumentation/dclgps.hxx>
58
62
 
59
63
#include "hud.hxx"
60
 
#include "panel.hxx"
 
64
 
61
65
 
62
66
#define WIN_X 0
63
67
#define WIN_Y 0
914
918
void
915
919
FGSpecialInstrument::draw (osg::State& state)
916
920
{
917
 
  complex->draw();
 
921
  complex->draw(state);
918
922
}
919
923
 
920
924
 
1112
1116
    text_renderer.start3f(0, 0, 0);
1113
1117
 
1114
1118
    _now.stamp();
1115
 
    long diff = _now - _then;
 
1119
    double diff = (_now - _then).toUSecs();
1116
1120
 
1117
1121
    if (diff > 100000 || diff < 0 ) {
1118
1122
      // ( diff < 0 ) is a sanity check and indicates our time stamp