Fixed compile issues

gscept · Mar 27, 2024 · 56b45bc · 56b45bc
1 parent 6bd630c
commit 56b45bc
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/code/addons/audiofeature/audiofeatureunit.cc b/code/addons/audiofeature/audiofeatureunit.cc
@@ -37,12 +37,11 @@ AudioFeatureUnit::~AudioFeatureUnit()
 void
 AudioFeatureUnit::OnAttach()
 {
-    Game::World* world = Game::GetWorld(WORLD_DEFAULT);
-    world->RegisterType<AudioEmitter>({ .decay = true, .OnInit = &AudioManager::InitAudioEmitter });
-    world->RegisterType<SpatialAudioEmission>();
-    world->RegisterType<AudioListener>();
-    world->RegisterType<ClipInstance>();
-    world->RegisterType<PlayAudioEvent>();
+    Game::RegisterType<AudioEmitter>({ .decay = true, .OnInit = &AudioManager::InitAudioEmitter });
+    Game::RegisterType<SpatialAudioEmission>();
+    Game::RegisterType<AudioListener>();
+    Game::RegisterType<ClipInstance>();
+    Game::RegisterType<PlayAudioEvent>();
 }
 
 //------------------------------------------------------------------------------

diff --git a/code/addons/graphicsfeature/graphicsfeatureunit.cc b/code/addons/graphicsfeature/graphicsfeatureunit.cc
@@ -75,10 +75,9 @@ GraphicsFeatureUnit::~GraphicsFeatureUnit()
 void
 GraphicsFeatureUnit::OnAttach()
 {
-    Game::World* world = Game::GetWorld(WORLD_DEFAULT);
-    world->RegisterType<PointLight>({.decay = true, .OnInit = &GraphicsManager::InitPointLight });
-    world->RegisterType<Model>({.decay = true, .OnInit = &GraphicsManager::InitModel });
-    world->RegisterType<Camera>();
+    Game::RegisterType<PointLight>({.decay = true, .OnInit = &GraphicsManager::InitPointLight });
+    Game::RegisterType<Model>({.decay = true, .OnInit = &GraphicsManager::InitModel });
+    Game::RegisterType<Camera>();
 }
 
 //------------------------------------------------------------------------------

diff --git a/code/addons/memdb/tablesignature.h b/code/addons/memdb/tablesignature.h
@@ -235,7 +235,20 @@ inline void
 TableSignature::SetBit(AttributeId component)
 {
     int offset = component.id / 128;
-    n_assert(offset < this->size); // currently, we can't set a bit that is outside the signatures size.
+    if (offset >= this->size)
+    {
+        uint8_t newSize = offset + 1;
+        __m128i* newMask = (__m128i*)Memory::Alloc(Memory::HeapType::ObjectHeap, newSize * 16);
+        if (this->mask != nullptr)
+        {
+            for (int i = 0; i < this->size; i++)
+                newMask[i] = _mm_load_si128(this->mask + i);
+
+            Memory::Free(Memory::HeapType::ObjectHeap, this->mask);
+        }
+        this->mask = newMask;
+        this->size = newSize;
+    }
     alignas(16) uint64_t partialMask[2] = {0, 0};
     uint64_t bit = component.id % 128;
     partialMask[bit / 64] |= 1ull << bit;

diff --git a/code/render/coregraphics/base/shaderserverbase.cc b/code/render/coregraphics/base/shaderserverbase.cc
@@ -165,10 +165,10 @@ ShaderServerBase::Close()
     n_assert(this->isOpen);
     #ifndef __linux__
     // unwatch 
-    if (IO::IoServer::Instance()->DirectoryExists("home:work/shaders/vk"))
-    {
-        IO::FileWatcher::Instance()->Unwatch("home:work/shaders/vk");
-    }
+    //if (IO::IoServer::Instance()->DirectoryExists("home:work/shaders/vk"))
+    //{
+    //    IO::FileWatcher::Instance()->Unwatch("home:work/shaders/vk");
+    //}
     #endif
 
     // unload all currently loaded shaders