Pārlūkot izejas kodu

Feature: C# 7.0 support
- Updated Mono to 5.4
- Updated glslang to most recent version
- Fixed a crash on editor startup
- Fixed a few warnings
- Updated search paths to match the new install path of SBGen

BearishSun 8 gadi atpakaļ
vecāks
revīzija
d2d96449c1

+ 1 - 1
Documentation/GitHub/features.md

@@ -110,7 +110,7 @@ All features listed here are the ones currently available (implemented). If you
 	* Collision filtering
 	* Discrete or continuous collision detection
 * __Scripting__
-  * C# 6.0
+  * C# 7.0
   * Separate high level engine API
   * Integrated runtime for maximum performance
   * Full access to .NET framework

+ 1 - 0
Documentation/MonoIntegrationGuide.txt

@@ -1,6 +1,7 @@
 ---------------------------------Compiling runtime-------------------------------------
  - Grab Mono 5.4 (or newer) source code
   - From tarball: https://download.mono-project.com/sources/mono/
+   - If on Windows, get the release from GitHub instead as tarballs don't seem to be configured for Windows builds
   - Optionally check it out from git repository: https://github.com/mono/mono
    - If on Windows, make sure your git client has this set: "git config --global core.autocrlf input" as otherwise you'll have problems with line endings during later steps
 

+ 1 - 0
Source/BansheeMono/BsMonoExec.cpp

@@ -1,6 +1,7 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2017 Marko Pintera ([email protected]). All rights reserved. **********************//
 #ifdef _WIN32
+	#define _CRT_SECURE_NO_WARNINGS 1
 	#include <direct.h>
 	#define getcwd _getcwd
 #else

+ 2 - 8
Source/BansheeUtility/Utility/BsAny.h

@@ -76,19 +76,13 @@ namespace bs
 		template <typename ValueType>
 		Any& operator= (const ValueType& rhs)
 		{
-			if(mData)
-				bs_delete(mData);
-
-			mData = bs_new<Data<ValueType>>(rhs);
+			Any(rhs).swap(*this);
 			return *this;
 		}
 
 		Any& operator= (const Any& rhs)
 		{
-			if(mData)
-				bs_delete(mData);
-
-			mData = rhs.mData != nullptr ? rhs.mData->clone() : nullptr;
+			Any(rhs).swap(*this);
 			return *this;
 		}
 

+ 0 - 6
Source/BansheeVulkanRenderAPI/CMakeLists.txt

@@ -14,12 +14,6 @@ set(BansheeVulkanRenderAPI_INC
 	"../BansheeCore"
 )
 
-if(WIN32)
-	set(BansheeVulkanRenderAPI_INC ${BansheeVulkanRenderAPI_INC} "Source/Win32")
-else()
-# TODO_OTHER_PLATFORMS_GO_HERE
-endif()	
-	
 include_directories(${BansheeVulkanRenderAPI_INC})	
 	
 # Target

+ 2 - 2
Source/CMake/Modules/FindBansheeSBGen.cmake

@@ -4,10 +4,10 @@
 #  BansheeSBGen_EXECUTABLE_PATH
 #  BansheeSBGen_FOUND
 
-set(BansheeSBGen_INSTALL_DIRS ${PROJECT_SOURCE_DIR}/../Dependencies/tools/BansheeSBGen CACHE PATH "")
+set(BansheeSBGen_INSTALL_DIRS ${PROJECT_SOURCE_DIR}/../Dependencies/tools/BansheeSBGen/bin CACHE PATH "")
 
 message(STATUS "Looking for BansheeSBGen installation...")
-find_program(BansheeSBGen_EXECUTABLE NAMES BansheeSBGen BansheeSBGen_v1.0.0 PATHS ${BansheeSBGen_INSTALL_DIRS})
+find_program(BansheeSBGen_EXECUTABLE NAMES BansheeSBGen PATHS ${BansheeSBGen_INSTALL_DIRS})
 
 if(BansheeSBGen_EXECUTABLE)
 	set(BansheeSBGen_FOUND TRUE)

+ 1 - 1
Source/CMakeLists.txt

@@ -5,7 +5,7 @@ project (Banshee)
 set (BS_VERSION_MAJOR 0)
 set (BS_VERSION_MINOR 4)
 
-set (BS_PREBUILT_DEPENDENCIES_VERSION 13)
+set (BS_PREBUILT_DEPENDENCIES_VERSION 14)
 set (BS_SRC_DEPENDENCIES_VERSION 15)
 set (BS_BUILTIN_ASSETS_VERSION 3)