Skip to content

Commit 4be4d9f

Browse files
committed
0_8_0
1 parent d84f6c0 commit 4be4d9f

8 files changed

Lines changed: 24 additions & 14 deletions

File tree

512 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

Blender_Importer/Blender_Importer.uplugin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"FileVersion": 3,
33
"Version": 1,
4-
"VersionName": "0.7.0",
4+
"VersionName": "0.8.0",
55
"FriendlyName": "Blender Importer",
66
"Description": "Blender Addon UE Importer",
77
"Category": "Importers",

Blender_Importer/Source/Blender_Importer/Private/BJD_Processer.cpp renamed to Blender_Importer/Source/Blender_Importer/Private/Import_BJD_Processer.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
22

3-
#include "BJD_Processer.h"
3+
#include "Import_BJD_Processer.h"
44

55
#include "AssetRegistryModule.h"
66
#include "Editor/UnrealEd/Public/Editor.h"
@@ -22,7 +22,7 @@
2222

2323
#define LOCTEXT_NAMESPACE "FBlender_ImporterModule"
2424

25-
bool FBJD_Processer::Process_JSON_Open(const FString& Filename)
25+
bool FImport_BJD_Processer::Process_JSON_Open(const FString& Filename)
2626
{
2727

2828
FString JsonString;
@@ -48,7 +48,14 @@ bool FBJD_Processer::Process_JSON_Open(const FString& Filename)
4848

4949
}
5050

51-
UFbxImportUI* FBJD_Processer::Process_Options() {
51+
bool FImport_BJD_Processer::Process_Auto()
52+
{
53+
54+
return JsonObject->GetBoolField(TEXT("Auto"));
55+
56+
}
57+
58+
UFbxImportUI* FImport_BJD_Processer::Process_Options() {
5259

5360
UFbxImportUI* FBX_Options = NewObject<UFbxImportUI>();
5461

@@ -119,7 +126,8 @@ UFbxImportUI* FBJD_Processer::Process_Options() {
119126
return FBX_Options;
120127

121128
}
122-
bool FBJD_Processer::Process_Materials()
129+
130+
bool FImport_BJD_Processer::Process_Materials()
123131
{
124132

125133
const FString data_path = JsonObject->GetStringField(TEXT("Path"));

Blender_Importer/Source/Blender_Importer/Private/Import_FBX_Factory.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
22

33
#include "Import_FBX_Factory.h"
4-
#include "BJD_Processer.h"
4+
#include "Import_BJD_Processer.h"
55
#include "Misc/Paths.h"
66
#include "AssetImportTask.h"
77
#include "Factories/FbxImportUI.h"
@@ -23,7 +23,7 @@ UImport_FBX_Factory::UImport_FBX_Factory(const FObjectInitializer& ObjectInitial
2323
bOperationCanceled = false;
2424
bDetectImportTypeOnImport = true;
2525
ImportPriority = 200;
26-
26+
2727
}
2828

2929
bool UImport_FBX_Factory::FactoryCanImport(const FString& Filename)
@@ -45,20 +45,20 @@ UObject* UImport_FBX_Factory::FactoryCreateFile(UClass* InClass, UObject* InPare
4545

4646
UObject* CreatedObject = NULL;
4747

48-
FBJD_Processer BJD_Processer;
48+
FImport_BJD_Processer Import_BJD_Processer;
4949

5050
const FString JSON_Filename = Filename.Replace(TEXT(".fbx"), TEXT(".bjd"));
5151

52-
if (BJD_Processer.Process_JSON_Open(JSON_Filename)) {
52+
if (Import_BJD_Processer.Process_JSON_Open(JSON_Filename)) {
5353

5454
UAssetImportTask* Task = NewObject<UAssetImportTask>();
55-
Task->bAutomated = true;
56-
Task->Options = BJD_Processer.Process_Options();;
55+
Task->bAutomated = Import_BJD_Processer.Process_Auto();
56+
Task->Options = Import_BJD_Processer.Process_Options();
5757
SetAssetImportTask(Task);
5858

5959
CreatedObject = Super::FactoryCreateFile(InClass, InParent, InName, Flags, Filename, Parms, Warn, bOutOperationCanceled);
6060

61-
const bool _processed_materials = BJD_Processer.Process_Materials();
61+
const bool _processed_materials = Import_BJD_Processer.Process_Materials();
6262

6363
remove(TCHAR_TO_ANSI(*JSON_Filename));
6464

Blender_Importer/Source/Blender_Importer/Public/BJD_Processer.h renamed to Blender_Importer/Source/Blender_Importer/Public/Import_BJD_Processer.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@
77
#include "Factories/FbxAnimSequenceImportData.h"
88
#include "Factories/FbxImportUI.h"
99

10-
class FBJD_Processer
10+
class FImport_BJD_Processer
1111
{
1212

1313
public:
1414

1515
bool Process_JSON_Open(const FString& Filename);
1616
UFbxImportUI* Process_Options();
1717
bool Process_Materials();
18-
18+
bool Process_Auto();
19+
1920
private:
2021

2122
TSharedPtr<FJsonObject> JsonObject;

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ This plugin utilises the standard built in FBX import by using "UFbxFactory" as
2929
### {fbx_file_name}.bjd
3030
~~~
3131
{
32+
"Auto": true,
3233
"Path":"Meshes/Test/",
3334
"Options":{
3435
"ImportMesh":true,

0 commit comments

Comments
 (0)