- cleanup game application init/deinit flow a bit

- add missing extend to pinned array
- avoid calling fetchresult on physx scene on shutdown if it wasnt simulating
- set max voices in soloud

code/application/appgame/gameapplication.cc

@@ -16,6 +16,7 @@
 #include "io/fswrapper.h"
 #include "jobs2/jobs2.h"
 #include "input/inputserver.h"
+#include "basegamefeature/basegamefeatureunit.h"
 
 #include "profiling/profiling.h"
 
@@ -147,7 +148,11 @@ GameApplication::Open()
         // create our game server and open it
         this->gameServer = Game::GameServer::Create();
         this->gameServer->SetCmdLineArgs(this->GetCmdLineArgs());
-
+
+        // always attach the base game feature
+        this->baseGameFeature = BaseGameFeature::BaseGameFeatureUnit::Create();
+        this->gameServer->AttachGameFeature(this->baseGameFeature);
+
         // create and add new game features
         this->SetupGameFeatures();
         // open the game server
@@ -174,18 +179,21 @@ GameApplication::Close()
     //_discard_timer(GameApplicationFrameTimeAll);
 
     // shutdown basic Nebula runtime
-    this->CleanupGameFeatures();
     this->gameServer->Stop();
+    this->gameServer->CleanupWorld(Game::GetWorld(WORLD_DEFAULT));
+
     this->gameServer->Close();
+
+    this->CleanupGameFeatures();
+    this->gameServer->RemoveGameFeature(this->baseGameFeature);
+    this->baseGameFeature->Release();
+    this->baseGameFeature = nullptr;
+
     this->gameServer = nullptr;
 
     this->gameContentServer->Discard();
     this->gameContentServer = nullptr;
 
-    this->ioInterface->Close();
-    this->ioInterface = nullptr;
-    this->ioServer = nullptr;
-
     this->resourceServer->Close();
     this->resourceServer = nullptr;
 
@@ -199,6 +207,10 @@ GameApplication::Close()
     this->httpInterface = nullptr;
 #endif
 
+    this->ioInterface->Close();
+    this->ioInterface = nullptr;
+    this->ioServer = nullptr;
+
     this->coreServer->Close();
     this->coreServer = nullptr;
 
@@ -274,7 +286,7 @@ GameApplication::StepFrame()
 void
 GameApplication::SetupGameFeatures()
 {
-    // create any features in derived class
+
 }
 
 //------------------------------------------------------------------------------

code/application/appgame/gameapplication.h

@@ -22,6 +22,7 @@
 #include "resources/resourceserver.h"
 #include "http/httpinterface.h"
 #include "http/httpserverproxy.h"     
+#include "basegamefeature/basegamefeatureunit.h"
 
 //------------------------------------------------------------------------------
 namespace App
@@ -59,6 +60,7 @@ class GameApplication : public Application
     Ptr<Resources::ResourceServer> resourceServer;
     Ptr<IO::IoServer> ioServer;
     Ptr<IO::IoInterface> ioInterface;  
+    Ptr<BaseGameFeature::BaseGameFeatureUnit> baseGameFeature;
 
 
 #if __NEBULA_HTTP__

code/application/game/gameserver.cc

@@ -31,9 +31,6 @@ GameServer::GameServer()
 
     this->state.templateDatabase = MemDb::Database::Create();
     this->CreateWorld(WORLD_DEFAULT);
-
-    // always attach the base game feature
-    this->AttachGameFeature(BaseGameFeature::BaseGameFeatureUnit::Create());
 }
 
 //------------------------------------------------------------------------------

code/application/game/world.h

@@ -368,7 +368,7 @@ World::AddComponent(Entity entity)
     n_assert2(!this->pipeline.IsRunningAsync(), "Adding component to entities while in an async processor is currently not supported!");
 #endif
     Game::ComponentId id = Game::GetComponentId<TYPE>();
-#if _DEBUG
+#if NEBULA_DEBUG
     n_assert(MemDb::AttributeRegistry::TypeSize(id) == sizeof(TYPE));
     //n_assert(!this->HasComponent<TYPE>(entity));
 #endif

code/audio/audio/audiodevice.cc

@@ -37,7 +37,7 @@ AudioDevice::Open()
 {
     soloud = new SoLoud::Soloud;
     soloud->init(SoLoud::Soloud::CLIP_ROUNDOFF);
-
+    soloud->setMaxActiveVoiceCount(32);
     this->ResetListener();
 
     _setup_grouped_timer(AudioOnFrameTime, "Audio Subsystem");
@@ -56,6 +56,8 @@ AudioDevice::Close()
     delete soloud;
 
     _discard_timer(AudioOnFrameTime);
+    _end_counter(AudioNumberOfSoundsPlaying);
+    _discard_counter(AudioNumberOfSoundsPlaying);
 
     return true;
 }
@@ -71,9 +73,9 @@ AudioDevice::OnFrame()
     soloud->update3dAudio();
 
     _stop_timer(AudioOnFrameTime);
-    //_begin_counter(AudioNumberOfSoundsPlaying);
-    //_set_counter(AudioNumberOfSoundsPlaying, soloud->getActiveVoiceCount());
-    //_end_counter(AudioNumberOfSoundsPlaying);
+    _begin_counter(AudioNumberOfSoundsPlaying);
+    _set_counter(AudioNumberOfSoundsPlaying, soloud->getActiveVoiceCount());
+    _end_counter(AudioNumberOfSoundsPlaying);
 }
 
 //------------------------------------------------------------------------------

code/foundation/util/pinnedarray.h

@@ -70,6 +70,8 @@ class PinnedArray : public Array<TYPE>
     void Realloc(SizeT capacity, SizeT grow);
     /// Resize to fit, destroys elements outside of new size
     void Resize(SizeT num);
+    /// Resize to fit the provided value, but don't shrink if the new size is smaller
+    void Extend(SizeT num);
 
     /// Free memory
     void Free();
@@ -619,6 +621,20 @@ PinnedArray<MAX_ALLOCS, TYPE>::Resize(SizeT num)
     this->count = num;
 }
 
+//------------------------------------------------------------------------------
+/**
+*/
+template<int MAX_ALLOCS, class TYPE>
+inline void
+PinnedArray<MAX_ALLOCS, TYPE>::Extend(SizeT num)
+{
+    if (num > this->capacity)
+    {
+        this->GrowTo(num);
+    }
+    this->count = Math::max(num, this->count);
+}
+
 //------------------------------------------------------------------------------
 /**
 */

code/physics/physics/physxstate.cc

@@ -336,7 +336,11 @@ PhysxState::FlushSimulation(IndexT sceneId)
 {
     n_assert(this->activeSceneIds.FindIndex(sceneId) != InvalidIndex);
     Physics::Scene& scene = this->activeScenes[sceneId];
-    scene.scene->fetchResults(true);
+    if (scene.isSimulating)
+    {
+        scene.scene->fetchResults(true);
+        scene.isSimulating = false;
+    }
 }
 
 PhysxState state;

code/render/graphics/environmentcontext.cc

@@ -95,7 +95,7 @@ Math::vec4
 CalculateZenithLuminanceYxy(float t, float thetaS)
 {
     float chi = (4.0 / 9.0 - t / 120.0) * (PI - 2.0 * thetaS);
-    float Yz = (4.0453 * t - 4.9710) * tan(chi) - 0.2155 * t + 2.4192;
+    float Yz = (4.0453 * t - 4.9710) * Math::tan(chi) - 0.2155 * t + 2.4192;
 
     float theta2 = thetaS * thetaS;
     float theta3 = theta2 * thetaS;
@@ -175,7 +175,7 @@ EnvironmentContext::OnBeforeFrame(const Graphics::FrameContext& ctx)
     D.store(tickParams.D);
     E.store(tickParams.E);
 
-    float thetaS = acos(Math::dot3(sunDir, Math::vec4(0, 1, 0, 0)));
+    float thetaS = Math::acos(Math::dot3(sunDir, Math::vec4(0, 1, 0, 0)));
     Z = CalculateZenithLuminanceYxy(envState.skyTurbidity, thetaS);
     Z.store(tickParams.Z);
 

code/render/renderutil/geometryhelpers.cc

@@ -89,7 +89,7 @@ GeometryHelpers::CreateDisk(SizeT numPoints)
     for (int i = 0; i < numPoints + 1; i++)
     {
         Vertex v;
-        v.pos = Math::float3{ sin(i * 2 * N_PI / float(numPoints)) * 0.5f, cos(i * 2 * N_PI / float(numPoints)) * 0.5f, 0 };
+        v.pos = Math::float3{ Math::sin(i * 2 * N_PI / float(numPoints)) * 0.5f, Math::cos(i * 2 * N_PI / float(numPoints)) * 0.5f, 0};
         v.uv = Math::float2{ 0, 0 };
         vertices.Append(v);
         indices.Append(i + 1);