Merge pull request #371 from RozeDoyanawa/development

feat:Emissive Label Text
Panakotta00 · Feb 8, 2025 · df8e203 · df8e203
2 parents b2be495 + fe27095
commit df8e203
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 3 deletions.
diff --git a/Content/Buildings/ModularPanel/Modules/-Shared/MI_DecalTextMaterial.uasset b/Content/Buildings/ModularPanel/Modules/-Shared/MI_DecalTextMaterial.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/-Shared/MI_EmissiveButton.uasset b/Content/Buildings/ModularPanel/Modules/-Shared/MI_EmissiveButton.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/-Shared/MM_DecalTextMaterial.uasset b/Content/Buildings/ModularPanel/Modules/-Shared/MM_DecalTextMaterial.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/Indicator/Desc_MCP_Mod_Indicator.uasset b/Content/Buildings/ModularPanel/Modules/Indicator/Desc_MCP_Mod_Indicator.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/Label/Build_ModuleLabel_1x1.uasset b/Content/Buildings/ModularPanel/Modules/Label/Build_ModuleLabel_1x1.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/Label/Build_Module_RingedLabel_1x1.uasset b/Content/Buildings/ModularPanel/Modules/Label/Build_Module_RingedLabel_1x1.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/Module_RCO.uasset b/Content/Buildings/ModularPanel/Modules/Module_RCO.uasset
diff --git a/...t/Buildings/ModularPanel/Modules/MushroomPushButton/Build_ModuleMushroomPushButton.uasset b/...t/Buildings/ModularPanel/Modules/MushroomPushButton/Build_ModuleMushroomPushButton.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/PushButton/Build_ModulesPushButton.uasset b/Content/Buildings/ModularPanel/Modules/PushButton/Build_ModulesPushButton.uasset
diff --git a/Content/Buildings/ModularPanel/Panels/-Shared/LabelFunctions.uasset b/Content/Buildings/ModularPanel/Panels/-Shared/LabelFunctions.uasset
diff --git a/Content/Buildings/ModularPanel/Panels/-Shared/LabeledMicroControlPanelBase.uasset b/Content/Buildings/ModularPanel/Panels/-Shared/LabeledMicroControlPanelBase.uasset
diff --git a/Content/Buildings/ModularPanel/Panels/MicroPanel1/Build_MicroPanel1.uasset b/Content/Buildings/ModularPanel/Panels/MicroPanel1/Build_MicroPanel1.uasset
diff --git a/Content/Buildings/ModularPanel/Panels/MicroPanel1/Build_MicroPanel1_Center.uasset b/Content/Buildings/ModularPanel/Panels/MicroPanel1/Build_MicroPanel1_Center.uasset
diff --git a/Content/Buildings/ModularPanel/Panels/MicroPanel2/Build_MicroPanel2.uasset b/Content/Buildings/ModularPanel/Panels/MicroPanel2/Build_MicroPanel2.uasset
diff --git a/Content/Buildings/ModularPanel/Panels/MicroPanel3/Build_MicroPanel3.uasset b/Content/Buildings/ModularPanel/Panels/MicroPanel3/Build_MicroPanel3.uasset
diff --git a/Content/Buildings/ModularPanel/Panels/MicroPanel6/Build_MicroPanel6.uasset b/Content/Buildings/ModularPanel/Panels/MicroPanel6/Build_MicroPanel6.uasset
diff --git a/Content/Buildings/ModularPanel/Panels/SizeablePanel/Build_SizeablePanel.uasset b/Content/Buildings/ModularPanel/Panels/SizeablePanel/Build_SizeablePanel.uasset
diff --git a/Content/Equipment/LabelingTool/I_LabelableInterface.uasset b/Content/Equipment/LabelingTool/I_LabelableInterface.uasset
diff --git a/Content/Equipment/LabelingTool/UI/Widget_LabelConfigurator.uasset b/Content/Equipment/LabelingTool/UI/Widget_LabelConfigurator.uasset
diff --git a/Source/FicsItNetworks/Public/Components/FINCommandPointMesh.h b/Source/FicsItNetworks/Public/Components/FINCommandPointMesh.h
@@ -40,8 +40,8 @@ USTRUCT(Blueprintable)
 struct FFINCommandLabelData  {
 	GENERATED_BODY()
 
-	FFINCommandLabelData() : ImagePath(""), Vertical(false), Text(""), TextColor(0,0,0,1){}
-	FFINCommandLabelData(FString imagePath, FString text, FLinearColor textColor, bool vertical) : ImagePath(imagePath), Vertical(vertical), Text(text), TextColor(textColor) {}
+	FFINCommandLabelData() : ImagePath(""), Vertical(false), Text(""), TextColor(0,0,0,1), Emit(0){}
+	FFINCommandLabelData(FString imagePath, FString text, FLinearColor textColor, bool vertical, float emit) : ImagePath(imagePath), Vertical(vertical), Text(text), TextColor(textColor), Emit(emit) {}
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
 	FString ImagePath;
@@ -58,20 +58,23 @@ struct FFINCommandLabelData  {
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
 	TEnumAsByte<EFINLabelPlacement> placement = North;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
+	float Emit;
 };
 
 
 USTRUCT(Blueprintable)
 struct FFINCommandLabelStructure {
 	GENERATED_BODY()
 
+	FFINCommandLabelStructure(UObject* reference, int index, FString path, bool doUpdate, bool doUpdateText, FString text, FLinearColor color, EFINLabelPlacement placement, float emit) : reference(reference), path(path), index(index), vertical(false), doUpdate(doUpdate), doUpdateText(doUpdateText), text(text), textColor(color), placement(placement), emit(emit) {}
 	FFINCommandLabelStructure(UObject* reference, int index, FString path, bool doUpdate, bool doUpdateText, FString text, FLinearColor color, EFINLabelPlacement placement) : reference(reference), path(path), index(index), vertical(false), doUpdate(doUpdate), doUpdateText(doUpdateText), text(text), textColor(color), placement(placement) {}
 	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) {
 		if(vertical) {
 			placement = West;
 		}
 	}
-	FFINCommandLabelStructure() : reference(0), path(""), index(0), vertical(false), doUpdate(false), doUpdateText(false), text(""), textColor(0,0,0, 1)  {}
+	FFINCommandLabelStructure() : reference(0), path(""), index(0), vertical(false), doUpdate(false), doUpdateText(false), text(""), textColor(0,0,0, 1), emit(0)  {}
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	UObject* reference;
@@ -102,4 +105,7 @@ struct FFINCommandLabelStructure {
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
 	TEnumAsByte<EFINLabelPlacement> placement = North;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame)
+	float emit;
 };