EventHorizonStudio/Pong
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Activity

Caught up with updates.

Browse Source
This commit is contained in:
Arron David Nelson 2024-07-01 19:39:05 -07:00
parent d361e171fd
commit ee7f06efa5
4 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/misc.xml
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CMakePythonSetting">
<option name="pythonIntegrationState" value="YES" />
</component>
<component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" /> <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
<component name="DiscordProjectSettings"> <component name="DiscordProjectSettings">
<option name="show" value="ASK" /> <option name="show" value="ASK" />

55
CMakeLists.txt
View File

@ -33,15 +33,56 @@ add_executable(Pong
Main.cpp Main.cpp
) )
if (IS_OS_WINDOWS) find_package(ZLIB REQUIRED)
add_compile_definitions(VK_USE_PLATFORM_WIN32_KHR) if (ZLIB_FOUND)
elseif (IS_OS_LINUX) message(STATUS "ZLIB was found.")
add_compile_definitions(VK_USE_PLATFORM_XCB_KHR EHS_WS_XCB) else ()
message(STATUS "ZLIB was not found.")
endif () endif ()
target_link_directories(Pong PRIVATE "${USER_HOME_DIRECTORY}/.local/lib") find_package(OpenSSL REQUIRED)
target_include_directories(Pong PRIVATE "${USER_HOME_DIRECTORY}/.local/include") if (OpenSSL_FOUND)
message(STATUS "OpenSSL was found.")
else ()
message(STATUS "OpenSSL was not found.")
endif ()
if (IS_OS_WINDOWS)
add_compile_definitions(VK_USE_PLATFORM_WIN32_KHR)
target_include_directories(Pong PUBLIC ${USER_HOME_DIRECTORY}/EHS/include)
target_include_directories(Pong PUBLIC ${USER_HOME_DIRECTORY}/EHE/include)
target_include_directories(Pong PUBLIC ${USER_HOME_DIRECTORY}/EHC/include)
target_include_directories(Pong PUBLIC ${USER_HOME_DIRECTORY}/LWE/include)
target_include_directories(Pong PUBLIC $ENV{VULKAN_SDK}/include)
message("VK Include Path: $ENV{VULKAN_SDK}/include")
target_link_directories(Pong PUBLIC "${USER_HOME_DIRECTORY}/EHS/lib")
target_link_directories(Pong PUBLIC "${USER_HOME_DIRECTORY}/EHE/lib")
target_link_directories(Pong PUBLIC "${USER_HOME_DIRECTORY}/EHC/lib")
target_link_directories(Pong PUBLIC "${USER_HOME_DIRECTORY}/LWE/lib")
target_link_directories(Pong PUBLIC $ENV{VULKAN_SDK}/lib)
target_link_libraries(Pong PUBLIC vulkan-1 ws2_32 avrt)
set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/LWE")
elseif (IS_OS_LINUX)
add_compile_definitions(VK_USE_PLATFORM_XCB_KHR EHS_WS_XCB)
find_package(Vulkan REQUIRED) find_package(Vulkan REQUIRED)
if (Vulkan_FOUND)
message(STATUS "Vulkan was found.")
else ()
message(STATUS "Vulkan was not found.")
endif ()
target_link_libraries(Pong PRIVATE Vulkan::Headers Vulkan::Vulkan xcb xcb-cursor xcb-xfixes xcb-xinput LWE EHC EHE EHS z asound) target_include_directories(Pong PUBLIC ${USER_HOME_DIRECTORY}/.local/include)
target_link_directories(Pong PUBLIC "${USER_HOME_DIRECTORY}/.local/lib")
target_link_libraries(Pong PUBLIC Vulkan::Headers)
target_link_libraries(Pong xcb xcb-cursor xcb-xfixes xcb-xinput wayland-client z asound Vulkan::Headers Vulkan::Vulkan)
endif()
target_link_libraries(Pong PRIVATE LWE EHC EHE EHS OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)

2
Levels/Game.cpp
View File

@ -76,7 +76,7 @@ void Game::Setup(lwe::GpuInterface *inf)
lwe::RenderWindow* win = gl->GetWindow(); lwe::RenderWindow* win = gl->GetWindow();
// Adding Systems Here // Adding Systems Here
//AddSystem(new lwe::AudioSystem()); AddSystem(new lwe::AudioSystem());
AddSystem(new lwe::Portrait2DSystem()); AddSystem(new lwe::Portrait2DSystem());
AddSystem(new lwe::RigidBodySystem()); AddSystem(new lwe::RigidBodySystem());

5
Main.cpp
View File

@ -13,6 +13,8 @@ ehs::SInt_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVe
*appVerId = "Release"; *appVerId = "Release";
*appVer = {1, 0, 0}; *appVer = {1, 0, 0};
ehs::Log::EnableImmediateMode(true);
ehs::Console::Attach(); ehs::Console::Attach();
#if defined(EHS_OS_WINDOWS) #if defined(EHS_OS_WINDOWS)
@ -23,7 +25,7 @@ ehs::SInt_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVe
lwe::GpuInstance::AddExtension(VK_KHR_SURFACE_EXTENSION_NAME); lwe::GpuInstance::AddExtension(VK_KHR_SURFACE_EXTENSION_NAME);
lwe::GpuInstance::Initialize(true); lwe::GpuInstance::Initialize(false);
lwe::GpuDevice primary = lwe::GpuDevice::GetBest(); lwe::GpuDevice primary = lwe::GpuDevice::GetBest();
@ -38,6 +40,7 @@ ehs::SInt_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVe
lwe::RenderWindow win(&inf, &queue); lwe::RenderWindow win(&inf, &queue);
win.Create_8(*appName, {0, 0}, {1024, 768}); win.Create_8(*appName, {0, 0}, {1024, 768});
win.Show();
lwe::GameLoop gl(&win, 6, 0); lwe::GameLoop gl(&win, 6, 0);
gl.AddLevel(new Game()); gl.AddLevel(new Game());