Merge branch 'master' of http://192.168.1.163:3000/Dron/Onejsky4U

Запек всё кроме верхних этажей, они один хер недоступны. сделал принтер, в общем всё кроме правок интерфейса и окон

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")
 

Config/DefaultLightmass.ini

@@ -1,4 +1,4 @@
 [DevOptions.GPULightmass]
 NumPrimaryGISamples=64
-NumSecondaryGISamples=32
+NumSecondaryGISamples=16
 FireflyClampingThreshold=1000.0

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=[]

Content/script/print.ps1

@@ -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
-

Onejsky4U.uproject

@@ -291,6 +291,10 @@
 			"Name": "CompactEmailService",
 			"Enabled": true,
 			"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/03a3cb2d7be4479085c8529fb2613887"
+		},
+		{
+			"Name": "JPrinter",
+			"Enabled": true
 		}
 	]
 }

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"
+		}
+	]
+}

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");*/
+    }
+}

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)

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<FString> UJPrinterBPLibrary::getPrinterList()
+{
+	TArray<FString> 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<FColor>& 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<TCHAR> 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<FColor> 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<FColor> 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;
+}

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.

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;
+};

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<FString> 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<FColor>& bgraData, int32 width, int32 height, int32 bitDepth);
+#endif
+
+};

Source/Onejsky4U/Onejsky4UGameModeBase.cpp

@@ -148,7 +148,6 @@ void AOnejsky4UGameModeBase::createProc(FString FullPathOfProgramToRun, TArray<F
 	{
 		Args = CommandlineArgs[0];
 	}
-	UE_LOG(LogTemp, Warning, TEXT("%s"), *Args)
 
 	//uint32 NeedBPUINT32 = 0;
 	FPlatformProcess::CreateProc(