ecker/engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

re-added libext.dll being compiled separately (to serve as a way to segregate non-engine into here)

Browse Source
This commit is contained in:
ecker 2025-08-10 19:07:57 -05:00
parent 87ed97408f
commit add0b88248
4 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -245,7 +245,7 @@ ifneq (,$(findstring xz,$(REQ_DEPS)))
DEPS += -lxz -llzma
endif
SRCS_DLL := $(shell find $(ENGINE_SRC_DIR) -name "*.cpp") $(shell find $(EXT_SRC_DIR) -name "*.cpp") $(shell find $(DEP_SRC_DIR) -name "*.cpp")
SRCS_DLL := $(shell find $(ENGINE_SRC_DIR) -name "*.cpp") $(shell find $(DEP_SRC_DIR) -name "*.cpp")
OBJS_DLL += $(patsubst %.cpp,%.$(PREFIX).o,$(SRCS_DLL))
BASE_DLL += lib$(LIB_NAME)
IM_DLL += $(ENGINE_LIB_DIR)/$(PREFIX_PATH)/$(BASE_DLL).$(TARGET_LIB_EXTENSION).a

14
client/main.cpp
View File

@ -36,7 +36,7 @@ namespace {
client::terminated = true;
//ext::terminate();
ext::terminate();
uf::terminate();
client::terminate();
}
@ -85,7 +85,7 @@ int main(int argc, char** argv){
signal(SIGSEGV, ::handlers::segv);
client::initialize();
//ext::initialize();
ext::initialize();
uf::initialize();
// For Multithreaded initialization
@ -109,22 +109,22 @@ int main(int argc, char** argv){
// auto& thread = uf::thread::fetchWorker();
auto& thread = uf::thread::get("Render");
uf::thread::queue(thread, [&]{
//ext::render();
ext::render();
uf::render();
client::render();
});
client::tick();
//ext::tick();
ext::tick();
uf::tick();
uf::thread::wait( thread );
} else {
client::tick();
uf::tick();
//ext::tick();
ext::tick();
//ext::render();
ext::render();
uf::render();
client::render();
}
@ -149,7 +149,7 @@ int main(int argc, char** argv){
if ( !client::terminated ) {
client::terminated = true;
UF_MSG_INFO("Natural termination!");
//ext::terminate();
ext::terminate();
uf::terminate();
client::terminate();
}

24
engine/inc/uf/engine/graph/mesh.inl
View File

@ -10,8 +10,8 @@ namespace uf {
pod::Vector3f tangent{};
pod::Vector<uint16_t, 2> id{};
static UF_API uf::stl::vector<uf::renderer::AttributeDescriptor> descriptor;
static UF_API Base interpolate( const Base& p1, const Base& p2, float t ) {
static uf::stl::vector<uf::renderer::AttributeDescriptor> descriptor;
static Base interpolate( const Base& p1, const Base& p2, float t ) {
return {
uf::vector::lerp( p1.position, p2.position, t ),
uf::vector::lerp( p1.uv, p2.uv, t ),
@ -36,8 +36,8 @@ namespace uf {
pod::Vector<uint16_t, 4> joints{};
pod::Vector4f weights{};
static UF_API uf::stl::vector<uf::renderer::AttributeDescriptor> descriptor;
static UF_API Skinned interpolate( const Skinned& p1, const Skinned& p2, float t ) {
static uf::stl::vector<uf::renderer::AttributeDescriptor> descriptor;
static Skinned interpolate( const Skinned& p1, const Skinned& p2, float t ) {
return {
uf::vector::lerp( p1.position, p2.position, t ),
uf::vector::lerp( p1.uv, p2.uv, t ),
@ -64,8 +64,8 @@ namespace uf {
pod::Vector3f16 tangent{};
pod::Vector<uint16_t, 2> id{};
static UF_API uf::stl::vector<uf::renderer::AttributeDescriptor> descriptor;
static UF_API Base_16f interpolate( const Base_16f& p1, const Base_16f& p2, float t ) {
static uf::stl::vector<uf::renderer::AttributeDescriptor> descriptor;
static Base_16f interpolate( const Base_16f& p1, const Base_16f& p2, float t ) {
return t < 0.5 ? p1 : p2;
/*
return {
@ -91,8 +91,8 @@ namespace uf {
pod::Vector<uint16_t, 4> joints{};
pod::Vector3f16 weights{};
static UF_API uf::stl::vector<uf::renderer::AttributeDescriptor> descriptor;
static UF_API Skinned_16f interpolate( const Skinned_16f& p1, const Skinned_16f& p2, float t ) {
static uf::stl::vector<uf::renderer::AttributeDescriptor> descriptor;
static Skinned_16f interpolate( const Skinned_16f& p1, const Skinned_16f& p2, float t ) {
return t < 0.5 ? p1 : p2;
/*
return {
@ -119,8 +119,8 @@ namespace uf {
pod::Vector<uint16_t, 3> tangent{};
pod::Vector<uint16_t, 2> id{};
static UF_API uf::stl::vector<uf::renderer::AttributeDescriptor> descriptor;
static UF_API Base_u16q interpolate( const Base_u16q& p1, const Base_u16q& p2, float t ) {
static uf::stl::vector<uf::renderer::AttributeDescriptor> descriptor;
static Base_u16q interpolate( const Base_u16q& p1, const Base_u16q& p2, float t ) {
return t < 0.5 ? p1 : p2;
/*
return {
@ -146,8 +146,8 @@ namespace uf {
pod::Vector<uint16_t, 4> joints{};
pod::Vector<uint16_t, 3> weights{};
static UF_API uf::stl::vector<uf::renderer::AttributeDescriptor> descriptor;
static UF_API Skinned_u16q interpolate( const Skinned_u16q& p1, const Skinned_u16q& p2, float t ) {
static uf::stl::vector<uf::renderer::AttributeDescriptor> descriptor;
static Skinned_u16q interpolate( const Skinned_u16q& p1, const Skinned_u16q& p2, float t ) {
return t < 0.5 ? p1 : p2;
/*
return {

15
ext/main.cpp Normal file
View File

@ -0,0 +1,15 @@
#include <uf/config.h>
#include <uf/ext/ext.h>
void EXT_API ext::initialize() {
}
void EXT_API ext::tick() {
}
void EXT_API ext::render() {
}
void EXT_API ext::terminate() {
}