celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-01-01 05:48:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added freetype premake file

Browse Source
This commit is contained in:
Antoine Pilote
2021-07-25 18:28:26 -04:00
parent 840c989033
commit 69fd08d941
6 changed files with 93 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -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

8
Editor/src/NewEditor.cpp
View File

@@ -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));

1
Nuake/dependencies/freetype Submodule

Submodule Nuake/dependencies/freetype added at ba47af32ba

76
Nuake/dependencies/freetype_p5.lua Normal file
View File

@@ -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"

10
Nuake/src/Scene/Systems/TransformSystem.cpp
View File

@@ -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 <src/Scene/Components/TransformComponent.h>
#include <src/Scene/Components/CameraComponent.h>
#include <src/Scene/Components/ParentComponent.h>
namespace Nuake {
TransformSystem::TransformSystem(Scene* scene)
@@ -39,8 +39,8 @@ namespace Nuake {
auto camView = m_Scene->m_Registry.view<TransformComponent, CameraComponent>();
for (auto e : camView)
{
auto [transform, camera] = camView.get<TransformComponent, CameraComponent>();
auto [transform, camera] = camView.get<TransformComponent, CameraComponent>(e);
//
Matrix4 cameraTransform = camera.CameraInstance->GetTransformRotation();
}

6
premake5.lua
View File

@@ -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"