Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
92abc32
Add MooaToon support
JasonMa0012 May 19, 2024
3aef5a9
Merge branch 'ruyo:master' into master
JasonMa0012 Jun 18, 2024
59a2336
Merge branch 'ruyo:master' into master
JasonMa0012 Jul 11, 2024
4c86ff1
Merge branch 'ruyo:master' into master
JasonMa0012 Jul 20, 2024
6d9628b
Merge branch 'ruyo:master' into master
JasonMa0012 Aug 3, 2024
14b8b91
Merge branch 'ruyo:master' into master
JasonMa0012 Aug 9, 2024
faae850
Fix VRM Material Importer
JasonMa0012 Aug 14, 2024
c62981d
Merge branch 'ruyo:master' into master
JasonMa0012 Aug 26, 2024
406e20c
Merge remote-tracking branch 'VRM4U/master'
JasonMa0012 Oct 23, 2024
4c4782d
Merge branch 'ruyo:master' into master
JasonMa0012 Nov 13, 2024
282bf29
Merge branch 'ruyo:master' into master
JasonMa0012 Nov 30, 2024
d90cd42
Fix compile errors
JasonMa0012 Dec 1, 2024
c2643f2
Fix UE 5.5 Installed Build errors
JasonMa0012 Dec 3, 2024
82d86cf
Merge remote-tracking branch 'VRM4U/master'
JasonMa0012 Dec 10, 2024
dae1b73
Fix compile error
JasonMa0012 Dec 10, 2024
8371612
Merge remote-tracking branch 'VRM4U/master'
JasonMa0012 Dec 11, 2024
a2306de
Merge branch 'ruyo:master' into master
JasonMa0012 Dec 12, 2024
b4883e5
Merge branch 'ruyo:master' into master
JasonMa0012 Dec 13, 2024
1847cdc
Merge branch 'ruyo:master' into master
JasonMa0012 Dec 17, 2024
1eba766
Fix installed build error
JasonMa0012 Dec 18, 2024
d1ce231
Fix installed build error
JasonMa0012 Dec 18, 2024
65ddeb1
Merge branch 'ruyo:master' into master
JasonMa0012 Jan 11, 2025
99b05a1
Merge branch 'ruyo:master' into master
JasonMa0012 Jan 23, 2025
29aff3c
Merge branch 'master' of https://github.com/ruyo/VRM4U
JasonMa0012 Feb 6, 2025
e5f3406
Merge branch 'ruyo:master' into master
JasonMa0012 Feb 8, 2025
49b5698
Merge branch 'ruyo:master' into master
JasonMa0012 Feb 26, 2025
400359e
Merge branch 'ruyo:master' into master
JasonMa0012 Mar 8, 2025
2f39f95
Merge branch 'ruyo:master' into master
JasonMa0012 Mar 12, 2025
33009a5
Merge remote-tracking branch 'VRM4U/master'
JasonMa0012 Apr 21, 2025
507fd72
Merge remote-tracking branch 'VRM4U/master'
JasonMa0012 Apr 30, 2025
b37c69e
Merge branch 'ruyo:master' into master
JasonMa0012 May 4, 2025
8746a8f
Merge branch 'ruyo:master' into master
JasonMa0012 May 19, 2025
f4307f2
Merge branch 'ruyo:master' into master
JasonMa0012 May 31, 2025
5d59858
Merge branch 'ruyo:master' into master
JasonMa0012 Jun 3, 2025
6045096
Fix 5.6 Installed Build Errors
JasonMa0012 Jun 6, 2025
e598665
Merge branch 'ruyo:master' into VRM4U_master
JasonMa0012 Jun 6, 2025
3a954c4
Fix 5.6 Installed Build Errors
JasonMa0012 Jun 6, 2025
997561b
Fix Text Encoding
JasonMa0012 Jun 6, 2025
5ecd378
Fix Text Encoding
JasonMa0012 Jun 6, 2025
85d6476
Merge branch 'ruyo:master' into master
JasonMa0012 Jul 12, 2025
40a22e6
Merge branch 'ruyo:master' into master
JasonMa0012 Jul 14, 2025
07d642c
Fix UE 5.4 Installed Build Errors
JasonMa0012 Jul 14, 2025
d8ff369
Merge branch 'master' of https://github.com/ruyo/VRM4U into VRM4U_master
JasonMa0012 Jul 14, 2025
38b695c
Fix UE 5.4 Installed Build Errors
JasonMa0012 Jul 14, 2025
8fdaf39
Merge branch 'ruyo:master' into master
JasonMa0012 Aug 13, 2025
6759b7a
Merge branch 'ruyo:master' into master
JasonMa0012 Aug 14, 2025
6ed6121
Merge branch 'ruyo:master' into master
JasonMa0012 Aug 21, 2025
1fd400a
Merge branch 'ruyo:master' into master
JasonMa0012 Sep 1, 2025
78f6cca
Merge remote-tracking branch 'VRM4U/master'
JasonMa0012 Nov 3, 2025
6f4be5e
Merge branch 'ruyo:master' into master
JasonMa0012 Nov 29, 2025
3604fab
Merge branch 'master' of https://github.com/JasonMa0012/VRM4U_MooaToo…
JasonMa0012 Nov 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@
*.exe
*.out
*.app
Intermediate
Binaries
Binary file added Content/ImportDataSet/DS_MooaToon.uasset
Binary file not shown.
Binary file modified Content/VrmAssetListObjectBP.uasset
Binary file not shown.
Binary file modified Content/VrmAssetListObjectBPUE5.uasset
Binary file not shown.
1 change: 1 addition & 0 deletions Source/VRM4U/Private/AnimNode_VrmConstraint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "Animation/AnimInstanceProxy.h"
#include "Kismet/KismetSystemLibrary.h"
#include "DrawDebugHelpers.h"
#include "SceneManagement.h"

#include "VrmMetaObject.h"
#include "VrmAssetListObject.h"
Expand Down
1 change: 1 addition & 0 deletions Source/VRM4U/Private/AnimNode_VrmSpringBone.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ SOFTWARE.
#include "Kismet/KismetSystemLibrary.h"
#include "SceneInterface.h"
#include "DrawDebugHelpers.h"
#include "SceneManagement.h"

#include "VrmMetaObject.h"
#include "VrmAssetListObject.h"
Expand Down
3 changes: 2 additions & 1 deletion Source/VRM4U/Private/VrmAssetListObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ UVrmAssetListObject::UVrmAssetListObject(const FObjectInitializer& ObjectInitial
void UVrmAssetListObject::CopyMember(UVrmAssetListObject *dst) const {
dst->bAssetSave = bAssetSave;
dst->bSkipMorphTarget = bSkipMorphTarget;


dst->MooaToonSet = MooaToonSet; // Mooa VRM
dst->MtoonLitSet = MtoonLitSet;
dst->MtoonUnlitSet = MtoonUnlitSet;
dst->SSSSet = SSSSet;
Expand Down
4 changes: 4 additions & 0 deletions Source/VRM4U/Private/VrmBPFunctionLibrary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
#include "Kismet/KismetRenderingLibrary.h"
#endif

#if UE_VERSION_NEWER_THAN(5,6,-1)
#include "MaterialShared.h"
#endif

#if UE_VERSION_OLDER_THAN(5,1,0)
#else
#if WITH_EDITOR && PLATFORM_WINDOWS
Expand Down
5 changes: 5 additions & 0 deletions Source/VRM4U/Public/VrmAssetListObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ class VRM4U_API UVrmAssetListObject : public UObject
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "InOption")
bool bSkipMorphTarget=false;

// Mooa VRM
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "InMaterial")
UVrmImportMaterialSet* MooaToonSet;
// Mooa End

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "InMaterial")
UVrmImportMaterialSet* MtoonLitSet;

Expand Down
2 changes: 1 addition & 1 deletion Source/VRM4U/Public/VrmUtil.h
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ FORCEINLINE USkeletalMesh *VRMGetSkinnedAsset(const USkinnedMeshComponent* t) {
UENUM(BlueprintType)
enum class EVRMImportMaterialType : uint8
{
VRMIMT_Auto UMETA(DisplayName = "Auto(MToon Unlit)"),
VRMIMT_Auto UMETA(DisplayName = "MooaToon"), // Mooa VRM
VRMIMT_MToon UMETA(DisplayName = "MToon Lit"),
VRMIMT_MToonUnlit UMETA(DisplayName = "MToon Unlit"),
VRMIMT_SSS UMETA(DisplayName = "Subsurface"),
Expand Down
4 changes: 4 additions & 0 deletions Source/VRM4UCapture/Private/VRM4U_VMCSubsystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
#include "OSCManager.h"
#include "OSCServer.h"

#if WITH_EDITOR
#include "Editor.h"
#endif

bool UVRM4U_VMCSubsystem::CopyVMCData(FVMCData &data, FString ServerAddress, int port) {
for (int i = 0; i < VMCObjectList.Num(); ++i) {
auto a = VMCObjectList[i].Get();
Expand Down
Loading