TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #668 from Ragora/feature-turret-typemask

Browse source 
Feature: Implement a TurretObjectType bit for typemasks
This commit is contained in:
Brian Roberts 2021-11-20 23:32:15 -06:00 committed by GitHub
parent df4624e88a 227b1e3f51
commit 797020286b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/T3D/gameFunctions.cpp
View file

@ -668,6 +668,7 @@ static void RegisterGameFunctions()
// PATHSHAPE
Con::setIntVariable("$TypeMasks::PathShapeObjectType", PathShapeObjectType);
// PATHSHAPE END
Con::setIntVariable("$TypeMasks::TurretObjectType", TurretObjectType);
Con::addVariable("Ease::InOut", TypeS32, &gEaseInOut,
"InOut ease for curve movement.\n"

4
Engine/source/T3D/objectTypes.h
View file

@ -167,6 +167,10 @@ enum SceneObjectTypes
PathShapeObjectType = BIT( 28 ),
// PATHSHAPE END
/// A turret object.
/// @see TurretShape
TurretObjectType = BIT(29),
/// @}
};

2
Engine/source/T3D/turret/turretShape.cpp
View file

@ -257,7 +257,7 @@ ConsoleDocClass( TurretShape,
TurretShape::TurretShape()
{
mTypeMask |= VehicleObjectType | DynamicShapeObjectType;
mTypeMask |= VehicleObjectType | DynamicShapeObjectType | TurretObjectType;
mDataBlock = 0;
allowManualRotation = true;