Redacted/Re3D
3
0
Fork 1
Code Issues 7 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix build script

Browse Source
This commit is contained in:
josh
2024-02-22 02:24:15 -05:00
parent f67fe99bc4
commit b1b17ae1e5
5 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
CMakeLists.txt
View File

@@ -40,9 +40,14 @@ if(UNIX AND NOT APPLE)
)
endif()
CPMAddPackage(
NAME Event
URL https://git.redacted.cc/josh/Event/archive/Release-1.zip
)
CPMAddPackage(
NAME ReWindow
URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.15.zip
URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.18.zip
)
CPMAddPackage(
@@ -57,7 +62,7 @@ CPMAddPackage(
#Causes multiple definition
CPMAddPackage(
NAME JGL
URL https://git.redacted.cc/josh/JGL/archive/Prerelease-4.zip
URL https://git.redacted.cc/josh/JGL/archive/Prerelease-5.zip
)
CPMAddPackage(
@@ -85,18 +90,6 @@ CPMAddPackage(
URL https://github.com/assimp/assimp/archive/refs/tags/v5.3.1.zip
)
add_library(Re3D SHARED ${SOURCES})
# Why god???
set_target_properties(Re3D PROPERTIES LINKER_LANGUAGE CXX)
find_package(OpenGL REQUIRED)
#target_include_directories(Re3D PRIVATE ${JGL_SOURCE_DIR}/include)
#target_link_libraries(Re3D PRIVATE JGL)
add_executable(Re3D_Demo "include/demo/main.cpp")
#Link based on the relative path *so you can copy the game around*
set_target_properties(Re3D_Demo PROPERTIES LINK_FLAGS "-Wl,-rpath,./lib")
include_directories(
${PROJECT_SOURCE_DIR}/include
@@ -105,14 +98,35 @@ include_directories(
${J3ML_SOURCE_DIR}/include
${SOIL_SOURCE_DIR}/include
${glad_SOURCE_DIR}/include
${uuid_v4_SOURCE_DIR}/
${uuid_v4_SOURCE_DIR}
${ASSIMP_SOURCE_DIR}/include
${archive_SOURCE_DIR}/include
${PROJECT_BINARY_DIR}/glu/include
${JGL_SOURCE_DIR}/include
${Event_SOURCE_DIR}/include
)
add_library(Re3D SHARED ${SOURCES})
# Why god???
set_target_properties(Re3D PROPERTIES LINKER_LANGUAGE CXX)
find_package(OpenGL REQUIRED)
target_link_libraries(Re3D PUBLIC Event)
#target_include_directories(Re3D PRIVATE ${JGL_SOURCE_DIR}/include)
#target_link_libraries(Re3D PRIVATE JGL)
add_executable(Re3D_Demo "include/demo/main.cpp")
#Link based on the relative path *so you can copy the game around*
set_target_properties(Re3D_Demo PROPERTIES LINK_FLAGS "-Wl,-rpath,./lib")
# TODO: Link all applicable dependencies to Re3D directly
if(UNIX AND NOT APPLE)
target_link_libraries(Re3D_Demo PUBLIC Re3D ReWindowLibrary ReHardwareID J3ML JGL soil uuid_v4 GL glad assimp archive ${PROJECT_BINARY_DIR}/lib/libGLU.so)
target_link_libraries(Re3D_Demo PUBLIC Re3D ReWindowLibrary ReHardwareID J3ML JGL soil uuid_v4 GL glad assimp archive ${PROJECT_BINARY_DIR}/lib/libGLU.so)
endif()
if(WIN32)

BIN
content/FreeSans.ttf Normal file
View File

Binary file not shown.

5
include/demo/main.cpp
View File

@@ -41,8 +41,11 @@ public:
glDemoGameApp() : GameApp()
{
engine = new Engine();
engine->window = new ReWindow::RWindow();
engine->window = new ReWindow::RWindow("Re3D Test Application", 1000, 700);
engine->window->setRenderer(RenderingAPI::OPENGL);
//engine->window->setResizable(true);
engine->world = new World();
}
void Init() override

2
include/engine/engine.h
View File

@@ -6,8 +6,10 @@
#include <iostream>
#include <fstream>
#include <engine/world.h>
#include <rewindow/types/window.h>
enum class GAMESTATE: uint8_t {
NORMAL = 0, //Gameplay.
IN_MAIN_MENU = 1,

35
src/engine/engine.cpp
View File

@@ -66,8 +66,10 @@ void Engine::initGL()
void Engine::init()
{
engine->window->init(RenderingAPI::OPENGL, "Re: 3D", 1152, 864, false);
engine->window->setFlag(RWindowFlags::RESIZABLE, false);
engine->window->setRenderer(RenderingAPI::OPENGL);
engine->window->Open();
engine->window->setResizable(true);
engine->initGL();
engine->loadConfig();
@@ -77,30 +79,29 @@ void Engine::initGL()
//glDisable(GL_CULL_FACE);
//glEnable(GL_BLEND);
auto* camera = new Camera();
camera->SetPos({0.0f, -2.0f, -5.0f});
camera->angle.y = 0.0f;
camera->track.load("assets/scriptedMove/default.smov");
camera->SetParent(engine->world);
engine->window->onKeyboardPress += [&](ReWindow::WindowEvents::KeyDownEvent event)
engine->window->OnKeyDownEvent += [&](ReWindow::WindowEvents::KeyDownEvent event)
{
if (event.key == Keys::Zero)
{
engine->takeScreenshot();
std::cout << "MY NIGGA" << std::endl;
}
{
engine->takeScreenshot();
std::cout << "MY NIGGA" << std::endl;
}
if (event.key == Keys::One)
camera->SetMode(CameraMode::FREECAM);
if (event.key == Keys::One)
camera->SetMode(CameraMode::FREECAM);
if (event.key == Keys::Two)
camera->SetMode(CameraMode::THIRD_PERSON);
if (event.key == Keys::Three)
camera->SetMode(CameraMode::SCRIPTED_MOVE);
if (event.key == Keys::Two)
camera->SetMode(CameraMode::THIRD_PERSON);
if (event.key == Keys::Three)
camera->SetMode(CameraMode::SCRIPTED_MOVE);
};
auto *player = new Player();
@@ -124,6 +125,10 @@ void Engine::initGL()
void Engine::preRender()
{
// TODO: Move into Update(dt)
// TODO: Create FixedUpdate(step)
//std::cout << engine->frameCount << std::endl;
engine->window->pollEvents();
engine->frameCount++;