GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix api error

Browse Source
This commit is contained in:
Wojtek Figat
2021-05-16 18:54:40 +02:00
parent 5e401b6a78
commit 9a617c630b
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Platform/Base/NetworkBase.cpp
View File

@@ -77,7 +77,7 @@ int32 NetworkBase::AddSocketToGroup(NetworkSocketGroup& group, NetworkSocket& so
return -1;
}
bool NetworkBase::GetSocketFromGroup(NetworkSocketGroup& group, uint32 index, NetworkSocket* socket)
bool NetworkBase::GetSocketFromGroup(NetworkSocketGroup& group, uint32 index, NetworkSocket& socket)
{
return true;
}

2
Source/Engine/Platform/Base/NetworkBase.h
View File

@@ -270,7 +270,7 @@ public:
/// <param name="index">The index.</param>
/// <param name="socket">The returned socket.</param>
/// <returns>Returns true on error, otherwise false.</returns>
API_FUNCTION() static bool GetSocketFromGroup(API_PARAM(Ref) NetworkSocketGroup& group, uint32 index, API_PARAM(Out) NetworkSocket* socket);
API_FUNCTION() static bool GetSocketFromGroup(API_PARAM(Ref) NetworkSocketGroup& group, uint32 index, API_PARAM(Out) NetworkSocket& socket);
/// <summary>
/// Removes the socket at the specified index.

12
Source/Engine/Platform/Win32/Win32Network.cpp
View File

@@ -339,21 +339,21 @@ int32 Win32Network::AddSocketToGroup(NetworkSocketGroup& group, NetworkSocket& s
return -1;
}
bool Win32Network::GetSocketFromGroup(NetworkSocketGroup& group, uint32 index, NetworkSocket* socket)
bool Win32Network::GetSocketFromGroup(NetworkSocketGroup& group, uint32 index, NetworkSocket& socket)
{
if (index >= group.Capacity)
return true;
SOCKET s = ((pollfd*)&group.Data[index * SOCKGROUP_ITEMSIZE])->fd;
memcpy(socket->Data, &s, sizeof(s));
memcpy(socket.Data, &s, sizeof(s));
int32 value;
if (GetSocketOption(*socket, NetworkSocketOption::Type, value))
if (GetSocketOption(socket, NetworkSocketOption::Type, value))
return true;
if (value == SOCK_DGRAM)
socket->Protocol = NetworkProtocol::Udp;
socket.Protocol = NetworkProtocol::Udp;
else if (value == SOCK_STREAM)
socket->Protocol = NetworkProtocol::Tcp;
socket.Protocol = NetworkProtocol::Tcp;
else
socket->Protocol = NetworkProtocol::Undefined;
socket.Protocol = NetworkProtocol::Undefined;
return false;
}

2
Source/Engine/Platform/Win32/Win32Network.h
View File

@@ -26,7 +26,7 @@ public:
static int32 Poll(NetworkSocketGroup& group);
static bool GetSocketState(NetworkSocketGroup& group, uint32 index, NetworkSocketState& state);
static int32 AddSocketToGroup(NetworkSocketGroup& group, NetworkSocket& socket);
static bool GetSocketFromGroup(NetworkSocketGroup& group, uint32 index, NetworkSocket* socket);
static bool GetSocketFromGroup(NetworkSocketGroup& group, uint32 index, NetworkSocket& socket);
static void RemoveSocketFromGroup(NetworkSocketGroup& group, uint32 index);
static bool RemoveSocketFromGroup(NetworkSocketGroup& group, NetworkSocket& socket);
static void ClearGroup(NetworkSocketGroup& group);

2
Source/Engine/Render2D/Render2D.cpp
View File

@@ -882,7 +882,7 @@ static uint32 ComputeBlurWeights(int32 kernelSize, float sigma, Vector4* outWeig
const uint32 numSamples = Math::DivideAndRoundUp((uint32)kernelSize, 2u);
outWeightsAndOffsets[0] = Vector4(Vector2(GetWeight(0, sigma), 0), GetWeightAndOffset(1, sigma));
uint32 sampleIndex = 1;
for (uint32 x = 3; x < kernelSize; x += 4)
for (int32 x = 3; x < kernelSize; x += 4)
{
outWeightsAndOffsets[sampleIndex] = Vector4(GetWeightAndOffset((float)x, sigma), GetWeightAndOffset((float)(x + 2), sigma));
sampleIndex++;

2
Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
View File

@@ -765,7 +765,7 @@ namespace Flax.Build.Bindings
GenerateCppWrapperManagedToNative(buildData, parameterInfo.Type, caller, out var managedType, functionInfo, out _);
contents.Append(managedType);
if (parameterInfo.IsRef || parameterInfo.IsOut)
if (parameterInfo.IsRef || parameterInfo.IsOut || UsePassByReference(buildData, parameterInfo.Type, caller))
contents.Append('*');
contents.Append(' ');
contents.Append(parameterInfo.Name);