SilverMoonStudio/EHS
3
0
Fork 0
Code Issues 8 Pull Requests Actions Projects 1 Releases 6 Wiki Activity

Fixed font atlas, feature completed garbage collection, and fix math.

Browse Source
This commit is contained in:
Karutoh
2024-06-29 22:20:53 -07:00
parent f030ac62ae
commit 0b298c6130
12 changed files with 283 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/EHS.cpp
View File

@@ -2,7 +2,7 @@
#include "ehs/Log.h"
#include "ehs/Version.h"
#include "ehs/io/Console.h"
#include "ehs/GarbageCollector.h"
#include "ehs/GC.h"
#include "ehs/io/audio/Audio.h"
#include "ehs/io/img/Img.h"
#include "ehs/io/img/PNG.h"
@@ -141,13 +141,13 @@ int main()
ehs::DecodeEHM
});
ehs::GarbageCollector::Start();
ehs::GC::Start();
const ehs::SInt_32 code = Main(&ehs::appName, &ehs::appVerId, &ehs::appVer);
if (code)
EHS_LOG_INT(ehs::LogType::WARN, 0, "Executable exited with code #" + ehs::Str_8::FromNum(code) + ".");
ehs::GarbageCollector::Stop();
ehs::GC::Stop();
ehs::Log::OnExit();

180
src/GC.cpp Normal file
View File

@@ -0,0 +1,180 @@
#include "ehs/GC.h"
namespace ehs
{
UInt_32 GarbageCollectionThread(void* params)
{
while (GC::IsRunning())
{
GC::Poll();
Thread::SleepFor(50);
}
GC::Dump();
return 0;
}
Array<GcLogic> GC::logic;
Vector<BaseObj*> GC::garbage(0, 1000);
UInt_64 GC::max = 10;
Thread GC::thread;
Mutex GC::mutex;
bool GC::running = false;
bool GC::Has(const BaseObj* obj)
{
for (UInt_64 i = 0; i < garbage.Size(); ++i)
if (garbage[i] == obj)
return true;
return false;
}
void GC::Start()
{
if (running)
return;
mutex.Initialize();
thread.Start(GarbageCollectionThread, nullptr);
running = true;
}
void GC::Stop()
{
if (!running)
return;
running = false;
thread.Join();
}
bool GC::HasLogic(GcLogic logicCb)
{
for (UInt_64 i = 0; i < logic.Size(); ++i)
if (logic[i] == logicCb)
return true;
return false;
}
bool GC::AddLogic(GcLogic logicCb)
{
if (HasLogic(logicCb))
return false;
if (running)
mutex.Lock();
logic.Push(logicCb);
if (running)
mutex.Unlock();
return true;
}
void GC::Add(BaseObj* obj)
{
if (!obj)
return;
#ifdef EHS_DEBUG
if (Has(obj))
{
EHS_LOG_INT(LogType::ERR, 1, Str_8(obj->GetTypeId(), obj->GetTypeIdSize()) +
" object with address of, \"" + Str_8::FromNum((ehs::Size)obj) + "\" is already in garbage.");
return;
}
#endif
garbage.Push(obj);
}
void GC::SetMax(const UInt_64 newMax)
{
max = newMax;
}
UInt_64 GC::GetMax()
{
return max;
}
void GC::SetStride(const UInt_64 newStride)
{
Dump();
garbage = Vector<BaseObj*>(0, newStride);
}
UInt_64 GC::GetStride()
{
return garbage.Stride();
}
UInt_64 GC::Size()
{
return garbage.Size();
}
void GC::Poll()
{
if (running)
mutex.Lock();
UInt_64 i = 0;
UInt_64 o = 0;
while (garbage.Size() && i < max && o < garbage.Size())
{
if (!ShouldDelete(garbage[o]))
{
o++;
continue;
}
if (o != garbage.Size() - 1)
garbage.Swap(o, garbage.End());
delete garbage.Pop();
i++;
}
if (running)
mutex.Unlock();
}
void GC::Dump()
{
if (running)
mutex.Lock();
for (UInt_64 i = 0; i < garbage.Size(); ++i)
delete garbage[i];
garbage.Clear();
if (running)
mutex.Unlock();
}
bool GC::IsRunning()
{
return running;
}
bool GC::ShouldDelete(BaseObj *obj)
{
for (UInt_64 l = 0; l < logic.Size(); ++l)
if (!logic[l](obj))
return false;
return true;
}
}

133
src/GarbageCollector.cpp
View File

@@ -1,133 +0,0 @@
#include "ehs/GarbageCollector.h"
namespace ehs
{
UInt_32 GarbageCollectionThread(void* params)
{
while (GarbageCollector::IsRunning())
{
GarbageCollector::Poll();
Thread::SleepFor(50);
}
GarbageCollector::Dump();
return 0;
}
Vector<BaseObj*> GarbageCollector::garbage(0, 1000);
UInt_64 GarbageCollector::max = 10;
Thread GarbageCollector::thread;
Mutex GarbageCollector::mutex;
bool GarbageCollector::running = false;
bool GarbageCollector::Has(const BaseObj* obj)
{
for (UInt_64 i = 0; i < garbage.Size(); ++i)
if (garbage[i] == obj)
return true;
return false;
}
void GarbageCollector::Start()
{
if (running)
return;
mutex.Initialize();
thread.Start(GarbageCollectionThread, nullptr);
running = true;
}
void GarbageCollector::Stop()
{
if (!running)
return;
running = false;
thread.Join();
}
void GarbageCollector::Add(BaseObj* obj)
{
if (!obj)
return;
/*
if (Has(obj))
{
EHS_LOG_INT(LogType::WARN, 1, obj->GetTypeId() + " object with address of, \"" + Str_8::FromNum<USize>((USize)obj) + "\" is already in garbage.");
return;
}
*/
garbage.Push(obj);
}
void GarbageCollector::SetMax(const UInt_64 newMax)
{
max = newMax;
}
UInt_64 GarbageCollector::GetMax()
{
return max;
}
void GarbageCollector::SetStride(const UInt_64 newStride)
{
Dump();
garbage = Vector<BaseObj*>(0, newStride);
}
UInt_64 GarbageCollector::GetStride()
{
return garbage.Stride();
}
UInt_64 GarbageCollector::Size()
{
return garbage.Size();
}
void GarbageCollector::Poll()
{
if (running)
mutex.Lock();
UInt_64 i = 0;
while (i < garbage.Size())
{
garbage.Swap(i, garbage.End());
delete garbage.Pop();
}
if (running)
mutex.Unlock();
}
void GarbageCollector::Dump()
{
if (running)
mutex.Lock();
for (UInt_64 i = 0; i < garbage.Size(); ++i)
delete garbage[i];
garbage.Clear();
if (running)
mutex.Unlock();
}
bool GarbageCollector::IsRunning()
{
return running;
}
}

1
src/io/FontAtlas.cpp
View File

@@ -43,6 +43,7 @@ namespace ehs
atlas = new Byte[resolution.x * resolution.y];
size = 0;
fData.ReadArray(atlas, &size);
fData.ReadArray(atlas, &size);
}
FontAtlas::FontAtlas(FontAtlas&& fa) noexcept

15
src/io/audio/AudioDevice_ALSA.cpp
View File

@@ -1,6 +1,7 @@
#include "ehs/io/audio/AudioDevice_ALSA.h"
#include "ehs/EHS.h"
#include "ehs/Log.h"
#include "ehs/io/Console.h"
namespace ehs
{
@@ -366,13 +367,21 @@ namespace ehs
}
else
{
EHS_LOG_INT(LogType::ERR, 0, "Wrong value for the audio device type.");
EHS_LOG_INT(LogType::ERR, 1, "Wrong value for the audio device type.");
return {};
}
int err = snd_pcm_open(&result.hdl, "default", rType, SND_PCM_NONBLOCK);
if (err < 0)
{
EHS_LOG_INT(LogType::ERR, 2, "Failed to retrieve default audio device with error #" + Str_8::FromNum(err) + ".");
return {};
}
snd_pcm_open(&result.hdl, "default", rType, SND_PCM_NONBLOCK);
result.type = AudioDeviceType::OUTPUT;
EHS_LOG_SUCCESS();
return result;
}
@@ -380,4 +389,4 @@ namespace ehs
{
return {};
}
}
}

2
src/io/model/Mdl.cpp
View File

@@ -275,7 +275,6 @@ namespace ehs
meshes[i].SetIndices(data.ReadArray<UInt_32, UInt_64>());
/*
Bone& skeleton = mdl->GetSkeleton();
UInt_8 boneCount = data.Read<UInt_8>();
for (UInt_8 b = 0; b < boneCount; ++b)
@@ -329,7 +328,6 @@ namespace ehs
}
}
}
*/
}
return true;

2
src/io/model/Mesh.cpp
View File

@@ -29,7 +29,7 @@ namespace ehs
}
Mesh::Mesh(const Mesh& mesh)
: BaseObj((BaseObj&&)mesh), hashId(mesh.hashId), id(mesh.id), vertices(mesh.vertices), indices(mesh.indices)
: BaseObj(mesh), hashId(mesh.hashId), id(mesh.id), vertices(mesh.vertices), indices(mesh.indices)
{
}