Merge remote-tracking branch 'origin/master' into linux-editor

2021-01-10 09:14:03 +01:00
parent efa5d05f5f d586f828b2
commit c7547b3a46
2436 changed files with 5156 additions and 31149 deletions
--- a/Source/Engine/Debug/Assert.cs
+++ b/Source/Engine/Debug/Assert.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;
 using System.Collections.Generic;
--- a/Source/Engine/Debug/AssertionException.cs
+++ b/Source/Engine/Debug/AssertionException.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Debug/Debug.Build.cs
+++ b/Source/Engine/Debug/Debug.Build.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System.Collections.Generic;
 using System.IO;
--- a/Source/Engine/Debug/DebugDraw.cpp
+++ b/Source/Engine/Debug/DebugDraw.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_DEBUG_DRAW

--- a/Source/Engine/Debug/DebugDraw.cs
+++ b/Source/Engine/Debug/DebugDraw.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 #if !FLAX_EDITOR
 using System;

--- a/Source/Engine/Debug/DebugDraw.h
+++ b/Source/Engine/Debug/DebugDraw.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/DebugLog.cpp
+++ b/Source/Engine/Debug/DebugLog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "DebugLog.h"
 #include "Engine/Core/Log.h"
--- a/Source/Engine/Debug/DebugLog.h
+++ b/Source/Engine/Debug/DebugLog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exception.cpp
+++ b/Source/Engine/Debug/Exception.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "Exception.h"

--- a/Source/Engine/Debug/Exception.h
+++ b/Source/Engine/Debug/Exception.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/ArgumentException.h
+++ b/Source/Engine/Debug/Exceptions/ArgumentException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/ArgumentNullException.h
+++ b/Source/Engine/Debug/Exceptions/ArgumentNullException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/ArgumentOutOfRangeException.h
+++ b/Source/Engine/Debug/Exceptions/ArgumentOutOfRangeException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/CLRInnerException.h
+++ b/Source/Engine/Debug/Exceptions/CLRInnerException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/DivideByZeroException.h
+++ b/Source/Engine/Debug/Exceptions/DivideByZeroException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/Exceptions.h
+++ b/Source/Engine/Debug/Exceptions/Exceptions.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/FileNotFoundException.h
+++ b/Source/Engine/Debug/Exceptions/FileNotFoundException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/IOException.h
+++ b/Source/Engine/Debug/Exceptions/IOException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/IndexOutOfRangeException.h
+++ b/Source/Engine/Debug/Exceptions/IndexOutOfRangeException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/InvalidOperationException.h
+++ b/Source/Engine/Debug/Exceptions/InvalidOperationException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/JsonParseException.h
+++ b/Source/Engine/Debug/Exceptions/JsonParseException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

@@ -23,8 +23,9 @@ namespace Log
        /// Init
        /// </summary>
        /// <param name="error">Parsing error code.</param>
-        JsonParseException(ErrorCode error)
-            : JsonParseException(error, String::Empty)
+        /// <param name="offset">Parsing error location.</param>
+        JsonParseException(ErrorCode error, size_t offset)
+            : JsonParseException(error, offset, String::Empty)
        {
        }

@@ -32,9 +33,10 @@ namespace Log
        /// Creates default exception with additional data
        /// </summary>
        /// <param name="error">Parsing error code.</param>
+        /// <param name="offset">Parsing error location.</param>
        /// <param name="additionalInfo">Additional information that help describe error</param>
-        JsonParseException(ErrorCode error, const String& additionalInfo)
-            : Exception(String::Format(TEXT("Parsing Json failed with error code {0}. {1}"), static_cast<int32>(error), GetParseError_En(error)), additionalInfo)
+        JsonParseException(ErrorCode error, size_t offset, const String& additionalInfo)
+            : Exception(String::Format(TEXT("Parsing Json failed with error code {0} (offset {2}). {1}"), static_cast<int32>(error), GetParseError_En(error), offset), additionalInfo)
        {
        }
    };
--- a/Source/Engine/Debug/Exceptions/NotImplementedException.h
+++ b/Source/Engine/Debug/Exceptions/NotImplementedException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/NotSupportedException.h
+++ b/Source/Engine/Debug/Exceptions/NotSupportedException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/OverflowException.h
+++ b/Source/Engine/Debug/Exceptions/OverflowException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/PathTooLongException.h
+++ b/Source/Engine/Debug/Exceptions/PathTooLongException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/PlatformNotSupportedException.h
+++ b/Source/Engine/Debug/Exceptions/PlatformNotSupportedException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/Exceptions/TimeoutException.h
+++ b/Source/Engine/Debug/Exceptions/TimeoutException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Debug/FloatComparer.cs
+++ b/Source/Engine/Debug/FloatComparer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;
 using System.Collections.Generic;