Merge branch 'development'

Config/AccessTransformers.ini

@@ -0,0 +1,4 @@
+[AccessTransformers]
+Friend=(Class="AFGBuildableHologram", FriendClass="FFicsItNetworksModule")
+Friend=(Class="AFGBuildableHologram", FriendClass="AFINNetworkCableHologram")
+Friend=(Class="AFGHologram", FriendClass="AFINNetworkCableHologram")

DefaultFicsitNetworks.ini

@@ -0,0 +1,2 @@
++ClassRedirects=(OldName="/Script/RozeFINAddons",NewName="/Script/FicsitNetwork", MatchSubstring=true)
++StructRedirects=(OldName="/Script/RozeFINAddons",NewName="/Script/FicsitNetwork", MatchSubstring=true)

FicsItNetworks.uplugin

@@ -1,16 +1,16 @@
 {
 	"FileVersion": 3,
 	"Version": 0,
-	"VersionName": "0.2",
-	"SemVersion": "0.2.2",
+	"VersionName": "0.3",
+	"SemVersion": "0.3.0",
 	"FriendlyName": "FicsIt-Networks",
 	"Description": "Adds a computer network and programmable computers to the Game.",
 	"Category": "Modding",
-	"CreatedBy": "Panakotta00",
-	"CreatedByURL": "https://twitch.tv/panakotta00",
+	"CreatedBy": "Panakotta00, RosszEmber, Deantendo, Coffeediction, Roze, Raysh, Esper",
+	"CreatedByURL": "",
 	"DocsURL": "https://docs.ficsit.app/ficsit-networks/0.0.1/index.html",
 	"MarketplaceURL": "",
-	"SupportURL": "",
+	"SupportURL": "https://discord.gg/3VfZ6Da",
 	"CanContainContent": true,
 	"IsBetaVersion": false,
 	"IsExperimentalVersion": false,

README.md

@@ -93,7 +93,7 @@ You can find the detailed progress in the [project board](https://github.com/Cod
 
 Contributors
 ============
-- [Panakotta00](https://twitch.tv/panakotta00)
+- [Panakotta00](https://panakotta00.massivebytes.net)
 - [RosszEmber](https://www.deviantart.com/ronsemberg)
 - Deantendo
 - Coffeediction

Source/FicsItNetworks/Components/FINCommandPointMesh.cpp

@@ -0,0 +1,60 @@
+#include "FINCommandPointMesh.h"
+
+#include <filesystem>
+#include <fstream>
+#include <sstream>
+
+
+#include "IImageWrapper.h"
+#include "IImageWrapperModule.h"
+#include "Developer/TargetPlatform/Public/Interfaces/IAudioFormat.h"
+#include "VorbisAudioInfo.h"
+#include "FicsitNetworks/FicsItKernel/Processor/Lua/LuaStructs.h"
+
+
+
+UTexture2D* UFINCommandPointMesh::LoadTextureFromFile(FString str)
+{
+	FString fsp;
+	// TODO: Get UFGSaveSystem::GetSaveDirectoryPath() working
+	if (fsp.IsEmpty()) {
+		fsp = FPaths::Combine(FPlatformProcess::UserSettingsDir(), FApp::GetProjectName(), TEXT("Saved/") TEXT("SaveGames/"));
+	}
+
+	auto file = str + TEXT(".png");
+	auto path = std::filesystem::path(*file);
+
+	std::filesystem::path root = *fsp;
+	root /= "Computers/Icons";
+	std::filesystem::create_directories(root);
+	auto pathToFile = root / path;
+	pathToFile = std::filesystem::absolute(pathToFile);
+	auto ps = pathToFile.string();
+	if (ps.rfind(std::filesystem::absolute(root).string(), 0) != 0 || !std::filesystem::exists(pathToFile)) {
+		return nullptr;
+	}
+
+	FString fstrPath = UTF8_TO_TCHAR(ps.c_str());
+
+
+	FString pngfile = "myimage.png";
+	IImageWrapperModule& ImageWrapperModule = FModuleManager::LoadModuleChecked<IImageWrapperModule>(FName("ImageWrapper"));
+	// Note: PNG format.  Other formats are supported
+	TSharedPtr<IImageWrapper> ImageWrapper = ImageWrapperModule.CreateImageWrapper(EImageFormat::PNG);
+
+	TArray<uint8> RawFileData;
+	if (FFileHelper::LoadFileToArray(RawFileData, *pngfile))
+	{
+		if (ImageWrapper.IsValid() && ImageWrapper->SetCompressed(RawFileData.GetData(), RawFileData.Num()))
+		{
+			TArray<uint8> UncompressedBGRA;
+			// bool GetRaw(const ERGBFormat InFormat, int32 InBitDepth, TArray<uint8>& OutRawData)
+			if (ImageWrapper->GetRaw(ERGBFormat::BGRA, 8, UncompressedBGRA))
+			{
+				return UTexture2D::CreateTransient(ImageWrapper->GetWidth(), ImageWrapper->GetHeight(), PF_B8G8R8A8);
+			}
+		}
+	}
+
+	return nullptr;
+}

Source/FicsItNetworks/Components/FINCommandPointMesh.h

@@ -0,0 +1,94 @@
+#pragma once
+
+#include "FGColoredInstanceMeshProxy.h"
+#include "Engine.h"
+
+#include "FINCommandPointMesh.generated.h"
+
+
+UCLASS(Blueprintable, meta = (BlueprintSpawnableComponent))
+class UFINCommandPointMesh : public UFGColoredInstanceMeshProxy
+{
+	GENERATED_BODY()
+
+public:
+	UFUNCTION(BlueprintCallable)
+	UTexture2D* LoadTextureFromFile(FString str);
+};
+
+
+USTRUCT(Blueprintable)
+struct FFINCommandLabelReferences {
+	GENERATED_BODY()
+
+	FFINCommandLabelReferences(UObject* reference, UObject* textReference, int index) : Reference(reference), TextObjectReference(textReference), Index(index) {}
+	FFINCommandLabelReferences() : Reference(nullptr), TextObjectReference(nullptr), Index(0)  {}
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
+	int Index;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UObject* Reference;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UObject* TextObjectReference;
+
+};
+
+USTRUCT(Blueprintable)
+struct FFINCommandLabelData  {
+	GENERATED_BODY()
+
+	FFINCommandLabelData() : ImagePath(""), Text(""), TextColor(0,0,0,1), Vertical(false){}
+	FFINCommandLabelData(FString imagePath, FString text, FLinearColor textColor, bool vertical) : ImagePath(imagePath), Text(text), TextColor(textColor), Vertical(vertical){}
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
+	FString ImagePath;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
+	bool Vertical;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
+	FString Text;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
+	FLinearColor TextColor;
+
+};
+
+USTRUCT(Blueprintable)
+struct FFINCommandLabelStructure
+{
+	GENERATED_BODY()
+
+	FFINCommandLabelStructure(UObject* reference, int index, FString path, bool vertical, bool doUpdate, bool doUpdateText, FString text, FLinearColor color) : reference(reference), path(path), index(index), vertical(vertical), doUpdate(doUpdate), doUpdateText(doUpdateText), text(text), textColor(color) {}
+	FFINCommandLabelStructure() : reference(0), path(""), index(0), vertical(false), doUpdate(false), doUpdateText(false), text(""), textColor(0,0,0, 1)  {}
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UObject* reference;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UObject* textObjectReference;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
+	FString path;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
+	int index;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
+	bool vertical;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	bool doUpdate;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	bool doUpdateText;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
+	FString text;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
+	FLinearColor textColor;
+
+};

Source/FicsItNetworks/Components/FINModuleScreen.cpp

@@ -37,16 +37,18 @@ void AFINModuleScreen::Tick(float DeltaSeconds) {
 }
 
 void AFINModuleScreen::BindGPU(const FFINNetworkTrace& gpu) {
-	if (gpu.GetUnderlyingPtr().IsValid()) check(gpu->GetClass()->ImplementsInterface(UFINGPUInterface::StaticClass()))
+	if (IsValid(gpu.GetUnderlyingPtr())) check(gpu->GetClass()->ImplementsInterface(UFINGPUInterface::StaticClass()))
 	if (!(GPU == gpu)) {
 		FFINNetworkTrace oldGPU = GPU;
 		GPU = FFINNetworkTrace();
-		if (oldGPU.GetUnderlyingPtr().IsValid()) Cast<IFINGPUInterface>(oldGPU.GetUnderlyingPtr().Get())->BindScreen(FFINNetworkTrace());
+		if (IsValid(oldGPU.GetUnderlyingPtr())) Cast<IFINGPUInterface>(oldGPU.GetUnderlyingPtr())->BindScreen(FFINNetworkTrace());
 		GPU = gpu;
-		if (gpu.GetUnderlyingPtr().IsValid()) Cast<IFINGPUInterface>(gpu.GetUnderlyingPtr().Get())->BindScreen(gpu / this);
+		if (IsValid(gpu.GetUnderlyingPtr())) Cast<IFINGPUInterface>(gpu.GetUnderlyingPtr())->BindScreen(gpu / this);
 		GPUPtr = GPU.Get();
 	}
-	NetMulti_OnGPUUpdate();
+	GetWorldTimerManager().SetTimerForNextTick([this]() {
+		NetMulti_OnGPUUpdate();
+	});
 }
 
 FFINNetworkTrace AFINModuleScreen::GetGPU() const {

Source/FicsItNetworks/Components/FINScreen.cpp

@@ -108,19 +108,21 @@ bool AFINScreen::ShouldSave_Implementation() const {
 }
 
 void AFINScreen::BindGPU(const FFINNetworkTrace& gpu) {
-	if (gpu.GetUnderlyingPtr().IsValid()) check(gpu->GetClass()->ImplementsInterface(UFINGPUInterface::StaticClass()))
+	if (IsValid(gpu.GetUnderlyingPtr())) check(gpu->GetClass()->ImplementsInterface(UFINGPUInterface::StaticClass()))
 	if (GPU != gpu) {
 		FFINNetworkTrace oldGPU = GPU;
 		GPU = FFINNetworkTrace();
-		if (oldGPU.GetUnderlyingPtr().IsValid()) Cast<IFINGPUInterface>(oldGPU.GetUnderlyingPtr().Get())->BindScreen(FFINNetworkTrace());
+		if (IsValid(oldGPU.GetUnderlyingPtr())) Cast<IFINGPUInterface>(oldGPU.GetUnderlyingPtr())->BindScreen(FFINNetworkTrace());
 		GPU = gpu;
-		if (gpu.GetUnderlyingPtr().IsValid()) {
-			Cast<IFINGPUInterface>(gpu.GetUnderlyingPtr().Get())->BindScreen(gpu / this);
+		if (IsValid(gpu.GetUnderlyingPtr())) {
+			Cast<IFINGPUInterface>(gpu.GetUnderlyingPtr())->BindScreen(gpu / this);
 		}
 		bGPUChanged = true;
 		GPUPtr = GPU.Get();
 	}
-	NetMulti_OnGPUUpdate();
+	GetWorldTimerManager().SetTimerForNextTick([this]() {
+		NetMulti_OnGPUUpdate();
+	});
 }
 
 FFINNetworkTrace AFINScreen::GetGPU() const {