TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1984 from FooBarbarians/fix-1912

Browse source 
Reordering initialization methods #1912
This commit is contained in:
Areloch 2017-04-26 01:11:51 -05:00 • committed by GitHub
commit 19dcfde60f
70 changed files with 207 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/environment/meshRoad.cpp
View file

@ -608,8 +608,8 @@ IMPLEMENT_CO_NETOBJECT_V1(MeshRoad);
MeshRoad::MeshRoad()
: mTextureLength( 5.0f ),
mBreakAngle( 3.0f ),
mPhysicsRep( NULL ),
mWidthSubdivisions( 0 )
mWidthSubdivisions( 0 ),
mPhysicsRep( NULL )
{
mConvexList = new Convex;
@ -2453,4 +2453,4 @@ DefineEngineMethod( MeshRoad, postApply, void, (),,
)
{
object->inspectPostApply();
}
}

10
Engine/source/environment/timeOfDay.cpp
View file

@ -61,14 +61,14 @@ ConsoleDocClass( TimeOfDay,
);
TimeOfDay::TimeOfDay()
: mElevation( 0.0f ),
mAzimuth( 0.0f ),
mAxisTilt( 23.44f ), // 35 degree tilt
: mStartTimeOfDay( 0.5f ), // High noon
mDayLen( 120.0f ), // 2 minutes
mStartTimeOfDay( 0.5f ), // High noon
mAxisTilt( 23.44f ), // 35 degree tilt
mAzimuth( 0.0f ),
mElevation( 0.0f ),
mTimeOfDay( 0.0f ), // initialized to StartTimeOfDay in onAdd
mPlay( true ),
mDayScale( 1.0f ),
mPlay( true ),
mNightScale( 1.5f ),
mAnimateTime( 0.0f ),
mAnimateSpeed( 0.0f ),

12
Engine/source/environment/waterObject.cpp
View file

@ -196,15 +196,15 @@ WaterObject::WaterObject()
mUndulateMaxDist(50.0f),
mMiscParamW( 0.0f ),
mUnderwaterPostFx( NULL ),
mBasicLighting( false ),
mOverallWaveMagnitude( 1.0f ),
mOverallRippleMagnitude( 0.1f ),
mCubemap( NULL ),
mSoundAmbience( NULL ),
mOverallWaveMagnitude( 1.0f ),
mBasicLighting( false ),
mSpecularPower( 48.0f ),
mSoundAmbience( NULL ),
mCubemap( NULL ),
mSpecularColor( 1.0f, 1.0f, 1.0f, 1.0f ),
mDepthGradientMax( 50.0f ),
mEmissive( false )
mEmissive( false ),
mDepthGradientMax( 50.0f )
{
mTypeMask = WaterObjectType;