ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to fix clang build

Browse Source
This commit is contained in:
Benau 2017-03-16 09:51:09 +08:00
parent 1ba3fce7b8
commit d55b513ca8
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/graphics/materials.cpp
View File

@ -746,7 +746,6 @@ const std::tuple<size_t> SkinnedSolid::FirstPassTextures
= std::tuple<size_t>(1);
const std::tuple<size_t, size_t, size_t> SkinnedSolid::SecondPassTextures
= std::tuple<size_t, size_t, size_t>(0, 1, 2);
const std::tuple<> SkinnedSolid::ShadowTextures;
const std::tuple<size_t> SkinnedSolid::RSMTextures = std::tuple<size_t>(0);
// ----------------------------------------------------------------------------
@ -775,7 +774,6 @@ const std::tuple<size_t, size_t> SkinnedNormalMat::FirstPassTextures
= std::tuple<size_t, size_t>(3, 1);
const std::tuple<size_t, size_t, size_t> SkinnedNormalMat::SecondPassTextures
= std::tuple<size_t, size_t, size_t>(0, 1, 2);
const std::tuple<> SkinnedNormalMat::ShadowTextures;
const std::tuple<size_t> SkinnedNormalMat::RSMTextures = std::tuple<size_t>(0);
// ----------------------------------------------------------------------------
@ -784,7 +782,6 @@ const std::tuple<size_t> DefaultMaterial::FirstPassTextures
= std::tuple<size_t>(1);
const std::tuple<size_t, size_t, size_t> DefaultMaterial::SecondPassTextures
= std::tuple<size_t, size_t, size_t>(0, 1, 2);
const std::tuple<> DefaultMaterial::ShadowTextures;
const std::tuple<size_t> DefaultMaterial::RSMTextures = std::tuple<size_t>(0);
// ----------------------------------------------------------------------------
@ -800,7 +797,6 @@ const std::tuple<size_t> AlphaRef::RSMTextures = std::tuple<size_t>(0);
const InstanceType SphereMap::Instance = InstanceTypeThreeTex;
const std::tuple<size_t> SphereMap::FirstPassTextures = std::tuple<size_t>(1);
const std::tuple<size_t> SphereMap::SecondPassTextures = std::tuple<size_t>(0);
const std::tuple<> SphereMap::ShadowTextures;
const std::tuple<size_t> SphereMap::RSMTextures = std::tuple<size_t>(0);
// ----------------------------------------------------------------------------
@ -826,7 +822,6 @@ const std::tuple<size_t, size_t> NormalMat::FirstPassTextures
= std::tuple<size_t, size_t>(3, 1);
const std::tuple<size_t, size_t, size_t> NormalMat::SecondPassTextures
= std::tuple<size_t, size_t, size_t>(0, 1, 2);
const std::tuple<> NormalMat::ShadowTextures;
const std::tuple<size_t> NormalMat::RSMTextures = std::tuple<size_t>(0);
// ----------------------------------------------------------------------------
@ -834,7 +829,6 @@ const InstanceType DetailMat::Instance = InstanceTypeFourTex;
const std::tuple<size_t> DetailMat::FirstPassTextures = std::tuple<size_t>(1);
const std::tuple<size_t, size_t, size_t> DetailMat::SecondPassTextures
= std::tuple<size_t, size_t, size_t>(0, 3, 1);
const std::tuple<> DetailMat::ShadowTextures;
const std::tuple<size_t> DetailMat::RSMTextures = std::tuple<size_t>(0);
// ----------------------------------------------------------------------------
@ -843,7 +837,6 @@ const std::tuple<size_t> SplattingMat::FirstPassTextures
const std::tuple<size_t, size_t, size_t, size_t, size_t>
SplattingMat::SecondPassTextures
= std::tuple<size_t, size_t, size_t, size_t, size_t>(1, 3, 4, 5, 6);
const std::tuple<> SplattingMat::ShadowTextures;
const std::tuple<size_t, size_t, size_t, size_t, size_t>
SplattingMat::RSMTextures
= std::tuple<size_t, size_t, size_t, size_t, size_t>(1, 3, 4, 5, 6);

14
src/graphics/materials.hpp
View File

@ -445,7 +445,7 @@ struct SkinnedSolid
static const enum InstanceType Instance;
static const std::tuple<size_t> FirstPassTextures;
static const std::tuple<size_t, size_t, size_t> SecondPassTextures;
static const std::tuple<> ShadowTextures;
static const std::tuple<> constexpr ShadowTextures {};
static const std::tuple<size_t> RSMTextures;
}; // SkinnedSolid
@ -487,7 +487,7 @@ struct SkinnedNormalMat
static const enum InstanceType Instance;
static const std::tuple<size_t, size_t> FirstPassTextures;
static const std::tuple<size_t, size_t, size_t> SecondPassTextures;
static const std::tuple<> ShadowTextures;
static const std::tuple<> constexpr ShadowTextures {};
static const std::tuple<size_t> RSMTextures;
}; // SkinnedNormalMat
@ -530,7 +530,7 @@ struct DefaultMaterial
static const enum InstanceType Instance;
static const std::tuple<size_t> FirstPassTextures;
static const std::tuple<size_t, size_t, size_t> SecondPassTextures;
static const std::tuple<> ShadowTextures;
static const std::tuple<> constexpr ShadowTextures {};
static const std::tuple<size_t> RSMTextures;
}; // DefaultMaterial
@ -573,7 +573,7 @@ struct SphereMap
static const enum InstanceType Instance;
static const std::tuple<size_t> FirstPassTextures;
static const std::tuple<size_t> SecondPassTextures;
static const std::tuple<> ShadowTextures;
static const std::tuple<> constexpr ShadowTextures {};
static const std::tuple<size_t> RSMTextures;
}; // SphereMap
@ -639,7 +639,7 @@ struct NormalMat
static const enum InstanceType Instance;
static const std::tuple<size_t, size_t> FirstPassTextures;
static const std::tuple<size_t, size_t, size_t> SecondPassTextures;
static const std::tuple<> ShadowTextures;
static const std::tuple<> constexpr ShadowTextures {};
static const std::tuple<size_t> RSMTextures;
}; // NormalMat
@ -661,7 +661,7 @@ struct DetailMat
static const enum InstanceType Instance;
static const std::tuple<size_t> FirstPassTextures;
static const std::tuple<size_t, size_t, size_t> SecondPassTextures;
static const std::tuple<> ShadowTextures;
static const std::tuple<> constexpr ShadowTextures {};
static const std::tuple<size_t> RSMTextures;
}; // DetailMat
@ -681,7 +681,7 @@ struct SplattingMat
static const std::tuple<size_t> FirstPassTextures;
static const std::tuple<size_t, size_t, size_t, size_t, size_t>
SecondPassTextures;
static const std::tuple<> ShadowTextures;
static const std::tuple<> constexpr ShadowTextures {};
static const std::tuple<size_t, size_t, size_t, size_t, size_t>
RSMTextures;
}; // SplattingMat