This commit is contained in:
2024-08-08 17:24:06 +05:00
parent 89e40a0d4e
commit be1e8825c5
34 changed files with 230 additions and 6575 deletions
+1 -1
View File
@@ -29,7 +29,7 @@ SourceArt/**/*.tga
!Plugins/**
# Don't ignore icon files in Build
!Build/**/*.ico
!Build/*.ico
# Built data for maps
*_BuiltData.uasset
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large Load Diff
+160
View File
@@ -117,6 +117,10 @@
"Path": "$(EngineDir)/Binaries/Win64/Linux/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Binaries/Win64/NvmlWrapper.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/OpenColorIO_2_2.dll",
"Type": "DynamicLibrary"
@@ -305,6 +309,10 @@
"Path": "$(EngineDir)/Binaries/Win64/UnrealEditor-AudioSettingsEditor.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/UnrealEditor-AugmentedReality.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/UnrealEditor-AutomationController.dll",
"Type": "DynamicLibrary"
@@ -1705,6 +1713,10 @@
"Path": "$(EngineDir)/Binaries/Win64/UnrealEditor-WebBrowser.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/UnrealEditor-WebSockets.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/UnrealEditor-WidgetCarousel.dll",
"Type": "DynamicLibrary"
@@ -2265,6 +2277,50 @@
"Path": "$(EngineDir)/Plugins/Enterprise/VariantManager/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/AMFCodecs/Binaries/Win64/UnrealEditor-AMFCodecs.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/AMFCodecs/Binaries/Win64/UnrealEditor-AMFCodecsRHI.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/AMFCodecs/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/AVCodecsCore/Binaries/Win64/UnrealEditor-AVCodecsCore.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/AVCodecsCore/Binaries/Win64/UnrealEditor-AVCodecsCoreRHI.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/AVCodecsCore/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/NVCodecs/Binaries/Win64/UnrealEditor-NVCodecs.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/NVCodecs/Binaries/Win64/UnrealEditor-NVCodecsRHI.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/NVCodecs/Binaries/Win64/UnrealEditor-NVDEC.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/NVCodecs/Binaries/Win64/UnrealEditor-NVENC.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/NVCodecs/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AutomationUtils/Binaries/Win64/UnrealEditor-AutomationUtils.dll",
"Type": "DynamicLibrary"
@@ -2469,6 +2525,14 @@
"Path": "$(EngineDir)/Plugins/Experimental/ToolPresets/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/WebSocketNetworking/Binaries/Win64/UnrealEditor-WebSocketNetworking.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/WebSocketNetworking/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/FX/Niagara/Binaries/Win64/UnrealEditor-Niagara.dll",
"Type": "DynamicLibrary"
@@ -2861,6 +2925,50 @@
"Path": "$(EngineDir)/Plugins/Media/OpusDecoderElectra/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelCapture/Binaries/Win64/UnrealEditor-PixelCapture.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelCapture/Binaries/Win64/UnrealEditor-PixelCaptureShaders.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelCapture/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelStreaming/Binaries/Win64/UnrealEditor-PixelStreaming.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelStreaming/Binaries/Win64/UnrealEditor-PixelStreamingBlueprint.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelStreaming/Binaries/Win64/UnrealEditor-PixelStreamingBlueprintEditor.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelStreaming/Binaries/Win64/UnrealEditor-PixelStreamingEditor.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelStreaming/Binaries/Win64/UnrealEditor-PixelStreamingHMD.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelStreaming/Binaries/Win64/UnrealEditor-PixelStreamingInput.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelStreaming/Binaries/Win64/UnrealEditor-PixelStreamingServers.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelStreaming/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Media/WmfMedia/Binaries/Win64/UnrealEditor-WmfMedia.dll",
"Type": "DynamicLibrary"
@@ -3257,6 +3365,18 @@
"Path": "$(EngineDir)/Plugins/Runtime/WindowsMoviePlayer/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/XRBase/Binaries/Win64/UnrealEditor-XRBase.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/XRBase/Binaries/Win64/UnrealEditor-XRBaseEditor.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/XRBase/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Tests/InterchangeTests/Binaries/Win64/UnrealEditor-InterchangeTestEditor.dll",
"Type": "DynamicLibrary"
@@ -6003,10 +6123,18 @@
"Path": "$(EngineDir)/Binaries/ThirdParty/Python3/Win64/Lib/lib2to3/Grammar.txt",
"Type": "NonUFS"
},
{
"Path": "$(EngineDir)/Binaries/ThirdParty/Python3/Win64/Lib/lib2to3/Grammar3.9.7.final.0.pickle",
"Type": "NonUFS"
},
{
"Path": "$(EngineDir)/Binaries/ThirdParty/Python3/Win64/Lib/lib2to3/PatternGrammar.txt",
"Type": "NonUFS"
},
{
"Path": "$(EngineDir)/Binaries/ThirdParty/Python3/Win64/Lib/lib2to3/PatternGrammar3.9.7.final.0.pickle",
"Type": "NonUFS"
},
{
"Path": "$(EngineDir)/Binaries/ThirdParty/Python3/Win64/Lib/lib2to3/__init__.py",
"Type": "NonUFS"
@@ -20071,6 +20199,10 @@
"Path": "$(EngineDir)/Binaries/Win64/EpicWebHelper.exe",
"Type": "NonUFS"
},
{
"Path": "$(EngineDir)/Binaries/Win64/NvmlWrapper.dll",
"Type": "NonUFS"
},
{
"Path": "$(EngineDir)/Binaries/Win64/OpenColorIO_2_2.dll",
"Type": "NonUFS"
@@ -23055,6 +23187,18 @@
"Path": "$(EngineDir)/Plugins/Enterprise/VariantManager/VariantManager.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/AMFCodecs/AMFCodecs.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/AVCodecsCore/AVCodecsCore.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AVCodecs/NVCodecs/NVCodecs.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/AutomationUtils/AutomationUtils.uplugin",
"Type": "UFS"
@@ -23119,6 +23263,10 @@
"Path": "$(EngineDir)/Plugins/Experimental/ToolPresets/ToolPresets.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/WebSocketNetworking/WebSocketNetworking.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/FX/Niagara/Niagara.uplugin",
"Type": "UFS"
@@ -23247,6 +23395,14 @@
"Path": "$(EngineDir)/Plugins/Media/OpusDecoderElectra/OpusDecoderElectra.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelCapture/PixelCapture.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelStreaming/PixelStreaming.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Media/WmfMedia/WmfMedia.uplugin",
"Type": "UFS"
@@ -23379,6 +23535,10 @@
"Path": "$(EngineDir)/Plugins/Runtime/WindowsMoviePlayer/WindowsMoviePlayer.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/XRBase/XRBase.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Tests/InterchangeTests/InterchangeTests.uplugin",
"Type": "UFS"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -2,6 +2,6 @@
"BuildId": "27405482",
"Modules":
{
"MasharovDev": "UnrealEditor-MasharovDev-0313.dll"
"MasharovDev": "UnrealEditor-MasharovDev.dll"
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+4
View File
@@ -396,6 +396,10 @@
{
"Name": "ElectraPlayer",
"Enabled": true
},
{
"Name": "PixelStreaming",
"Enabled": true
}
],
"TargetPlatforms": [
+44 -27
View File
@@ -140,36 +140,53 @@ sendCommand(socket, cmd);*/
#pragma pack(pop)
class CSocket {
char* ipAddr_;
u_short port_;
class CSocket {
char* ipAddr_;
u_short port_;
private:
int clientSocket;
struct sockaddr_in serverAddress;
int cnn;
public:
CSocket(char* ipAddr, u_short port) {
ipAddr_ = ipAddr;
port_ = port;
public:
CSocket(char* ipAddr, u_short port) {
ipAddr_ = ipAddr;
port_ = port;
}
void write(const char* buffer, size_t size) {
int clientSocket = socket(AF_INET, SOCK_STREAM, 0);
if (clientSocket == -1) {
std::cerr << "Error creating socket" << std::endl;
return;
}
struct sockaddr_in serverAddress;
serverAddress.sin_family = AF_INET;
serverAddress.sin_port = htons(port_); // Порт сервера
serverAddress.sin_addr.s_addr = inet_addr(ipAddr_); // IP адрес сервера
}
~CSocket() {
closesocket(clientSocket);
WSACleanup();
}
void write(const char* buffer, size_t size) {
if (connect(clientSocket, (struct sockaddr*)&serverAddress, sizeof(serverAddress)) == -1) {
std::cerr << "Error connecting to server" << std::endl;
return;
}
while (true) {
if (send(clientSocket, buffer, size, 0) == -1) {
std::cerr << "Error sending message" << std::endl;
return;
}
UE_LOG(LogTemp, Warning, TEXT("Error sending message"));
closesocket(clientSocket);
closesocket(clientSocket);
clientSocket = socket(AF_INET, SOCK_STREAM, 0);
if (clientSocket == -1) {
UE_LOG(LogTemp, Warning, TEXT("cant create socket"));
return;
}
serverAddress.sin_family = AF_INET;
serverAddress.sin_port = htons(port_); // Порт сервера
serverAddress.sin_addr.s_addr = inet_addr(ipAddr_); // IP адрес сервера
cnn = connect(clientSocket, (struct sockaddr*)&serverAddress, sizeof(serverAddress));
UE_LOG(LogTemp, Warning, TEXT("connect with code %d"), cnn);
if (cnn == -1) {
UE_LOG(LogTemp, Warning, TEXT("Error connecting to server"));
return;
}
}
else break;
}
};
//closesocket(clientSocket);
}
};
+16
View File
@@ -10,6 +10,7 @@
CSocket* soc;
char ipc[100];
/*for working tarray::Contains*/
bool operator==(const Fcppcoords& c1, const Fcppcoords& c2) {
return c1.flat == c2.flat &&
@@ -207,3 +208,18 @@ void UcppGI::setPartState(uint8 part, uint8 state)
}
void UcppGI::sendBytes(TArray<uint8> bytes)
{/*
if (!soc)return;
char ass=1;
//UIntToChar(bytes[0], &ass);
soc->write(reinterpret_cast<const char*>(&ass), sizeof(ass));*/
}
void UcppGI::Shutdown()
{
delete soc;
Super::Shutdown();
return;
}
+3 -1
View File
@@ -115,8 +115,10 @@ public:
*1 — Включить часть, в ручном режиме(часть работает в статическом режиме, день ночь на ней, не меняется)
*2 — Включить часть, в автоматическом режиме(часть работает в режиме смены дня и ночи)*/
UFUNCTION(blueprintcallable, Category = "maketConnection")
void setPartState(uint8 part, uint8 state);
UFUNCTION(blueprintcallable, Category = "maketConnection")
void sendBytes(TArray< uint8> bytes);
virtual void Shutdown() override;
};
Binary file not shown.

After

Width:  |  Height:  |  Size: 494 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 435 KiB

+1 -1
View File
@@ -1,2 +1,2 @@
ip=192.168.1.131
ip=127.0.0.1
port=1201
Binary file not shown.