diff --git a/Content/Blueprints/Player/CM.uasset b/Content/Blueprints/Player/CM.uasset index 43c9745..2cd77e1 100644 Binary files a/Content/Blueprints/Player/CM.uasset and b/Content/Blueprints/Player/CM.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index c1336aa..45fe638 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index c3d7a81..1cf507c 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/UI/Materials/0to1Cubic.uasset b/Content/Blueprints/UI/Materials/0to1Cubic.uasset new file mode 100644 index 0000000..bb856ee Binary files /dev/null and b/Content/Blueprints/UI/Materials/0to1Cubic.uasset differ diff --git a/Content/Blueprints/world/BP_House.uasset b/Content/Blueprints/world/BP_House.uasset index 85ce5e7..5b78e53 100644 Binary files a/Content/Blueprints/world/BP_House.uasset and b/Content/Blueprints/world/BP_House.uasset differ diff --git a/Content/Materials/Masters/Common/M_Holo.uasset b/Content/Materials/Masters/Common/M_Holo.uasset new file mode 100644 index 0000000..69c452a Binary files /dev/null and b/Content/Materials/Masters/Common/M_Holo.uasset differ diff --git a/Content/Materials/Masters/Common/M_Holo_Inst_house.uasset b/Content/Materials/Masters/Common/M_Holo_Inst_house.uasset new file mode 100644 index 0000000..2907184 Binary files /dev/null and b/Content/Materials/Masters/Common/M_Holo_Inst_house.uasset differ diff --git a/Source/GraffModule/Private/cppGI.cpp b/Source/GraffModule/Private/cppGI.cpp index 8901785..9e2ddb9 100644 --- a/Source/GraffModule/Private/cppGI.cpp +++ b/Source/GraffModule/Private/cppGI.cpp @@ -31,13 +31,16 @@ TArray UcppGI::cppLvlManage(UObject* WorldContextObject, Fcppc { TArray outStruct; bool loadthis; - auto temp = Fcppcoords(); - temp.house = -2; - temp.section = -2; - temp.floor = 1; + /*for 3Dtour only*/ + if(currentState==11) { + auto temp = Fcppcoords(); + temp.house = -2; + temp.section = -2; + temp.floor = 1; + cppLoadList.AddUnique(temp); + } cppLoadList.AddUnique(currentCoords); - cppLoadList.AddUnique(temp); for (const auto& lvl : cppLevels) { @@ -69,9 +72,10 @@ TArray UcppGI::cppLvlManage(UObject* WorldContextObject, Fcppc else { /*load new level instance*/ bool b; - if (ULevelStreamingDynamic* newlvl = ULevelStreamingDynamic::LoadLevelInstance(WorldContextObject, lvl.path, FVector(0, 0, lvl.Z), FRotator(), b, lvl.uniqName.ToString())) { + if (ULevelStreamingDynamic* newlvl = ULevelStreamingDynamic::LoadLevelInstance(WorldContextObject, lvl.path, FVector(0, 0, lvl.Z), FRotator(0), b, lvl.uniqName.ToString())) { newlvl->SetPriority(lvl.coords.flat == -1 ? 1 : 0); newlvl->bShouldBlockOnLoad = lvl.dontUnload; + cppCreatedList.Add(lvl.uniqName); cpploadedList.Add(lvl.uniqName); outStruct.Add(newlvl); }