TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2240 from GarageGames/Release_3_10_1

Browse source 
Release 3.10.1
This commit is contained in:
Areloch 2018-04-05 01:09:16 -05:00 • committed by GitHub
commit ff03c78fcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 44 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/console/engineFunctions.h
View file

@ -108,7 +108,17 @@ private:
std::tie(std::get<I + (sizeof...(ArgTs) - sizeof...(TailTs))>(args)...) = defaultArgs; std::tie(std::get<I + (sizeof...(ArgTs) - sizeof...(TailTs))>(args)...) = defaultArgs;
} }
#ifdef _MSC_VER == 1910
template<typename ...TailTs>
struct DodgyVCHelper
{
using type = typename std::enable_if<sizeof...(TailTs) <= sizeof...(ArgTs), decltype(mArgs)>::type;
};
template<typename ...TailTs> using MaybeSelfEnabled = typename DodgyVCHelper<TailTs...>::type;
#else
template<typename ...TailTs> using MaybeSelfEnabled = typename std::enable_if<sizeof...(TailTs) <= sizeof...(ArgTs), decltype(mArgs)>::type; template<typename ...TailTs> using MaybeSelfEnabled = typename std::enable_if<sizeof...(TailTs) <= sizeof...(ArgTs), decltype(mArgs)>::type;
#endif
template<typename ...TailTs> static MaybeSelfEnabled<TailTs...> tailInit(TailTs ...tail) { template<typename ...TailTs> static MaybeSelfEnabled<TailTs...> tailInit(TailTs ...tail) {
std::tuple<DefVST<ArgTs>...> argsT; std::tuple<DefVST<ArgTs>...> argsT;

9
Engine/source/environment/VolumetricFog.cpp
View file

@ -142,7 +142,7 @@ VolumetricFog::VolumetricFog()
VolumetricFog::~VolumetricFog() VolumetricFog::~VolumetricFog()
{ {
if (isClientObject()) if (!isClientObject())
return; return;
for (S32 i = 0; i < det_size.size(); i++) for (S32 i = 0; i < det_size.size(); i++)
@ -152,12 +152,11 @@ VolumetricFog::~VolumetricFog()
if (det_size[i].piArray != NULL) if (det_size[i].piArray != NULL)
delete(det_size[i].piArray); delete(det_size[i].piArray);
if (det_size[i].verts != NULL) if (det_size[i].verts != NULL)
delete(det_size[i].verts); delete [] (det_size[i].verts);
} }
det_size.clear(); det_size.clear();
if (z_buf.isValid()) z_buf = NULL;
SAFE_DELETE(z_buf);
if (!mTexture.isNull()) if (!mTexture.isNull())
mTexture.free(); mTexture.free();
@ -365,7 +364,7 @@ bool VolumetricFog::LoadShape()
if (det_size[i].piArray != NULL) if (det_size[i].piArray != NULL)
delete(det_size[i].piArray); delete(det_size[i].piArray);
if (det_size[i].verts != NULL) if (det_size[i].verts != NULL)
delete(det_size[i].verts); delete [] (det_size[i].verts);
} }
det_size.clear(); det_size.clear();

2
Engine/source/platform/platformNet.cpp
View file

@ -1706,7 +1706,7 @@ Net::Error Net::send(NetSocket handleFd, const U8 *buffer, S32 bufferSize, S32 *
if (outBytesWritten) if (outBytesWritten)
{ {
*outBytesWritten = outBytesWritten < 0 ? 0 : bytesWritten; *outBytesWritten = *outBytesWritten < 0 ? 0 : bytesWritten;
} }
return PlatformNetState::getLastError(); return PlatformNetState::getLastError();

24
Engine/source/windowManager/sdl/sdlSplashScreen.cpp
View file

@ -103,10 +103,26 @@ bool Platform::displaySplashWindow( String path )
bool Platform::closeSplashWindow() bool Platform::closeSplashWindow()
{ {
SDL_DestroyTexture(gSplashTexture); if (gSplashTexture != nullptr)
SDL_FreeSurface(gSplashImage); {
SDL_DestroyRenderer(gSplashRenderer); SDL_DestroyTexture(gSplashTexture);
SDL_DestroyWindow(gSplashWindow); gSplashTexture = nullptr;
}
if (gSplashImage != nullptr)
{
SDL_FreeSurface(gSplashImage);
gSplashImage = nullptr;
}
if (gSplashRenderer != nullptr)
{
SDL_DestroyRenderer(gSplashRenderer);
gSplashRenderer = nullptr;
}
if (gSplashWindow != nullptr)
{
SDL_DestroyWindow(gSplashWindow);
gSplashWindow = nullptr;
}
return true; return true;
} }

4
Engine/source/windowManager/win32/win32WindowMgr.cpp
View file

@ -89,7 +89,7 @@ Point2I Win32WindowManager::getDesktopResolution()
dMemset( &devMode, 0, sizeof( devMode ) ); dMemset( &devMode, 0, sizeof( devMode ) );
devMode.dmSize = sizeof( devMode ); devMode.dmSize = sizeof( devMode );
if (!::EnumDisplaySettings(NULL, ENUM_REGISTRY_SETTINGS, &devMode)) if (!::EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devMode))
return Point2I(-1,-1); return Point2I(-1,-1);
// Return Resolution // Return Resolution
@ -102,7 +102,7 @@ S32 Win32WindowManager::getDesktopBitDepth()
dMemset( &devMode, 0, sizeof( devMode ) ); dMemset( &devMode, 0, sizeof( devMode ) );
devMode.dmSize = sizeof( devMode ); devMode.dmSize = sizeof( devMode );
if (!::EnumDisplaySettings(NULL, ENUM_REGISTRY_SETTINGS, &devMode)) if (!::EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devMode))
return -1; return -1;
// Return Bits per Pixel // Return Bits per Pixel

2
Templates/Empty/game/tools/forestEditor/forestEditorGui.cs
View file

@ -50,7 +50,7 @@ function ForestEditorGui::onActiveForestUpdated( %this, %forest, %createNew )
/// Called from a message box when a forest is not found. /// Called from a message box when a forest is not found.
function ForestEditorGui::createForest( %this ) function ForestEditorGui::createForest( %this )
{ {
%forestObject = parseMissionGroupForIds("Forest", ""); %forestObject = trim(parseMissionGroupForIds("Forest", ""));
if ( isObject( %forestObject ) ) if ( isObject( %forestObject ) )
{ {

4
Templates/Empty/game/tools/forestEditor/main.cs
View file

@ -143,7 +143,7 @@ function ForestEditorPlugin::onActivated( %this )
//ForestEditToolbar.setVisible( true ); //ForestEditToolbar.setVisible( true );
//Get our existing forest object in our current mission if we have one //Get our existing forest object in our current mission if we have one
%forestObject = parseMissionGroupForIds("Forest", ""); %forestObject = trim(parseMissionGroupForIds("Forest", ""));
if(isObject(%forestObject)) if(isObject(%forestObject))
{ {
ForestEditorGui.setActiveForest(%forestObject.getName()); ForestEditorGui.setActiveForest(%forestObject.getName());
@ -241,7 +241,7 @@ function ForestEditorPlugin::onSaveMission( %this, %missionFile )
ForestDataManager.saveDirty(); ForestDataManager.saveDirty();
//First, find out if we have an existing forest object //First, find out if we have an existing forest object
%forestObject = parseMissionGroupForIds("Forest", ""); %forestObject = trim(parseMissionGroupForIds("Forest", ""));
if ( isObject( %forestObject ) ) if ( isObject( %forestObject ) )
{ {

2
Templates/Full/game/tools/forestEditor/forestEditorGui.cs
View file

@ -50,7 +50,7 @@ function ForestEditorGui::onActiveForestUpdated( %this, %forest, %createNew )
/// Called from a message box when a forest is not found. /// Called from a message box when a forest is not found.
function ForestEditorGui::createForest( %this ) function ForestEditorGui::createForest( %this )
{ {
%forestObject = parseMissionGroupForIds("Forest", ""); %forestObject = trim(parseMissionGroupForIds("Forest", ""));
if ( isObject( %forestObject ) ) if ( isObject( %forestObject ) )
{ {

4
Templates/Full/game/tools/forestEditor/main.cs
View file

@ -143,7 +143,7 @@ function ForestEditorPlugin::onActivated( %this )
//ForestEditToolbar.setVisible( true ); //ForestEditToolbar.setVisible( true );
//Get our existing forest object in our current mission if we have one //Get our existing forest object in our current mission if we have one
%forestObject = parseMissionGroupForIds("Forest", ""); %forestObject = trim(parseMissionGroupForIds("Forest", ""));
if(isObject(%forestObject)) if(isObject(%forestObject))
{ {
ForestEditorGui.setActiveForest(%forestObject.getName()); ForestEditorGui.setActiveForest(%forestObject.getName());
@ -241,7 +241,7 @@ function ForestEditorPlugin::onSaveMission( %this, %missionFile )
ForestDataManager.saveDirty(); ForestDataManager.saveDirty();
//First, find out if we have an existing forest object //First, find out if we have an existing forest object
%forestObject = parseMissionGroupForIds("Forest", ""); %forestObject = trim(parseMissionGroupForIds("Forest", ""));
if ( isObject( %forestObject ) ) if ( isObject( %forestObject ) )
{ {

2
Tools/CMake/torque3d.cmake
View file

@ -497,7 +497,7 @@ if(TORQUE_SDL)
set(SDL_SHARED ON CACHE BOOL "Build a shared version of the library" FORCE) set(SDL_SHARED ON CACHE BOOL "Build a shared version of the library" FORCE)
set(SDL_STATIC OFF CACHE BOOL "Build a static version of the library" FORCE) set(SDL_STATIC OFF CACHE BOOL "Build a static version of the library" FORCE)
endif() endif()
add_subdirectory( ${libDir}/sdl ${CMAKE_CURRENT_BINARY_DIR}/sdl2) add_subdirectory( ${libDir}/sdl ${CMAKE_CURRENT_BINARY_DIR}/sdl2 EXCLUDE_FROM_ALL)
link_directories( ${libDir}/sdl ${CMAKE_CURRENT_BINARY_DIR}/sdl2) link_directories( ${libDir}/sdl ${CMAKE_CURRENT_BINARY_DIR}/sdl2)
endif() endif()