mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 07:04:36 +00:00
Merge pull request #1984 from FooBarbarians/fix-1912
Reordering initialization methods #1912
This commit is contained in:
commit
19dcfde60f
70 changed files with 207 additions and 205 deletions
|
|
@ -880,8 +880,8 @@ IMPLEMENT_CALLBACK( ShapeBase, validateCameraFov, F32, (F32 fov), (fov),
|
||||||
ShapeBase::ShapeBase()
|
ShapeBase::ShapeBase()
|
||||||
: mDataBlock( NULL ),
|
: mDataBlock( NULL ),
|
||||||
mIsAiControlled( false ),
|
mIsAiControlled( false ),
|
||||||
mAiPose( 0 ),
|
|
||||||
mControllingObject( NULL ),
|
mControllingObject( NULL ),
|
||||||
|
mAiPose( 0 ),
|
||||||
mMoveMotion( false ),
|
mMoveMotion( false ),
|
||||||
mShapeBaseMount( NULL ),
|
mShapeBaseMount( NULL ),
|
||||||
mShapeInstance( NULL ),
|
mShapeInstance( NULL ),
|
||||||
|
|
|
||||||
|
|
@ -54,8 +54,8 @@ StringTableEntry assetPrivateField = StringTable->insert("AssetPrivate");
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
AssetBase::AssetBase() :
|
AssetBase::AssetBase() :
|
||||||
mAcquireReferenceCount(0),
|
|
||||||
mpOwningAssetManager(NULL),
|
mpOwningAssetManager(NULL),
|
||||||
|
mAcquireReferenceCount(0),
|
||||||
mAssetInitialized(false)
|
mAssetInitialized(false)
|
||||||
{
|
{
|
||||||
// Generate an asset definition.
|
// Generate an asset definition.
|
||||||
|
|
|
||||||
|
|
@ -73,9 +73,9 @@ AssetManager::AssetManager() :
|
||||||
mLoadedPrivateAssetsCount( 0 ),
|
mLoadedPrivateAssetsCount( 0 ),
|
||||||
mMaxLoadedInternalAssetsCount( 0 ),
|
mMaxLoadedInternalAssetsCount( 0 ),
|
||||||
mMaxLoadedExternalAssetsCount( 0 ),
|
mMaxLoadedExternalAssetsCount( 0 ),
|
||||||
mMaxLoadedPrivateAssetsCount( 0 ),
|
|
||||||
mAcquiredReferenceCount( 0 ),
|
|
||||||
mEchoInfo( false ),
|
mEchoInfo( false ),
|
||||||
|
mAcquiredReferenceCount( 0 ),
|
||||||
|
mMaxLoadedPrivateAssetsCount( 0 ),
|
||||||
mIgnoreAutoUnload( true )
|
mIgnoreAutoUnload( true )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -122,8 +122,8 @@ S32 QSORT_CALLBACK ArrayObject::_valueFunctionCompare( const void* a, const void
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
ArrayObject::ArrayObject()
|
ArrayObject::ArrayObject()
|
||||||
: mCurrentIndex( NULL ),
|
: mCaseSensitive( false ),
|
||||||
mCaseSensitive( false )
|
mCurrentIndex( NULL )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,8 +44,8 @@ EngineExport::EngineExport( const char* name, EngineExportKind kind, EngineExpor
|
||||||
: mExportName( name ),
|
: mExportName( name ),
|
||||||
mExportKind( kind ),
|
mExportKind( kind ),
|
||||||
mExportScope( scope ),
|
mExportScope( scope ),
|
||||||
mNextExport( NULL ),
|
mDocString( docString ),
|
||||||
mDocString( docString )
|
mNextExport( NULL )
|
||||||
{
|
{
|
||||||
AssertFatal( name != NULL, "EngineExport - export without name!" );
|
AssertFatal( name != NULL, "EngineExport - export without name!" );
|
||||||
AssertFatal( scope != NULL, avar( "EngineExport - export '%s' is in no scope" ) );
|
AssertFatal( scope != NULL, avar( "EngineExport - export '%s' is in no scope" ) );
|
||||||
|
|
|
||||||
|
|
@ -47,8 +47,8 @@ SimPersistID::SimPersistID( SimObject* object )
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
SimPersistID::SimPersistID( const Torque::UUID& uuid )
|
SimPersistID::SimPersistID( const Torque::UUID& uuid )
|
||||||
: mUUID( uuid ),
|
: mObject( NULL ),
|
||||||
mObject( NULL )
|
mUUID( uuid )
|
||||||
{
|
{
|
||||||
AssertFatal( !uuid.isNull(), "SimPersistID::SimPersistID - invalid UUID!" );
|
AssertFatal( !uuid.isNull(), "SimPersistID::SimPersistID - invalid UUID!" );
|
||||||
smLookupTable->insertUnique( mUUID, this );
|
smLookupTable->insertUnique( mUUID, this );
|
||||||
|
|
|
||||||
|
|
@ -54,8 +54,8 @@ MemStream::MemStream( U32 bufferSize,
|
||||||
mStreamSize( bufferSize ),
|
mStreamSize( bufferSize ),
|
||||||
mBufferBase( buffer ),
|
mBufferBase( buffer ),
|
||||||
mInstCaps( 0 ),
|
mInstCaps( 0 ),
|
||||||
mCurrentPosition( 0 ),
|
mOwnsMemory( false ),
|
||||||
mOwnsMemory( false )
|
mCurrentPosition( 0 )
|
||||||
{
|
{
|
||||||
AssertFatal( bufferSize > 0, "Invalid buffer size");
|
AssertFatal( bufferSize > 0, "Invalid buffer size");
|
||||||
AssertFatal( allowRead || allowWrite, "Either write or read must be allowed");
|
AssertFatal( allowRead || allowWrite, "Either write or read must be allowed");
|
||||||
|
|
|
||||||
|
|
@ -608,8 +608,8 @@ IMPLEMENT_CO_NETOBJECT_V1(MeshRoad);
|
||||||
MeshRoad::MeshRoad()
|
MeshRoad::MeshRoad()
|
||||||
: mTextureLength( 5.0f ),
|
: mTextureLength( 5.0f ),
|
||||||
mBreakAngle( 3.0f ),
|
mBreakAngle( 3.0f ),
|
||||||
mPhysicsRep( NULL ),
|
mWidthSubdivisions( 0 ),
|
||||||
mWidthSubdivisions( 0 )
|
mPhysicsRep( NULL )
|
||||||
{
|
{
|
||||||
mConvexList = new Convex;
|
mConvexList = new Convex;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,14 +61,14 @@ ConsoleDocClass( TimeOfDay,
|
||||||
);
|
);
|
||||||
|
|
||||||
TimeOfDay::TimeOfDay()
|
TimeOfDay::TimeOfDay()
|
||||||
: mElevation( 0.0f ),
|
: mStartTimeOfDay( 0.5f ), // High noon
|
||||||
mAzimuth( 0.0f ),
|
|
||||||
mAxisTilt( 23.44f ), // 35 degree tilt
|
|
||||||
mDayLen( 120.0f ), // 2 minutes
|
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
|
mTimeOfDay( 0.0f ), // initialized to StartTimeOfDay in onAdd
|
||||||
mPlay( true ),
|
|
||||||
mDayScale( 1.0f ),
|
mDayScale( 1.0f ),
|
||||||
|
mPlay( true ),
|
||||||
mNightScale( 1.5f ),
|
mNightScale( 1.5f ),
|
||||||
mAnimateTime( 0.0f ),
|
mAnimateTime( 0.0f ),
|
||||||
mAnimateSpeed( 0.0f ),
|
mAnimateSpeed( 0.0f ),
|
||||||
|
|
|
||||||
|
|
@ -196,15 +196,15 @@ WaterObject::WaterObject()
|
||||||
mUndulateMaxDist(50.0f),
|
mUndulateMaxDist(50.0f),
|
||||||
mMiscParamW( 0.0f ),
|
mMiscParamW( 0.0f ),
|
||||||
mUnderwaterPostFx( NULL ),
|
mUnderwaterPostFx( NULL ),
|
||||||
mBasicLighting( false ),
|
|
||||||
mOverallWaveMagnitude( 1.0f ),
|
|
||||||
mOverallRippleMagnitude( 0.1f ),
|
mOverallRippleMagnitude( 0.1f ),
|
||||||
mCubemap( NULL ),
|
mOverallWaveMagnitude( 1.0f ),
|
||||||
mSoundAmbience( NULL ),
|
mBasicLighting( false ),
|
||||||
mSpecularPower( 48.0f ),
|
mSpecularPower( 48.0f ),
|
||||||
|
mSoundAmbience( NULL ),
|
||||||
|
mCubemap( NULL ),
|
||||||
mSpecularColor( 1.0f, 1.0f, 1.0f, 1.0f ),
|
mSpecularColor( 1.0f, 1.0f, 1.0f, 1.0f ),
|
||||||
mDepthGradientMax( 50.0f ),
|
mEmissive( false ),
|
||||||
mEmissive( false )
|
mDepthGradientMax( 50.0f )
|
||||||
{
|
{
|
||||||
mTypeMask = WaterObjectType;
|
mTypeMask = WaterObjectType;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -159,8 +159,8 @@ ConsoleDocClass( ForestSelectionTool,
|
||||||
|
|
||||||
ForestSelectionTool::ForestSelectionTool()
|
ForestSelectionTool::ForestSelectionTool()
|
||||||
: Parent(),
|
: Parent(),
|
||||||
mCurrAction( NULL ),
|
|
||||||
mGizmo( NULL ),
|
mGizmo( NULL ),
|
||||||
|
mCurrAction( NULL ),
|
||||||
mGizmoProfile( NULL )
|
mGizmoProfile( NULL )
|
||||||
{
|
{
|
||||||
mBounds = Box3F::Invalid;
|
mBounds = Box3F::Invalid;
|
||||||
|
|
|
||||||
|
|
@ -81,8 +81,8 @@ ConsoleDocClass( Forest,
|
||||||
|
|
||||||
Forest::Forest()
|
Forest::Forest()
|
||||||
: mDataFileName( NULL ),
|
: mDataFileName( NULL ),
|
||||||
mReflectionLodScalar( 2.0f ),
|
|
||||||
mConvexList( new Convex() ),
|
mConvexList( new Convex() ),
|
||||||
|
mReflectionLodScalar( 2.0f ),
|
||||||
mZoningDirty( false )
|
mZoningDirty( false )
|
||||||
{
|
{
|
||||||
mTypeMask |= EnvironmentObjectType | StaticShapeObjectType | StaticObjectType;
|
mTypeMask |= EnvironmentObjectType | StaticShapeObjectType | StaticObjectType;
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,8 @@
|
||||||
ForestCell::ForestCell( const RectF &rect ) :
|
ForestCell::ForestCell( const RectF &rect ) :
|
||||||
mRect( rect ),
|
mRect( rect ),
|
||||||
mBounds( Box3F::Invalid ),
|
mBounds( Box3F::Invalid ),
|
||||||
mLargestItem( ForestItem::Invalid ),
|
|
||||||
mIsDirty( false ),
|
mIsDirty( false ),
|
||||||
|
mLargestItem( ForestItem::Invalid ),
|
||||||
mIsInteriorOnly( false )
|
mIsInteriorOnly( false )
|
||||||
{
|
{
|
||||||
dMemset( mSubCells, 0, sizeof( mSubCells ) );
|
dMemset( mSubCells, 0, sizeof( mSubCells ) );
|
||||||
|
|
|
||||||
|
|
@ -42,8 +42,8 @@ SimSet* ForestItemData::smSet = NULL;
|
||||||
ForestItemData::ForestItemData()
|
ForestItemData::ForestItemData()
|
||||||
: mNeedPreload( true ),
|
: mNeedPreload( true ),
|
||||||
mShapeFile( NULL ),
|
mShapeFile( NULL ),
|
||||||
mCollidable( true ),
|
|
||||||
mRadius( 1 ),
|
mRadius( 1 ),
|
||||||
|
mCollidable( true ),
|
||||||
mWindScale( 0.0f ),
|
mWindScale( 0.0f ),
|
||||||
mTrunkBendScale( 0.0f ),
|
mTrunkBendScale( 0.0f ),
|
||||||
mWindBranchAmp( 0.0f ),
|
mWindBranchAmp( 0.0f ),
|
||||||
|
|
@ -215,9 +215,9 @@ ForestItem::ForestItem()
|
||||||
: mDataBlock( NULL ),
|
: mDataBlock( NULL ),
|
||||||
mTransform( true ),
|
mTransform( true ),
|
||||||
mScale( 0.0f ),
|
mScale( 0.0f ),
|
||||||
mWorldBox( 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f ),
|
mKey( 0 ),
|
||||||
mRadius( 0.0f ),
|
mRadius( 0.0f ),
|
||||||
mKey( 0 )
|
mWorldBox( 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -84,12 +84,12 @@ ForestWind::ForestWind( ForestWindEmitter *emitter )
|
||||||
mDirection( 1.0f, 0, 0 ),
|
mDirection( 1.0f, 0, 0 ),
|
||||||
mLastGustTime( 0 ),
|
mLastGustTime( 0 ),
|
||||||
mLastYawTime( 0 ),
|
mLastYawTime( 0 ),
|
||||||
mCurrentTarget( 0, 0 ),
|
|
||||||
mCurrentInterp( 0 ),
|
|
||||||
mTargetYawAngle( 0 ),
|
mTargetYawAngle( 0 ),
|
||||||
|
mCurrentInterp( 0 ),
|
||||||
|
mCurrentTarget( 0, 0 ),
|
||||||
mParent( emitter ),
|
mParent( emitter ),
|
||||||
mIsDirty( false ),
|
mRandom( Platform::getRealMilliseconds() + 1 ),
|
||||||
mRandom( Platform::getRealMilliseconds() + 1 )
|
mIsDirty( false )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -204,8 +204,9 @@ void ForestWind::setDirection( const VectorF &direction )
|
||||||
IMPLEMENT_CO_NETOBJECT_V1(ForestWindEmitter);
|
IMPLEMENT_CO_NETOBJECT_V1(ForestWindEmitter);
|
||||||
|
|
||||||
ForestWindEmitter::ForestWindEmitter( bool makeClientObject )
|
ForestWindEmitter::ForestWindEmitter( bool makeClientObject )
|
||||||
: mEnabled( true ),
|
:
|
||||||
mAddedToScene( false ),
|
mAddedToScene( false ),
|
||||||
|
mEnabled( true ),
|
||||||
mWind( NULL ),
|
mWind( NULL ),
|
||||||
mWindStrength( 1 ),
|
mWindStrength( 1 ),
|
||||||
mWindDirection( 1, 0, 0 ),
|
mWindDirection( 1, 0, 0 ),
|
||||||
|
|
|
||||||
|
|
@ -42,8 +42,8 @@ ConsoleDocClass( TSForestItemData,
|
||||||
);
|
);
|
||||||
|
|
||||||
TSForestItemData::TSForestItemData()
|
TSForestItemData::TSForestItemData()
|
||||||
: mShapeInstance( NULL ),
|
: mIsClientObject( false ),
|
||||||
mIsClientObject( false )
|
mShapeInstance( NULL )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -240,8 +240,8 @@ void GenericConstBufferLayout::clear()
|
||||||
|
|
||||||
|
|
||||||
GenericConstBuffer::GenericConstBuffer(GenericConstBufferLayout* layout)
|
GenericConstBuffer::GenericConstBuffer(GenericConstBufferLayout* layout)
|
||||||
: mBuffer( NULL ),
|
: mLayout( layout ),
|
||||||
mLayout( layout ),
|
mBuffer( NULL ),
|
||||||
mDirtyStart( U32_MAX ),
|
mDirtyStart( U32_MAX ),
|
||||||
mDirtyEnd( 0 )
|
mDirtyEnd( 0 )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -73,8 +73,8 @@ U32 GFXVertexElement::getSizeInBytes() const
|
||||||
|
|
||||||
GFXVertexFormat::GFXVertexFormat()
|
GFXVertexFormat::GFXVertexFormat()
|
||||||
: mDirty( true ),
|
: mDirty( true ),
|
||||||
mHasColor( false ),
|
|
||||||
mHasNormal( false ),
|
mHasNormal( false ),
|
||||||
|
mHasColor( false ),
|
||||||
mHasTangent( false ),
|
mHasTangent( false ),
|
||||||
mHasInstancing( false ),
|
mHasInstancing( false ),
|
||||||
mTexCoordCount( 0 ),
|
mTexCoordCount( 0 ),
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,9 @@ GLCircularVolatileBuffer* getCircularVolatileIndexBuffer()
|
||||||
}
|
}
|
||||||
|
|
||||||
GFXGLPrimitiveBuffer::GFXGLPrimitiveBuffer(GFXDevice *device, U32 indexCount, U32 primitiveCount, GFXBufferType bufferType) :
|
GFXGLPrimitiveBuffer::GFXGLPrimitiveBuffer(GFXDevice *device, U32 indexCount, U32 primitiveCount, GFXBufferType bufferType) :
|
||||||
GFXPrimitiveBuffer(device, indexCount, primitiveCount, bufferType), mZombieCache(NULL),
|
GFXPrimitiveBuffer(device, indexCount, primitiveCount, bufferType),
|
||||||
mBufferOffset(0)
|
mBufferOffset(0),
|
||||||
|
mZombieCache(NULL)
|
||||||
{
|
{
|
||||||
if( mBufferType == GFXBufferTypeVolatile )
|
if( mBufferType == GFXBufferTypeVolatile )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,8 @@ GFX_ImplementTextureProfile( BackBufferDepthProfile,
|
||||||
GFXTextureProfile::NONE );
|
GFXTextureProfile::NONE );
|
||||||
|
|
||||||
GFXGLWindowTarget::GFXGLWindowTarget(PlatformWindow *win, GFXDevice *d)
|
GFXGLWindowTarget::GFXGLWindowTarget(PlatformWindow *win, GFXDevice *d)
|
||||||
: GFXWindowTarget(win), mDevice(d), mContext(NULL), mFullscreenContext(NULL)
|
: GFXWindowTarget(win), mDevice(d), mContext(NULL), mCopyFBO(0)
|
||||||
, mCopyFBO(0), mBackBufferFBO(0), mSecondaryWindow(false)
|
, mFullscreenContext(NULL), mBackBufferFBO(0), mSecondaryWindow(false)
|
||||||
{
|
{
|
||||||
win->appEvent.notify(this, &GFXGLWindowTarget::_onAppSignal);
|
win->appEvent.notify(this, &GFXGLWindowTarget::_onAppSignal);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -47,8 +47,8 @@ inline void sBlendPixelRGB888( U8* src, U8* dst, F32 factor )
|
||||||
ScreenShot::ScreenShot()
|
ScreenShot::ScreenShot()
|
||||||
: mPending( false ),
|
: mPending( false ),
|
||||||
mWriteJPG( false ),
|
mWriteJPG( false ),
|
||||||
mCurrTile( 0, 0 ),
|
mTiles( 1 ),
|
||||||
mTiles( 1 )
|
mCurrTile( 0, 0 )
|
||||||
{
|
{
|
||||||
mFilename[0] = 0;
|
mFilename[0] = 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -227,8 +227,8 @@ void TheoraTexture::FrameStream::releaseTextureLocks()
|
||||||
TheoraTexture::AsyncState::AsyncState( const ThreadSafeRef< OggInputStream >& oggStream, bool looping )
|
TheoraTexture::AsyncState::AsyncState( const ThreadSafeRef< OggInputStream >& oggStream, bool looping )
|
||||||
: mOggStream( oggStream ),
|
: mOggStream( oggStream ),
|
||||||
mTheoraDecoder( dynamic_cast< OggTheoraDecoder* >( oggStream->getDecoder( "Theora" ) ) ),
|
mTheoraDecoder( dynamic_cast< OggTheoraDecoder* >( oggStream->getDecoder( "Theora" ) ) ),
|
||||||
mVorbisDecoder( dynamic_cast< OggVorbisDecoder* >( oggStream->getDecoder( "Vorbis" ) ) ),
|
mCurrentTime( 0 ),
|
||||||
mCurrentTime( 0 )
|
mVorbisDecoder( dynamic_cast< OggVorbisDecoder* >( oggStream->getDecoder( "Vorbis" ) ) )
|
||||||
{
|
{
|
||||||
if( mTheoraDecoder )
|
if( mTheoraDecoder )
|
||||||
{
|
{
|
||||||
|
|
@ -276,8 +276,8 @@ bool TheoraTexture::AsyncState::isAtEnd()
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
TheoraTexture::TheoraTexture()
|
TheoraTexture::TheoraTexture()
|
||||||
: mPlaybackQueue( NULL ),
|
: mCurrentFrame( NULL ),
|
||||||
mCurrentFrame( NULL ),
|
mPlaybackQueue( NULL ),
|
||||||
mIsPaused( true )
|
mIsPaused( true )
|
||||||
{
|
{
|
||||||
GFXTextureManager::addEventDelegate( this, &TheoraTexture::_onTextureEvent );
|
GFXTextureManager::addEventDelegate( this, &TheoraTexture::_onTextureEvent );
|
||||||
|
|
|
||||||
|
|
@ -54,15 +54,15 @@ MODULE_END;
|
||||||
|
|
||||||
VideoCapture::VideoCapture() :
|
VideoCapture::VideoCapture() :
|
||||||
mEncoder(NULL),
|
mEncoder(NULL),
|
||||||
mIsRecording(false),
|
|
||||||
mCanvas(NULL),
|
|
||||||
mFrameGrabber(NULL),
|
mFrameGrabber(NULL),
|
||||||
mWaitingForCanvas(false),
|
mCanvas(NULL),
|
||||||
mResolution(0,0),
|
mIsRecording(false),
|
||||||
mFrameRate(30.0f),
|
mFrameRate(30.0f),
|
||||||
|
mResolution(0,0),
|
||||||
|
mWaitingForCanvas(false),
|
||||||
mEncoderName("THEORA"),
|
mEncoderName("THEORA"),
|
||||||
mFileName(""),
|
mMsPerFrameError(0),
|
||||||
mMsPerFrameError(0)
|
mFileName("")
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -95,8 +95,8 @@ GuiAutoScrollCtrl::GuiAutoScrollCtrl()
|
||||||
mStartDelay( 3.f ),
|
mStartDelay( 3.f ),
|
||||||
mResetDelay( 5.f ),
|
mResetDelay( 5.f ),
|
||||||
mChildBorder( 10 ),
|
mChildBorder( 10 ),
|
||||||
mScrollSpeed( 1.f ),
|
mScrollOutOfSight( false ),
|
||||||
mScrollOutOfSight( false )
|
mScrollSpeed( 1.f )
|
||||||
{
|
{
|
||||||
mIsContainer = true;
|
mIsContainer = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,25 +55,25 @@ IMPLEMENT_CALLBACK( GuiScrollCtrl, onScroll, void, (), (),
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
GuiScrollCtrl::GuiScrollCtrl()
|
GuiScrollCtrl::GuiScrollCtrl()
|
||||||
: mChildMargin( 0, 0 ),
|
: mBorderThickness( 1 ),
|
||||||
mBorderThickness( 1 ),
|
mChildMargin( 0, 0 ),
|
||||||
mScrollBarThickness( 16 ),
|
mScrollBarThickness( 16 ),
|
||||||
mScrollBarArrowBtnLength( 16 ),
|
mScrollBarArrowBtnLength( 16 ),
|
||||||
mScrollBarDragTolerance( 130 ),
|
mScrollBarDragTolerance( 130 ),
|
||||||
mStateDepressed( false ),
|
mStateDepressed( false ),
|
||||||
mHitRegion( None ),
|
mHitRegion( None ),
|
||||||
mWillFirstRespond( true ),
|
|
||||||
mUseConstantHeightThumb( false ),
|
|
||||||
mForceVScrollBar( ScrollBarAlwaysOn ),
|
mForceVScrollBar( ScrollBarAlwaysOn ),
|
||||||
|
mUseConstantHeightThumb( false ),
|
||||||
|
mWillFirstRespond( true ),
|
||||||
mForceHScrollBar( ScrollBarAlwaysOn ),
|
mForceHScrollBar( ScrollBarAlwaysOn ),
|
||||||
mLockHorizScroll( false ),
|
mLockHorizScroll( false ),
|
||||||
mLockVertScroll( false ),
|
mLockVertScroll( false ),
|
||||||
mIgnoreChildResized( false ),
|
mIgnoreChildResized( false ),
|
||||||
mAnimating( false ),
|
mAnimating( false ),
|
||||||
mScrollAnimSpeed( -1 ),
|
mScrollAnimSpeed( -1 ),
|
||||||
mScrollTargetPos( -1, -1 ),
|
|
||||||
mChildExt(0, 0),
|
|
||||||
mChildPos(0, 0),
|
mChildPos(0, 0),
|
||||||
|
mChildExt(0, 0),
|
||||||
|
mScrollTargetPos( -1, -1 ),
|
||||||
mBaseThumbSize(0)
|
mBaseThumbSize(0)
|
||||||
{
|
{
|
||||||
mIsContainer = true;
|
mIsContainer = true;
|
||||||
|
|
|
||||||
|
|
@ -70,16 +70,16 @@ IMPLEMENT_CALLBACK( GuiWindowCtrl, onRestore, void, (), (),
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
GuiWindowCtrl::GuiWindowCtrl()
|
GuiWindowCtrl::GuiWindowCtrl()
|
||||||
: mResizeEdge(edgeNone),
|
: mResizeWidth(true),
|
||||||
mResizeWidth(true),
|
mResizeEdge(edgeNone),
|
||||||
mResizeHeight(true),
|
mResizeHeight(true),
|
||||||
mResizeMargin(2.f),
|
|
||||||
mCanMove(true),
|
mCanMove(true),
|
||||||
|
mResizeMargin(2.f),
|
||||||
mCanClose(true),
|
mCanClose(true),
|
||||||
mCanMinimize(true),
|
mCanMinimize(true),
|
||||||
mCanMaximize(true),
|
mCanMaximize(true),
|
||||||
mCanDock(false),
|
|
||||||
mCanCollapse(false),
|
mCanCollapse(false),
|
||||||
|
mCanDock(false),
|
||||||
mEdgeSnap(true),
|
mEdgeSnap(true),
|
||||||
mCollapseGroup(-1),
|
mCollapseGroup(-1),
|
||||||
mCollapseGroupNum(-1),
|
mCollapseGroupNum(-1),
|
||||||
|
|
|
||||||
|
|
@ -52,8 +52,8 @@ ConsoleDocClass( GuiDecoyCtrl,
|
||||||
"Currently editor use only, no real application without extension.\n\n "
|
"Currently editor use only, no real application without extension.\n\n "
|
||||||
"@internal");
|
"@internal");
|
||||||
|
|
||||||
GuiDecoyCtrl::GuiDecoyCtrl() : mIsDecoy(true),
|
GuiDecoyCtrl::GuiDecoyCtrl() : mMouseOver(false),
|
||||||
mMouseOver(false),
|
mIsDecoy(true),
|
||||||
mDecoyReference(NULL)
|
mDecoyReference(NULL)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,8 +32,8 @@
|
||||||
|
|
||||||
GuiGameListMenuCtrl::GuiGameListMenuCtrl()
|
GuiGameListMenuCtrl::GuiGameListMenuCtrl()
|
||||||
: mSelected(NO_ROW),
|
: mSelected(NO_ROW),
|
||||||
mHighlighted(NO_ROW),
|
mDebugRender(false),
|
||||||
mDebugRender(false)
|
mHighlighted(NO_ROW)
|
||||||
{
|
{
|
||||||
VECTOR_SET_ASSOCIATION(mRows);
|
VECTOR_SET_ASSOCIATION(mRows);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -237,8 +237,8 @@ GuiMLTextCtrl::GuiMLTextCtrl()
|
||||||
mCurY( 0 ),
|
mCurY( 0 ),
|
||||||
mCurClipX( 0 ),
|
mCurClipX( 0 ),
|
||||||
mLineAtoms( NULL ),
|
mLineAtoms( NULL ),
|
||||||
mLineAtomPtr( &mLineAtoms ),
|
|
||||||
mLineList( NULL ),
|
mLineList( NULL ),
|
||||||
|
mLineAtomPtr( &mLineAtoms ),
|
||||||
mLineInsert( &mLineList ),
|
mLineInsert( &mLineList ),
|
||||||
mScanPos( 0 ),
|
mScanPos( 0 ),
|
||||||
mCurX( 0 ),
|
mCurX( 0 ),
|
||||||
|
|
@ -247,8 +247,8 @@ GuiMLTextCtrl::GuiMLTextCtrl()
|
||||||
mLineStart( 0 ),
|
mLineStart( 0 ),
|
||||||
mVertMoveAnchor( 0 ),
|
mVertMoveAnchor( 0 ),
|
||||||
mVertMoveAnchorValid( false ),
|
mVertMoveAnchorValid( false ),
|
||||||
mSelectionAnchor( 0 ),
|
|
||||||
mIsEditCtrl( false ),
|
mIsEditCtrl( false ),
|
||||||
|
mSelectionAnchor( 0 ),
|
||||||
mCursorPosition( false ),
|
mCursorPosition( false ),
|
||||||
mMaxBufferSize( -1 ),
|
mMaxBufferSize( -1 ),
|
||||||
mInitialText( StringTable->EmptyString() ),
|
mInitialText( StringTable->EmptyString() ),
|
||||||
|
|
@ -257,13 +257,13 @@ GuiMLTextCtrl::GuiMLTextCtrl()
|
||||||
mSelectionEnd( 0 ),
|
mSelectionEnd( 0 ),
|
||||||
mLineSpacingPixels( 2 ),
|
mLineSpacingPixels( 2 ),
|
||||||
mAllowColorChars( false ),
|
mAllowColorChars( false ),
|
||||||
mUseURLMouseCursor( false ),
|
|
||||||
mBitmapList( 0 ),
|
mBitmapList( 0 ),
|
||||||
|
mUseURLMouseCursor( false ),
|
||||||
mBitmapRefList( 0 ),
|
mBitmapRefList( 0 ),
|
||||||
mDirty( true ),
|
|
||||||
mTagList( NULL ),
|
mTagList( NULL ),
|
||||||
mHitURL( 0 ),
|
mDirty( true ),
|
||||||
mAlpha( 1.0f ),
|
mAlpha( 1.0f ),
|
||||||
|
mHitURL( 0 ),
|
||||||
mFontList( NULL )
|
mFontList( NULL )
|
||||||
{
|
{
|
||||||
mActive = true;
|
mActive = true;
|
||||||
|
|
|
||||||
|
|
@ -97,8 +97,8 @@ GuiSliderCtrl::GuiSliderCtrl()
|
||||||
mIncAmount( 0.f ),
|
mIncAmount( 0.f ),
|
||||||
mDisplayValue( false ),
|
mDisplayValue( false ),
|
||||||
mMouseOver( false ),
|
mMouseOver( false ),
|
||||||
mMouseDragged( false ),
|
mDepressed( false ),
|
||||||
mDepressed( false )
|
mMouseDragged( false )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -100,33 +100,33 @@ GuiCanvas::GuiCanvas(): GuiControl(),
|
||||||
mCursorEnabled(true),
|
mCursorEnabled(true),
|
||||||
mForceMouseToGUI(false),
|
mForceMouseToGUI(false),
|
||||||
mAlwaysHandleMouseButtons(false),
|
mAlwaysHandleMouseButtons(false),
|
||||||
mCursorChanged(0),
|
|
||||||
mClampTorqueCursor(true),
|
|
||||||
mShowCursor(true),
|
mShowCursor(true),
|
||||||
|
mClampTorqueCursor(true),
|
||||||
|
mCursorChanged(0),
|
||||||
mLastCursorEnabled(false),
|
mLastCursorEnabled(false),
|
||||||
mMouseControl(NULL),
|
|
||||||
mMouseCapturedControl(NULL),
|
mMouseCapturedControl(NULL),
|
||||||
|
mMouseControl(NULL),
|
||||||
mMouseControlClicked(false),
|
mMouseControlClicked(false),
|
||||||
mMouseButtonDown(false),
|
mMouseButtonDown(false),
|
||||||
mMouseRightButtonDown(false),
|
mMouseRightButtonDown(false),
|
||||||
mMouseMiddleButtonDown(false),
|
|
||||||
mDefaultCursor(NULL),
|
mDefaultCursor(NULL),
|
||||||
mLastCursor(NULL),
|
mMouseMiddleButtonDown(false),
|
||||||
mLastCursorPt(0,0),
|
|
||||||
mCursorPt(0,0),
|
mCursorPt(0,0),
|
||||||
|
mLastCursorPt(0,0),
|
||||||
|
mLastCursor(NULL),
|
||||||
mLastMouseClickCount(0),
|
mLastMouseClickCount(0),
|
||||||
mLastMouseDownTime(0),
|
|
||||||
mPrevMouseTime(0),
|
|
||||||
mRenderFront(false),
|
mRenderFront(false),
|
||||||
|
mPrevMouseTime(0),
|
||||||
|
mLastMouseDownTime(0),
|
||||||
mHoverControl(NULL),
|
mHoverControl(NULL),
|
||||||
mHoverPositionSet(false),
|
mHoverPositionSet(false),
|
||||||
mHoverLeftControlTime(0),
|
|
||||||
mLeftMouseLast(false),
|
mLeftMouseLast(false),
|
||||||
|
mHoverLeftControlTime(0),
|
||||||
mMiddleMouseLast(false),
|
mMiddleMouseLast(false),
|
||||||
mRightMouseLast(false),
|
mRightMouseLast(false),
|
||||||
mMouseDownPoint(0.0f,0.0f),
|
mMouseDownPoint(0.0f,0.0f),
|
||||||
mPlatformWindow(NULL),
|
|
||||||
mLastRenderMs(0),
|
mLastRenderMs(0),
|
||||||
|
mPlatformWindow(NULL),
|
||||||
mDisplayWindow(true),
|
mDisplayWindow(true),
|
||||||
mMenuBarCtrl(NULL)
|
mMenuBarCtrl(NULL)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -95,12 +95,12 @@ GuiEditCtrl::GuiEditCtrl()
|
||||||
mDragBeginPoint( -1, -1 ),
|
mDragBeginPoint( -1, -1 ),
|
||||||
mSnapToControls( true ),
|
mSnapToControls( true ),
|
||||||
mSnapToEdges( true ),
|
mSnapToEdges( true ),
|
||||||
mSnapToCenters( true ),
|
|
||||||
mSnapToGuides( true ),
|
mSnapToGuides( true ),
|
||||||
|
mSnapToCenters( true ),
|
||||||
mSnapToCanvas( true ),
|
mSnapToCanvas( true ),
|
||||||
mSnapSensitivity( 2 ),
|
|
||||||
mFullBoxSelection( false ),
|
|
||||||
mDrawBorderLines( true ),
|
mDrawBorderLines( true ),
|
||||||
|
mFullBoxSelection( false ),
|
||||||
|
mSnapSensitivity( 2 ),
|
||||||
mDrawGuides( true )
|
mDrawGuides( true )
|
||||||
{
|
{
|
||||||
VECTOR_SET_ASSOCIATION( mSelectedControls );
|
VECTOR_SET_ASSOCIATION( mSelectedControls );
|
||||||
|
|
|
||||||
|
|
@ -63,28 +63,28 @@ GuiShapeEdPreview::GuiShapeEdPreview()
|
||||||
: mOrbitDist( 5.0f ),
|
: mOrbitDist( 5.0f ),
|
||||||
mMoveSpeed ( 1.0f ),
|
mMoveSpeed ( 1.0f ),
|
||||||
mZoomSpeed ( 1.0f ),
|
mZoomSpeed ( 1.0f ),
|
||||||
mModel( NULL ),
|
|
||||||
mGridDimension( 30, 30 ),
|
mGridDimension( 30, 30 ),
|
||||||
|
mModel( NULL ),
|
||||||
mRenderGhost( false ),
|
mRenderGhost( false ),
|
||||||
mRenderNodes( false ),
|
mRenderNodes( false ),
|
||||||
mRenderBounds( false ),
|
mRenderBounds( false ),
|
||||||
mRenderObjBox( false ),
|
mRenderObjBox( false ),
|
||||||
mRenderMounts( true ),
|
mRenderMounts( true ),
|
||||||
mSunDiffuseColor( 255, 255, 255, 255 ),
|
mSunDiffuseColor( 255, 255, 255, 255 ),
|
||||||
mSunAmbientColor( 140, 140, 140, 255 ),
|
|
||||||
mSelectedNode( -1 ),
|
mSelectedNode( -1 ),
|
||||||
|
mSunAmbientColor( 140, 140, 140, 255 ),
|
||||||
mHoverNode( -1 ),
|
mHoverNode( -1 ),
|
||||||
mSelectedObject( -1 ),
|
mSelectedObject( -1 ),
|
||||||
mSelectedObjDetail( 0 ),
|
|
||||||
mUsingAxisGizmo( false ),
|
mUsingAxisGizmo( false ),
|
||||||
mGizmoDragID( 0 ),
|
mSelectedObjDetail( 0 ),
|
||||||
mEditingSun( false ),
|
mEditingSun( false ),
|
||||||
|
mGizmoDragID( 0 ),
|
||||||
mTimeScale( 1.0f ),
|
mTimeScale( 1.0f ),
|
||||||
mActiveThread( -1 ),
|
mActiveThread( -1 ),
|
||||||
mLastRenderTime( 0 ),
|
|
||||||
mFakeSun( NULL ),
|
mFakeSun( NULL ),
|
||||||
mSunRot( 45.0f, 0, 135.0f ),
|
mLastRenderTime( 0 ),
|
||||||
mCameraRot( 0, 0, 3.9f ),
|
mCameraRot( 0, 0, 3.9f ),
|
||||||
|
mSunRot( 45.0f, 0, 135.0f ),
|
||||||
mRenderCameraAxes( false ),
|
mRenderCameraAxes( false ),
|
||||||
mOrbitPos( 0, 0, 0 ),
|
mOrbitPos( 0, 0, 0 ),
|
||||||
mFixedDetail( true ),
|
mFixedDetail( true ),
|
||||||
|
|
|
||||||
|
|
@ -45,8 +45,8 @@ ConsoleDocClass( GuiInspectorField,
|
||||||
GuiInspectorField::GuiInspectorField( GuiInspector* inspector,
|
GuiInspectorField::GuiInspectorField( GuiInspector* inspector,
|
||||||
GuiInspectorGroup* parent,
|
GuiInspectorGroup* parent,
|
||||||
AbstractClassRep::Field* field )
|
AbstractClassRep::Field* field )
|
||||||
: mInspector( inspector ),
|
: mParent( parent ),
|
||||||
mParent( parent ),
|
mInspector( inspector ),
|
||||||
mField( field ),
|
mField( field ),
|
||||||
mFieldArrayIndex( NULL ),
|
mFieldArrayIndex( NULL ),
|
||||||
mEdit( NULL )
|
mEdit( NULL )
|
||||||
|
|
@ -66,12 +66,12 @@ GuiInspectorField::GuiInspectorField( GuiInspector* inspector,
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
GuiInspectorField::GuiInspectorField()
|
GuiInspectorField::GuiInspectorField()
|
||||||
: mInspector( NULL ),
|
: mParent( NULL ),
|
||||||
mParent( NULL ),
|
mInspector( NULL ),
|
||||||
mEdit( NULL ),
|
|
||||||
mField( NULL ),
|
mField( NULL ),
|
||||||
mFieldArrayIndex( NULL ),
|
mEdit( NULL ),
|
||||||
mCaption( StringTable->EmptyString() ),
|
mCaption( StringTable->EmptyString() ),
|
||||||
|
mFieldArrayIndex( NULL ),
|
||||||
mHighlighted( false )
|
mHighlighted( false )
|
||||||
{
|
{
|
||||||
setCanSave( false );
|
setCanSave( false );
|
||||||
|
|
|
||||||
|
|
@ -42,8 +42,8 @@ CreatorTree::Node::Node() :
|
||||||
mFlags(0),
|
mFlags(0),
|
||||||
mParent(0),
|
mParent(0),
|
||||||
mName(0),
|
mName(0),
|
||||||
mValue(0),
|
|
||||||
mId(0),
|
mId(0),
|
||||||
|
mValue(0),
|
||||||
mTab(0)
|
mTab(0)
|
||||||
{
|
{
|
||||||
VECTOR_SET_ASSOCIATION(mChildren);
|
VECTOR_SET_ASSOCIATION(mChildren);
|
||||||
|
|
|
||||||
|
|
@ -292,10 +292,10 @@ F32 Gizmo::smProjectDistance = 20000.0f;
|
||||||
|
|
||||||
Gizmo::Gizmo()
|
Gizmo::Gizmo()
|
||||||
: mProfile( NULL ),
|
: mProfile( NULL ),
|
||||||
mSelectionIdx( -1 ),
|
|
||||||
mCameraMat( true ),
|
|
||||||
mTransform( true ),
|
|
||||||
mObjectMat( true ),
|
mObjectMat( true ),
|
||||||
|
mTransform( true ),
|
||||||
|
mCameraMat( true ),
|
||||||
|
mSelectionIdx( -1 ),
|
||||||
mObjectMatInv( true ),
|
mObjectMatInv( true ),
|
||||||
mCurrentTransform( true ),
|
mCurrentTransform( true ),
|
||||||
mSavedTransform( true ),
|
mSavedTransform( true ),
|
||||||
|
|
@ -303,23 +303,23 @@ Gizmo::Gizmo()
|
||||||
mDeltaScale( 0,0,0 ),
|
mDeltaScale( 0,0,0 ),
|
||||||
mDeltaRot( 0,0,0 ),
|
mDeltaRot( 0,0,0 ),
|
||||||
mDeltaPos( 0,0,0 ),
|
mDeltaPos( 0,0,0 ),
|
||||||
mDeltaTotalPos( 0,0,0 ),
|
|
||||||
mDeltaTotalRot( 0,0,0 ),
|
|
||||||
mDeltaTotalScale( 0,0,0 ),
|
|
||||||
mCurrentAlignment( World ),
|
mCurrentAlignment( World ),
|
||||||
|
mDeltaTotalScale( 0,0,0 ),
|
||||||
|
mDeltaTotalRot( 0,0,0 ),
|
||||||
|
mDeltaTotalPos( 0,0,0 ),
|
||||||
mCurrentMode( MoveMode ),
|
mCurrentMode( MoveMode ),
|
||||||
mDirty( false ),
|
|
||||||
mMouseDownPos( -1,-1 ),
|
mMouseDownPos( -1,-1 ),
|
||||||
|
mDirty( false ),
|
||||||
mMouseDown( false ),
|
mMouseDown( false ),
|
||||||
mLastWorldMat( true ),
|
mLastWorldMat( true ),
|
||||||
mLastProjMat( true ),
|
mLastProjMat( true ),
|
||||||
mLastViewport( 0, 0, 10, 10 ),
|
mLastViewport( 0, 0, 10, 10 ),
|
||||||
mLastCameraFOV( 1.f ),
|
mLastCameraFOV( 1.f ),
|
||||||
mElipseCursorCollideVecSS( 1.0f, 0.0f, 0.0f ),
|
|
||||||
mElipseCursorCollidePntSS( 0.0f, 0.0f, 0.0f ),
|
|
||||||
mHighlightCentroidHandle( false ),
|
mHighlightCentroidHandle( false ),
|
||||||
mHighlightAll( false ),
|
mElipseCursorCollidePntSS( 0.0f, 0.0f, 0.0f ),
|
||||||
|
mElipseCursorCollideVecSS( 1.0f, 0.0f, 0.0f ),
|
||||||
mGridPlaneEnabled( true ),
|
mGridPlaneEnabled( true ),
|
||||||
|
mHighlightAll( false ),
|
||||||
mMoveGridEnabled( true ),
|
mMoveGridEnabled( true ),
|
||||||
mMoveGridSize( 20.f ),
|
mMoveGridSize( 20.f ),
|
||||||
mMoveGridSpacing( 1.f )
|
mMoveGridSpacing( 1.f )
|
||||||
|
|
|
||||||
|
|
@ -58,8 +58,8 @@ ConsoleDocClass( GuiConvexEditorCtrl,
|
||||||
|
|
||||||
GuiConvexEditorCtrl::GuiConvexEditorCtrl()
|
GuiConvexEditorCtrl::GuiConvexEditorCtrl()
|
||||||
: mIsDirty( false ),
|
: mIsDirty( false ),
|
||||||
mFaceHL( -1 ),
|
|
||||||
mFaceSEL( -1 ),
|
mFaceSEL( -1 ),
|
||||||
|
mFaceHL( -1 ),
|
||||||
mFaceSavedXfm( true ),
|
mFaceSavedXfm( true ),
|
||||||
mSavedUndo( false ),
|
mSavedUndo( false ),
|
||||||
mDragging( false ),
|
mDragging( false ),
|
||||||
|
|
@ -68,12 +68,12 @@ GuiConvexEditorCtrl::GuiConvexEditorCtrl()
|
||||||
mUsingPivot( false ),
|
mUsingPivot( false ),
|
||||||
mSettingPivot( false ),
|
mSettingPivot( false ),
|
||||||
mActiveTool( NULL ),
|
mActiveTool( NULL ),
|
||||||
mCreateTool( NULL ),
|
|
||||||
mMouseDown( false ),
|
mMouseDown( false ),
|
||||||
mUndoManager( NULL ),
|
mCreateTool( NULL ),
|
||||||
mLastUndo( NULL ),
|
|
||||||
mHasCopied( false ),
|
|
||||||
mSavedGizmoFlags( -1 ),
|
mSavedGizmoFlags( -1 ),
|
||||||
|
mHasCopied( false ),
|
||||||
|
mLastUndo( NULL ),
|
||||||
|
mUndoManager( NULL ),
|
||||||
mCtrlDown( false )
|
mCtrlDown( false )
|
||||||
{
|
{
|
||||||
mMaterialName = StringTable->insert("Grid512_OrangeLines_Mat");
|
mMaterialName = StringTable->insert("Grid512_OrangeLines_Mat");
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ ConsoleDocClass( GuiTerrPreviewCtrl,
|
||||||
"@internal"
|
"@internal"
|
||||||
);
|
);
|
||||||
|
|
||||||
GuiTerrPreviewCtrl::GuiTerrPreviewCtrl(void) : mTerrainEditor(NULL), mTerrainSize(2048.0f)
|
GuiTerrPreviewCtrl::GuiTerrPreviewCtrl(void) : mTerrainSize(2048.0f), mTerrainEditor(NULL)
|
||||||
{
|
{
|
||||||
mRoot.set( 0, 0 );
|
mRoot.set( 0, 0 );
|
||||||
mOrigin.set( 0, 0 );
|
mOrigin.set( 0, 0 );
|
||||||
|
|
|
||||||
|
|
@ -668,11 +668,11 @@ TerrainEditor::TerrainEditor() :
|
||||||
mMousePos(0,0,0),
|
mMousePos(0,0,0),
|
||||||
mMouseBrush(0),
|
mMouseBrush(0),
|
||||||
mInAction(false),
|
mInAction(false),
|
||||||
mUndoSel(0),
|
|
||||||
mGridUpdateMin( S32_MAX, S32_MAX ),
|
mGridUpdateMin( S32_MAX, S32_MAX ),
|
||||||
|
mUndoSel(0),
|
||||||
mGridUpdateMax( 0, 0 ),
|
mGridUpdateMax( 0, 0 ),
|
||||||
mMaxBrushSize(256,256),
|
|
||||||
mNeedsGridUpdate( false ),
|
mNeedsGridUpdate( false ),
|
||||||
|
mMaxBrushSize(256,256),
|
||||||
mNeedsMaterialUpdate( false ),
|
mNeedsMaterialUpdate( false ),
|
||||||
mMouseDown( false )
|
mMouseDown( false )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,8 @@ ConsoleDocClass( WorldEditorSelection,
|
||||||
WorldEditorSelection::WorldEditorSelection()
|
WorldEditorSelection::WorldEditorSelection()
|
||||||
: mCentroidValid(false),
|
: mCentroidValid(false),
|
||||||
mAutoSelect(false),
|
mAutoSelect(false),
|
||||||
mPrevCentroid(0.0f, 0.0f, 0.0f),
|
mContainsGlobalBounds(false),
|
||||||
mContainsGlobalBounds(false)
|
mPrevCentroid(0.0f, 0.0f, 0.0f)
|
||||||
{
|
{
|
||||||
// Selections are transient by default.
|
// Selections are transient by default.
|
||||||
setCanSave( false );
|
setCanSave( false );
|
||||||
|
|
|
||||||
|
|
@ -158,8 +158,8 @@ public:
|
||||||
blTerrainProxy::blTerrainProxy( SceneObject *obj ) :
|
blTerrainProxy::blTerrainProxy( SceneObject *obj ) :
|
||||||
Parent( obj ),
|
Parent( obj ),
|
||||||
mLightMapSize( getObject()->getLightMapSize() ),
|
mLightMapSize( getObject()->getLightMapSize() ),
|
||||||
mTerrainBlockSize( getObject()->getBlockSize() ),
|
|
||||||
mShadowVolume( NULL ),
|
mShadowVolume( NULL ),
|
||||||
|
mTerrainBlockSize( getObject()->getBlockSize() ),
|
||||||
mLightmap( NULL ),
|
mLightmap( NULL ),
|
||||||
sgBakedLightmap( NULL )
|
sgBakedLightmap( NULL )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -41,14 +41,14 @@ LightInfoExType::LightInfoExType( const char *type )
|
||||||
|
|
||||||
|
|
||||||
LightInfo::LightInfo()
|
LightInfo::LightInfo()
|
||||||
: mTransform( true ),
|
: mColor( 0.0f, 0.0f, 0.0f, 1.0f ),
|
||||||
mColor( 0.0f, 0.0f, 0.0f, 1.0f ),
|
mTransform( true ),
|
||||||
mBrightness( 1.0f ),
|
mBrightness( 1.0f ),
|
||||||
mAmbient( 0.0f, 0.0f, 0.0f, 1.0f ),
|
mAmbient( 0.0f, 0.0f, 0.0f, 1.0f ),
|
||||||
mRange( 1.0f, 1.0f, 1.0f ),
|
mRange( 1.0f, 1.0f, 1.0f ),
|
||||||
mInnerConeAngle( 90.0f ),
|
mInnerConeAngle( 90.0f ),
|
||||||
mOuterConeAngle( 90.0f ),
|
|
||||||
mType( Vector ),
|
mType( Vector ),
|
||||||
|
mOuterConeAngle( 90.0f ),
|
||||||
mCastShadows( false ),
|
mCastShadows( false ),
|
||||||
mStaticRefreshFreq( 250 ),
|
mStaticRefreshFreq( 250 ),
|
||||||
mDynamicRefreshFreq( 8 ),
|
mDynamicRefreshFreq( 8 ),
|
||||||
|
|
|
||||||
|
|
@ -47,10 +47,10 @@ LightManager::LightManager( const char *name, const char *id )
|
||||||
: mName( name ),
|
: mName( name ),
|
||||||
mId( id ),
|
mId( id ),
|
||||||
mIsActive( false ),
|
mIsActive( false ),
|
||||||
mSceneManager( NULL ),
|
|
||||||
mDefaultLight( NULL ),
|
mDefaultLight( NULL ),
|
||||||
mAvailableSLInterfaces( NULL ),
|
mSceneManager( NULL ),
|
||||||
mCullPos( Point3F::Zero )
|
mCullPos( Point3F::Zero ),
|
||||||
|
mAvailableSLInterfaces( NULL )
|
||||||
{
|
{
|
||||||
_getLightManagers().insert( mName, this );
|
_getLightManagers().insert( mName, this );
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -83,12 +83,12 @@ GFX_ImplementTextureProfile( ShadowMapZProfile,
|
||||||
|
|
||||||
LightShadowMap::LightShadowMap( LightInfo *light )
|
LightShadowMap::LightShadowMap( LightInfo *light )
|
||||||
: mWorldToLightProj( true ),
|
: mWorldToLightProj( true ),
|
||||||
mLight( light ),
|
|
||||||
mTexSize( 0 ),
|
mTexSize( 0 ),
|
||||||
mLastShader( NULL ),
|
mLight( light ),
|
||||||
mLastUpdate( 0 ),
|
mLastUpdate( 0 ),
|
||||||
mLastCull( 0 ),
|
mLastShader( NULL ),
|
||||||
mIsViewDependent( false ),
|
mIsViewDependent( false ),
|
||||||
|
mLastCull( 0 ),
|
||||||
mLastScreenSize( 0.0f ),
|
mLastScreenSize( 0.0f ),
|
||||||
mLastPriority( 0.0f ),
|
mLastPriority( 0.0f ),
|
||||||
mIsDynamic( false )
|
mIsDynamic( false )
|
||||||
|
|
@ -580,8 +580,8 @@ MODULE_END;
|
||||||
LightInfoExType ShadowMapParams::Type( "" );
|
LightInfoExType ShadowMapParams::Type( "" );
|
||||||
|
|
||||||
ShadowMapParams::ShadowMapParams( LightInfo *light )
|
ShadowMapParams::ShadowMapParams( LightInfo *light )
|
||||||
: mLight( light ),
|
: mShadowMap( NULL ),
|
||||||
mShadowMap( NULL ),
|
mLight( light ),
|
||||||
mDynamicShadowMap ( NULL ),
|
mDynamicShadowMap ( NULL ),
|
||||||
isDynamic ( true )
|
isDynamic ( true )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -91,8 +91,8 @@ NamedTexTarget* NamedTexTarget::find( const String &name )
|
||||||
}
|
}
|
||||||
|
|
||||||
NamedTexTarget::NamedTexTarget()
|
NamedTexTarget::NamedTexTarget()
|
||||||
: mViewport( RectI::One ),
|
: mIsRegistered( false ),
|
||||||
mIsRegistered( false ),
|
mViewport( RectI::One ),
|
||||||
mConditioner( NULL )
|
mConditioner( NULL )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -66,8 +66,8 @@ mModuleId(StringTable->EmptyString()),
|
||||||
mModuleScriptFilePath(StringTable->EmptyString()),
|
mModuleScriptFilePath(StringTable->EmptyString()),
|
||||||
mSignature(StringTable->EmptyString()),
|
mSignature(StringTable->EmptyString()),
|
||||||
mLoadCount( 0 ),
|
mLoadCount( 0 ),
|
||||||
mLocked( false ),
|
|
||||||
mScopeSet( 0 ),
|
mScopeSet( 0 ),
|
||||||
|
mLocked( false ),
|
||||||
mpModuleManager( NULL )
|
mpModuleManager( NULL )
|
||||||
{
|
{
|
||||||
// Set Vector Associations.
|
// Set Vector Associations.
|
||||||
|
|
|
||||||
|
|
@ -142,9 +142,9 @@ Taml::Taml() :
|
||||||
mJSONStrict( true ),
|
mJSONStrict( true ),
|
||||||
mBinaryCompression(true),
|
mBinaryCompression(true),
|
||||||
mWriteDefaults(false),
|
mWriteDefaults(false),
|
||||||
mProgenitorUpdate(true),
|
|
||||||
mAutoFormat(true),
|
|
||||||
mAutoFormatXmlExtension("taml"),
|
mAutoFormatXmlExtension("taml"),
|
||||||
|
mAutoFormat(true),
|
||||||
|
mProgenitorUpdate(true),
|
||||||
mAutoFormatBinaryExtension("baml"),
|
mAutoFormatBinaryExtension("baml"),
|
||||||
mAutoFormatJSONExtension("json")
|
mAutoFormatJSONExtension("json")
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -165,8 +165,8 @@ AsyncBufferedInputStream< T, Stream >::AsyncBufferedInputStream
|
||||||
ThreadPool* threadPool,
|
ThreadPool* threadPool,
|
||||||
ThreadContext* threadContext )
|
ThreadContext* threadContext )
|
||||||
: Parent( stream ),
|
: Parent( stream ),
|
||||||
mIsStopped( false ),
|
|
||||||
mIsLooping( isLooping ),
|
mIsLooping( isLooping ),
|
||||||
|
mIsStopped( false ),
|
||||||
mNumRemainingSourceElements( numSourceElementsToRead ),
|
mNumRemainingSourceElements( numSourceElementsToRead ),
|
||||||
mNumBufferedElements( 0 ),
|
mNumBufferedElements( 0 ),
|
||||||
mMaxBufferedElements( numReadAhead ),
|
mMaxBufferedElements( numReadAhead ),
|
||||||
|
|
|
||||||
|
|
@ -245,8 +245,8 @@ AsyncPacketBufferedInputStream< Stream, Packet >::AsyncPacketBufferedInputStream
|
||||||
ThreadContext* threadContext )
|
ThreadContext* threadContext )
|
||||||
: Parent( stream, numSourceElementsToRead, numReadAhead, isLooping, threadPool, threadContext ),
|
: Parent( stream, numSourceElementsToRead, numReadAhead, isLooping, threadPool, threadContext ),
|
||||||
mPacketSize( packetSize ),
|
mPacketSize( packetSize ),
|
||||||
mNumTotalSourceElements( numSourceElementsToRead ),
|
mNextPacketIndex( 0 ),
|
||||||
mNextPacketIndex( 0 )
|
mNumTotalSourceElements( numSourceElementsToRead )
|
||||||
{
|
{
|
||||||
AssertFatal( mPacketSize > 0,
|
AssertFatal( mPacketSize > 0,
|
||||||
"AsyncPacketStream::AsyncPacketStream() - packet size cannot be zero" );
|
"AsyncPacketStream::AsyncPacketStream() - packet size cannot be zero" );
|
||||||
|
|
|
||||||
|
|
@ -228,8 +228,8 @@ struct HeapIterator
|
||||||
|
|
||||||
HeapIterator( bool allocatedOnly = true )
|
HeapIterator( bool allocatedOnly = true )
|
||||||
: mCurrentPage( gPageList ),
|
: mCurrentPage( gPageList ),
|
||||||
mAllocatedOnly( allocatedOnly ),
|
mCurrentHeader( NULL ),
|
||||||
mCurrentHeader( NULL )
|
mAllocatedOnly( allocatedOnly )
|
||||||
{
|
{
|
||||||
if( mCurrentPage )
|
if( mCurrentPage )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -39,10 +39,10 @@ ThreadPool::Context ThreadPool::Context::smRootContext( "ROOT", NULL, 1.0 );
|
||||||
//--------------------------------------------------------------------------
|
//--------------------------------------------------------------------------
|
||||||
|
|
||||||
ThreadPool::Context::Context( const char* name, ThreadPool::Context* parent, F32 priorityBias )
|
ThreadPool::Context::Context( const char* name, ThreadPool::Context* parent, F32 priorityBias )
|
||||||
: mName( name ),
|
: mParent( parent ),
|
||||||
mParent( parent ),
|
mName( name ),
|
||||||
mSibling( 0 ),
|
|
||||||
mChildren( 0 ),
|
mChildren( 0 ),
|
||||||
|
mSibling( 0 ),
|
||||||
mPriorityBias( priorityBias ),
|
mPriorityBias( priorityBias ),
|
||||||
mAccumulatedPriorityBias( 0.0 )
|
mAccumulatedPriorityBias( 0.0 )
|
||||||
{
|
{
|
||||||
|
|
@ -215,8 +215,8 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
ThreadPool::WorkerThread::WorkerThread( ThreadPool* pool, U32 index )
|
ThreadPool::WorkerThread::WorkerThread( ThreadPool* pool, U32 index )
|
||||||
: mPool( pool ),
|
: mIndex( index ),
|
||||||
mIndex( index )
|
mPool( pool )
|
||||||
{
|
{
|
||||||
// Link us to the pool's thread list.
|
// Link us to the pool's thread list.
|
||||||
|
|
||||||
|
|
@ -311,8 +311,8 @@ ThreadPool::ThreadPool( const char* name, U32 numThreads )
|
||||||
mNumThreads( numThreads ),
|
mNumThreads( numThreads ),
|
||||||
mNumThreadsAwake( 0 ),
|
mNumThreadsAwake( 0 ),
|
||||||
mNumPendingItems( 0 ),
|
mNumPendingItems( 0 ),
|
||||||
mThreads( 0 ),
|
mSemaphore( 0 ),
|
||||||
mSemaphore( 0 )
|
mThreads( 0 )
|
||||||
{
|
{
|
||||||
// Number of worker threads to create.
|
// Number of worker threads to create.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -266,21 +266,21 @@ PostEffect::PostEffect()
|
||||||
: mRenderTime( PFXAfterDiffuse ),
|
: mRenderTime( PFXAfterDiffuse ),
|
||||||
mRenderPriority( 1.0 ),
|
mRenderPriority( 1.0 ),
|
||||||
mEnabled( false ),
|
mEnabled( false ),
|
||||||
mSkip( false ),
|
|
||||||
mUpdateShader( true ),
|
|
||||||
mStateBlockData( NULL ),
|
mStateBlockData( NULL ),
|
||||||
|
mUpdateShader( true ),
|
||||||
|
mSkip( false ),
|
||||||
mAllowReflectPass( false ),
|
mAllowReflectPass( false ),
|
||||||
mTargetClear( PFXTargetClear_None ),
|
mTargetClear( PFXTargetClear_None ),
|
||||||
mTargetViewport( PFXTargetViewport_TargetSize ),
|
|
||||||
mTargetScale( Point2F::One ),
|
mTargetScale( Point2F::One ),
|
||||||
|
mTargetViewport( PFXTargetViewport_TargetSize ),
|
||||||
mTargetSize( Point2I::Zero ),
|
mTargetSize( Point2I::Zero ),
|
||||||
mTargetFormat( GFXFormatR8G8B8A8 ),
|
mTargetFormat( GFXFormatR8G8B8A8 ),
|
||||||
mTargetClearColor( ColorF::BLACK ),
|
mTargetClearColor( ColorF::BLACK ),
|
||||||
mOneFrameOnly( false ),
|
mOneFrameOnly( false ),
|
||||||
mOnThisFrame( true ),
|
mOnThisFrame( true ),
|
||||||
mShaderReloadKey( 0 ),
|
|
||||||
mIsValid( false ),
|
|
||||||
mRTSizeSC( NULL ),
|
mRTSizeSC( NULL ),
|
||||||
|
mIsValid( false ),
|
||||||
|
mShaderReloadKey( 0 ),
|
||||||
mOneOverRTSizeSC( NULL ),
|
mOneOverRTSizeSC( NULL ),
|
||||||
mViewportOffsetSC( NULL ),
|
mViewportOffsetSC( NULL ),
|
||||||
mTargetViewportSC( NULL ),
|
mTargetViewportSC( NULL ),
|
||||||
|
|
|
||||||
|
|
@ -52,8 +52,8 @@ MODULE_END;
|
||||||
bool PostEffectManager::smRenderEffects = true;
|
bool PostEffectManager::smRenderEffects = true;
|
||||||
|
|
||||||
PostEffectManager::PostEffectManager() :
|
PostEffectManager::PostEffectManager() :
|
||||||
mFrameStateSwitch( false ),
|
mLastBackBufferTarget( NULL ),
|
||||||
mLastBackBufferTarget( NULL )
|
mFrameStateSwitch( false )
|
||||||
{
|
{
|
||||||
GFXDevice::getDeviceEventSignal().notify( this, &PostEffectManager::_handleDeviceEvent );
|
GFXDevice::getDeviceEventSignal().notify( this, &PostEffectManager::_handleDeviceEvent );
|
||||||
RenderPassManager::getRenderBinSignal().notify( this, &PostEffectManager::_handleBinEvent );
|
RenderPassManager::getRenderBinSignal().notify( this, &PostEffectManager::_handleBinEvent );
|
||||||
|
|
|
||||||
|
|
@ -33,9 +33,9 @@ IMPLEMENT_CONOBJECT(RenderBinManager);
|
||||||
|
|
||||||
|
|
||||||
RenderBinManager::RenderBinManager( const RenderInstType& ritype, F32 renderOrder, F32 processAddOrder ) :
|
RenderBinManager::RenderBinManager( const RenderInstType& ritype, F32 renderOrder, F32 processAddOrder ) :
|
||||||
mRenderInstType( ritype ),
|
|
||||||
mRenderOrder( renderOrder ),
|
|
||||||
mProcessAddOrder( processAddOrder ),
|
mProcessAddOrder( processAddOrder ),
|
||||||
|
mRenderOrder( renderOrder ),
|
||||||
|
mRenderInstType( ritype ),
|
||||||
mRenderPass( NULL ),
|
mRenderPass( NULL ),
|
||||||
mBasicOnly ( false )
|
mBasicOnly ( false )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -49,8 +49,8 @@ F32 SceneCullingState::smOccluderMinHeightPercentage = 0.1f;
|
||||||
SceneCullingState::SceneCullingState( SceneManager* sceneManager, const SceneCameraState& viewState )
|
SceneCullingState::SceneCullingState( SceneManager* sceneManager, const SceneCameraState& viewState )
|
||||||
: mSceneManager( sceneManager ),
|
: mSceneManager( sceneManager ),
|
||||||
mCameraState( viewState ),
|
mCameraState( viewState ),
|
||||||
mDisableZoneCulling( smDisableZoneCulling ),
|
mDisableTerrainOcclusion( smDisableTerrainOcclusion ),
|
||||||
mDisableTerrainOcclusion( smDisableTerrainOcclusion )
|
mDisableZoneCulling( smDisableZoneCulling )
|
||||||
{
|
{
|
||||||
AssertFatal( sceneManager->getZoneManager(), "SceneCullingState::SceneCullingState - SceneManager must have a zone manager!" );
|
AssertFatal( sceneManager->getZoneManager(), "SceneCullingState::SceneCullingState - SceneManager must have a zone manager!" );
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -83,8 +83,8 @@ U32 ReflectionManager::smFrameReflectionMS = 10;
|
||||||
F32 ReflectionManager::smRefractTexScale = 0.5f;
|
F32 ReflectionManager::smRefractTexScale = 0.5f;
|
||||||
|
|
||||||
ReflectionManager::ReflectionManager()
|
ReflectionManager::ReflectionManager()
|
||||||
: mUpdateRefract( true ),
|
: mReflectFormat( GFXFormatR8G8B8A8 ),
|
||||||
mReflectFormat( GFXFormatR8G8B8A8 ),
|
mUpdateRefract( true ),
|
||||||
mLastUpdateMs( 0 )
|
mLastUpdateMs( 0 )
|
||||||
{
|
{
|
||||||
mTimer = PlatformTimer::create();
|
mTimer = PlatformTimer::create();
|
||||||
|
|
|
||||||
|
|
@ -39,16 +39,16 @@ SceneRenderState::SceneRenderState( SceneManager* sceneManager,
|
||||||
RenderPassManager* renderPass /* = NULL */,
|
RenderPassManager* renderPass /* = NULL */,
|
||||||
bool usePostEffects /* = true */ )
|
bool usePostEffects /* = true */ )
|
||||||
: mSceneManager( sceneManager ),
|
: mSceneManager( sceneManager ),
|
||||||
mCullingState( sceneManager, view ),
|
|
||||||
mRenderPass( renderPass ? renderPass : sceneManager->getDefaultRenderPass() ),
|
|
||||||
mScenePassType( passType ),
|
mScenePassType( passType ),
|
||||||
mRenderNonLightmappedMeshes( true ),
|
mRenderPass( renderPass ? renderPass : sceneManager->getDefaultRenderPass() ),
|
||||||
mRenderLightmappedMeshes( true ),
|
mCullingState( sceneManager, view ),
|
||||||
mUsePostEffects( usePostEffects ),
|
mUsePostEffects( usePostEffects ),
|
||||||
mDisableAdvancedLightingBins( false ),
|
mRenderLightmappedMeshes( true ),
|
||||||
|
mRenderNonLightmappedMeshes( true ),
|
||||||
mRenderArea( view.getFrustum().getBounds() ),
|
mRenderArea( view.getFrustum().getBounds() ),
|
||||||
mAmbientLightColor( sceneManager->getAmbientLightColor() ),
|
mDisableAdvancedLightingBins( false ),
|
||||||
mSceneRenderStyle( SRS_Standard )
|
mSceneRenderStyle( SRS_Standard ),
|
||||||
|
mAmbientLightColor( sceneManager->getAmbientLightColor() )
|
||||||
{
|
{
|
||||||
// Setup the default parameters for the screen metrics methods.
|
// Setup the default parameters for the screen metrics methods.
|
||||||
mDiffuseCameraTransform = view.getHeadWorldViewMatrix();
|
mDiffuseCameraTransform = view.getHeadWorldViewMatrix();
|
||||||
|
|
|
||||||
|
|
@ -30,8 +30,8 @@
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
SceneObjectLink::SceneObjectLink( SceneTracker* tracker, SceneObject* object )
|
SceneObjectLink::SceneObjectLink( SceneTracker* tracker, SceneObject* object )
|
||||||
: mTracker( tracker ),
|
: mObject( object ),
|
||||||
mObject( object ),
|
mTracker( tracker ),
|
||||||
mNextLink( NULL ),
|
mNextLink( NULL ),
|
||||||
mPrevLink( NULL )
|
mPrevLink( NULL )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -41,10 +41,10 @@ ClassChunker< SceneZoneSpace::ZoneSpaceRef > SceneZoneSpace::smZoneSpaceRefChunk
|
||||||
|
|
||||||
SceneZoneSpace::SceneZoneSpace()
|
SceneZoneSpace::SceneZoneSpace()
|
||||||
: mManager( NULL ),
|
: mManager( NULL ),
|
||||||
mZoneGroup( InvalidZoneGroup ),
|
|
||||||
mZoneRangeStart( SceneZoneSpaceManager::InvalidZoneId ),
|
mZoneRangeStart( SceneZoneSpaceManager::InvalidZoneId ),
|
||||||
mZoneFlags( ZoneFlag_IsClosedOffSpace ),
|
mZoneGroup( InvalidZoneGroup ),
|
||||||
mNumZones( 0 ),
|
mNumZones( 0 ),
|
||||||
|
mZoneFlags( ZoneFlag_IsClosedOffSpace ),
|
||||||
mConnectedZoneSpaces( NULL )
|
mConnectedZoneSpaces( NULL )
|
||||||
{
|
{
|
||||||
VECTOR_SET_ASSOCIATION( mOccluders );
|
VECTOR_SET_ASSOCIATION( mOccluders );
|
||||||
|
|
|
||||||
|
|
@ -44,8 +44,8 @@ ClassChunker< SceneObject::ZoneRef > SceneZoneSpaceManager::smZoneRefChunker;
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
SceneZoneSpaceManager::SceneZoneSpaceManager( SceneContainer* container )
|
SceneZoneSpaceManager::SceneZoneSpaceManager( SceneContainer* container )
|
||||||
: mContainer( container ),
|
: mRootZone( new SceneRootZone() ),
|
||||||
mRootZone( new SceneRootZone() ),
|
mContainer( container ),
|
||||||
mNumTotalAllocatedZones( 0 ),
|
mNumTotalAllocatedZones( 0 ),
|
||||||
mNumActiveZones( 0 ),
|
mNumActiveZones( 0 ),
|
||||||
mDirtyArea( Box3F::Invalid )
|
mDirtyArea( Box3F::Invalid )
|
||||||
|
|
|
||||||
|
|
@ -54,9 +54,9 @@ SFXALBuffer::SFXALBuffer( const OPENALFNTABLE &oalft,
|
||||||
SFXDescription* description,
|
SFXDescription* description,
|
||||||
bool useHardware )
|
bool useHardware )
|
||||||
: Parent( stream, description ),
|
: Parent( stream, description ),
|
||||||
mOpenAL( oalft ),
|
mIs3d( description->mIs3D ),
|
||||||
mUseHardware( useHardware ),
|
mUseHardware( useHardware ),
|
||||||
mIs3d( description->mIs3D )
|
mOpenAL( oalft )
|
||||||
{
|
{
|
||||||
// Set up device buffers.
|
// Set up device buffers.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,8 +34,8 @@ SFXALDevice::SFXALDevice( SFXProvider *provider,
|
||||||
S32 maxBuffers )
|
S32 maxBuffers )
|
||||||
: Parent( name, provider, useHardware, maxBuffers ),
|
: Parent( name, provider, useHardware, maxBuffers ),
|
||||||
mOpenAL( openal ),
|
mOpenAL( openal ),
|
||||||
mDevice( NULL ),
|
|
||||||
mContext( NULL ),
|
mContext( NULL ),
|
||||||
|
mDevice( NULL ),
|
||||||
mRolloffFactor( 1.0f )
|
mRolloffFactor( 1.0f )
|
||||||
{
|
{
|
||||||
mMaxBuffers = getMax( maxBuffers, 8 );
|
mMaxBuffers = getMax( maxBuffers, 8 );
|
||||||
|
|
|
||||||
|
|
@ -83,10 +83,10 @@ SFXAmbience::ChangeSignal SFXAmbience::smChangeSignal;
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
SFXAmbience::SFXAmbience()
|
SFXAmbience::SFXAmbience()
|
||||||
: mEnvironment( NULL ),
|
: mDopplerFactor( 0.5f ),
|
||||||
mSoundTrack( NULL ),
|
|
||||||
mRolloffFactor( 1.f ),
|
mRolloffFactor( 1.f ),
|
||||||
mDopplerFactor( 0.5f )
|
mSoundTrack( NULL ),
|
||||||
|
mEnvironment( NULL )
|
||||||
{
|
{
|
||||||
dMemset( mState, 0, sizeof( mState ) );
|
dMemset( mState, 0, sizeof( mState ) );
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -134,8 +134,8 @@ SFXDescription::SFXDescription()
|
||||||
mFadeLoops( false ),
|
mFadeLoops( false ),
|
||||||
mStreamPacketSize( SFXInternal::SFXAsyncStream::DEFAULT_STREAM_PACKET_LENGTH ),
|
mStreamPacketSize( SFXInternal::SFXAsyncStream::DEFAULT_STREAM_PACKET_LENGTH ),
|
||||||
mStreamReadAhead( SFXInternal::SFXAsyncStream::DEFAULT_STREAM_LOOKAHEAD ),
|
mStreamReadAhead( SFXInternal::SFXAsyncStream::DEFAULT_STREAM_LOOKAHEAD ),
|
||||||
mPriority( 1.0f ),
|
|
||||||
mScatterDistance( 0.f, 0.f, 0.f ),
|
mScatterDistance( 0.f, 0.f, 0.f ),
|
||||||
|
mPriority( 1.0f ),
|
||||||
mSourceGroup( NULL )
|
mSourceGroup( NULL )
|
||||||
{
|
{
|
||||||
dMemset( mParameters, 0, sizeof( mParameters ) );
|
dMemset( mParameters, 0, sizeof( mParameters ) );
|
||||||
|
|
@ -164,11 +164,11 @@ SFXDescription::SFXDescription( const SFXDescription& desc )
|
||||||
mFadeOutEase( desc.mFadeOutEase ),
|
mFadeOutEase( desc.mFadeOutEase ),
|
||||||
mFadeLoops( desc.mFadeLoops ),
|
mFadeLoops( desc.mFadeLoops ),
|
||||||
mStreamPacketSize( desc.mStreamPacketSize ),
|
mStreamPacketSize( desc.mStreamPacketSize ),
|
||||||
mStreamReadAhead( desc.mStreamReadAhead ),
|
|
||||||
mUseReverb( desc.mUseReverb ),
|
mUseReverb( desc.mUseReverb ),
|
||||||
|
mStreamReadAhead( desc.mStreamReadAhead ),
|
||||||
mReverb( desc.mReverb ),
|
mReverb( desc.mReverb ),
|
||||||
mPriority( desc.mPriority ),
|
mScatterDistance( desc.mScatterDistance ),
|
||||||
mScatterDistance( desc.mScatterDistance )
|
mPriority( desc.mPriority )
|
||||||
{
|
{
|
||||||
for( U32 i = 0; i < MaxNumParameters; ++ i )
|
for( U32 i = 0; i < MaxNumParameters; ++ i )
|
||||||
mParameters[ i ] = desc.mParameters[ i ];
|
mParameters[ i ] = desc.mParameters[ i ];
|
||||||
|
|
|
||||||
|
|
@ -60,8 +60,8 @@ bool SFXOneShotModifier::update()
|
||||||
SFXRangeModifier::SFXRangeModifier( SFXSource* source, F32 startTime, F32 endTime, bool removeWhenDone )
|
SFXRangeModifier::SFXRangeModifier( SFXSource* source, F32 startTime, F32 endTime, bool removeWhenDone )
|
||||||
: Parent( source, removeWhenDone ),
|
: Parent( source, removeWhenDone ),
|
||||||
mStartTime( startTime ),
|
mStartTime( startTime ),
|
||||||
mEndTime( endTime ),
|
mIsActive( false ),
|
||||||
mIsActive( false )
|
mEndTime( endTime )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -217,8 +217,8 @@ EndImplementEnumType;
|
||||||
SFXPlayList::SFXPlayList()
|
SFXPlayList::SFXPlayList()
|
||||||
: mRandomMode( RANDOM_NotRandom ),
|
: mRandomMode( RANDOM_NotRandom ),
|
||||||
mLoopMode( LOOP_All ),
|
mLoopMode( LOOP_All ),
|
||||||
mNumSlotsToPlay( NUM_SLOTS ),
|
mTrace( false ),
|
||||||
mTrace( false )
|
mNumSlotsToPlay( NUM_SLOTS )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -53,8 +53,8 @@ void SFXProvider::regProvider( SFXProvider* provider )
|
||||||
}
|
}
|
||||||
|
|
||||||
SFXProvider::SFXProvider( const String& name )
|
SFXProvider::SFXProvider( const String& name )
|
||||||
: mName( name ),
|
: mNextProvider( NULL ),
|
||||||
mNextProvider( NULL )
|
mName( name )
|
||||||
{
|
{
|
||||||
VECTOR_SET_ASSOCIATION( mDeviceInfo );
|
VECTOR_SET_ASSOCIATION( mDeviceInfo );
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -198,8 +198,8 @@ SFXSystem::SFXSystem()
|
||||||
mStatNumVoices( 0 ),
|
mStatNumVoices( 0 ),
|
||||||
mStatSourceUpdateTime( 0 ),
|
mStatSourceUpdateTime( 0 ),
|
||||||
mStatParameterUpdateTime( 0 ),
|
mStatParameterUpdateTime( 0 ),
|
||||||
mStatAmbientUpdateTime( 0 ),
|
|
||||||
mDistanceModel( SFXDistanceModelLinear ),
|
mDistanceModel( SFXDistanceModelLinear ),
|
||||||
|
mStatAmbientUpdateTime( 0 ),
|
||||||
mDopplerFactor( 0.5 ),
|
mDopplerFactor( 0.5 ),
|
||||||
mRolloffFactor( 1.0 ),
|
mRolloffFactor( 1.0 ),
|
||||||
mSoundscapeMgr( NULL )
|
mSoundscapeMgr( NULL )
|
||||||
|
|
|
||||||
|
|
@ -145,8 +145,8 @@ public:
|
||||||
ShaderFeature()
|
ShaderFeature()
|
||||||
: output( NULL ),
|
: output( NULL ),
|
||||||
mProcessIndex( 0 ),
|
mProcessIndex( 0 ),
|
||||||
mInstancingFormat( NULL ),
|
mVertexFormat( NULL ),
|
||||||
mVertexFormat( NULL )
|
mInstancingFormat( NULL )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -98,8 +98,8 @@ class InterpolatedChangeProperty
|
||||||
///
|
///
|
||||||
InterpolatedChangeProperty( const T& initialValue = T() )
|
InterpolatedChangeProperty( const T& initialValue = T() )
|
||||||
: mCurrentValue( initialValue ),
|
: mCurrentValue( initialValue ),
|
||||||
mTargetValue( initialValue ),
|
|
||||||
mBlendPhaseTime( DEFAULT_TRANSITION_TIME ),
|
mBlendPhaseTime( DEFAULT_TRANSITION_TIME ),
|
||||||
|
mTargetValue( initialValue ),
|
||||||
mTransitionStartTime( 0 )
|
mTransitionStartTime( 0 )
|
||||||
{
|
{
|
||||||
// By default, start time source right away.
|
// By default, start time source right away.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue