Merge pull request #1172 from davidgyu/dev_warnings_fix

Fixed warnings in examples and regression/common
This commit is contained in:
George ElKoura 2020-01-15 16:11:04 -08:00 committed by GitHub
commit 8c86d81c2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

View File

@ -164,9 +164,9 @@ Sky::initialize(ID3D11Device * device) {
for (int v = 0; v < V_DIV; ++v) {
float s = float(2*M_PI*float(u)/U_DIV);
float t = float(M_PI*float(v)/(V_DIV-1));
vbo.push_back(-sin(t)*sin(s));
vbo.push_back(cos(t));
vbo.push_back(-sin(t)*cos(s));
vbo.push_back(-sinf(t)*sinf(s));
vbo.push_back(cosf(t));
vbo.push_back(-sinf(t)*cosf(s));
vbo.push_back(u/float(U_DIV));
vbo.push_back(v/float(V_DIV));

View File

@ -102,7 +102,7 @@ ArgOptions::PrintUnrecognizedArgsWarnings() const
}
}
int
size_t
ArgOptions::AppendObjShapes(std::vector<ShapeDesc>& shapes, bool warn) const
{
size_t originalShapesSize = shapes.size();

View File

@ -72,7 +72,8 @@ public:
// Operations on parsed arguments
//
int AppendObjShapes(std::vector<ShapeDesc>& shapes, bool warn = true) const;
size_t AppendObjShapes(std::vector<ShapeDesc>& shapes,
bool warn = true) const;
private: