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

Return correct type from DeepSkyObject::getRenderMask() 

More correctly is to return Renderer::RenderFlags, but this require big
render.h refactoring.
pull/3/head
Hleb Valoshka 2019-07-06 15:37:18 +03:00
parent b11cd25553
commit a10da37741
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/celengine/deepskyobj.h
View File

@ -97,7 +97,7 @@ class DeepSkyObject : public CatEntry
float pixelSize,
const Renderer*) = 0;
virtual unsigned int getRenderMask() const { return 0; }
virtual uint64_t getRenderMask() const { return 0; }
virtual unsigned int getLabelMask() const { return 0; }
enum : uint32_t

2
src/celengine/galaxy.cpp
View File

@ -458,7 +458,7 @@ void Galaxy::renderGalaxyEllipsoid(const Vec3f& offset,
#endif
unsigned int Galaxy::getRenderMask() const
uint64_t Galaxy::getRenderMask() const
{
return Renderer::ShowGalaxies;
}

2
src/celengine/galaxy.h
View File

@ -68,7 +68,7 @@ class Galaxy : public DeepSkyObject
static float getLightGain();
static void setLightGain(float);
virtual unsigned int getRenderMask() const;
virtual uint64_t getRenderMask() const;
virtual unsigned int getLabelMask() const;
virtual const char* getObjTypeName() const;

2
src/celengine/globular.cpp
View File

@ -494,7 +494,7 @@ void Globular::renderGlobularPointSprites(
glEnd();
}
unsigned int Globular::getRenderMask() const
uint64_t Globular::getRenderMask() const
{
return Renderer::ShowGlobulars;
}

2
src/celengine/globular.h
View File

@ -69,7 +69,7 @@ class Globular : public DeepSkyObject
float pixelSize);
GlobularForm* getForm() const;
virtual unsigned int getRenderMask() const;
virtual uint64_t getRenderMask() const;
virtual unsigned int getLabelMask() const;
virtual const char* getObjTypeName() const;

2
src/celengine/nebula.cpp
View File

@ -107,7 +107,7 @@ void Nebula::render(const Vector3f& /*unused*/,
}
unsigned int Nebula::getRenderMask() const
uint64_t Nebula::getRenderMask() const
{
return Renderer::ShowNebulae;
}

2
src/celengine/nebula.h
View File

@ -34,7 +34,7 @@ class Nebula : public DeepSkyObject
float pixelSize,
const Renderer* renderer);
virtual unsigned int getRenderMask() const;
virtual uint64_t getRenderMask() const;
virtual unsigned int getLabelMask() const;
void setGeometry(ResourceHandle);

2
src/celengine/opencluster.cpp
View File

@ -77,7 +77,7 @@ void OpenCluster::render(const Vector3f& /*unused*/,
}
unsigned int OpenCluster::getRenderMask() const
uint64_t OpenCluster::getRenderMask() const
{
return Renderer::ShowOpenClusters;
}

2
src/celengine/opencluster.h
View File

@ -35,7 +35,7 @@ class OpenCluster : public DeepSkyObject
float pixelSize,
const Renderer* r = nullptr);
virtual unsigned int getRenderMask() const;
virtual uint64_t getRenderMask() const;
virtual unsigned int getLabelMask() const;
virtual const char* getObjTypeName() const;