0_8_0

DigiKrafting · Sep 10, 2019 · 4be4d9f · 4be4d9f
1 parent d84f6c0
commit 4be4d9f
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 14 deletions.
diff --git a/Blender_Importer/Binaries/Win64/UE4Editor-Blender_Importer.dll b/Blender_Importer/Binaries/Win64/UE4Editor-Blender_Importer.dll
diff --git a/Blender_Importer/Binaries/Win64/UE4Editor-Blender_Importer.pdb b/Blender_Importer/Binaries/Win64/UE4Editor-Blender_Importer.pdb
diff --git a/Blender_Importer/Blender_Importer.uplugin b/Blender_Importer/Blender_Importer.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "0.7.0",
+	"VersionName": "0.8.0",
 	"FriendlyName": "Blender Importer",
 	"Description": "Blender Addon UE Importer",
 	"Category": "Importers",

diff --git a/...mediate/Build/Win64/UE4Editor/Development/Blender_Importer/UE4Editor-Blender_Importer.lib b/...mediate/Build/Win64/UE4Editor/Development/Blender_Importer/UE4Editor-Blender_Importer.lib
diff --git a/...lender_Importer/Private/BJD_Processer.cpp → ...Importer/Private/Import_BJD_Processer.cpp b/...lender_Importer/Private/BJD_Processer.cpp → ...Importer/Private/Import_BJD_Processer.cpp
@@ -1,6 +1,6 @@
 // Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
 
-#include "BJD_Processer.h"
+#include "Import_BJD_Processer.h"
 
 #include "AssetRegistryModule.h"
 #include "Editor/UnrealEd/Public/Editor.h"
@@ -22,7 +22,7 @@
 
 #define LOCTEXT_NAMESPACE "FBlender_ImporterModule"
 
-bool FBJD_Processer::Process_JSON_Open(const FString& Filename)
+bool FImport_BJD_Processer::Process_JSON_Open(const FString& Filename)
 {
 
 	FString JsonString;
@@ -48,7 +48,14 @@ bool FBJD_Processer::Process_JSON_Open(const FString& Filename)
 
 }
 
-UFbxImportUI* FBJD_Processer::Process_Options() {
+bool FImport_BJD_Processer::Process_Auto()
+{
+
+	return JsonObject->GetBoolField(TEXT("Auto"));
+
+}
+
+UFbxImportUI* FImport_BJD_Processer::Process_Options() {
 
 	UFbxImportUI* FBX_Options = NewObject<UFbxImportUI>();
 
@@ -119,7 +126,8 @@ UFbxImportUI* FBJD_Processer::Process_Options() {
 	return FBX_Options;
 
 }
-bool FBJD_Processer::Process_Materials()
+
+bool FImport_BJD_Processer::Process_Materials()
 {
 
 		const FString data_path = JsonObject->GetStringField(TEXT("Path"));

diff --git a/Blender_Importer/Source/Blender_Importer/Private/Import_FBX_Factory.cpp b/Blender_Importer/Source/Blender_Importer/Private/Import_FBX_Factory.cpp
@@ -1,7 +1,7 @@
 // Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
 
 #include "Import_FBX_Factory.h"
-#include "BJD_Processer.h"
+#include "Import_BJD_Processer.h"
 #include "Misc/Paths.h"
 #include "AssetImportTask.h"
 #include "Factories/FbxImportUI.h"
@@ -23,7 +23,7 @@ UImport_FBX_Factory::UImport_FBX_Factory(const FObjectInitializer& ObjectInitial
 	bOperationCanceled = false;
 	bDetectImportTypeOnImport = true;
 	ImportPriority = 200;
-
+	
 }
 
 bool UImport_FBX_Factory::FactoryCanImport(const FString& Filename)
@@ -45,20 +45,20 @@ UObject* UImport_FBX_Factory::FactoryCreateFile(UClass* InClass, UObject* InPare
 
 	UObject* CreatedObject = NULL;
 
-	FBJD_Processer BJD_Processer;
+	FImport_BJD_Processer Import_BJD_Processer;
 
 	const FString JSON_Filename = Filename.Replace(TEXT(".fbx"), TEXT(".bjd"));
 
-	if (BJD_Processer.Process_JSON_Open(JSON_Filename)) {
+	if (Import_BJD_Processer.Process_JSON_Open(JSON_Filename)) {
 
 		UAssetImportTask* Task = NewObject<UAssetImportTask>();
-		Task->bAutomated = true;
-		Task->Options = BJD_Processer.Process_Options();;
+		Task->bAutomated = Import_BJD_Processer.Process_Auto();
+		Task->Options = Import_BJD_Processer.Process_Options();
 		SetAssetImportTask(Task);
 
 		CreatedObject = Super::FactoryCreateFile(InClass, InParent, InName, Flags, Filename, Parms, Warn, bOutOperationCanceled);
 
-		const bool _processed_materials = BJD_Processer.Process_Materials();
+		const bool _processed_materials = Import_BJD_Processer.Process_Materials();
 
 		remove(TCHAR_TO_ANSI(*JSON_Filename));
 

diff --git a/...e/Blender_Importer/Public/BJD_Processer.h → ...er_Importer/Public/Import_BJD_Processer.h b/...e/Blender_Importer/Public/BJD_Processer.h → ...er_Importer/Public/Import_BJD_Processer.h
@@ -7,15 +7,16 @@
 #include "Factories/FbxAnimSequenceImportData.h"
 #include "Factories/FbxImportUI.h"
 
-class FBJD_Processer
+class FImport_BJD_Processer
 {
 
 public:
 
 	bool Process_JSON_Open(const FString& Filename);
 	UFbxImportUI* Process_Options();
 	bool Process_Materials();
-
+	bool Process_Auto();
+
 private:
 
 	TSharedPtr<FJsonObject> JsonObject;

diff --git a/README.md b/README.md
@@ -29,6 +29,7 @@ This plugin utilises the standard built in FBX import by using "UFbxFactory" as
 ### {fbx_file_name}.bjd
 ~~~
 {
+   "Auto": true,
    "Path":"Meshes/Test/",
    "Options":{
       "ImportMesh":true,