FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

feat(graphic): support local and file-based textures in material setup by Miou-zora · Pull Request #435 · EngineSquared/EngineSquared · GitHub

/ EngineSquared Public

feat(graphic): support local and file-based textures in material setup #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Miou-zora merged 7 commits into from
Jan 24, 2026
Conversation 6 Commits 7 Checks 19 Files changed
Merged

feat(graphic): support local and file-based textures in material setup #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb4627b
feat(graphic): support local and file-based textures in material setup
Miou-zora Jan 24, 2026
fe1ee02
style: apply linter
github-actions[bot] Jan 24, 2026
5f9da33
Merge branch 'main' into add-a-way-to-use-custom-materials
Miou-zora Jan 24, 2026
e6f05f3
feat: add warning log for missing ambient texture in material creation
Miou-zora Jan 24, 2026
c7e9d7b
Merge branch 'main' into add-a-way-to-use-custom-materials
Miou-zora Jan 24, 2026
7621298
Merge branch 'main' into add-a-way-to-use-custom-materials
Miou-zora Jan 24, 2026
bf2a5da
fix(graphic): update material structure to include ambient property
Miou-zora Jan 24, 2026
File filter

Filter by extension

Filter by extension .cpp  (2) .hpp  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
23 changes: 18 additions & 5 deletions examples/graphic_material_usage/src/main.cpp
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,33 @@ void Setup(Engine::Core &core)
cube.AddComponent<Object::Component::Transform>(glm::vec3(-2.0f, 0.0f, 0.0f));
cube.AddComponent<Object::Component::Mesh>(Object::Utils::GenerateCubeMesh());

// Custom Material with Texture
// Custom Material from file
Object::Component::Material materialWithTexture;
materialWithTexture.ambientTexName = "./asset/texture.png";
auto cube1 = core.CreateEntity();
cube1.AddComponent<Object::Component::Transform>();
cube1.AddComponent<Object::Component::Mesh>(Object::Utils::GenerateCubeMesh());
cube1.AddComponent<Object::Component::Material>(std::move(materialWithTexture));

// Custom Material without Texture
Object::Component::Material materialWithoutTexture;
// Custom Material from local texture
Object::Component::Material materialFromLocalTexture;
materialFromLocalTexture.ambientTexName = "LocalTextureName";
auto &textureManager = core.GetResource<Graphic::Resource::TextureContainer>();
auto texture =
Graphic::Resource::Texture(core.GetResource<Graphic::Resource::Context>(), "LocalTexture", glm::uvec2(255, 255),
[](glm::uvec2 pos) { return glm::u8vec4(pos.x, pos.y, 0, 255); });
textureManager.Add("LocalTextureName", std::move(texture));
auto cube2 = core.CreateEntity();
cube2.AddComponent<Object::Component::Transform>(glm::vec3(2.0f, 0.0f, 0.0f));
cube2.AddComponent<Object::Component::Transform>(glm::vec3(0.0f, 2.0f, 0.0f));
cube2.AddComponent<Object::Component::Mesh>(Object::Utils::GenerateCubeMesh());
cube2.AddComponent<Object::Component::Material>(std::move(materialWithoutTexture));
cube2.AddComponent<Object::Component::Material>(std::move(materialFromLocalTexture));

// Custom Material without Texture
Object::Component::Material materialWithoutTexture;
auto cube3 = core.CreateEntity();
cube3.AddComponent<Object::Component::Transform>(glm::vec3(2.0f, 0.0f, 0.0f));
cube3.AddComponent<Object::Component::Mesh>(Object::Utils::GenerateCubeMesh());
cube3.AddComponent<Object::Component::Material>(std::move(materialWithoutTexture));

// Camera
auto camera = core.CreateEntity();
Expand Down
4 changes: 2 additions & 2 deletions src/plugin/default-pipeline/src/resource/pass/GBuffer.hpp
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct Object {
}

struct Material {
emission: vec3f,
ambient: vec3f,
padding: f32,
};

Expand Down Expand Up @@ -89,7 +89,7 @@ fn fs_main(
var output : GBufferOutput;
var uv = vec2f(1.0 - fragUV.x, 1.0 - fragUV.y);
output.normal = vec4(normalize(fragNormal), 1.0);
output.albedo = vec4(textureSample(texture, textureSampler, uv).rgb, 1.0);
output.albedo = vec4(textureSample(texture, textureSampler, uv).rgb * material.ambient, 1.0);

return output;
}
Expand Down
15 changes: 9 additions & 6 deletions src/plugin/default-pipeline/src/system/GPUComponentManagement/OnMaterialCreation.cpp
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,21 @@ void DefaultPipeline::System::OnMaterialCreation(Engine::Core &core, Engine::Ent
entt::hashed_string textureId{material.ambientTexName.data(), material.ambientTexName.size()};
entt::hashed_string samplerId{material.ambientTexName.data(), material.ambientTexName.size()};

if (std::filesystem::exists(material.ambientTexName) == false)
{
Log::Warn(fmt::format("Material texture file not found: {}", material.ambientTexName));
GPUMaterial.texture = entt::hashed_string{};
}
else
if (std::filesystem::exists(material.ambientTexName))
{
Graphic::Resource::Texture texture{context, material.ambientTexName,
Graphic::Resource::Image(material.ambientTexName)};
textureContainer.Add(textureId, std::move(texture));
GPUMaterial.texture = textureId;
}
else if (textureContainer.Contains(textureId))
{
GPUMaterial.texture = textureId;
}
Comment thread
Miou-zora marked this conversation as resolved.
else if (!material.ambientTexName.empty())
{
Log::Warn(fmt::format("Texture '{}' not found as file or in texture container", material.ambientTexName));
}

Graphic::Resource::Sampler sampler{context.deviceContext.GetDevice().value()};
samplerContainer.Add(samplerId, std::move(sampler));
Expand Down
Loading
Back | FazBrowse Home | New Git URL