diff options
| author | 2024-10-08 14:51:21 -0400 | |
|---|---|---|
| committer | 2024-10-08 14:51:21 -0400 | |
| commit | 2bb807dd32e1c18a6f1e8f22c25141de3334de9f (patch) | |
| tree | 64795e558ef7b21655b69327e67027b43bf4b26f /src/objects | |
| parent | 4d81d3b52952edb7a0cc329b4d0b302599b6c4c7 (diff) | |
| download | mauri-2bb807dd32e1c18a6f1e8f22c25141de3334de9f.tar.gz mauri-2bb807dd32e1c18a6f1e8f22c25141de3334de9f.tar.bz2 mauri-2bb807dd32e1c18a6f1e8f22c25141de3334de9f.zip | |
Remove gstreamer and visualizer, cleanup
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/effect.cc | 2 | ||||
| -rw-r--r-- | src/objects/material.cc | 2 | ||||
| -rw-r--r-- | src/objects/model.cc | 2 | ||||
| -rw-r--r-- | src/objects/pass.cc | 2 | ||||
| -rw-r--r-- | src/objects/pass.h | 8 | ||||
| -rw-r--r-- | src/objects/scene.cc | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/objects/effect.cc b/src/objects/effect.cc index 92f7dda..2a6960f 100644 --- a/src/objects/effect.cc +++ b/src/objects/effect.cc @@ -7,7 +7,7 @@ auto Effect::parse(Parser &pr, const json &root) -> Effect * { Effect *effect = new Effect(); - Asset *asset = asset_manager()->get_file(root["file"]); + Asset *asset = asset_manager()->get(root["file"]); if (asset->type == ASSET_VOID) parse_fail(effect); const json &file = json::parse(asset->as_string(), nullptr, false); diff --git a/src/objects/material.cc b/src/objects/material.cc index e3e3e02..7c36d13 100644 --- a/src/objects/material.cc +++ b/src/objects/material.cc @@ -7,7 +7,7 @@ auto Material::parse(Parser &pr, const std::string &path) -> Material * { Material *material = new Material(); - Asset *asset = asset_manager()->get_file(path); + Asset *asset = asset_manager()->get(path); if (asset->type == ASSET_VOID) parse_fail(material); const json &root = json::parse(asset->as_string(), nullptr, false); diff --git a/src/objects/model.cc b/src/objects/model.cc index 830bdaf..f5ce9c4 100644 --- a/src/objects/model.cc +++ b/src/objects/model.cc @@ -6,7 +6,7 @@ auto Model::parse(Parser &pr, const std::string &path) -> Model * { Model *model = new Model(); - Asset *asset = asset_manager()->get_file(path); + Asset *asset = asset_manager()->get(path); if (asset->type == ASSET_VOID) parse_fail(model); const json &root = json::parse(asset->as_string(), nullptr, false); diff --git a/src/objects/pass.cc b/src/objects/pass.cc index 04e23d5..a7cfc09 100644 --- a/src/objects/pass.cc +++ b/src/objects/pass.cc @@ -190,7 +190,7 @@ RenderPass::RenderPass(Engine *engine, Pass *pass) if (!this->textures[i]) { - Asset *asset = asset_manager()->get_file(pass->textures[i], TEXTURE); + Asset *asset = asset_manager()->get(pass->textures[i], TEXTURE); if (asset->type != ASSET_VOID) { this->textures[i] = (Texture *)asset->lasset; diff --git a/src/objects/pass.h b/src/objects/pass.h index 5012ed5..fdec680 100644 --- a/src/objects/pass.h +++ b/src/objects/pass.h @@ -52,8 +52,8 @@ class Pass std::string shader; - std::array<std::string, MAX_TEXTURES> binds = { }; - std::array<std::string, MAX_TEXTURES> textures = { }; + std::array<std::string, MAX_TEXTURES> binds = {}; + std::array<std::string, MAX_TEXTURES> textures = {}; bool model; bool combine; @@ -83,8 +83,8 @@ class RenderPass mat4x4 *mat; RenderObject *render_object; - std::array<Texture *, MAX_TEXTURES> textures = { }; - std::array<TextureType, MAX_TEXTURES> texture_types = { }; + std::array<Texture *, MAX_TEXTURES> textures = {}; + std::array<TextureType, MAX_TEXTURES> texture_types = {}; auto draw(Engine *engine) -> void; diff --git a/src/objects/scene.cc b/src/objects/scene.cc index b7d1192..832cea6 100644 --- a/src/objects/scene.cc +++ b/src/objects/scene.cc @@ -6,7 +6,7 @@ auto Scene::parse(const std::string &path) -> Scene * { Scene *scene = new Scene(); - Asset *asset = asset_manager()->get_file(path); + Asset *asset = asset_manager()->get(path); if (asset->type == ASSET_VOID) parse_fail(scene); const json &root = json::parse(asset->as_string(), nullptr, false); |