0_2_0

Author: DigiKrafting

Blender_Importer/Binaries/Win64/UE4Editor-Blender_Importer.dll

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "0.1",
+	"VersionName": "0.2.0",
 	"FriendlyName": "Blender Importer",
 	"Description": "Blender Addon UE Importer",
 	"Category": "Importers",

Blender_Importer/Binaries/Win64/UE4Editor-Blender_Importer.pdb

@@ -21,7 +21,7 @@ void EmptyLinkFunctionForGeneratedCodeBlender_Importer_init() {}
 				nullptr,
 				0,
 				PKG_CompiledIn | 0x00000040,
-				0x3D50620E,
+				0x9A7AEB84,
 				0x374559E1,
 				METADATA_PARAMS(nullptr, 0)
 			};

Blender_Importer/Blender_Importer.uplugin

@@ -40,7 +40,6 @@ void EmptyLinkFunctionForGeneratedCodeImport_Factory() {}
 	};
 #if WITH_METADATA
 	const UE4CodeGen_Private::FMetaDataPairParam Z_Construct_UClass_UImport_Factory_Statics::Class_MetaDataParams[] = {
-		{ "HideCategories", "Object" },
 		{ "IncludePath", "Import_Factory.h" },
 		{ "ModuleRelativePath", "Public/Import_Factory.h" },
 	};
@@ -60,7 +59,7 @@ void EmptyLinkFunctionForGeneratedCodeImport_Factory() {}
 		0,
 		0,
 		0,
-		0x000000A0u,
+		0x000000A8u,
 		METADATA_PARAMS(Z_Construct_UClass_UImport_Factory_Statics::Class_MetaDataParams, ARRAY_COUNT(Z_Construct_UClass_UImport_Factory_Statics::Class_MetaDataParams))
 	};
 	UClass* Z_Construct_UClass_UImport_Factory()
@@ -72,7 +71,7 @@ void EmptyLinkFunctionForGeneratedCodeImport_Factory() {}
 		}
 		return OuterClass;
 	}
-	IMPLEMENT_CLASS(UImport_Factory, 3054864883);
+	IMPLEMENT_CLASS(UImport_Factory, 1763245714);
 	template<> BLENDER_IMPORTER_API UClass* StaticClass<UImport_Factory>()
 	{
 		return UImport_Factory::StaticClass();

Blender_Importer/Intermediate/Build/Win64/UE4Editor/Development/Blender_Importer/UE4Editor-Blender_Importer.lib

@@ -20,7 +20,7 @@ private: \
 	static void StaticRegisterNativesUImport_Factory(); \
 	friend struct Z_Construct_UClass_UImport_Factory_Statics; \
 public: \
-	DECLARE_CLASS(UImport_Factory, UFactory, COMPILED_IN_FLAGS(0), CASTCLASS_None, TEXT("/Script/Blender_Importer"), NO_API) \
+	DECLARE_CLASS(UImport_Factory, UFactory, COMPILED_IN_FLAGS(0 | CLASS_Transient), CASTCLASS_None, TEXT("/Script/Blender_Importer"), NO_API) \
 	DECLARE_SERIALIZER(UImport_Factory)
 
 
@@ -29,7 +29,7 @@ private: \
 	static void StaticRegisterNativesUImport_Factory(); \
 	friend struct Z_Construct_UClass_UImport_Factory_Statics; \
 public: \
-	DECLARE_CLASS(UImport_Factory, UFactory, COMPILED_IN_FLAGS(0), CASTCLASS_None, TEXT("/Script/Blender_Importer"), NO_API) \
+	DECLARE_CLASS(UImport_Factory, UFactory, COMPILED_IN_FLAGS(0 | CLASS_Transient), CASTCLASS_None, TEXT("/Script/Blender_Importer"), NO_API) \
 	DECLARE_SERIALIZER(UImport_Factory)
 
 

Blender_Importer/Intermediate/Build/Win64/UE4Editor/Inc/Blender_Importer/Blender_Importer.init.gen.cpp

@@ -1,30 +1,15 @@
 // Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
 
 #include "Import_Factory.h"
-#include "AssetRegistryModule.h"
-#include "Editor/UnrealEd/Public/Editor.h"
-#include "Misc/FeedbackContext.h"
-#include "Logging/LogMacros.h"
-#include "Logging/TokenizedMessage.h"
-#include "MessageLogModule.h"
-#include "Serialization/JsonTypes.h"
-#include "Dom/JsonObject.h"
-#include "Serialization/JsonReader.h"
-#include "Serialization/JsonSerializer.h"
-#include "Misc/FileHelper.h"
-#include "ContentBrowserModule.h"
-#include "Factories/MaterialFactoryNew.h"
-#include "Materials/MaterialExpressionTextureSample.h"
-#include "Materials/Material.h"
-#include "Materials/MaterialExpressionConstant.h"
+#include "Import_Processer.h"
 
 #define LOCTEXT_NAMESPACE "FBlender_ImporterModule"
 
 UImport_Factory::UImport_Factory(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 {
 
-	bCreateNew = true;
+	bCreateNew = false;
 	bEditorImport = true;
 	bEditAfterNew = false;
 	bText = true;
@@ -42,117 +27,26 @@ bool UImport_Factory::FactoryCanImport(const FString& Filename)
 
 	if (JSON_Filename == TEXT("blender_addon_ue_data.json"))
 	{
-	
-		FString JsonString; 
-		FFileHelper::LoadFileToString(JsonString, *Filename);
-		TSharedPtr<FJsonObject> JsonObject = MakeShareable(new FJsonObject());
-		TSharedRef<TJsonReader<>> JsonReader = TJsonReaderFactory<>::Create(JsonString);
-
-		if (FJsonSerializer::Deserialize(JsonReader, JsonObject) && JsonObject.IsValid())
-		{
-			const FString data_path = JsonObject->GetStringField(TEXT("path"));
-
-			TArray<TSharedPtr<FJsonValue>> objArray = JsonObject->GetArrayField(TEXT("materials"));
-			for (int32 i = 0; i < objArray.Num(); i++)
-			{
-				TSharedPtr<FJsonValue> value = objArray[i];
-				TSharedPtr<FJsonObject> json = value->AsObject();
-			
-				const FString data_name = json->GetStringField(TEXT("name"));
-				const FString data_base_color = json->GetStringField(TEXT("base_color"));
-				const FString data_orm = json->GetStringField(TEXT("orm"));
-				const FString data_normal = json->GetStringField(TEXT("normal"));
-
-				FString PackageName = TEXT("/Game/") + data_path + data_name;
-
-				UPackage* Package = CreatePackage(NULL, *PackageName);
-
-				auto MaterialFactory = NewObject<UMaterialFactoryNew>();
-				UMaterial* UnrealMaterial = (UMaterial*)MaterialFactory->FactoryCreateNew(UMaterial::StaticClass(), Package, *data_name, RF_Standalone | RF_Public, NULL, GWarn);
-				FAssetRegistryModule::AssetCreated(UnrealMaterial);
-				Package->FullyLoad();
-				Package->SetDirtyFlag(true);
-			
-				// Base Color
-
-				if (data_base_color != "") {
-			
-					FStringAssetReference AssetPath_Basecolor(TEXT("/Game/") + data_path + data_base_color);
-					UTexture* Texture_Basecolor = Cast<UTexture>(AssetPath_Basecolor.TryLoad());
-					if (Texture_Basecolor)
-					{
-						UMaterialExpressionTextureSample* TextureExpression = NewObject<UMaterialExpressionTextureSample>(UnrealMaterial);
-						TextureExpression->Texture = Texture_Basecolor;
-						TextureExpression->SamplerType = SAMPLERTYPE_Color;
-						UnrealMaterial->Expressions.Add(TextureExpression);
-						UnrealMaterial->BaseColor.Expression = TextureExpression;
-					}
-			
-				}
-			
-				// ORM
-
-				if (data_orm != "") {
-			
-					FStringAssetReference AssetPath_ORM(TEXT("/Game/") + data_path + data_orm);
-					UTexture* Texture_ORM = Cast<UTexture>(AssetPath_ORM.TryLoad());
-					if (Texture_ORM)
-					{
-						UMaterialExpressionTextureSample* TextureExpression = NewObject<UMaterialExpressionTextureSample>(UnrealMaterial);
-						TextureExpression->Texture = Texture_ORM;
-						TextureExpression->SamplerType = SAMPLERTYPE_Color;
-						UnrealMaterial->Expressions.Add(TextureExpression);
-
-						UnrealMaterial->AmbientOcclusion.Connect(1, TextureExpression);
-						UnrealMaterial->Roughness.Connect(2, TextureExpression);
-						UnrealMaterial->Metallic.Connect(3, TextureExpression);
-
-					}
-			
-				}
-
-				// Normal
-
-				if (data_normal != "") {
-				
-					FStringAssetReference AssetPath_Normal(TEXT("/Game/") + data_path + data_normal);
-					UTexture* Texture_Normal = Cast<UTexture>(AssetPath_Normal.TryLoad());
-					if (Texture_Normal)
-					{
-						UMaterialExpressionTextureSample* TextureExpression = NewObject<UMaterialExpressionTextureSample>(UnrealMaterial);
-						TextureExpression->Texture = Texture_Normal;
-						TextureExpression->SamplerType = SAMPLERTYPE_Normal;
-						UnrealMaterial->Expressions.Add(TextureExpression);
-						UnrealMaterial->Normal.Expression = TextureExpression;
-					}
-
-				}
-
-			}
-
-		} else {
-
-			FText DialogText = FText::Format(
-				LOCTEXT("Error deserializing/processing ", "[{0}]"),
-				FText::FromString(Filename)
-			);
-			FMessageDialog::Open(EAppMsgType::Ok, DialogText);
-
-		}
 
 		return true;
 
-	} else {
-
-		return false;
-
 	}
 
+	return false;
+
 }
 
 UObject* UImport_Factory::FactoryCreateFile(UClass* InClass, UObject* InParent, FName InName, EObjectFlags Flags, const FString& Filename, const TCHAR* Parms, FFeedbackContext* Warn, bool& bOutOperationCanceled)
 {
+
+	UObject* ImportedObject = nullptr;
+
+	bool processed = FImport_Processer::Process_JSON_Data(Filename);
+
+	remove(TCHAR_TO_ANSI(*Filename));
+
 	return nullptr;
+
 }
 
 #undef LOCTEXT_NAMESPACE