Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 07:23:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve Hash const function and include per Jenkins

Browse source
This commit is contained in:
Zach Pomerantz 2016-01-05 18:08:16 -08:00
parent 948dc26d24
commit da50eacaad
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/render-utils/src/DeferredLightingEffect.h
View file

@ -21,7 +21,7 @@
#include "model/Stage.h" #include "model/Stage.h"
#include "model/Geometry.h" #include "model/Geometry.h"
#include "render/Shape.h" #include "ShapeRender.h"
class RenderArgs; class RenderArgs;
class SimpleProgramKey; class SimpleProgramKey;
@ -32,7 +32,7 @@ class DeferredLightingEffect : public Dependency {
SINGLETON_DEPENDENCY SINGLETON_DEPENDENCY
public: public:
static const int NORMAL_FITTING_MAP_SLOT = render::Shape::Slot::NORMAL_FITTING_MAP; static const int NORMAL_FITTING_MAP_SLOT = ShapeRender::Slot::NORMAL_FITTING_MAP;
static const int DEFERRED_TRANSFORM_BUFFER_SLOT = 2; static const int DEFERRED_TRANSFORM_BUFFER_SLOT = 2;
void init(); void init();

2
libraries/render/src/render/Shape.h
View file

@ -87,7 +87,7 @@ public:
// Hasher for use in unordered_maps // Hasher for use in unordered_maps
class Hash { class Hash {
public: public:
size_t operator() (const ShapeKey& key) { size_t operator() (const ShapeKey& key) const {
return std::hash<ShapeKey::Flags>()(key._flags); return std::hash<ShapeKey::Flags>()(key._flags);
} }
}; };