TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-05 04:21:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #210 from Azaezel/alpha40_spotlightBoundsFix

Browse source 
adress #162 based on work by Chad Hall
This commit is contained in:
Brian Roberts 2020-06-20 05:29:47 -05:00 committed by GitHub
parent cc0d4f4d6b 0c0646a90c
commit f6cedc8043
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Engine/source/T3D/spotLight.cpp
View file

@ -134,9 +134,18 @@ void SpotLight::_conformLights()
// Update the bounds and scale to fit our spotlight.
F32 radius = mRange * mSin( mDegToRad( mOuterConeAngle ) * 0.5f );
mObjBox.minExtents.set( -1, 0, -1 );
mObjBox.maxExtents.set( 1, 1, 1 );
mObjScale.set( radius, mRange, radius );
Point3F objectScale(radius, mRange, radius);
Point3F objectBoxMin(-1, 0, -1);
if (mAnimationData && mAnimationData->mRot.keyLen > 0)
{
objectBoxMin.set(-1, -1, -1);
objectScale.set(mRange, mRange, mRange);
}
mObjBox.minExtents.set(objectBoxMin);
mObjBox.maxExtents.set(1, 1, 1);
mObjScale.set(objectScale);
// Skip our transform... it just dirties mask bits.
Parent::setTransform( mObjToWorld );

23
Templates/BaseGame/game/core/gameObjects/datablocks/defaultDatablocks.cs
View file

@ -146,3 +146,26 @@ datablock CameraData(Observer)
{
mode = "Observer";
};
datablock LightAnimData( NullLightAnim )
{
animEnabled = false;
};
datablock LightAnimData( PulseLightAnim )
{
brightnessA = 0;
brightnessZ = 1;
brightnessPeriod = 1;
brightnessKeys = "aza";
brightnessSmooth = true;
};
datablock LightAnimData( SpinLightAnim )
{
rotA[2] = "0";
rotZ[2] = "360";
rotPeriod[2] = "1";
rotKeys[2] = "az";
rotSmooth[2] = true;
};