diff --git a/example/main.c b/example/main.c index de17d3c..317b0c9 100644 --- a/example/main.c +++ b/example/main.c @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 17:55:21 by maldavid #+# #+# */ -/* Updated: 2024/01/11 15:03:14 by maldavid ### ########.fr */ +/* Updated: 2024/01/11 20:09:56 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -30,6 +30,7 @@ int update(void *param) t_mlx *mlx; mlx = (t_mlx *)param; + mlx_set_font_scale(mlx->mlx, mlx->win, "default", 6.f); mlx_string_put(mlx->mlx, mlx->win, 160, 120, 0xFFFF2066, "this text should be hidden"); mlx_put_image_to_window(mlx->mlx, mlx->win, mlx->logo, 100, 100); mlx_put_image_to_window(mlx->mlx, mlx->win, mlx->img, 150, 60); diff --git a/src/platform/inputs.cpp b/src/platform/inputs.cpp index 412732a..a6de3a7 100644 --- a/src/platform/inputs.cpp +++ b/src/platform/inputs.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/05 16:30:19 by maldavid #+# #+# */ -/* Updated: 2024/01/10 18:31:13 by maldavid ### ########.fr */ +/* Updated: 2024/01/11 19:08:23 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -35,7 +35,7 @@ namespace mlx } uint32_t id = _event.window.windowID; - if(!_events_hooks.count(id)) + if(_events_hooks.find(id) == _events_hooks.end()) continue; auto& hooks = _events_hooks[id]; diff --git a/src/renderer/texts/font.h b/src/renderer/texts/font.h index d25c4b7..1b0ed40 100644 --- a/src/renderer/texts/font.h +++ b/src/renderer/texts/font.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/11 21:17:04 by kbz_8 #+# #+# */ -/* Updated: 2023/12/14 17:51:40 by maldavid ### ########.fr */ +/* Updated: 2024/01/11 20:08:55 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -31,8 +31,8 @@ namespace mlx inline float getScale() const noexcept { return _scale; } inline const std::array& getCharData() const { return _cdata; } inline const TextureAtlas& getAtlas() const noexcept { return _atlas; } - inline bool operator==(const Font& rhs) const { return rhs._name == _name; } - inline bool operator!=(const Font& rhs) const { return rhs._name != _name; } + inline bool operator==(const Font& rhs) const { return rhs._name == _name && rhs._scale == _scale; } + inline bool operator!=(const Font& rhs) const { return rhs._name != _name && rhs._scale != _scale; } ~Font(); private: diff --git a/src/renderer/texts/text_manager.h b/src/renderer/texts/text_manager.h index 93cfedb..d530868 100644 --- a/src/renderer/texts/text_manager.h +++ b/src/renderer/texts/text_manager.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/06 16:24:11 by maldavid #+# #+# */ -/* Updated: 2024/01/11 05:18:42 by maldavid ### ########.fr */ +/* Updated: 2024/01/11 18:48:01 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -32,7 +32,7 @@ namespace mlx void init(Renderer& renderer) noexcept; std::pair registerText(int x, int y, uint32_t color, std::string str); - inline void clear() { _text_descriptors.clear(); TextLibrary::get().clearLibrary(); } + inline void clear() { _text_descriptors.clear(); /*TextLibrary::get().clearLibrary();*/ } void loadFont(Renderer& renderer, const std::filesystem::path& filepath, float scale); void destroy() noexcept; diff --git a/valgrind.supp b/valgrind.supp index d746267..c0feb86 100644 --- a/valgrind.supp +++ b/valgrind.supp @@ -1,7 +1,31 @@ { name Memcheck:Leak - fun:*alloc + fun:* + ... + obj:*libmlx* + ... +} +{ + name + Memcheck:Cond + fun:* + ... + obj:*libmlx* + ... +} +{ + name + Memcheck:Value8 + fun:* + ... + obj:*libmlx* + ... +} +{ + name + Memcheck:Addr4 + fun:* ... obj:*libmlx* ... @@ -9,7 +33,7 @@ { name Memcheck:Leak - fun:*alloc + fun:* ... obj:*SDL* ... @@ -17,7 +41,7 @@ { name Memcheck:Leak - fun:*alloc + fun:* ... obj:*X11* ... @@ -25,7 +49,7 @@ { name Memcheck:Leak - fun:*alloc + fun:* ... obj:*nvidia.so* ... @@ -33,7 +57,7 @@ { name Memcheck:Leak - fun:*alloc + fun:* obj:* ... fun:X11* @@ -51,7 +75,16 @@ { name Memcheck:Leak - fun:*alloc + fun:* + obj:* + ... + fun:_dl_* + ... +} +{ + name + Memcheck:Leak + fun:* obj:* ... fun:dl_* @@ -94,4 +127,3 @@ obj:* obj:* } -