diff options
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/effect.cc | 2 | ||||
| -rw-r--r-- | src/objects/pass.cc | 5 | ||||
| -rw-r--r-- | src/objects/pass.h | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/objects/effect.cc b/src/objects/effect.cc index 854ec2d..fe3fbbe 100644 --- a/src/objects/effect.cc +++ b/src/objects/effect.cc @@ -58,7 +58,7 @@ void Effect::load(Engine *engine, Object *object, bool last) for (u32 i = 0; i < passes1.size(); i++) { - Pass pass; + Pass pass; pass.object = object; pass.effect = this; diff --git a/src/objects/pass.cc b/src/objects/pass.cc index b193234..96a349a 100644 --- a/src/objects/pass.cc +++ b/src/objects/pass.cc @@ -31,8 +31,7 @@ Pass::Pass(Parser &p, json &root, PassStage stage) for (auto &value : _uniforms.items()) { uniforms.emplace_back( - new UniformOverride({ vec4(0.f), value.key() }) - ); + new UniformOverride({vec4(0.f), value.key()})); p.get_value<vec4>(_uniforms, value.key(), &uniforms.back()->value, vec4(0.f)); } @@ -71,7 +70,7 @@ Pass::Pass(Parser &p, json &root, PassStage stage) break; } case MATERIAL_ONLY_PASS: - case MATERIAL_PASS: + case MATERIAL_PASS: shader = root["shader"]; break; } diff --git a/src/objects/pass.h b/src/objects/pass.h index c5318fb..6b8f2a9 100644 --- a/src/objects/pass.h +++ b/src/objects/pass.h @@ -57,8 +57,8 @@ class Pass std::string shader; - std::array<std::string, MAX_TEXTURES> textures; - std::array<std::string, MAX_TEXTURES> binds; + std::array<std::string, MAX_TEXTURES> textures = {""}; + std::array<std::string, MAX_TEXTURES> binds = {""}; bool combine; |