diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 7dcf909f..59a1c1b1 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -67,4 +67,5 @@ bSkipMovies=False +IniKeyBlacklist=IniSectionBlacklist +DirectoriesToAlwaysCook=(Path="/Game/Blueprints/UI/Imgs/photos") +DirectoriesToAlwaysCook=(Path="/Game/AssetPacks/CarMoveSpline/Meshes") ++DirectoriesToAlwaysStageAsNonUFS=(Path="script") diff --git a/Config/DefaultLightmass.ini b/Config/DefaultLightmass.ini index 60a23e87..33c60b6c 100644 --- a/Config/DefaultLightmass.ini +++ b/Config/DefaultLightmass.ini @@ -1,4 +1,4 @@ [DevOptions.GPULightmass] NumPrimaryGISamples=64 -NumSecondaryGISamples=32 +NumSecondaryGISamples=16 FireflyClampingThreshold=1000.0 diff --git a/Content/AssetPacks/NaturePackage/Materials/BaseMaterial/Flora_back.uasset b/Content/AssetPacks/NaturePackage/Materials/BaseMaterial/Flora_back.uasset new file mode 100644 index 00000000..3014a97c Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Materials/BaseMaterial/Flora_back.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Materials/BaseMaterial/Flora_twoSides.uasset b/Content/AssetPacks/NaturePackage/Materials/BaseMaterial/Flora_twoSides.uasset new file mode 100644 index 00000000..57254e23 Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Materials/BaseMaterial/Flora_twoSides.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Materials/BaseMaterial/bese_material.uasset b/Content/AssetPacks/NaturePackage/Materials/BaseMaterial/bese_material.uasset new file mode 100644 index 00000000..1ed3d2cb Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Materials/BaseMaterial/bese_material.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Materials/flora/Flora_twoSides_Inst.uasset b/Content/AssetPacks/NaturePackage/Materials/flora/Flora_twoSides_Inst.uasset new file mode 100644 index 00000000..13de84a4 Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Materials/flora/Flora_twoSides_Inst.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Materials/flora/RTree2.uasset b/Content/AssetPacks/NaturePackage/Materials/flora/RTree2.uasset new file mode 100644 index 00000000..05cf5139 Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Materials/flora/RTree2.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Materials/flora/tree_bark.uasset b/Content/AssetPacks/NaturePackage/Materials/flora/tree_bark.uasset new file mode 100644 index 00000000..e90eeb8d Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Materials/flora/tree_bark.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Meshes/RescaledFlora/Tree07_2.uasset b/Content/AssetPacks/NaturePackage/Meshes/RescaledFlora/Tree07_2.uasset new file mode 100644 index 00000000..1b36cd5c Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Meshes/RescaledFlora/Tree07_2.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Meshes/RescaledFlora/Tree07_2_FoliageType.uasset b/Content/AssetPacks/NaturePackage/Meshes/RescaledFlora/Tree07_2_FoliageType.uasset new file mode 100644 index 00000000..4fe86e77 Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Meshes/RescaledFlora/Tree07_2_FoliageType.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Meshes/RescaledFlora/Tree08.uasset b/Content/AssetPacks/NaturePackage/Meshes/RescaledFlora/Tree08.uasset new file mode 100644 index 00000000..0dd8dd12 Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Meshes/RescaledFlora/Tree08.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Meshes/RescaledFlora/Tree08_FoliageType.uasset b/Content/AssetPacks/NaturePackage/Meshes/RescaledFlora/Tree08_FoliageType.uasset new file mode 100644 index 00000000..90d62896 Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Meshes/RescaledFlora/Tree08_FoliageType.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Textures/BaseTexture/Mask1.uasset b/Content/AssetPacks/NaturePackage/Textures/BaseTexture/Mask1.uasset new file mode 100644 index 00000000..90d311c5 Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Textures/BaseTexture/Mask1.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Textures/BaseTexture/base_flat_n.uasset b/Content/AssetPacks/NaturePackage/Textures/BaseTexture/base_flat_n.uasset new file mode 100644 index 00000000..a8338467 Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Textures/BaseTexture/base_flat_n.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Textures/BaseTexture/base_gray_d.uasset b/Content/AssetPacks/NaturePackage/Textures/BaseTexture/base_gray_d.uasset new file mode 100644 index 00000000..84e82432 Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Textures/BaseTexture/base_gray_d.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Textures/BaseTexture/base_white_d.uasset b/Content/AssetPacks/NaturePackage/Textures/BaseTexture/base_white_d.uasset new file mode 100644 index 00000000..76868f7b Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Textures/BaseTexture/base_white_d.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Textures/BaseTexture/gradient_D.uasset b/Content/AssetPacks/NaturePackage/Textures/BaseTexture/gradient_D.uasset new file mode 100644 index 00000000..28ac9605 Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Textures/BaseTexture/gradient_D.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Textures/flora/RTrees2_D.uasset b/Content/AssetPacks/NaturePackage/Textures/flora/RTrees2_D.uasset new file mode 100644 index 00000000..854171d5 Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Textures/flora/RTrees2_D.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Textures/flora/TreeBark_D.uasset b/Content/AssetPacks/NaturePackage/Textures/flora/TreeBark_D.uasset new file mode 100644 index 00000000..288082dd Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Textures/flora/TreeBark_D.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Textures/flora/TreeBark_N.uasset b/Content/AssetPacks/NaturePackage/Textures/flora/TreeBark_N.uasset new file mode 100644 index 00000000..30dece41 Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Textures/flora/TreeBark_N.uasset differ diff --git a/Content/AssetPacks/NaturePackage/Textures/flora/TreeBranch2_D.uasset b/Content/AssetPacks/NaturePackage/Textures/flora/TreeBranch2_D.uasset new file mode 100644 index 00000000..04acbfea Binary files /dev/null and b/Content/AssetPacks/NaturePackage/Textures/flora/TreeBranch2_D.uasset differ diff --git a/Content/Blueprints/BPSChunk.uasset b/Content/Blueprints/BPSChunk.uasset index 0ae04a9a..09ebf5f9 100644 Binary files a/Content/Blueprints/BPSChunk.uasset and b/Content/Blueprints/BPSChunk.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index 8164bd09..1e81cd94 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/GameplayFunctions.uasset b/Content/Blueprints/Player/GameplayFunctions.uasset index dfb9024a..42153ef7 100644 Binary files a/Content/Blueprints/Player/GameplayFunctions.uasset and b/Content/Blueprints/Player/GameplayFunctions.uasset differ diff --git a/Content/Blueprints/Player/MathAndConvertFns.uasset b/Content/Blueprints/Player/MathAndConvertFns.uasset index f5d0518a..9fc98f8c 100644 Binary files a/Content/Blueprints/Player/MathAndConvertFns.uasset and b/Content/Blueprints/Player/MathAndConvertFns.uasset differ diff --git a/Content/Blueprints/Player/MyPC.uasset b/Content/Blueprints/Player/MyPC.uasset index 9a40e421..e376f664 100644 Binary files a/Content/Blueprints/Player/MyPC.uasset and b/Content/Blueprints/Player/MyPC.uasset differ diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index 024f08b2..8358dc2f 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/Player/WalkingPawn.uasset b/Content/Blueprints/Player/WalkingPawn.uasset index aa7e9767..eeea62ce 100644 Binary files a/Content/Blueprints/Player/WalkingPawn.uasset and b/Content/Blueprints/Player/WalkingPawn.uasset differ diff --git a/Content/Blueprints/Player/getFunctions.uasset b/Content/Blueprints/Player/getFunctions.uasset index 4e911443..717a74bc 100644 Binary files a/Content/Blueprints/Player/getFunctions.uasset and b/Content/Blueprints/Player/getFunctions.uasset differ diff --git a/Content/Blueprints/UI/Actors/KPmaker.uasset b/Content/Blueprints/UI/Actors/KPmaker.uasset index 66e4c424..7832ad83 100644 Binary files a/Content/Blueprints/UI/Actors/KPmaker.uasset and b/Content/Blueprints/UI/Actors/KPmaker.uasset differ diff --git a/Content/Blueprints/UI/Actors/MOPpoint.uasset b/Content/Blueprints/UI/Actors/MOPpoint.uasset new file mode 100644 index 00000000..94fab6b1 Binary files /dev/null and b/Content/Blueprints/UI/Actors/MOPpoint.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_1/0.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/0.uasset new file mode 100644 index 00000000..cb881c7b Binary files /dev/null and b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/0.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_1/14.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/14.uasset index 54245638..3d6ea85c 100644 Binary files a/Content/Blueprints/UI/Imgs/FlatPlans/section_1/14.uasset and b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/14.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_1/15.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/15.uasset new file mode 100644 index 00000000..e50c1f20 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/15.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_1/16.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/16.uasset new file mode 100644 index 00000000..41ba2249 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/16.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_1/17.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/17.uasset new file mode 100644 index 00000000..45a27c32 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/17.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_1/18.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/18.uasset new file mode 100644 index 00000000..3332cf24 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/18.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_1/19.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/19.uasset new file mode 100644 index 00000000..85b83965 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/19.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_1/20.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/20.uasset new file mode 100644 index 00000000..80cc938e Binary files /dev/null and b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/20.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_1/21.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/21.uasset new file mode 100644 index 00000000..56b1dac7 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/21.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_1/22.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/22.uasset new file mode 100644 index 00000000..29f3e959 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/FlatPlans/section_1/22.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_2/0.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_2/0.uasset new file mode 100644 index 00000000..e44ace3b Binary files /dev/null and b/Content/Blueprints/UI/Imgs/FlatPlans/section_2/0.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_2/11.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_2/11.uasset index 4fb73858..df0cd726 100644 Binary files a/Content/Blueprints/UI/Imgs/FlatPlans/section_2/11.uasset and b/Content/Blueprints/UI/Imgs/FlatPlans/section_2/11.uasset differ diff --git a/Content/Blueprints/UI/Imgs/FlatPlans/section_2/12.uasset b/Content/Blueprints/UI/Imgs/FlatPlans/section_2/12.uasset new file mode 100644 index 00000000..3f265f03 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/FlatPlans/section_2/12.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow.uasset b/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow.uasset index 575f10a7..2bea0189 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow.uasset and b/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow_Airport.uasset b/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow_Airport.uasset index f68b7a07..b4ff1cc9 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow_Airport.uasset and b/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow_Airport.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow_Center_Base.uasset b/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow_Center_Base.uasset index 8894c305..472838ff 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow_Center_Base.uasset and b/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow_Center_Base.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow_Center_Base_n.uasset b/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow_Center_Base_n.uasset index 957c4fd9..18c2a0c7 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow_Center_Base_n.uasset and b/Content/Blueprints/UI/Imgs/newInterface/elements/Arrow_Center_Base_n.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/icons/Airport.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/Airport.uasset index b41a4f1f..c481819e 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/icons/Airport.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/Airport.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/icons/Bus.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/Bus.uasset index 3906c8d3..fcb2f050 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/icons/Bus.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/Bus.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/icons/Center.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/Center.uasset index 3e0decfd..ea614dab 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/icons/Center.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/Center.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/icons/Park.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/Park.uasset index ab8f5c6e..0d8cd07a 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/icons/Park.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/Park.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/icons/Shop.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/Shop.uasset index d32cf44e..eb8eedd0 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/icons/Shop.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/Shop.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/icons/price_icon.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/price_icon.uasset index de8b077c..11d8f721 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/icons/price_icon.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/price_icon.uasset differ diff --git a/Content/Blueprints/UI/Others/FlatData.uasset b/Content/Blueprints/UI/Others/FlatData.uasset index c9b46994..4ae85ed4 100644 Binary files a/Content/Blueprints/UI/Others/FlatData.uasset and b/Content/Blueprints/UI/Others/FlatData.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/FlatInfo.uasset b/Content/Blueprints/UI/WBPS/Menu/FlatInfo.uasset index b9279b55..9c1be82e 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/FlatInfo.uasset and b/Content/Blueprints/UI/WBPS/Menu/FlatInfo.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset index e3cebf30..64e79a3d 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset and b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MenuBtn.uasset b/Content/Blueprints/UI/WBPS/Menu/MenuBtn.uasset index 7bce61c2..b46b639f 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/MenuBtn.uasset and b/Content/Blueprints/UI/WBPS/Menu/MenuBtn.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/settings.uasset b/Content/Blueprints/UI/WBPS/Menu/settings.uasset index 25b321fe..043286d2 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/settings.uasset and b/Content/Blueprints/UI/WBPS/Menu/settings.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Pointers/FlatPointer.uasset b/Content/Blueprints/UI/WBPS/Pointers/FlatPointer.uasset index 739eb16e..3d7fb128 100644 Binary files a/Content/Blueprints/UI/WBPS/Pointers/FlatPointer.uasset and b/Content/Blueprints/UI/WBPS/Pointers/FlatPointer.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Pointers/MOPpointer.uasset b/Content/Blueprints/UI/WBPS/Pointers/MOPpointer.uasset new file mode 100644 index 00000000..c557bdbf Binary files /dev/null and b/Content/Blueprints/UI/WBPS/Pointers/MOPpointer.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset b/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset index a85934ad..9b05f423 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset and b/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset differ diff --git a/Content/Instances/Fabric/MI_Fabric_4.uasset b/Content/Instances/Fabric/MI_Fabric_4.uasset index e876c9e8..4d9be8d7 100644 Binary files a/Content/Instances/Fabric/MI_Fabric_4.uasset and b/Content/Instances/Fabric/MI_Fabric_4.uasset differ diff --git a/Content/Maps/DayLightStatic.umap b/Content/Maps/DayLightStatic.umap index c3878227..50883210 100644 Binary files a/Content/Maps/DayLightStatic.umap and b/Content/Maps/DayLightStatic.umap differ diff --git a/Content/Maps/MainScene.umap b/Content/Maps/MainScene.umap index 6a35f8cf..12a35a60 100644 Binary files a/Content/Maps/MainScene.umap and b/Content/Maps/MainScene.umap differ diff --git a/Content/Maps/People.umap b/Content/Maps/People.umap index c2ae682a..97c49c0e 100644 Binary files a/Content/Maps/People.umap and b/Content/Maps/People.umap differ diff --git a/Content/Maps/S01/S01F03.umap b/Content/Maps/S01/S01F03.umap index a1baa0c0..4b3d3e06 100644 Binary files a/Content/Maps/S01/S01F03.umap and b/Content/Maps/S01/S01F03.umap differ diff --git a/Content/Maps/S01/S01F03Refl.umap b/Content/Maps/S01/S01F03Refl.umap index 05746d92..d92ad6ec 100644 Binary files a/Content/Maps/S01/S01F03Refl.umap and b/Content/Maps/S01/S01F03Refl.umap differ diff --git a/Content/Maps/S01/S01F14.umap b/Content/Maps/S01/S01F14.umap index 07963079..5804d633 100644 Binary files a/Content/Maps/S01/S01F14.umap and b/Content/Maps/S01/S01F14.umap differ diff --git a/Content/Maps/S01/S01F15.umap b/Content/Maps/S01/S01F15.umap index 7d4aefe8..4a6aac96 100644 Binary files a/Content/Maps/S01/S01F15.umap and b/Content/Maps/S01/S01F15.umap differ diff --git a/Content/Maps/S02/S02F03.umap b/Content/Maps/S02/S02F03.umap index fef274e2..1bd83397 100644 Binary files a/Content/Maps/S02/S02F03.umap and b/Content/Maps/S02/S02F03.umap differ diff --git a/Content/Maps/S02/S02F03Refl.umap b/Content/Maps/S02/S02F03Refl.umap index 6c24aea8..d4c2439b 100644 Binary files a/Content/Maps/S02/S02F03Refl.umap and b/Content/Maps/S02/S02F03Refl.umap differ diff --git a/Content/Maps/S02/S02F04.umap b/Content/Maps/S02/S02F04.umap index 1c36d02f..ca02fc79 100644 Binary files a/Content/Maps/S02/S02F04.umap and b/Content/Maps/S02/S02F04.umap differ diff --git a/Content/Maps/S02/S02F05.umap b/Content/Maps/S02/S02F05.umap index 5f2c9e52..a478ede3 100644 Binary files a/Content/Maps/S02/S02F05.umap and b/Content/Maps/S02/S02F05.umap differ diff --git a/Content/Maps/S02/S02F07.umap b/Content/Maps/S02/S02F07.umap index bf936738..c1654056 100644 Binary files a/Content/Maps/S02/S02F07.umap and b/Content/Maps/S02/S02F07.umap differ diff --git a/Content/Maps/S02/S02F20.umap b/Content/Maps/S02/S02F20.umap index 46769c10..b67c0087 100644 Binary files a/Content/Maps/S02/S02F20.umap and b/Content/Maps/S02/S02F20.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03.umap b/Content/Maps/S04/S04F03/S04F03.umap index 785b087a..398cac06 100644 Binary files a/Content/Maps/S04/S04F03/S04F03.umap and b/Content/Maps/S04/S04F03/S04F03.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03A01.umap b/Content/Maps/S04/S04F03/S04F03A01.umap index aa2ade72..1065690a 100644 Binary files a/Content/Maps/S04/S04F03/S04F03A01.umap and b/Content/Maps/S04/S04F03/S04F03A01.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03A02.umap b/Content/Maps/S04/S04F03/S04F03A02.umap index 6d80e739..0a9dcbaf 100644 Binary files a/Content/Maps/S04/S04F03/S04F03A02.umap and b/Content/Maps/S04/S04F03/S04F03A02.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03A03.umap b/Content/Maps/S04/S04F03/S04F03A03.umap index 2f5fa9b0..da62f775 100644 Binary files a/Content/Maps/S04/S04F03/S04F03A03.umap and b/Content/Maps/S04/S04F03/S04F03A03.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03A04.umap b/Content/Maps/S04/S04F03/S04F03A04.umap index 2f0d777f..615b44fa 100644 Binary files a/Content/Maps/S04/S04F03/S04F03A04.umap and b/Content/Maps/S04/S04F03/S04F03A04.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03A05.umap b/Content/Maps/S04/S04F03/S04F03A05.umap index 761371ff..44a82d61 100644 Binary files a/Content/Maps/S04/S04F03/S04F03A05.umap and b/Content/Maps/S04/S04F03/S04F03A05.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03Refl.umap b/Content/Maps/S04/S04F03/S04F03Refl.umap index bf2d1559..fbd755bf 100644 Binary files a/Content/Maps/S04/S04F03/S04F03Refl.umap and b/Content/Maps/S04/S04F03/S04F03Refl.umap differ diff --git a/Content/Maps/Yard.umap b/Content/Maps/Yard.umap index 6025317f..ad76bc2c 100644 Binary files a/Content/Maps/Yard.umap and b/Content/Maps/Yard.umap differ diff --git a/Content/Maps/printer.umap b/Content/Maps/printer.umap index 4d598260..4f423229 100644 Binary files a/Content/Maps/printer.umap and b/Content/Maps/printer.umap differ diff --git a/Content/Materials/M_Fabric.uasset b/Content/Materials/M_Fabric.uasset index 547823b2..f6621b73 100644 Binary files a/Content/Materials/M_Fabric.uasset and b/Content/Materials/M_Fabric.uasset differ diff --git a/Content/script/SendMesage.py b/Content/script/SendMesage.py index 76eb811f..19cdfc7e 100644 --- a/Content/script/SendMesage.py +++ b/Content/script/SendMesage.py @@ -87,7 +87,7 @@ def attach_file(msg, filepath): # Функция п # Использование функции send_email() -addr_to = "andronchik92@gmail.com" # Получатель +#addr_to = "andronchik92@gmail.com" # Получатель files = [] files = [filefold] # Список файлов, если вложений нет, то files=[] diff --git a/Content/script/print.ps1 b/Content/script/print.ps1 deleted file mode 100644 index 0b4b9dcb..00000000 --- a/Content/script/print.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -Add-Type @" - using System; - using System.Runtime.InteropServices; - public class Util { - [DllImport("user32.dll")] - public static extern IntPtr GetForegroundWindow(); -} -"@ -$wshell = New-Object -ComObject wscript.shell; -foreach($i in $args){ - -$app = Start-Process -FilePath $i -passThru -Verb Print -start-sleep -m 200 -$wshell.AppActivate($app.Id) -#start-sleep -m 200 -$wshell.SendKeys('{ENTER}') -#Wait-Process -InputObject $app -#start-sleep -m 200 -} -sleep 10 -exit - diff --git a/Onejsky4U.uproject b/Onejsky4U.uproject index 4aa05df7..2be76d32 100644 --- a/Onejsky4U.uproject +++ b/Onejsky4U.uproject @@ -291,6 +291,10 @@ "Name": "CompactEmailService", "Enabled": true, "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/03a3cb2d7be4479085c8529fb2613887" + }, + { + "Name": "JPrinter", + "Enabled": true } ] } \ No newline at end of file diff --git a/Plugins/JPrinter/JPrinter.uplugin b/Plugins/JPrinter/JPrinter.uplugin new file mode 100644 index 00000000..dd3deaeb --- /dev/null +++ b/Plugins/JPrinter/JPrinter.uplugin @@ -0,0 +1,24 @@ +{ + "FileVersion": 3, + "Version": 1, + "VersionName": "1.0", + "FriendlyName": "JPrinter", + "Description": "Now you can print picture from unreal direcly!, you print from file or even print a texture, only for windows, soon mac ox", + "Category": "Hardware", + "CreatedBy": "ZKarmaKun", + "CreatedByURL": "", + "DocsURL": "", + "MarketplaceURL": "", + "SupportURL": "", + "EnabledByDefault": false, + "CanContainContent": false, + "IsBetaVersion": false, + "Installed": false, + "Modules": [ + { + "Name": "JPrinter", + "Type": "Runtime", + "LoadingPhase": "Default" + } + ] +} \ No newline at end of file diff --git a/Plugins/JPrinter/Resources/Icon128.png b/Plugins/JPrinter/Resources/Icon128.png new file mode 100644 index 00000000..1228ddbd Binary files /dev/null and b/Plugins/JPrinter/Resources/Icon128.png differ diff --git a/Plugins/JPrinter/Source/JPrinter/JPrinter.Build.cs b/Plugins/JPrinter/Source/JPrinter/JPrinter.Build.cs new file mode 100644 index 00000000..7f4696f4 --- /dev/null +++ b/Plugins/JPrinter/Source/JPrinter/JPrinter.Build.cs @@ -0,0 +1,69 @@ +// Some copyright should be here... + +using UnrealBuildTool; +using System.IO; + +public class JPrinter : ModuleRules +{ + public JPrinter(ReadOnlyTargetRules Target): base( Target ) + { + + PublicIncludePaths.AddRange( + new string[] { + "JPrinter/Public" + + // ... add public include paths required here ... + } + ); + + + PrivateIncludePaths.AddRange( + new string[] { + "JPrinter/Private", + + // ... add other private include paths required here ... + } + ); + + + PublicDependencyModuleNames.AddRange( + new string[] + { + "Core", + + // ... add other public dependencies that you statically link with here ... + } + ); + + + PrivateDependencyModuleNames.AddRange( + new string[] + { + "CoreUObject", + "Engine", + "Slate", + "SlateCore", + "ImageWrapper", + // ... add private dependencies that you statically link with here ... + } + ); + + + DynamicallyLoadedModuleNames.AddRange( + new string[] + { + // ... add any modules that your module loads dynamically here ... + } + ); + + //string ModulePath = Path.GetDirectoryName(RulesCompiler.GetModuleFilename(this.GetType().Name)); + /* + string ThirdParty = Path.GetFullPath(Path.Combine(ModuleDirectory, "../../ThirdParty/")); + + string IncludePaths = Path.Combine(ThirdParty, "opencv", "include"); + string LibPath = Path.Combine(ThirdParty, "opencv", "lib"); + PublicIncludePaths.Add(IncludePaths); + PublicAdditionalLibraries.Add(LibPath + "/opencv_world300.lib"); + PublicAdditionalLibraries.Add(LibPath + "/opencv_ts300.lib");*/ + } +} diff --git a/Plugins/JPrinter/Source/JPrinter/Private/JPrinter.cpp b/Plugins/JPrinter/Source/JPrinter/Private/JPrinter.cpp new file mode 100644 index 00000000..a4a3ebd2 --- /dev/null +++ b/Plugins/JPrinter/Source/JPrinter/Private/JPrinter.cpp @@ -0,0 +1,22 @@ +// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved. + +#include "JPrinterPrivatePCH.h" + +#define LOCTEXT_NAMESPACE "FJPrinterModule" + +void FJPrinterModule::StartupModule() +{ + // This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module + +} + +void FJPrinterModule::ShutdownModule() +{ + // This function may be called during shutdown to clean up your module. For modules that support dynamic reloading, + // we call this function before unloading the module. + +} + +#undef LOCTEXT_NAMESPACE + +IMPLEMENT_MODULE(FJPrinterModule, JPrinter) \ No newline at end of file diff --git a/Plugins/JPrinter/Source/JPrinter/Private/JPrinterBPLibrary.cpp b/Plugins/JPrinter/Source/JPrinter/Private/JPrinterBPLibrary.cpp new file mode 100644 index 00000000..a8129ce5 --- /dev/null +++ b/Plugins/JPrinter/Source/JPrinter/Private/JPrinterBPLibrary.cpp @@ -0,0 +1,266 @@ +// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved. + +#include "JPrinterPrivatePCH.h" +#include "JPrinterBPLibrary.h" +#define print(txt) GEngine->AddOnScreenDebugMessage(-1,10,FColor::Green, txt) +DEFINE_LOG_CATEGORY_STATIC(JPrinterLog, Log, All); + +UJPrinterBPLibrary::UJPrinterBPLibrary(const FObjectInitializer& ObjectInitializer) +: Super(ObjectInitializer) +{ + +} + +TArray UJPrinterBPLibrary::getPrinterList() +{ + TArray out; +#if PLATFORM_WINDOWS + LPBYTE pPrinterEnum; + unsigned long pcbNeeded, pcbReturned; + PRINTER_INFO_2* printerInfo = NULL; + EnumPrinters(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &pcbNeeded, &pcbReturned); + + pPrinterEnum = new BYTE[pcbNeeded]; + if (EnumPrinters(PRINTER_ENUM_LOCAL, NULL, 2, pPrinterEnum, pcbNeeded, &pcbNeeded, &pcbReturned)) + { + printerInfo = ((PRINTER_INFO_2*)pPrinterEnum); + for (unsigned short i = 0; i < pcbReturned; i++) + { + TCHAR* wname = printerInfo[i].pPrinterName; + FString name = wname; + out.Add(name); + } + } +#endif + return out; +} + +FString UJPrinterBPLibrary::getPrimaryPrinterName() +{ + FString out; +#if PLATFORM_WINDOWS + unsigned long size = 0; + GetDefaultPrinter(NULL, &size); + if (size) + { + TCHAR* buffer = new TCHAR[size]; + GetDefaultPrinter(buffer, &size); + out = buffer; + } +#endif + return out; +} + +#if PLATFORM_WINDOWS +printerInfo UJPrinterBPLibrary::getPrinterInfo(FString printer, bool usePrimary) +{ + printerInfo out; + unsigned long size = 0; + LPWSTR defaultName = NULL; + GetDefaultPrinter(NULL, &size); + if (size) + { + TCHAR* buffer = new TCHAR[size]; + GetDefaultPrinter(buffer, &size); + defaultName = buffer; + } + + if (defaultName) + { + out.deviceName = defaultName; + LPBYTE pPrinterEnum; + unsigned long pcbNeeded, pcbReturned; + PRINTER_INFO_2* printerInfo = NULL; + EnumPrinters(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &pcbNeeded, &pcbReturned); + + pPrinterEnum = new BYTE[pcbNeeded]; + if (EnumPrinters(PRINTER_ENUM_LOCAL, NULL, 2, pPrinterEnum, pcbNeeded, &pcbNeeded, &pcbReturned)) + { + printerInfo = ((PRINTER_INFO_2*)pPrinterEnum); + std::wstring wsdefaultName(defaultName); + std::string sdefaultName(wsdefaultName.begin(), wsdefaultName.end()); + + for (unsigned int i = 0; i < pcbReturned; i++) + { + LPWSTR name = printerInfo[i].pPrinterName; + std::wstring wsname(name); + std::string sname(wsname.begin(), wsname.end()); + if (usePrimary) + { + if (sname == sdefaultName) + { + out.driver = printerInfo[i].pDriverName; + out.portName = printerInfo[i].pPortName; + } + } + else + { + std::string choosen(TCHAR_TO_ANSI(*printer)); + if (sname == choosen) + { + out.driver = printerInfo[i].pDriverName; + out.portName = printerInfo[i].pPortName; + } + } + + } + } + } + return out; +} + +HBITMAP UJPrinterBPLibrary::getHBITMAPFromData(TArray& bgraData, int32 width, int32 height, int32 bitDepth) +{ + if (bgraData.Num() <= 0) return NULL; + + uint8* rgb = new uint8[width * height * 3]; + for (int i = 0; i < (width * height); i++) + { + rgb[3 * i + 0] = bgraData[i].B; + rgb[3 * i + 1] = bgraData[i].G; + rgb[3 * i + 2] = bgraData[i].R; + } + // Create DIB + HBITMAP hbmp = CreateBitmap(width, height, 1, 24, rgb); + if (hbmp == NULL) { + delete rgb; + return hbmp; + } + delete rgb; + return hbmp; +} +#endif + +FString UJPrinterBPLibrary::Replace(FString source, FString in, FString out) +{ + TArray ar = source.GetCharArray(); + FString result; + for (int i = 0; i < ar.Num(); i++) + { + if (ar[i] != in[0]) + { + result += ar[i]; + } + else + { + result += out; + } + } + return result; +} + +bool UJPrinterBPLibrary::printImage(FString path, FString printer, bool usePrimary) +{ + if (!FPaths::FileExists(path)) { + UE_LOG(JPrinterLog, Log, TEXT("%s"), *path) + return false; + } + + if (usePrimary) + { + printer = getPrimaryPrinterName(); + } + + path = "\"" + path + "\""; + path = Replace(path, "/", "\\"); + FString args = " c:\\WINDOWS\\system32\\shimgvw.dll,ImageView_PrintTo /pt " + path + " \"" + printer + "\""; + FString prg = "rundll32"; + UE_LOG(JPrinterLog, Log, TEXT("%s%s"), *prg,*args); + int error=33; //= WinExec(TCHAR_TO_ANSI(*fullPath), SW_SHOW); + FPlatformProcess::CreateProc( + *prg, + *args, + false,//* @param bLaunchDetached if true, the new process will have its own window + false,//* @param bLaunchHidded if true, the new process will be minimized in the task bar + false,//* @param bLaunchReallyHidden if true, the new process will not have a window or be in the task bar + 0, + 0, + nullptr,//const TCHAR* OptionalWorkingDirectory, + nullptr + ); + return (error == 33) ? true : false; +} + +bool UJPrinterBPLibrary::printTexture2D(UTexture2D* texture, FString printer, bool usePrimary, EPaperSize paperSize) +{ + if (!texture) return false; + + //const double DPIConvertion = 142.0643729189789; + //const float DPIConvertion = 142.0643729189789f; + const float DPIConvertion = 142.06437f; + + bool out = false; + int32 width = texture->GetSizeX(); + int32 height = texture->GetSizeY(); + int32 bitDepth = 24; + TArray colorData; + colorData.Init(FColor(), width * height); + FTexture2DMipMap& Mip = texture->PlatformData->Mips[0]; + uint8* Data = (uint8*)Mip.BulkData.Lock(LOCK_READ_WRITE); + + for (int i = 0; i < colorData.Num(); i++) + { + colorData[i].R = Data[4 * i + 2]; + colorData[i].G = Data[4 * i + 1]; + colorData[i].B = Data[4 * i + 0]; + colorData[i].A = 255; + } + + Mip.BulkData.Unlock(); + texture->UpdateResource(); + + if (paperSize != EPaperSize::None) + { + + float scale = 1; + switch (paperSize) + { + case EPaperSize::letter: + if (width == 2969) break; + scale = FMath::FloorToFloat((2969.f / width) * 100) / 100.f; + break; + case EPaperSize::photo: + if (width == 1373) break; + scale = FMath::FloorToFloat((1373.f / width) * 1000) / 1000.f; + break; + default: + break; + } + + if (scale != 1) + { + TArray fixColorData; + FImageUtils::ImageResize(width, height, colorData, width * scale, height * scale, fixColorData, true); + width = width * scale; + height = height * scale; + colorData = fixColorData; + } + + } + +#if PLATFORM_WINDOWS + HWND currentWindow = GetActiveWindow(); + printerInfo dev = getPrinterInfo(printer, usePrimary); + + HBITMAP hBMP = getHBITMAPFromData(colorData, width, height, bitDepth); + //HBITMAP hBMP = (HBITMAP)LoadImage(NULL, L"D:/gokuHQ.bmp", IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); + HDC printerHDC = CreateDC(dev.driver, dev.deviceName, dev.portName, NULL); + if (printerHDC) + { + HDC hdc = CreateCompatibleDC(printerHDC); + SelectObject(hdc, hBMP); + Escape(printerHDC, STARTDOC, 8, "Happy-Doc", NULL); + BitBlt(printerHDC, 0, 0, width, height, hdc, 0, 0, SRCCOPY2); + Escape(printerHDC, NEWFRAME, 0, NULL, NULL); + Escape(printerHDC, ENDDOC, 0, NULL, NULL); + + UE_LOG(JPrinterLog,Log, TEXT("Printing... wPX=%i hPX=%i"), width, height); + + DeleteDC(printerHDC); + out = true; + } + +#endif + + return out; +} diff --git a/Plugins/JPrinter/Source/JPrinter/Private/JPrinterPrivatePCH.h b/Plugins/JPrinter/Source/JPrinter/Private/JPrinterPrivatePCH.h new file mode 100644 index 00000000..e3704763 --- /dev/null +++ b/Plugins/JPrinter/Source/JPrinter/Private/JPrinterPrivatePCH.h @@ -0,0 +1,6 @@ +// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved. + +#include "JPrinter.h" + +// You should place include statements to your module's private header files here. You only need to +// add includes for headers that are used in most of your module's source files though. \ No newline at end of file diff --git a/Plugins/JPrinter/Source/JPrinter/Public/JPrinter.h b/Plugins/JPrinter/Source/JPrinter/Public/JPrinter.h new file mode 100644 index 00000000..92ae5ce4 --- /dev/null +++ b/Plugins/JPrinter/Source/JPrinter/Public/JPrinter.h @@ -0,0 +1,14 @@ +// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved. + +#pragma once + +#include "Modules/ModuleManager.h" + +class FJPrinterModule : public IModuleInterface +{ +public: + + /** IModuleInterface implementation */ + virtual void StartupModule() override; + virtual void ShutdownModule() override; +}; \ No newline at end of file diff --git a/Plugins/JPrinter/Source/JPrinter/Public/JPrinterBPLibrary.h b/Plugins/JPrinter/Source/JPrinter/Public/JPrinterBPLibrary.h new file mode 100644 index 00000000..418a9fc8 --- /dev/null +++ b/Plugins/JPrinter/Source/JPrinter/Public/JPrinterBPLibrary.h @@ -0,0 +1,69 @@ +// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved. + +#pragma once +#if PLATFORM_WINDOWS +#include "Windows/AllowWindowsPlatformTypes.h" +#include "Windows.h" +#include "winspool.h" +#include "iostream" +#include "time.h" +#include "fstream" +#include "string" +#include "Windows/HideWindowsPlatformTypes.h" +#endif +#include "Engine.h" +#include "ImageUtils.h" + +//opencv +//#include "opencv/cv.hpp" + +#include "JPrinterBPLibrary.generated.h" + +//using namespace cv; + +#if PLATFORM_WINDOWS +struct printerInfo +{ + LPCWSTR portName; + LPCWSTR driver; + LPCWSTR deviceName; + LPCWSTR output = NULL; +}; +#define SRCCOPY2 (unsigned long)0x00CC0020 +#endif + +UENUM(BlueprintType) +enum class EPaperSize : uint8 +{ + None UMETA(DisplayName = "None"), + letter UMETA(DisplayName = "Letter 8 1/2 x 11 in"), + photo UMETA(DisplayName = "Photo 4 x 6 in"), +}; + +UCLASS() +class UJPrinterBPLibrary : public UBlueprintFunctionLibrary +{ + GENERATED_UCLASS_BODY() + +public: + UFUNCTION(BlueprintPure, Category = JPrinter) + static TArray getPrinterList(); + + UFUNCTION(BlueprintPure, Category = JPrinter) + static FString getPrimaryPrinterName(); + + UFUNCTION(BlueprintCallable, Category = JPrinter) + static bool printImage(FString path, FString printer, bool usePrimary = true); + + UFUNCTION(BlueprintCallable, Category = JPrinter) + static bool printTexture2D(UTexture2D* texture, FString printer, bool usePrimary, EPaperSize paperSize = EPaperSize::None); + + + static FString Replace(FString source, FString in, FString out); + +#if PLATFORM_WINDOWS + static printerInfo getPrinterInfo(FString printer, bool usePrimary); + static HBITMAP getHBITMAPFromData(TArray& bgraData, int32 width, int32 height, int32 bitDepth); +#endif + +}; diff --git a/Source/Onejsky4U/Onejsky4UGameModeBase.cpp b/Source/Onejsky4U/Onejsky4UGameModeBase.cpp index 51935325..70935cd6 100644 --- a/Source/Onejsky4U/Onejsky4UGameModeBase.cpp +++ b/Source/Onejsky4U/Onejsky4UGameModeBase.cpp @@ -148,7 +148,6 @@ void AOnejsky4UGameModeBase::createProc(FString FullPathOfProgramToRun, TArray