general app improvements

Author: ItchyTrack

src/app.cpp

@@ -20,7 +20,7 @@ App& App::get() {
 		logInfo("Creating App", "App");
 		appSingleton.emplace();
 		appSingleton->newMainWindow();
-		appSingleton->windows.back()->getActiveCircuitViewWidget()->newCircuit();
+		if (appSingleton->windows.back()->getActiveCircuitViewWidget()) appSingleton->windows.back()->getActiveCircuitViewWidget()->newCircuit();
 	}
 	return *appSingleton;
 }
@@ -97,6 +97,11 @@ const char* const addLoopTracyName = "appLoop";
 
 void App::runLoop() {
 	logInfo("Starting App loop", "App");
+	if (windows.empty()) {
+		logError("Killing App loop. No windows Found!", "App");
+		App::kill();
+		return;
+	}
 	Network::get().checkForUpdates(get().windows[0]->getPopUpManager());
 	running = true;
 	while (running) {

src/cli/commands/helpCommand.cpp

@@ -1,6 +1,5 @@
 #include "helpCommand.h"
 
-#include "environment/environment.h"
 #include "../commandManager.h"
 #include "util/runAtStartup.h"
 

src/cli/commands/testCircuitCommand.cpp

@@ -1,10 +1,8 @@
 #include "testCircuitCommand.h"
 
-#include "environment/environment.h"
 #include "util/runAtStartup.h"
 #include "../commandManager.h"
 #include "backend/circuitTestCase/circuitTestCase.h"
-#include "backend/container/block/blockDefs.h"
 
 runAtStartup(CommandManager::get().registerCommand(std::make_unique<TestCircuitCommand>());)
 

src/cli/commands/versionCommand.cpp

@@ -1,6 +1,5 @@
 #include "versionCommand.h"
 
-#include "environment/environment.h"
 #include "../commandManager.h"
 #include "util/runAtStartup.h"
 #include "util/version.h"

src/environment/blockRenderDataFeeder.cpp

@@ -1,5 +1,6 @@
 #include "blockRenderDataFeeder.h"
 
+#include "gpu/blockRenderDataManager.h"
 #include "backend/backend.h"
 #include "gpu/freetype/freetype.h"
 #include "gpu/mainRenderer.h"

src/environment/blockRenderDataFeeder.h

@@ -1,13 +1,16 @@
 #ifndef blockRenderDataFeeder_h
 #define blockRenderDataFeeder_h
 
-#include "gpu/blockRenderDataManager.h"
 #include "gpu/cpuImageEditor/cpuImage.h"
 #include "backend/container/block/blockDefs.h"
 #include "backend/container/block/connectionEnd.h"
 #include "backend/dataUpdateEventManager.h"
 #include "blockTextureGenerator.h"
 
+typedef uint32_t BlockRenderDataId;
+typedef uint32_t BlockPortRenderDataId;
+typedef uint32_t BlockTextureId;
+
 class Font;
 class Backend;
 class BlockData;

src/gpu/renderer/viewport/blockTextureManager.cpp

@@ -53,6 +53,7 @@ BlockTextureId BlockTextureManager::addTexture(const std::string& path) {
 		rectId = layerRectPackers[layer].tryAddRect({textureWidth, textureHeight});
 		if (!rectId) {
 			logError("Could not fit texture with size ({}, {})", "BlockTextureManager", textureWidth, textureHeight);
+			stbi_image_free(pixels);
 			return 0;
 		}
 	}
@@ -81,7 +82,8 @@ void BlockTextureManager::refreshBlockTexture(const std::string& path) {
 	int textureWidth, texHeight, texChannels;
 	stbi_uc* pixels = stbi_load(path.c_str(), &textureWidth, &texHeight, &texChannels, STBI_rgb_alpha);
 	if (!pixels) {
-		throwFatalError("Failed to load texture: " + path);
+		logError("Failed to load texture: {}", "", path);
+		return;
 	}
 
 	if (blockTexture.textureSize.x != textureWidth || blockTexture.textureSize.y != texHeight) {
@@ -94,6 +96,7 @@ void BlockTextureManager::refreshBlockTexture(const std::string& path) {
 			textureWidth,
 			texHeight
 		);
+		stbi_image_free(pixels);
 		return;
 	}
 

src/gpu/renderer/viewport/blockTextureManager.h

@@ -25,7 +25,7 @@ struct BlockTextureArray {
 	~BlockTextureArray();
 };
 
-typedef unsigned int BlockTextureId;
+typedef uint32_t BlockTextureId;
 
 struct BlockTexture {
 public:

src/gpu/renderer/viewport/logic/chunking/vulkanChunker.cpp

@@ -11,7 +11,7 @@
 #include "gpu/mainRenderer.h"
 #include "gpu/renderer/viewport/blockTextureManager.h"
 
-const int CHUNK_SIZE = 16;
+const int CHUNK_SIZE = 32;
 coordinate_t getChunk(coordinate_t in) { return std::floor((float)in / (float)CHUNK_SIZE) * (int)CHUNK_SIZE; }
 Position getChunk(Position in) {
 	in.x = getChunk(in.x);
@@ -551,18 +551,18 @@ std::vector<std::shared_ptr<VulkanLogicAllocation>> VulkanChunker::getAllocation
 	max = getChunk(max + Vector(1));
 
 	// go through each chunk in view and collect it if it exists and has an allocation
-	std::set<LogicGroup*> logicGroups;
+	std::set<LogicGroup*> logicGroupsToRender;
 	for (coordinate_t chunkX = min.x; chunkX <= max.x; chunkX += CHUNK_SIZE) {
 		for (coordinate_t chunkY = min.y; chunkY <= max.y; chunkY += CHUNK_SIZE) {
 			auto groupsAtChunkIter = chunkToGroups.find({ chunkX, chunkY });
 			if (groupsAtChunkIter == chunkToGroups.end()) continue;
 			for (LogicGroup* group : groupsAtChunkIter->second) {
-				if (group->getAllocation().has_value()) logicGroups.insert(group);
+				if (group->getAllocation().has_value()) logicGroupsToRender.insert(group);
 			}
 		}
 	}
 	std::vector<std::shared_ptr<VulkanLogicAllocation>> seen;
-	for (LogicGroup* group : logicGroups) {
+	for (LogicGroup* group : logicGroupsToRender) {
 		seen.push_back(group->getAllocation().value());
 	}
 

src/gpu/renderer/viewport/viewportRenderer.cpp

@@ -22,6 +22,9 @@ void ViewportRenderer::render(Frame& frame, ViewportRenderData* viewport) {
 #endif
 	// get view data
 	ViewportViewData viewData = viewport->getViewData();
+	if (viewData.viewport.height == 0 || viewData.viewport.width == 0) {
+		return; // sometimes it wont be the correct size immediately
+	}
 
 	// set dynamic state
 	vkCmdSetViewport(frame.mainCommandBuffer, 0, 1, &viewData.viewport);