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

Fix building on linux after merge

Browse Source
This commit is contained in:
Wojtek Figat
2021-02-16 19:01:00 +01:00
parent fc4dc8cb50
commit 6fd1580d67
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Animations/AnimationUtils.h
View File

@@ -235,7 +235,7 @@ namespace AnimationUtils
}
template<>
static void BezierFirstDerivative<Quaternion>(const Quaternion& p0, const Quaternion& p1, const Quaternion& p2, const Quaternion& p3, float t, Quaternion& result)
void BezierFirstDerivative<Quaternion>(const Quaternion& p0, const Quaternion& p1, const Quaternion& p2, const Quaternion& p3, float t, Quaternion& result)
{
Vector3 euler;
BezierFirstDerivative<Vector3>(p0.GetEuler(), p1.GetEuler(), p2.GetEuler(), p3.GetEuler(), t, euler);
@@ -243,7 +243,7 @@ namespace AnimationUtils
}
template<>
static void BezierFirstDerivative<Transform>(const Transform& p0, const Transform& p1, const Transform& p2, const Transform& p3, float t, Transform& result)
void BezierFirstDerivative<Transform>(const Transform& p0, const Transform& p1, const Transform& p2, const Transform& p3, float t, Transform& result)
{
BezierFirstDerivative<Vector3>(p0.Translation, p1.Translation, p2.Translation, p3.Translation, t, result.Translation);
BezierFirstDerivative<Quaternion>(p0.Orientation, p1.Orientation, p2.Orientation, p3.Orientation, t, result.Orientation);

2
Source/Engine/Content/Assets/VisualScript.cpp
View File

@@ -1732,7 +1732,7 @@ void VisualScriptingBinaryModule::OnScriptsReloading()
#endif
void VisualScriptingBinaryModule::OnEvent(ScriptingObject* object, Span<Variant>& parameters, const ScriptingTypeHandle& eventType, const StringView& eventName)
void VisualScriptingBinaryModule::OnEvent(ScriptingObject* object, Span<Variant> parameters, ScriptingTypeHandle eventType, StringView eventName)
{
if (object)
{

2
Source/Engine/Content/Assets/VisualScript.h
View File

@@ -327,7 +327,7 @@ private:
#if USE_EDITOR
void OnScriptsReloading();
#endif
static void OnEvent(ScriptingObject* object, Span<Variant>& parameters, const ScriptingTypeHandle& eventType, const StringView& eventName);
static void OnEvent(ScriptingObject* object, Span<Variant> parameters, ScriptingTypeHandle eventType, StringView eventName);
public:

2
Source/Engine/Graphics/Materials/MaterialShaderFeatures.h
View File

@@ -13,7 +13,7 @@ struct MaterialShaderFeature
{
const Char* Template;
};
#endif;
#endif
};
// Material shader feature that add support for Forward shading inside the material shader.

2
Source/Engine/Scripting/BinaryModule.cpp
View File

@@ -17,7 +17,7 @@
#include "Events.h"
Dictionary<Pair<ScriptingTypeHandle, StringView>, void(*)(ScriptingObject*, void*, bool)> ScriptingEvents::EventsTable;
Delegate<ScriptingObject*, Span<Variant>&, const ScriptingTypeHandle&, const StringView&> ScriptingEvents::Event;
Delegate<ScriptingObject*, Span<Variant>, ScriptingTypeHandle, StringView> ScriptingEvents::Event;
ManagedBinaryModule* GetBinaryModuleCorlib()
{

2
Source/Engine/Scripting/Events.h
View File

@@ -32,5 +32,5 @@ public:
/// <remarks>
/// Delegate parameters: event caller instance (null for static events), event invocation parameters list, event type name (full), event name.
/// </remarks>
static Delegate<ScriptingObject*, Span<Variant>&, const ScriptingTypeHandle&, const StringView&> Event;
static Delegate<ScriptingObject*, Span<Variant>, ScriptingTypeHandle, StringView> Event;
};

2
Source/FlaxEngine.Gen.cs
View File

@@ -12,6 +12,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: Guid("095aaaed-cc57-6182-57cc-82617b3c2889")]
[assembly: Guid("b8442186-4a70-7c85-704a-857c262d00f6")]
[assembly: AssemblyVersion("1.0.6216")]
[assembly: AssemblyFileVersion("1.0.6216")]