From 79c6a25050be61eab99789e1bc52006d2bea973c Mon Sep 17 00:00:00 2001 From: Duion Date: Sun, 27 Dec 2015 00:39:52 +0100 Subject: [PATCH 1/2] 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/2] 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.