Cleanup includes a little bit
parent
26063bf3a6
commit
739f71cd1c
|
@ -11,11 +11,17 @@
|
|||
#include <cstdarg>
|
||||
#include <cassert>
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
#include <celutil/utf8.h>
|
||||
#include <celmath/geomutil.h>
|
||||
#include <GL/glew.h>
|
||||
#include "vecgl.h"
|
||||
#include "console.h"
|
||||
#if NO_TTF
|
||||
#include <celtxf/texturefont.h>
|
||||
#else
|
||||
#include <celttf/truetypefont.h>
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
using namespace celmath;
|
||||
|
|
|
@ -11,15 +11,10 @@
|
|||
#define _CELENGINE_CONSOLE_H_
|
||||
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#if NO_TTF
|
||||
#include <celtxf/texturefont.h>
|
||||
#else
|
||||
#include <celttf/truetypefont.h>
|
||||
#endif
|
||||
|
||||
#include <iosfwd>
|
||||
|
||||
class Console;
|
||||
class TextureFont;
|
||||
|
||||
// Custom streambuf class to support C++ operator style output. The
|
||||
// output is completely unbuffered.
|
||||
|
|
|
@ -8,11 +8,13 @@
|
|||
// as published by the Free Software Foundation; either version 2
|
||||
// of the License, or (at your option) any later version.
|
||||
|
||||
#include <celmath/frustum.h>
|
||||
#include <celmath/mathlib.h>
|
||||
#include <celutil/util.h>
|
||||
#include <GL/glew.h>
|
||||
#include <vector>
|
||||
#include "render.h"
|
||||
#include "vertexobject.h"
|
||||
#include "marker.h"
|
||||
|
||||
|
||||
|
|
|
@ -9,16 +9,22 @@
|
|||
|
||||
#include <cstring>
|
||||
#include <cstdarg>
|
||||
#include <celutil/utf8.h>
|
||||
#include <iostream>
|
||||
#include <GL/glew.h>
|
||||
#include <Eigen/Core>
|
||||
#include <celutil/debug.h>
|
||||
#include <celutil/utf8.h>
|
||||
#include <celmath/geomutil.h>
|
||||
#include "vecgl.h"
|
||||
#include "overlay.h"
|
||||
#include "rectangle.h"
|
||||
#include "render.h"
|
||||
#include "texture.h"
|
||||
#if NO_TTF
|
||||
#include <celtxf/texturefont.h>
|
||||
#else
|
||||
#include <celttf/truetypefont.h>
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
using namespace Eigen;
|
||||
|
|
|
@ -10,21 +10,15 @@
|
|||
#ifndef _OVERLAY_H_
|
||||
#define _OVERLAY_H_
|
||||
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <iostream>
|
||||
#include <iosfwd>
|
||||
#include <string>
|
||||
#include <celutil/color.h>
|
||||
#if NO_TTF
|
||||
#include <celtxf/texturefont.h>
|
||||
#else
|
||||
#include <celttf/truetypefont.h>
|
||||
#endif
|
||||
|
||||
|
||||
class Overlay;
|
||||
class Renderer;
|
||||
class Rect;
|
||||
class TextureFont;
|
||||
|
||||
// Custom streambuf class to support C++ operator style output. The
|
||||
// output is completely unbuffered so that it can coexist with printf
|
||||
|
|
|
@ -64,14 +64,22 @@ std::ofstream hdrlog;
|
|||
#include "orbitsampler.h"
|
||||
#include "asterismrenderer.h"
|
||||
#include "boundariesrenderer.h"
|
||||
#include <celutil/debug.h>
|
||||
#include "rendcontext.h"
|
||||
#include "vertexobject.h"
|
||||
#include <celengine/observer.h>
|
||||
#include <celmath/frustum.h>
|
||||
#include <celmath/distance.h>
|
||||
#include <celmath/intersect.h>
|
||||
#include <celmath/geomutil.h>
|
||||
#include <celutil/debug.h>
|
||||
#include <celutil/utf8.h>
|
||||
#include <celutil/util.h>
|
||||
#include <celutil/timer.h>
|
||||
#if NO_TTF
|
||||
#include <celtxf/texturefont.h>
|
||||
#else
|
||||
#include <celttf/truetypefont.h>
|
||||
#endif
|
||||
#include <GL/glew.h>
|
||||
#ifdef VIDEO_SYNC
|
||||
#ifdef _WIN32
|
||||
|
@ -88,6 +96,9 @@ std::ofstream hdrlog;
|
|||
#include <sstream>
|
||||
#include <iomanip>
|
||||
#include <numeric>
|
||||
#ifdef USE_GLCONTEXT
|
||||
#include "glcontext.h"
|
||||
#endif
|
||||
|
||||
using namespace cmod;
|
||||
using namespace Eigen;
|
||||
|
|
|
@ -15,24 +15,15 @@
|
|||
#include <list>
|
||||
#include <string>
|
||||
#include <Eigen/Core>
|
||||
#include <celmath/frustum.h>
|
||||
#include <celengine/universe.h>
|
||||
#include <celengine/observer.h>
|
||||
#include <celengine/selection.h>
|
||||
#ifdef USE_GLCONTEXT
|
||||
#include <celengine/glcontext.h>
|
||||
#endif
|
||||
#include <celengine/starcolors.h>
|
||||
#include <celengine/rendcontext.h>
|
||||
#include <celengine/renderlistentry.h>
|
||||
#include <celengine/vertexobject.h>
|
||||
#if NO_TTF
|
||||
#include <celtxf/texturefont.h>
|
||||
#else
|
||||
#include <celttf/truetypefont.h>
|
||||
|
||||
#ifdef USE_GLCONTEXT
|
||||
class GLContext;
|
||||
#endif
|
||||
|
||||
|
||||
class RendererWatcher;
|
||||
class FrameTree;
|
||||
class ReferenceMark;
|
||||
|
@ -41,6 +32,12 @@ class Rect;
|
|||
class PointStarVertexBuffer;
|
||||
class AsterismRenderer;
|
||||
class BoundariesRenderer;
|
||||
class Observer;
|
||||
class TextureFont;
|
||||
namespace celmath
|
||||
{
|
||||
class Frustum;
|
||||
};
|
||||
|
||||
struct LightSource
|
||||
{
|
||||
|
|
|
@ -58,6 +58,11 @@
|
|||
#ifdef CELX
|
||||
#include <celephem/scriptobject.h>
|
||||
#endif
|
||||
#if NO_TTF
|
||||
#include <celtxf/texturefont.h>
|
||||
#else
|
||||
#include <celttf/truetypefont.h>
|
||||
#endif
|
||||
|
||||
#include "imagecapture.h"
|
||||
|
||||
|
|
|
@ -13,6 +13,11 @@
|
|||
#include <celscript/legacy/cmdparser.h>
|
||||
#include <celscript/legacy/execution.h>
|
||||
#include <celestia/celestiacore.h>
|
||||
#if NO_TTF
|
||||
#include <celtxf/texturefont.h>
|
||||
#else
|
||||
#include <celttf/truetypefont.h>
|
||||
#endif
|
||||
|
||||
using namespace celestia::scripts;
|
||||
|
||||
|
|
Loading…
Reference in New Issue