Compare commits

..

No commits in common. "f7e087ee8d840d0e2f20bf2c988edab8a4a36d6c" and "ceb485018f868670f51d055d65734ac852884a22" have entirely different histories.

10 changed files with 109 additions and 78 deletions

18
ImGui/premake5.lua Normal file
View File

@ -0,0 +1,18 @@
project "ImGui"
kind "StaticLib"
includedirs {
"../libs/glfw/include",
"../libs/ImGui"
}
files {
"../libs/ImGui/*.cpp",
"../libs/ImGui/backends/imgui_impl_glfw.cpp",
"../libs/ImGui/backends/imgui_impl_Opengl3.cpp",
}
libdirs{
"../libs/ImGui",
"../libs/glad"
}

19
ImGuizmo/premake5.lua Normal file
View File

@ -0,0 +1,19 @@
project "ImGuizmo"
kind "StaticLib"
includedirs {
"../libs/glfw/include",
"../libs/ImGui",
"../libs/guizmo"
}
files {
"../libs/guizmo/*.cpp",
}
libdirs{
"../libs/ImGui",
"../libs/glad"
}
include("../ImGui")

39
Runtime/premake5.lua Normal file
View File

@ -0,0 +1,39 @@
project "Runtime"
kind "ConsoleApp"
buildmessage "Building the runtime ..."
links{
"YoggieEngine"
}
includedirs{
"./../YoggieEngine/src",
-- I'd prefer if didn't need these..
-- We'll figure that out some time later
"./../libs/lua/include",
"./../libs/spdlog/include",
"./../libs/glm",
"./../libs/GorillaAudio/include",
"./../libs/assimp/include",
"./../libs/glad/include",
"./../libs/glfw/include",
"./../libs/tinygltf",
"./../libs/glew/include",
"./../libs/glm",
"./../libs/ImGui",
"./include"
}
libdirs {
'./../YoggieEngine/build/Debug'
}
files {
"./src/*.h",
"./src/*.cpp"
}

6
Runtime/src/main.cpp Normal file
View File

@ -0,0 +1,6 @@
#include <iostream>
int main()
{
std::cout << "Welcome to the runtime!" << std::endl;
}

View File

@ -1,33 +0,0 @@
#include <YoggieEngine.h>
#include <gtest/gtest.h>
TEST(HelloTDD, MyFirstTest) {
EXPECT_EQ(1, 1);
};
TEST(TRANSFORM_COMPONENT_TESTS , CAN_EXTRACT_TRANSLATION_FROM_TRANSFORM_MATRIX) {
auto component = YoggieEngine::TransformComponent{};
component.Position = glm::vec3(1.0f, 2.0f, 3.0f);
auto transformationMatrix = component.GetTransform();
auto newComponent = YoggieEngine::TransformComponent{};
newComponent.Decompose(transformationMatrix);
EXPECT_EQ(newComponent.Position.x, component.Position.x);
EXPECT_EQ(newComponent.Position.y, component.Position.y);
EXPECT_EQ(newComponent.Position.z, component.Position.z);
}
int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}

View File

@ -1,32 +0,0 @@
project "EngineTests"
kind "ConsoleApp"
language "C++"
targetdir "bin/%{cfg.buildcfg}"
files{"**.h", "**.cpp"}
includedirs{
"../YoggieEngine/src",
incfolder["lua"],
incfolder["spdlog"],
incfolder["glm"],
incfolder["glad"],
incfolder["glfw"],
incfolder["imgui"],
incfolder["imguizmo"],
incfolder["entt"],
"../libs/physx/physx/include",
"../libs/physx/pxshared/include",
incfolder["GoogleTest"]
}
libdirs {
staticlib["yoggie"],
staticlib["GoogleTest"]
}
links{
"YoggieEngine",
"gtest"
}

View File

@ -38,7 +38,6 @@ project "YoggieEngine"
"../libs/steam-audio/include", "../libs/steam-audio/include",
"../libs/ImGui", "../libs/ImGui",
} }
links { links {
@ -66,7 +65,8 @@ project "YoggieEngine"
"../libs/spdlog/build/Release", "../libs/spdlog/build/Release",
"../libs/assimp/lib/Debug", "../libs/assimp/lib/Debug",
"../libs/glfw/build/src/Debug", "../libs/glfw/build/src/Debug",
"../libs/physx/physx/bin/win.x86_64.vc142.md/debug", "../libs/physx/physx/bin/win.x86_64.vc142.md/debug"
} }
files { files {

View File

@ -7,8 +7,6 @@ incfolder["glm"] = "%{wks.location}/libs/glm"
incfolder["entt"] = "%{wks.location}/libs/entt/src" incfolder["entt"] = "%{wks.location}/libs/entt/src"
incfolder["yamlcpp"] = "%{wks.location}/libs/yaml-cpp/include" incfolder["yamlcpp"] = "%{wks.location}/libs/yaml-cpp/include"
incfolder["mINI"] = "%{wks.location}/libs/mINI/src" incfolder["mINI"] = "%{wks.location}/libs/mINI/src"
incfolder["GoogleTest"] = "%{wks.location}/libs/googletest/googletest/include"
-- Graphics -- Graphics
incfolder["glad"] = "%{wks.location}/libs/glad/include" incfolder["glad"] = "%{wks.location}/libs/glad/include"
incfolder["glfw"] = "%{wks.location}/libs/glfw/include" incfolder["glfw"] = "%{wks.location}/libs/glfw/include"
@ -34,4 +32,4 @@ staticlib = {}
staticlib["yoggie"] = "Yoggie/build/Debug" staticlib["yoggie"] = "Yoggie/build/Debug"
staticlib["nativefiledialog"]= "%{wks.location}/libs/nativefiledialog/build/lib/Release/x64" staticlib["nativefiledialog"]= "%{wks.location}/libs/nativefiledialog/build/lib/Release/x64"
staticlib["GoogleTest"] = "%{wks.location}/libs/googletest/build/lib/Debug"

View File

@ -2,14 +2,14 @@ include("libraries")
print("Using Premake version ", _PREMAKE_VERSION) print("Using Premake version ", _PREMAKE_VERSION)
workspace "Yoggie GameEngine" workspace "Yoggie GameEngine"
configurations { "Debug", "Release" } configurations { "Debug", "Test", "Release" }
language "C++" language "C++"
cppdialect "C++17" cppdialect "C++17"
architecture "x86_64" architecture "x86_64"
targetdir "%{wks.location}/libs/%{prj.name}/build/%{cfg.buildcfg}" targetdir "./%{prj.name}/build/%{cfg.buildcfg}"
objdir "%{wks.location}/libs/%{prj.name}/build/%{cfg.buildcfg}/intermediates/" objdir "./%{prj.name}/build/%{cfg.buildcfg}/intermediates/"
startproject("Editor") startproject("Editor")
@ -31,14 +31,17 @@ workspace "Yoggie GameEngine"
include("./YoggieEngine") include("./YoggieEngine")
include ("./Editor") include ("./Editor")
include ("./Tests")
group("Other") group("Other")
include("./SandboxApp") includeexternal("./SandboxApp")
includeexternal("./Runtime")
group("Libraries") group("Libraries")
include('libs/ImGui') include('ImGui')
include("libs/guizmo") include("ImGuizmo")
include("libs/yaml-cpp") include("yaml-cpp")

13
yaml-cpp/premake5.lua Normal file
View File

@ -0,0 +1,13 @@
project "yaml-cpp"
kind "StaticLib"
buildmessage "Building YAML parser ..."
includedirs{
"../libs/yaml-cpp/include"
}
files{
"../libs/yaml-cpp/src/*.h",
"../libs/yaml-cpp/src/*.cpp"
}