fix (some) compiler warnings

# Conflicts:
#	src/celengine/observer.cpp
pull/110/head
Hleb Valoshka 2018-03-12 20:18:51 +03:00
parent 882e4ecf28
commit f34c7568c4
9 changed files with 23 additions and 25 deletions

View File

@ -116,8 +116,9 @@ void indent()
cout << " ";
}
void logChunk(uint16 chunkType/*, int chunkSize*/)
void logChunk(uint16 /*chunkType*/ /*, int chunkSize*/)
{
#if 0
const char* name = NULL;
switch (chunkType)
@ -193,7 +194,7 @@ void logChunk(uint16 chunkType/*, int chunkSize*/)
default:
break;
}
#if 0
indent();
if (name == NULL)

View File

@ -703,24 +703,21 @@ CommandCapture::CommandCapture(const std::string& _type,
void CommandCapture::process(ExecutionEnvironment&)
{
#ifndef TARGET_OS_MAC
bool success = false;
// Get the dimensions of the current viewport
int viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
if (compareIgnoringCase(type, "jpeg") == 0)
{
success = CaptureGLBufferToJPEG(filename,
viewport[0], viewport[1],
viewport[2], viewport[3]);
CaptureGLBufferToJPEG(filename,
viewport[0], viewport[1],
viewport[2], viewport[3]);
}
if (compareIgnoringCase(type, "png") == 0)
{
success = CaptureGLBufferToPNG(filename,
viewport[0], viewport[1],
viewport[2], viewport[3]);
CaptureGLBufferToPNG(filename,
viewport[0], viewport[1],
viewport[2], viewport[3]);
}
#endif
}

View File

@ -426,7 +426,7 @@ void Observer::update(double dt, double timeScale)
UniversalCoord origin = centerObj.getPosition(simTime);
Vector3d v0 = ufrom.offsetFromKm(origin);
Vector3d v1 = uto.offsetFromKm(origin);
//Vector3d v1 = uto.offsetFromKm(origin);
if (jv.norm() == 0.0)
{
@ -629,7 +629,7 @@ void Observer::computeGotoParameters(const Selection& destination,
}
UniversalCoord targetPosition = destination.getPosition(getTime());
Vector3d v = targetPosition.offsetFromKm(getPosition()).normalized();
//Vector3d v = targetPosition.offsetFromKm(getPosition()).normalized();
jparams.traj = Linear;
jparams.duration = gotoTime;
@ -694,7 +694,7 @@ void Observer::computeGotoParametersGC(const Selection& destination,
setFrame(frame->getCoordinateSystem(), destination);
UniversalCoord targetPosition = destination.getPosition(getTime());
Vector3d v = targetPosition.offsetFromKm(getPosition()).normalized();
//Vector3d v = targetPosition.offsetFromKm(getPosition()).normalized();
jparams.traj = GreatCircle;
jparams.duration = gotoTime;
@ -791,7 +791,7 @@ void Observer::computeCenterCOParameters(const Selection& destination,
Selection centerObj = frame->getRefObject();
UniversalCoord centerPos = centerObj.getPosition(getTime());
UniversalCoord targetPosition = destination.getPosition(getTime());
//UniversalCoord targetPosition = destination.getPosition(getTime());
Quaterniond q;
q.setFromTwoVectors(v, w);

View File

@ -8033,8 +8033,10 @@ void Renderer::renderCometTail(const Body& body,
{
Vector3f cometPoints[MaxCometTailPoints];
Vector3d pos0 = body.getOrbit(now)->positionAtTime(now);
#if 0
Vector3d pos1 = body.getOrbit(now)->positionAtTime(now - 0.01);
Vector3d vd = pos1 - pos0;
#endif
double t = now;
float distanceFromSun, irradiance_max = 0.0f;

View File

@ -773,7 +773,7 @@ void renderGeometryShadow_GLSL(Geometry* geometry,
int lightIndex = 0;
Vector3f viewDir = -ls.lights[lightIndex].direction_obj;
Vector3f upDir = viewDir.unitOrthogonal();
Vector3f rightDir = upDir.cross(viewDir);
/*Vector3f rightDir = */upDir.cross(viewDir);
glUseProgramObjectARB(0);

View File

@ -761,7 +761,7 @@ StarDetails::StarDetails() :
bolometricCorrection(0.0f),
knowledge(0u),
visible(true),
texture(texture),
texture(texture), // warning: StarDetails::texture is initialized with itself [-Winit-self]
geometry(InvalidResource),
orbit(NULL),
orbitalRadius(0.0f),

View File

@ -155,8 +155,7 @@ static void MouseButton(int button, int state, int x, int y)
lastY = y;
}
static void KeyPress(unsigned char c, int x, int y)
static void KeyPress(unsigned char c, int /*x*/, int /*y*/)
{
// Ctrl-Q exits
if (c == '\021')
@ -167,7 +166,7 @@ static void KeyPress(unsigned char c, int x, int y)
}
static void KeyUp(unsigned char c, int x, int y)
static void KeyUp(unsigned char c, int /*x*/, int /*y*/)
{
appCore->keyUp((int) c);
}
@ -237,13 +236,13 @@ static void HandleSpecialKey(int key, bool down)
}
static void SpecialKeyPress(int key, int x, int y)
static void SpecialKeyPress(int key, int /*x*/, int /*y*/)
{
HandleSpecialKey(key, true);
}
static void SpecialKeyUp(int key, int x, int y)
static void SpecialKeyUp(int key, int /*x*/, int /*y*/)
{
HandleSpecialKey(key, false);
}

View File

@ -29,7 +29,7 @@
using namespace std;
extern "C" { FILE __iob_func[3] = { *stdin,*stdout,*stderr }; }
static const char *description = "Celestia";
//static const char *description = "Celestia";
// Command line options
static bool startFullscreen = false;

View File

@ -416,11 +416,10 @@ std::string BigFix::toString()
// Conversion using code from the original BigFix class.
std::string encoded("");
int bits, c, char_count, started, i, j;
int bits, c, char_count, i, j;
char_count = 0;
bits = 0;
started = 0;
// Find first significant (non null) byte
i = 16;