From 79c6a25050be61eab99789e1bc52006d2bea973c Mon Sep 17 00:00:00 2001 From: Duion Date: Sun, 27 Dec 2015 00:39:52 +0100 Subject: [PATCH 1/4] multiplayer decals and art/core filepaths fixes --- Engine/source/T3D/decal/decalData.cpp | 1 + Engine/source/gfx/gfxTextureManager.cpp | 6 +++--- Engine/source/ts/tsShapeConstruct.cpp | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Engine/source/T3D/decal/decalData.cpp b/Engine/source/T3D/decal/decalData.cpp index 67436e991..e517d2897 100644 --- a/Engine/source/T3D/decal/decalData.cpp +++ b/Engine/source/T3D/decal/decalData.cpp @@ -284,6 +284,7 @@ void DecalData::unpackData( BitStream *stream ) Parent::unpackData( stream ); stream->read( &lookupName ); + assignName(lookupName); stream->read( &size ); stream->read( &materialName ); _updateMaterial(); diff --git a/Engine/source/gfx/gfxTextureManager.cpp b/Engine/source/gfx/gfxTextureManager.cpp index e367ed883..f86799c1d 100644 --- a/Engine/source/gfx/gfxTextureManager.cpp +++ b/Engine/source/gfx/gfxTextureManager.cpp @@ -42,9 +42,9 @@ using namespace Torque; S32 GFXTextureManager::smTextureReductionLevel = 0; -String GFXTextureManager::smMissingTexturePath("core/art/missingTexture"); -String GFXTextureManager::smUnavailableTexturePath("core/art/unavailable"); -String GFXTextureManager::smWarningTexturePath("core/art/warnmat"); +String GFXTextureManager::smMissingTexturePath("art/core/missingTexture"); +String GFXTextureManager::smUnavailableTexturePath("art/core/unavailable"); +String GFXTextureManager::smWarningTexturePath("art/core/warnMat"); GFXTextureManager::EventSignal GFXTextureManager::smEventSignal; diff --git a/Engine/source/ts/tsShapeConstruct.cpp b/Engine/source/ts/tsShapeConstruct.cpp index da93d9691..4877350ef 100644 --- a/Engine/source/ts/tsShapeConstruct.cpp +++ b/Engine/source/ts/tsShapeConstruct.cpp @@ -74,9 +74,9 @@ EndImplementEnumType; //----------------------------------------------------------------------------- -String TSShapeConstructor::smCapsuleShapePath("core/art/shapes/unit_capsule.dts"); -String TSShapeConstructor::smCubeShapePath("core/art/shapes/unit_cube.dts"); -String TSShapeConstructor::smSphereShapePath("core/art/shapes/unit_sphere.dts"); +String TSShapeConstructor::smCapsuleShapePath("art/core/shapes/unit_capsule.dts"); +String TSShapeConstructor::smCubeShapePath("art/core/shapes/unit_cube.dts"); +String TSShapeConstructor::smSphereShapePath("art/core/shapes/unit_sphere.dts"); ResourceRegisterPostLoadSignal< TSShape > TSShapeConstructor::_smAutoLoad( &TSShapeConstructor::_onTSShapeLoaded ); ResourceRegisterUnloadSignal< TSShape > TSShapeConstructor::_smAutoUnload( &TSShapeConstructor::_onTSShapeUnloaded ); From 03d6ca749bfdf0c38c52fd9ae96274e764cefb8f Mon Sep 17 00:00:00 2001 From: Duion Date: Tue, 12 Jan 2016 23:55:54 +0100 Subject: [PATCH 2/4] make crosshair show in third person --- Engine/source/T3D/fps/guiCrossHairHud.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engine/source/T3D/fps/guiCrossHairHud.cpp b/Engine/source/T3D/fps/guiCrossHairHud.cpp index a8cd3e1ba..fb1122b5e 100644 --- a/Engine/source/T3D/fps/guiCrossHairHud.cpp +++ b/Engine/source/T3D/fps/guiCrossHairHud.cpp @@ -118,7 +118,8 @@ void GuiCrossHairHud::onRender(Point2I offset, const RectI &updateRect) if (!conn) return; ShapeBase* control = dynamic_cast(conn->getControlObject()); - if (!control || !(control->getTypeMask() & ObjectMask) || !conn->isFirstPerson()) + //if (!control || !(control->getTypeMask() & ObjectMask) || !conn->isFirstPerson()) //original + if (!control || !(control->getTypeMask() & ObjectMask)) //Duion: Modified to show crosshair in third person return; // Parent render. From b37bbf2d059ac6c1785c45de1d60dfe82ecf0739 Mon Sep 17 00:00:00 2001 From: Duion Date: Wed, 13 Jan 2016 02:27:42 +0100 Subject: [PATCH 3/4] Dedicated server fixes I think --- .../source/platformSDL/menus/menuBarSDL.cpp | 20 +++++++------ Tools/CMake/modules/module_dedicated.cmake | 29 +++++++++++++++++++ Tools/CMake/torque3d.cmake | 1 - 3 files changed, 40 insertions(+), 10 deletions(-) create mode 100644 Tools/CMake/modules/module_dedicated.cmake diff --git a/Engine/source/platformSDL/menus/menuBarSDL.cpp b/Engine/source/platformSDL/menus/menuBarSDL.cpp index 211f7bb07..4ea5a4ddf 100644 --- a/Engine/source/platformSDL/menus/menuBarSDL.cpp +++ b/Engine/source/platformSDL/menus/menuBarSDL.cpp @@ -39,7 +39,7 @@ // class PlatformMenuBarData // { -// +// // }; Map PlatformPopupMenuData::mMenuMap; @@ -91,8 +91,8 @@ GuiPlatformGenericMenuBar* _FindMenuBarCtrl() GuiControl* control; Sim::findObject("PlatformGenericMenubar", control); AssertFatal(control, ""); - if( !control ) - return NULL; + if( !control ) + return NULL; GuiPlatformGenericMenuBar* menuBar; menuBar = dynamic_cast( control->findObjectByInternalName( StringTable->insert("menubar"), true) ); @@ -104,7 +104,7 @@ GuiPlatformGenericMenuBar* _FindMenuBarCtrl() void MenuBar::updateMenuBar(PopupMenu *popupMenu /* = NULL */) { //if(! isAttachedToCanvas()) - // return; + // return; if(!popupMenu) return; @@ -156,7 +156,7 @@ void MenuBar::attachToCanvas(GuiCanvas *owner, S32 pos) mCanvas = owner; PlatformWindowSDL *pWindow = dynamic_cast(owner->getPlatformWindow()); - if(pWindow == NULL) + if(pWindow == NULL) return; // Setup the native menu bar @@ -168,15 +168,15 @@ void MenuBar::attachToCanvas(GuiCanvas *owner, S32 pos) { pWindow->setMenuHandle( hWindowMenu ); GuiControl *base = hWindowMenu->getParent(); - + while( base->getParent() ) { base = base->getParent(); - } + } mCanvas->setMenuBar( base ); } - +#ifndef TORQUE_DEDICATED for (S32 i = 0; i < size(); ++i) { PopupMenu *mnu = dynamic_cast(at(i)); @@ -191,7 +191,7 @@ void MenuBar::attachToCanvas(GuiCanvas *owner, S32 pos) mnu->attachToMenuBar(owner, pos + i); } - +#endif } void MenuBar::removeFromCanvas() @@ -201,6 +201,7 @@ void MenuBar::removeFromCanvas() //_FindMenuBarCtrl()->clearMenus(); +#ifndef TORQUE_DEDICATED // Add the items for (S32 i = 0; i < size(); ++i) { @@ -215,6 +216,7 @@ void MenuBar::removeFromCanvas() } mCanvas->setMenuBar(NULL); +#endif mCanvas = NULL; } diff --git a/Tools/CMake/modules/module_dedicated.cmake b/Tools/CMake/modules/module_dedicated.cmake new file mode 100644 index 000000000..1c2a99d5f --- /dev/null +++ b/Tools/CMake/modules/module_dedicated.cmake @@ -0,0 +1,29 @@ +# ----------------------------------------------------------------------------- +# Copyright (c) 2014 GarageGames, LLC +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# ----------------------------------------------------------------------------- + +option(TORQUE_DEDICATED "Dedicated Server" OFF) +mark_as_advanced(TORQUE_DEDICATED) + +if(TORQUE_DEDICATED) + # Project defines + addDef( "TORQUE_DEDICATED" ) +endif() diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index 14d4873b1..341550e23 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -80,7 +80,6 @@ if(WIN32) #mark_as_advanced(TORQUE_OPENGL) else() set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac - option(TORQUE_DEDICATED "Torque dedicated" OFF) endif() ############################################################################### From 2fc35bad99ad4739952db2259a3d5df4e35a7333 Mon Sep 17 00:00:00 2001 From: Duion Date: Fri, 15 Jan 2016 02:30:02 +0100 Subject: [PATCH 4/4] version change to 1.0.4.0 --- Engine/source/app/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/source/app/version.h b/Engine/source/app/version.h index be118252e..5c7e82cff 100644 --- a/Engine/source/app/version.h +++ b/Engine/source/app/version.h @@ -42,10 +42,10 @@ /// code version, the game name, and which type of game it is (TGB, TGE, TGEA, etc.). /// /// Version number is major * 1000 + minor * 100 + revision * 10. -#define TORQUE_GAME_ENGINE 1030 +#define TORQUE_GAME_ENGINE 1040 /// Human readable engine version string. -#define TORQUE_GAME_ENGINE_VERSION_STRING "1.0.3.0" +#define TORQUE_GAME_ENGINE_VERSION_STRING "1.0.4.0" /// Gets the engine version number. The version number is specified as a global in version.cc U32 getVersionNumber();