MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2025-06-19 19:26:36 +02:00
Code Issues Projects Releases Wiki Activity

trying to fix some warnings (had side effects)

Browse Source
This commit is contained in:
Green Sky
2021-06-14 17:44:59 +02:00
parent 05a8dfe1ff
commit 573b276116
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/imgui/src/mm/imgui/widgets/texture.cpp
View File

@ -8,7 +8,7 @@
namespace MM::ImGuiWidgets {
// TODO: fix formating
void Texture(MM::OpenGL::Texture::handle& texture, bool dropTarget) {
void Texture(MM::OpenGL::Texture::handle_t& texture, bool dropTarget) {
const float s_sz = ImGui::GetFrameHeight();
//const float w_all = ImGui::CalcItemWidth();
//const char* lable_display_end = ImGui::FindRenderedTextEnd(label);
@ -58,7 +58,7 @@ void Texture(MM::OpenGL::Texture::handle& texture, bool dropTarget) {
ImGui::EndGroup();
}
void LabelTexture(const char* label, MM::OpenGL::Texture::handle& texture, bool dropTarget) {
void LabelTexture(const char* label, MM::OpenGL::Texture::handle_t& texture, bool dropTarget) {
const float s_sz = ImGui::GetFrameHeight();
const float w_all = ImGui::CalcItemWidth();
const char* lable_display_end = ImGui::FindRenderedTextEnd(label);

4
framework/imgui/src/mm/imgui/widgets/texture.hpp
View File

@ -6,8 +6,8 @@ namespace MM::ImGuiWidgets {
#define IMGUI_PAYLOAD_TYPE_MM_REND_TEXTURE "MM_REND_TEXTURE"
void Texture(MM::OpenGL::Texture::handle& texture, bool dropTarget = true);
void LabelTexture(const char* label, MM::OpenGL::Texture::handle& texture, bool dropTarget = true);
void Texture(MM::OpenGL::Texture::handle_t& texture, bool dropTarget = true);
void LabelTexture(const char* label, MM::OpenGL::Texture::handle_t& texture, bool dropTarget = true);
}

2
framework/imgui/src/mm/imgui/widgets/texture_resource_manager.cpp
View File

@ -32,7 +32,7 @@ void TextureResourceManagerList(void) {
void TextureResourceManagerLoader(MM::Engine& engine) {
using namespace entt::literals;
auto& rm = MM::ResourceManager<MM::OpenGL::Texture>::ref();
static MM::OpenGL::Texture::handle texture = rm.get("default"_hs);
static MM::OpenGL::Texture::handle_t texture = rm.get("default"_hs);
static std::string path = "";