From 69fd08d941a7053e34d676d7c496acd219688cc9 Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Sun, 25 Jul 2021 18:28:26 -0400 Subject: [PATCH] Added freetype premake file --- .gitmodules | 3 + Editor/src/NewEditor.cpp | 8 +-- Nuake/dependencies/freetype | 1 + Nuake/dependencies/freetype_p5.lua | 76 +++++++++++++++++++++ Nuake/src/Scene/Systems/TransformSystem.cpp | 10 +-- premake5.lua | 6 +- 6 files changed, 93 insertions(+), 11 deletions(-) create mode 160000 Nuake/dependencies/freetype create mode 100644 Nuake/dependencies/freetype_p5.lua diff --git a/.gitmodules b/.gitmodules index 34ca6bda..ecff5908 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "Nuake/dependencies/glew"] path = Nuake/dependencies/glew url = https://github.com/nigels-com/glew.git +[submodule "Nuake/dependencies/freetype"] + path = Nuake/dependencies/freetype + url = https://github.com/freetype/freetype.git diff --git a/Editor/src/NewEditor.cpp b/Editor/src/NewEditor.cpp index 756b0436..d7c57c13 100644 --- a/Editor/src/NewEditor.cpp +++ b/Editor/src/NewEditor.cpp @@ -72,16 +72,16 @@ namespace Nuake float mouseX = Input::GetMouseX(); float ratio = mouseX / totalWidth; - m_Inspector->NormalStyle.Width.Unit = Layout::PIXEL; + m_Inspector->NormalStyle.Width.mUnit = Layout::PIXEL; m_Inspector->NormalStyle.Width.Value = (1.0f - ratio) * totalWidth - 3.0f; - m_ViewportNode->NormalStyle.Width.Unit = Layout::PIXEL; + m_ViewportNode->NormalStyle.Width.mUnit = Layout::PIXEL; m_ViewportNode->NormalStyle.Width.Value = ratio * totalWidth; - m_Inspector->HoverStyle.Width.Unit = Layout::PIXEL; + m_Inspector->HoverStyle.Width.mUnit = Layout::PIXEL; m_Inspector->HoverStyle.Width.Value = (1.0f - ratio) * totalWidth - 3.0f; - m_ViewportNode->HoverStyle.Width.Unit = Layout::PIXEL; + m_ViewportNode->HoverStyle.Width.mUnit = Layout::PIXEL; m_ViewportNode->HoverStyle.Width.Value = ratio * totalWidth; Logger::Log("mouseX " + std::to_string(ratio)); diff --git a/Nuake/dependencies/freetype b/Nuake/dependencies/freetype new file mode 160000 index 00000000..ba47af32 --- /dev/null +++ b/Nuake/dependencies/freetype @@ -0,0 +1 @@ +Subproject commit ba47af32ba6a8a5f2cd5c0a5868c37c6a2665c1c diff --git a/Nuake/dependencies/freetype_p5.lua b/Nuake/dependencies/freetype_p5.lua new file mode 100644 index 00000000..453cdcad --- /dev/null +++ b/Nuake/dependencies/freetype_p5.lua @@ -0,0 +1,76 @@ +project "Freetype" + location "freetype" + kind "StaticLib" + staticruntime "on" + language "C" + + targetdir ("freetype/bin/" .. outputdir .. "/%{prj.name}") + objdir ("freetype/bin-obj/" .. outputdir .. "/%{prj.name}") + + includedirs { + 'freetype/include/', + 'freetype/', + "freetype/include/config/" + } + defines { "FT2_BUILD_LIBRARY" } + + files { + "freetype/src/autofit/autofit.c", + "freetype/src/base/ftbase.c", + "freetype/src/base/ftbbox.c", + "freetype/src/base/ftbdf.c", + "freetype/src/base/ftbitmap.c", + "freetype/src/base/ftcid.c", + "freetype/src/base/ftfstype.c", + "freetype/src/base/ftgasp.c", + "freetype/src/base/ftglyph.c", + "freetype/src/base/ftgxval.c", + "freetype/src/base/ftinit.c", + "freetype/src/base/ftmm.c", + "freetype/src/base/ftotval.c", + "freetype/src/base/ftpatent.c", + "freetype/src/base/ftpfr.c", + "freetype/src/base/ftstroke.c", + "freetype/src/base/ftsynth.c", + "freetype/src/base/ftsystem.c", + "freetype/src/base/fttype1.c", + "freetype/src/base/ftwinfnt.c", + "freetype/src/bdf/bdf.c", + "freetype/src/cache/ftcache.c", + "freetype/src/cff/cff.c", + "freetype/src/cid/type1cid.c", + "freetype/src/gzip/ftgzip.c", + "freetype/src/lzw/ftlzw.c", + "freetype/src/pcf/pcf.c", + "freetype/src/pfr/pfr.c", + "freetype/src/psaux/psaux.c", + "freetype/src/pshinter/pshinter.c", + "freetype/src/psnames/psmodule.c", + "freetype/src/raster/raster.c", + "freetype/src/sfnt/sfnt.c", + "freetype/src/smooth/smooth.c", + "freetype/src/truetype/truetype.c", + "freetype/src/type1/type1.c", + "freetype/src/type42/type42.c", + "freetype/src/winfonts/winfnt.c", + "freetype/src/winfonts/winfnt.c", + "freetype/src/sdf/sdf.c" + } + + + filter "system:windows" + systemversion "latest" + + defines + { + + } + + filter "configurations:Debug" + files { "freetype/src/base/ftdebug.c" } + runtime "Debug" + symbols "on" + + filter "configurations:Release" + runtime "Release" + optimize "on" \ No newline at end of file diff --git a/Nuake/src/Scene/Systems/TransformSystem.cpp b/Nuake/src/Scene/Systems/TransformSystem.cpp index ff054cfe..8532a995 100644 --- a/Nuake/src/Scene/Systems/TransformSystem.cpp +++ b/Nuake/src/Scene/Systems/TransformSystem.cpp @@ -3,9 +3,9 @@ #include "src/Core/Maths.h" #include "src/Scene/Scene.h" -#include "src/Scene/Components/TransformComponent.h" -#include "src/Scene/Components/ParentComponent.h" -#include "src/Scene/Components/CameraComponent.h" +#include +#include +#include namespace Nuake { TransformSystem::TransformSystem(Scene* scene) @@ -39,8 +39,8 @@ namespace Nuake { auto camView = m_Scene->m_Registry.view(); for (auto e : camView) { - auto [transform, camera] = camView.get(); - + auto [transform, camera] = camView.get(e); + // Matrix4 cameraTransform = camera.CameraInstance->GetTransformRotation(); } diff --git a/premake5.lua b/premake5.lua index 2a821680..40e6071d 100644 --- a/premake5.lua +++ b/premake5.lua @@ -12,6 +12,7 @@ outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}" include "Nuake/dependencies/glfw_p5.lua" include "Nuake/dependencies/assimp_p5.lua" include "Nuake/dependencies/bullet_p5.lua" +include "Nuake/dependencies/freetype_p5.lua" project "Nuake" location "Nuake" @@ -67,6 +68,7 @@ project "Nuake" "BulletCollision", "BulletDynamics", "LinearMath", + "Freetype" } filter "system:windows" @@ -113,7 +115,7 @@ project "Editor" "%{prj.name}/../Nuake/dependencies/assimp/lib/", "%{prj.name}/../Nuake/dependencies/freetype-windows-binaries/release static/win64", "%{prj.name}/../bin/%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}/Nuake/", - "%{prj.name}/../Nuake/src/Vendors/msdf/freetype/include", + "%{prj.name}/../Nuake/dependencies/freetype/include", "%{prj.name}/../Nuake/src/Vendors/msdfgen/freetype/win64", "%{prj.name}/../Nuake/src/Vendors/msdfgen", "%{prj.name}/../Nuake/src/Vendors/wren/src/include", @@ -129,7 +131,7 @@ project "Editor" "BulletCollision", "BulletDynamics", "LinearMath", - "freetype.lib" + "Freetype" } filter "system:windows"