EventHorizonStudio/TechDemo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated with back-end changes.

Browse Source
This commit is contained in:
Arron David Nelson 2024-07-27 10:14:28 -07:00
parent 148c10eb08
commit 2121c8b7de
4 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/misc.xml generated
View File

@ -4,8 +4,4 @@
<option name="pythonIntegrationState" value="YES" />
</component>
<component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
<component name="DiscordProjectSettings">
<option name="show" value="ASK" />
<option name="description" value="" />
</component>
</project>

43
CMakeLists.txt
View File

@ -4,6 +4,7 @@ project(TechDemo C CXX)
if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
set(IS_OS_WINDOWS TRUE)
set(USER_HOME_DIRECTORY $ENV{USERPROFILE})
string(REPLACE "\\" "/" USER_HOME_DIRECTORY "${USER_HOME_DIRECTORY}")
message("Building for the Windows operating system.")
elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
set(IS_OS_LINUX TRUE)
@ -28,18 +29,11 @@ message("Home Dir: ${USER_HOME_DIRECTORY}")
set(CMAKE_CXX_STANDARD 20)
add_executable(TechDemo main.cpp Levels/TestLevel.cpp Levels/TestLevel.h Levels/MainMenu.cpp Levels/MainMenu.h
Gui/HealthBarGui.cpp
Gui/HealthBarGui.h)
if (IS_OS_WINDOWS)
add_compile_definitions(VK_USE_PLATFORM_WIN32_KHR)
elseif (IS_OS_LINUX)
add_compile_definitions(VK_USE_PLATFORM_WAYLAND_KHR EHS_WS_WAYLAND)
endif()
target_link_directories(TechDemo PRIVATE "${USER_HOME_DIRECTORY}/.local/lib")
target_include_directories(TechDemo PRIVATE "${USER_HOME_DIRECTORY}/.local/include")
add_executable(TechDemo
main.cpp
Levels/TestLevel.cpp Levels/TestLevel.h
Levels/MainMenu.cpp Levels/MainMenu.h
Gui/HealthBarGui.cpp Gui/HealthBarGui.h)
find_package(Vulkan REQUIRED)
if (Vulkan_FOUND)
@ -62,4 +56,27 @@ else ()
message(STATUS "OpenSSL was not found.")
endif ()
target_link_libraries(TechDemo PRIVATE Vulkan::Headers Vulkan::Vulkan wayland-client xcb xcb-cursor xcb-xfixes xcb-xinput OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB asound LWE EHC EHE EHS)
if (IS_OS_WINDOWS)
add_compile_definitions(VK_USE_PLATFORM_WIN32_KHR)
target_include_directories(TechDemo PRIVATE "${USER_HOME_DIRECTORY}/EHS/include")
target_include_directories(TechDemo PRIVATE "${USER_HOME_DIRECTORY}/EHE/include")
target_include_directories(TechDemo PRIVATE "${USER_HOME_DIRECTORY}/EHC/include")
target_include_directories(TechDemo PRIVATE "${USER_HOME_DIRECTORY}/LWE/include")
target_link_directories(TechDemo PRIVATE "${USER_HOME_DIRECTORY}/EHS/lib")
target_link_directories(TechDemo PRIVATE "${USER_HOME_DIRECTORY}/EHE/lib")
target_link_directories(TechDemo PRIVATE "${USER_HOME_DIRECTORY}/EHC/lib")
target_link_directories(TechDemo PRIVATE "${USER_HOME_DIRECTORY}/LWE/lib")
target_link_libraries(TechDemo PRIVATE ws2_32 avrt)
elseif (IS_OS_LINUX)
add_compile_definitions(VK_USE_PLATFORM_WAYLAND_KHR EHS_WS_WAYLAND)
target_link_directories(TechDemo PRIVATE "${USER_HOME_DIRECTORY}/.local/lib")
target_include_directories(TechDemo PRIVATE "${USER_HOME_DIRECTORY}/.local/include")
target_link_libraries(TechDemo PRIVATE wayland-client xcb xcb-cursor xcb-xfixes xcb-xinput asound)
endif()
target_link_libraries(TechDemo PRIVATE Vulkan::Headers Vulkan::Vulkan OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB LWE EHC EHE EHS_STC)

13
Levels/TestLevel.cpp
View File

@ -214,7 +214,12 @@ void TestLevel::Setup(lwe::GpuInterface* inf)
}
*/
//AddSystem(new lwe::AudioSystem());
lwe::AudioSystem *audioSys = new lwe::AudioSystem();
lwe::AudioSource src("Song", "sample");
src.Play();
audioSys->AddSource(src);
AddSystem(audioSys);
AddSystem(new lwe::SkyboxSystem());
AddSystem(new lwe::RigidBodySystem(true));
AddSystem(new lwe::CameraSystem());
@ -344,13 +349,13 @@ void TestLevel::Setup(lwe::GpuInterface* inf)
//ent->AddComponent(new lwe::Networked(false, false, lwe::EndpointOwner::SERVICE));
/*
lwe::AudioSource3D* as = new lwe::AudioSource3D("Song", "sample", 20.0f);
as->Pause();
as->EnableLoop(true);
as->EnableAutoDelete(false);
//as->EnablePanning(false);
//as->EnableAttenuation(false);
ent.AddComponent(as);
*/
lwe::Health* entHealth = new lwe::Health(100, 100);
ent.AddComponent(entHealth);
@ -511,9 +516,11 @@ void TestLevel::OnUpdate(lwe::RenderWindow* win, ehs::Input* input, const float
if (cooldown <= 0.0f && mouse->IsDown(ehs::Mouse::LMB)) // Left Mouse Button
{
/*
lwe::AudioSource* gunshot = new lwe::AudioSource("Gunshot_" + ehs::Str_8::FromNum(count), "Gunshot");
gunshot->SetVolume(1.0f);
ply->AddComponent(gunshot);
*/
lwe::Entity* bullet = CreateEntity("Bullet", "Bullet_" + ehs::Str_8::FromNum(count++));
bullet->SetPos(ply->GetPos() + cam->GetTransform().GetForward() * 2.0f);

8
main.cpp
View File

@ -18,11 +18,9 @@
#include "Levels/MainMenu.h"
#include "Levels/TestLevel.h"
ehs::SInt_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVer)
int main()
{
*appName = "TechDemo";
*appVerId = "Release";
*appVer = {1, 0, 0};
ehs::Initialize("TechDemo", "Release", {1, 0, 0});
ehs::Log::EnableImmediateMode(true);
@ -128,5 +126,7 @@ ehs::SInt_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVe
ehs::Console::Free();
ehs::Uninitialize();
return 0;
}