Removed unused parameters
parent
9cf5c29740
commit
2a36ada0ae
|
@ -200,8 +200,8 @@ double astro::degMinSecToDecimal(int hours, int minutes, double seconds)
|
|||
|
||||
// Compute the fraction of a sphere which is illuminated and visible
|
||||
// to a viewer. The source of illumination is assumed to be at (0, 0, 0)
|
||||
float astro::sphereIlluminationFraction(Point3d spherePos,
|
||||
Point3d viewerPos)
|
||||
float astro::sphereIlluminationFraction(Point3d,
|
||||
Point3d)
|
||||
{
|
||||
return 1.0f;
|
||||
}
|
||||
|
|
|
@ -351,8 +351,9 @@ bool DSODatabase::load(istream& in, const string& resourcePath)
|
|||
}
|
||||
|
||||
|
||||
bool DSODatabase::loadBinary(istream& in)
|
||||
bool DSODatabase::loadBinary(istream&)
|
||||
{
|
||||
// TODO: define a binary dso file format
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ bool dsoAbsoluteMagnitudePredicate(DeepSkyObject* const & _dso, const float absM
|
|||
}
|
||||
|
||||
|
||||
bool dsoStraddlesNodesPredicate(const Point3d& cellCenterPos, DeepSkyObject* const & _dso, const float absMag)
|
||||
bool dsoStraddlesNodesPredicate(const Point3d& cellCenterPos, DeepSkyObject* const & _dso, const float)
|
||||
{
|
||||
//checks if this dso's radius straddles child nodes
|
||||
float dsoRadius = _dso->getRadius();
|
||||
|
@ -32,7 +32,7 @@ bool dsoStraddlesNodesPredicate(const Point3d& cellCenterPos, DeepSkyObject* con
|
|||
Point3d dsoPos = _dso->getPosition();
|
||||
|
||||
return abs(dsoPos.x - cellCenterPos.x) < dsoRadius ||
|
||||
abs(dsoPos.y - cellCenterPos.y) < dsoRadius ||
|
||||
abs(dsoPos.y - cellCenterPos.y) < dsoRadius ||
|
||||
abs(dsoPos.z - cellCenterPos.z) < dsoRadius;
|
||||
}
|
||||
|
||||
|
|
|
@ -107,7 +107,7 @@ Model* ModelInfo::load(const string& filename)
|
|||
{
|
||||
cerr << _("Error loading model '") << filename << "'\n";
|
||||
}
|
||||
|
||||
|
||||
return model;
|
||||
}
|
||||
|
||||
|
@ -180,9 +180,9 @@ Model* LoadCelestiaMesh(const string& filename)
|
|||
}
|
||||
|
||||
Hash* meshDef = meshDefValue->getHash();
|
||||
|
||||
|
||||
NoiseMeshParameters params;
|
||||
|
||||
|
||||
params.size = Vec3f(1, 1, 1);
|
||||
params.offset = Vec3f(10, 10, 10);
|
||||
params.featureHeight = 0.0f;
|
||||
|
@ -229,7 +229,7 @@ static VertexList* ConvertToVertexList(M3DTriangleMesh& mesh,
|
|||
if (nTexCoords == nVertices)
|
||||
parts |= VertexList::TexCoord0;
|
||||
VertexList* vl = new VertexList(parts);
|
||||
|
||||
|
||||
Vec3f* faceNormals = new Vec3f[nFaces];
|
||||
Vec3f* vertexNormals = new Vec3f[nFaces * 3];
|
||||
int* faceCounts = new int[nVertices];
|
||||
|
@ -361,7 +361,7 @@ static VertexList* ConvertToVertexList(M3DTriangleMesh& mesh,
|
|||
M3DColor specular = material->getSpecularColor();
|
||||
vl->setSpecularColor(Color(specular.red, specular.green, specular.blue));
|
||||
float shininess = material->getShininess();
|
||||
|
||||
|
||||
// Map the 3DS file's shininess from percentage (0-100) to
|
||||
// range that OpenGL uses for the specular exponent. The
|
||||
// current equation is just a guess at the mapping that
|
||||
|
@ -405,7 +405,9 @@ static VertexList* ConvertToVertexList(M3DTriangleMesh& mesh,
|
|||
|
||||
|
||||
static Mesh*
|
||||
ConvertVertexListToMesh(VertexList* vlist, const string& texPath, uint32 material)
|
||||
ConvertVertexListToMesh(VertexList* vlist,
|
||||
const string& /*texPath*/, //TODO: remove parameter??
|
||||
uint32 material)
|
||||
{
|
||||
Mesh::VertexAttribute attributes[8];
|
||||
uint32 nAttributes = 0;
|
||||
|
|
|
@ -201,7 +201,7 @@ Point3d EllipticalOrbit::positionAtTime(double t) const
|
|||
double meanMotion = 2.0 * PI / period;
|
||||
double meanAnomaly = meanAnomalyAtEpoch + t * meanMotion;
|
||||
double E = eccentricAnomaly(meanAnomaly);
|
||||
|
||||
|
||||
return positionAtE(E);
|
||||
}
|
||||
|
||||
|
@ -219,7 +219,7 @@ double EllipticalOrbit::getBoundingRadius() const
|
|||
}
|
||||
|
||||
|
||||
void EllipticalOrbit::sample(double start, double t, int nSamples,
|
||||
void EllipticalOrbit::sample(double, double t, int nSamples,
|
||||
OrbitSampleProc& proc) const
|
||||
{
|
||||
double dE = 2 * PI / (double) nSamples;
|
||||
|
@ -279,7 +279,7 @@ static EllipticalOrbit* StateVectorToOrbit(const Point3d& position,
|
|||
// Compute the mean anomaly
|
||||
double E = atan2(ey, ex);
|
||||
double M = E - e * sin(E);
|
||||
|
||||
|
||||
// Compute the inclination
|
||||
double cosi = L * Vec3d(0, 1.0, 0);
|
||||
double i = 0.0;
|
||||
|
@ -327,7 +327,7 @@ MixedOrbit::MixedOrbit(Orbit* orbit, double t0, double t1, double mass) :
|
|||
{
|
||||
assert(t1 > t0);
|
||||
assert(orbit != NULL);
|
||||
|
||||
|
||||
double dt = 1.0 / 1440.0; // 1 minute
|
||||
Point3d p0 = orbit->positionAtTime(t0);
|
||||
Point3d p1 = orbit->positionAtTime(t1);
|
||||
|
|
|
@ -23,7 +23,8 @@ class Orbit
|
|||
virtual Point3d positionAtTime(double) const = 0;
|
||||
virtual double getPeriod() const = 0;
|
||||
virtual double getBoundingRadius() const = 0;
|
||||
virtual void sample(double, double, int, OrbitSampleProc&) const = 0;
|
||||
virtual void sample(double start, double t,
|
||||
int nSamples, OrbitSampleProc& proc) const = 0;
|
||||
virtual bool isPeriodic() const { return true; };
|
||||
|
||||
// Return the time range over which the orbit is valid; if the orbit
|
||||
|
@ -113,7 +114,8 @@ class MixedOrbit : public Orbit
|
|||
Point3d positionAtTime(double jd) const;
|
||||
virtual double getPeriod() const;
|
||||
virtual double getBoundingRadius() const;
|
||||
virtual void sample(double, double, int, OrbitSampleProc& proc) const;
|
||||
virtual void sample(double t0, double t1,
|
||||
int nSamples, OrbitSampleProc& proc) const;
|
||||
|
||||
private:
|
||||
Orbit* primary;
|
||||
|
|
|
@ -25,7 +25,7 @@ bool starAbsoluteMagnitudePredicate(const Star& star, const float absMag)
|
|||
}
|
||||
|
||||
|
||||
bool starOrbitStraddlesNodesPredicate(const Point3f& cellCenterPos, const Star& star, const float absMag)
|
||||
bool starOrbitStraddlesNodesPredicate(const Point3f& cellCenterPos, const Star& star, const float)
|
||||
{
|
||||
//checks if this star's orbit straddles child nodes
|
||||
float orbitalRadius = star.getOrbitalRadius();
|
||||
|
@ -35,7 +35,7 @@ bool starOrbitStraddlesNodesPredicate(const Point3f& cellCenterPos, const Star&
|
|||
Point3f starPos = star.getPosition();
|
||||
|
||||
return abs(starPos.x - cellCenterPos.x) < orbitalRadius ||
|
||||
abs(starPos.y - cellCenterPos.y) < orbitalRadius ||
|
||||
abs(starPos.y - cellCenterPos.y) < orbitalRadius ||
|
||||
abs(starPos.z - cellCenterPos.z) < orbitalRadius;
|
||||
}
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ class KCelBookmarkOwner : virtual public KBookmarkOwner {
|
|||
|
||||
public:
|
||||
virtual QString currentIcon() const { return QString::null; };
|
||||
virtual Url currentUrl(Url::UrlType type=Url::Absolute) const { return Url(); };
|
||||
virtual Url currentUrl(Url::UrlType /*type*/=Url::Absolute) const { return Url(); };
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue