spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove dead code

pull/703/head
Hleb Valoshka 2020-04-19 17:33:22 +03:00
parent b4bab385a0
commit 1cf5c868cf
2 changed files with 1 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/celengine/render.cpp
View File

@ -31,7 +31,6 @@ std::ofstream hdrlog;
#define BLUR_SIZE 128
#define DEFAULT_EXPOSURE -23.35f
#define EXPOSURE_HALFLIFE 0.4f
//#define USE_BLOOM_LISTS
#endif
#include <config.h>
@ -299,12 +298,6 @@ Renderer::Renderer() :
blurTextures[i] = nullptr;
}
#endif
#ifdef USE_BLOOM_LISTS
for (size_t i = 0; i < (sizeof gaussianLists/sizeof(GLuint)); ++i)
{
gaussianLists[i] = 0;
}
#endif
for (int i = 0; i < (int) FontCount; i++)
{
@ -323,13 +316,7 @@ Renderer::~Renderer()
delete[] skyVertices;
delete[] skyIndices;
delete[] skyContour;
#ifdef USE_BLOOM_LISTS
for (size_t i = 0; i < (sizeof gaussianLists/sizeof(GLuint)); ++i)
{
if (gaussianLists[i] != 0)
glDeleteLists(gaussianLists[i], 1);
}
#endif
#ifdef USE_HDR
for (size_t i = 0; i < BLUR_PASS_COUNT; ++i)
{
@ -616,19 +603,6 @@ bool Renderer::init(
commonDataInitialized = true;
}
#if 0
int nSamples = 0;
int sampleBuffers = 0;
int enabled = (int) glIsEnabled(GL_MULTISAMPLE);
glGetIntegerv(GL_SAMPLE_BUFFERS, &sampleBuffers);
glGetIntegerv(GL_SAMPLES, &nSamples);
clog << "AA samples: " << nSamples
<< ", enabled=" << (int) enabled
<< ", sample buffers=" << (sampleBuffers)
<< "\n";
glEnable(GL_MULTISAMPLE);
#endif
#ifdef USE_HDR
Image *testImg = new Image(GL_LUMINANCE_ALPHA, 1, 1);
ImageTexture *testTex = new ImageTexture(*testImg,
@ -1818,14 +1792,6 @@ void Renderer::draw(const Observer& observer,
glDisable(GL_BLEND);
glDepthMask(GL_TRUE);
#if 0
int errCode = glGetError();
if (errCode != GL_NO_ERROR)
{
cout << "glError: " << (char*) gluErrorString(errCode) << '\n';
}
#endif
}
void renderPoint(const Renderer &renderer,
@ -2028,9 +1994,6 @@ void Renderer::renderEllipsoidAtmosphere(const Atmosphere& atmosphere,
float height = atmosphere.height / radius;
Vector3f recipSemiAxes = semiAxes.cwiseInverse();
#if 0
Vector3f recipAtmSemiAxes = recipSemiAxes / (1.0f + height);
#endif
// ellipDist is not the true distance from the surface unless the
// planet is spherical. Computing the true distance requires finding
// the roots of a sixth degree polynomial, and isn't actually what we
@ -3016,15 +2979,8 @@ void Renderer::renderObject(const Vector3f& pos,
}
glDisable(GL_POLYGON_OFFSET_FILL);
// Reset the texture matrix
glMatrixMode(GL_TEXTURE);
glLoadIdentity();
glMatrixMode(GL_MODELVIEW);
glDepthMask(GL_TRUE);
glFrontFace(GL_CCW);
glPopMatrix();
}
}

33
src/celengine/render.h
View File

@ -540,14 +540,6 @@ class Renderer
const Observer& observer,
float discSizeInPixels);
void renderObjectAsPoint_nosprite(const Eigen::Vector3f& center,
float radius,
float appMag,
float _faintestMag,
float discSizeInPixels,
Color color,
const Eigen::Quaternionf& cameraOrientation,
bool useHalos);
void renderObjectAsPoint(const Eigen::Vector3f& center,
float radius,
float appMag,
@ -750,31 +742,6 @@ class Renderer
int m_GLStateFlag { 0 };
public:
#if 0
struct OrbitSample
{
double t;
Point3d pos;
OrbitSample(const Eigen::Vector3d& _pos, double _t) : t(_t), pos(_pos.x(), _pos.y(), _pos.z()) { }
OrbitSample() { }
};
struct OrbitSection
{
Capsuled boundingVolume;
uint32_t firstSample;
};
struct CachedOrbit
{
std::vector<OrbitSample> trajectory;
std::vector<OrbitSection> sections;
uint32_t lastUsed;
};
#endif
private:
typedef std::map<const Orbit*, CurvePlot*> OrbitCache;
OrbitCache orbitCache;